From 8631e4476480af44eaeb1925a48dc809dfd085b5 Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期五, 26 三月 2021 10:43:47 +0800
Subject: [PATCH] 更正代码
---
.idea/workspace.xml | 64 +++++++++++++++++++-------------
src/main/resources/templates/exam/testMember/add.html | 2
src/main/resources/application-sand.yml | 8 ++--
src/main/resources/application.yml | 2
4 files changed, 44 insertions(+), 32 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 110eb91..fa346f7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -20,7 +20,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="cd72c5cc-17e9-4269-9d87-e1dc29ad79ec" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/restcontroller/ExamPaperAnswerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/restcontroller/ExamPaperAnswerController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/application-sand.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-sand.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/templates/exam/testMember/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/exam/testMember/add.html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -56,7 +59,7 @@
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="ignore_missing_gitignore" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../tai-ots-framework" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.0" />
@@ -123,6 +126,7 @@
<workItem from="1615687698610" duration="24365000" />
<workItem from="1615790694638" duration="12801000" />
<workItem from="1615859554413" duration="19554000" />
+ <workItem from="1616726174980" duration="370000" />
</task>
<task id="LOCAL-00001" summary="娴嬭瘎椤圭洰鏈�鏂颁唬鐮�">
<created>1615212708854</created>
@@ -138,7 +142,14 @@
<option name="project" value="LOCAL" />
<updated>1615460723307</updated>
</task>
- <option name="localTasksCounter" value="3" />
+ <task id="LOCAL-00003" summary="鏇存浠ｇ爜">
+ <created>1616725860932</created>
+ <option name="number" value="00003" />
+ <option name="presentableId" value="LOCAL-00003" />
+ <option name="project" value="LOCAL" />
+ <updated>1616725860932</updated>
+ </task>
+ <option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -189,7 +200,8 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="娴嬭瘎椤圭洰鏈�鏂颁唬鐮�" />
<MESSAGE value="娴嬭瘎绯荤粺澶栭儴浠ｇ爜" />
- <option name="LAST_COMMIT_MESSAGE" value="娴嬭瘎绯荤粺澶栭儴浠ｇ爜" />
+ <MESSAGE value="鏇存浠ｇ爜" />
+ <option name="LAST_COMMIT_MESSAGE" value="鏇存浠ｇ爜" />
</component>
<component name="WindowStateProjectService">
<state x="590" y="113" key="#OtsApplication" timestamp="1615515366491">
@@ -204,10 +216,10 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1615688571928" />
- <state x="456" y="74" key="CommitChangelistDialog2" timestamp="1615460721590">
+ <state x="456" y="74" key="CommitChangelistDialog2" timestamp="1616725859977">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state x="456" y="74" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1615460721590" />
+ <state x="456" y="74" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1616725859977" />
<state x="135" y="145" width="1736" height="856" key="DiffContextDialog" timestamp="1615732620930">
<screen x="0" y="0" width="1920" height="1040" />
</state>
@@ -220,38 +232,38 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="267" height="357" key="Git.Branch.Popup/0.0.1920.1040@0.0.1920.1040" timestamp="1615460729320" />
- <state width="1877" height="385" key="GridCell.Tab.0.bottom" timestamp="1615889667308">
+ <state width="1877" height="340" key="GridCell.Tab.0.bottom" timestamp="1616726443372">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="385" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1615889667308" />
- <state width="1877" height="385" key="GridCell.Tab.0.center" timestamp="1615889667308">
+ <state width="1877" height="340" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1616726443372" />
+ <state width="1877" height="340" key="GridCell.Tab.0.center" timestamp="1616726443372">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="385" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1615889667308" />
- <state width="1877" height="385" key="GridCell.Tab.0.left" timestamp="1615889667308">
+ <state width="1877" height="340" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1616726443372" />
+ <state width="1877" height="340" key="GridCell.Tab.0.left" timestamp="1616726443372">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="385" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1615889667308" />
- <state width="1877" height="385" key="GridCell.Tab.0.right" timestamp="1615889667308">
+ <state width="1877" height="340" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1616726443372" />
+ <state width="1877" height="340" key="GridCell.Tab.0.right" timestamp="1616726443372">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="385" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1615889667308" />
- <state width="1877" height="385" key="GridCell.Tab.1.bottom" timestamp="1615889660605">
+ <state width="1877" height="340" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1616726443372" />
+ <state width="1877" height="340" key="GridCell.Tab.1.bottom" timestamp="1616726443372">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="385" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1615889660605" />
- <state width="1877" height="385" key="GridCell.Tab.1.center" timestamp="1615889660605">
+ <state width="1877" height="340" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1616726443372" />
+ <state width="1877" height="340" key="GridCell.Tab.1.center" timestamp="1616726443372">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="385" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1615889660605" />
- <state width="1877" height="385" key="GridCell.Tab.1.left" timestamp="1615889660605">
+ <state width="1877" height="340" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1616726443372" />
+ <state width="1877" height="340" key="GridCell.Tab.1.left" timestamp="1616726443372">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="385" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1615889660605" />
- <state width="1877" height="385" key="GridCell.Tab.1.right" timestamp="1615889660605">
+ <state width="1877" height="340" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1616726443372" />
+ <state width="1877" height="340" key="GridCell.Tab.1.right" timestamp="1616726443372">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="385" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1615889660605" />
+ <state width="1877" height="340" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1616726443372" />
<state width="1877" height="385" key="GridCell.Tab.2.bottom" timestamp="1615889660606">
<screen x="0" y="0" width="1920" height="1040" />
</state>
@@ -288,18 +300,18 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="754" y="432" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1616725792611" />
- <state x="1083" y="283" width="603" height="748" key="find.popup" timestamp="1616725783782">
+ <state x="1083" y="283" width="603" height="748" key="find.popup" timestamp="1616726199225">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state x="1083" y="283" width="603" height="748" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616725783782" />
+ <state x="1083" y="283" width="603" height="748" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616726199225" />
<state x="761" y="426" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1615460537318">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="761" y="426" key="git4idea.remote.GitConfigureRemotesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1615460537318" />
- <state x="616" y="240" width="672" height="677" key="run.anything.popup" timestamp="1615795422622">
+ <state x="616" y="240" width="672" height="677" key="run.anything.popup" timestamp="1616725833203">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state x="616" y="240" width="672" height="677" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1615795422622" />
+ <state x="616" y="240" width="672" height="677" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616725833203" />
<state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1615864418427">
<screen x="0" y="0" width="1920" height="1040" />
</state>
diff --git a/src/main/resources/application-sand.yml b/src/main/resources/application-sand.yml
index f4ccc4f..a35a5ef 100644
--- a/src/main/resources/application-sand.yml
+++ b/src/main/resources/application-sand.yml
@@ -11,13 +11,13 @@
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ots/uploadPath锛孡inux閰嶇疆 /home/data/ots/uploadPath锛�
profile: /home/data/ots/uploadPath
# 鍥剧墖鐨剈rl锛屽:vue绔http://139.199.11.114/images鍦板潃
- imagePath: http://120.24.39.179:8090/profile/images
+ imagePath: http://47.114.179.216:8090/profile/images
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: true
# 鎶ュ憡妯＄増鍦板潃
reportTemplates: /home/data/ots/reportTemplates/
# http profile
- httpProfilePath: http://120.24.39.179:8090/profile
+ httpProfilePath: http://47.114.179.216:8090/profile
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -26,7 +26,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://120.24.39.179:3306/ots-sand?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://47.114.179.216:3306/ots-sand?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: TAI@2019#Zjun
# 浠庡簱鏁版嵁婧�
@@ -80,7 +80,7 @@
# VUE绔闂湴鍧�
vue:
- url: http://120.24.39.179/exam-stu/#/ots/{0}/login
+ url: http://47.114.179.216/exam-stu/#/ots/{0}/login
# 杩滅▼娉板浗璁＄畻鏈嶅姟
ATSTai:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ceffe07..32f7406 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -40,7 +40,7 @@
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
profiles:
- active: dev
+ active: sand
# 鏂囦欢涓婁紶
servlet:
multipart:
diff --git a/src/main/resources/templates/exam/testMember/add.html b/src/main/resources/templates/exam/testMember/add.html
index a054178..e646345 100644
--- a/src/main/resources/templates/exam/testMember/add.html
+++ b/src/main/resources/templates/exam/testMember/add.html
@@ -40,7 +40,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">[[#{basis.remark}]]锛�</label>
<div class="col-sm-8">
- <input name="remark" class="form-control" type="text" required>
+ <input name="remark" class="form-control" type="text">
</div>
</div>
</form>
--
Gitblit v1.9.1