From 345eab350d41d832c040d63011a178689696b650 Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期日, 28 三月 2021 12:03:55 +0800
Subject: [PATCH] 更改短信默认模板
---
.idea/workspace.xml | 77 +++++++++++++++++++++-----------------
src/main/java/com/ots/project/exam/controller/EntTestMemberController.java | 9 +---
src/main/resources/application-sand.yml | 2
3 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fa346f7..163a20f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,9 +21,8 @@
<component name="ChangeListManager">
<list default="true" id="cd72c5cc-17e9-4269-9d87-e1dc29ad79ec" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/controller/EntTestMemberController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/ots/project/exam/controller/EntTestMemberController.java" 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" />
@@ -82,7 +81,7 @@
</option>
</component>
<component name="RunManager">
- <configuration name="OtsApplication (1)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
+ <configuration name="OtsApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true">
<module name="tai-ots-master" />
<extension name="coverage">
<pattern>
@@ -91,13 +90,14 @@
</pattern>
</extension>
<option name="SPRING_BOOT_MAIN_CLASS" value="com.ots.OtsApplication" />
+ <option name="ALTERNATIVE_JRE_PATH" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<recent_temporary>
<list>
- <item itemvalue="Spring Boot.OtsApplication (1)" />
+ <item itemvalue="Spring Boot.OtsApplication" />
</list>
</recent_temporary>
</component>
@@ -126,7 +126,9 @@
<workItem from="1615687698610" duration="24365000" />
<workItem from="1615790694638" duration="12801000" />
<workItem from="1615859554413" duration="19554000" />
- <workItem from="1616726174980" duration="370000" />
+ <workItem from="1616726174980" duration="484000" />
+ <workItem from="1616735202222" duration="693000" />
+ <workItem from="1616900600709" duration="3355000" />
</task>
<task id="LOCAL-00001" summary="娴嬭瘎椤圭洰鏈�鏂颁唬鐮�">
<created>1615212708854</created>
@@ -149,7 +151,14 @@
<option name="project" value="LOCAL" />
<updated>1616725860932</updated>
</task>
- <option name="localTasksCounter" value="4" />
+ <task id="LOCAL-00004" summary="鏇存浠ｇ爜">
+ <created>1616726627804</created>
+ <option name="number" value="00004" />
+ <option name="presentableId" value="LOCAL-00004" />
+ <option name="project" value="LOCAL" />
+ <updated>1616726627804</updated>
+ </task>
+ <option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -212,14 +221,14 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="440" y="94" key="#Project_Structure/0.0.1920.1040@0.0.1920.1040" timestamp="1615515318160" />
- <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1615688571928">
+ <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1616901531959">
<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="1616725859977">
+ <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1616901531959" />
+ <state x="456" y="74" key="CommitChangelistDialog2" timestamp="1616726627155">
<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="1616725859977" />
+ <state x="456" y="74" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1616726627155" />
<state x="135" y="145" width="1736" height="856" key="DiffContextDialog" timestamp="1615732620930">
<screen x="0" y="0" width="1920" height="1040" />
</state>
@@ -228,42 +237,42 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="740" y="274" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1615860106593" />
- <state width="267" height="357" key="Git.Branch.Popup" timestamp="1615460729320">
+ <state width="273" height="363" key="Git.Branch.Popup" timestamp="1616900622360">
<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="340" key="GridCell.Tab.0.bottom" timestamp="1616726443372">
+ <state width="273" height="363" key="Git.Branch.Popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616900622360" />
+ <state width="1877" height="302" key="GridCell.Tab.0.bottom" timestamp="1616903591368">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <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">
+ <state width="1877" height="302" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1616903591368" />
+ <state width="1877" height="302" key="GridCell.Tab.0.center" timestamp="1616903591368">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <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">
+ <state width="1877" height="302" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1616903591368" />
+ <state width="1877" height="302" key="GridCell.Tab.0.left" timestamp="1616903591368">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <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">
+ <state width="1877" height="302" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1616903591368" />
+ <state width="1877" height="302" key="GridCell.Tab.0.right" timestamp="1616903591368">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <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">
+ <state width="1877" height="302" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1616903591368" />
+ <state width="1877" height="302" key="GridCell.Tab.1.bottom" timestamp="1616903591368">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <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">
+ <state width="1877" height="302" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1616903591368" />
+ <state width="1877" height="302" key="GridCell.Tab.1.center" timestamp="1616903591368">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <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">
+ <state width="1877" height="302" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1616903591368" />
+ <state width="1877" height="302" key="GridCell.Tab.1.left" timestamp="1616903591368">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <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">
+ <state width="1877" height="302" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1616903591368" />
+ <state width="1877" height="302" key="GridCell.Tab.1.right" timestamp="1616903591368">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state width="1877" height="340" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1616726443372" />
+ <state width="1877" height="302" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1616903591368" />
<state width="1877" height="385" key="GridCell.Tab.2.bottom" timestamp="1615889660606">
<screen x="0" y="0" width="1920" height="1040" />
</state>
@@ -288,10 +297,10 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="461" y="164" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1615431876749" />
- <state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1615460743690">
+ <state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1616726636568">
<screen x="0" y="0" width="1920" height="1040" />
</state>
- <state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1615460743690" />
+ <state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1616726636568" />
<state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1615866063087">
<screen x="0" y="0" width="1920" height="1040" />
</state>
@@ -300,18 +309,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="1616726199225">
+ <state x="1083" y="283" width="603" height="748" key="find.popup" timestamp="1616903062075">
<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="1616726199225" />
+ <state x="1083" y="283" width="603" height="748" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616903062075" />
<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="1616725833203">
+ <state x="616" y="240" width="672" height="677" key="run.anything.popup" timestamp="1616903591280">
<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="1616725833203" />
+ <state x="616" y="240" width="672" height="677" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1616903591280" />
<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/java/com/ots/project/exam/controller/EntTestMemberController.java b/src/main/java/com/ots/project/exam/controller/EntTestMemberController.java
index d9aecec..db42bdf 100644
--- a/src/main/java/com/ots/project/exam/controller/EntTestMemberController.java
+++ b/src/main/java/com/ots/project/exam/controller/EntTestMemberController.java
@@ -278,15 +278,10 @@
public String sendSms(@PathVariable("memberIds") String memberIds, @PathVariable("testId") Long testId, ModelMap mmap) {
StringBuilder builder = new StringBuilder();
builder.append("浜茬埍鐨剓FullName}锛�").append("\n");
- builder.append("\n");
- builder.append("{Company} 閭�璇锋偍瀹屾垚涓�浠芥祴璇曪紝澶ф闇�瑕�20-25鍒嗛挓鏃堕棿銆傛偍鍙互鐩存帴鐐瑰嚮涓嬮潰鐨勯摼鎺ュ紑濮嬭娴嬭瘯銆傚鏋滀笉鑳界洿鎺ヨ闂紝璇峰鍒跺湴鍧�鍒版祻瑙堝櫒涓洿鎺ユ墦寮�銆�").append("\n");
- builder.append("\n");
+ builder.append("灞辫タ璐㈢粡澶у宸ュ晢绠＄悊瀛﹂櫌MBA鏁欒偛涓績閭�璇锋偍瀹屾垚涓�涓績鐞嗘祴璇曪紝澶ф闇�瑕�20鍒嗛挓鏃堕棿銆傛偍鍙互鐩存帴鐐瑰嚮涓嬮潰鐨勯摼鎺ュ紑濮嬭娴嬭瘯銆傚鏋滀笉鑳界洿鎺ヨ闂紝璇峰鍒跺湴鍧�鍒版祻瑙堝櫒涓洿鎺ユ墦寮�銆傚鏋滈亣鍒扮綉缁滃紓甯告祴璇曚腑鏂紝鍙互閫�鍑烘祻瑙堝櫒锛岄噸鏂扮偣鍑绘祴璇曢個璇烽噷鐨勯摼鎺ワ紝缁х画绛旈銆傚鏋滅鍒板叾瀹冩妧鏈笂鐨勬晠闅滐紝鍙互鑱旂郴IT鍏徃鐨勫惔宸ワ紝13611452175銆�").append("\n");
builder.append("閾炬帴鍦板潃鏄細{url}");
builder.append("\n");
- builder.append("濡傛湁鐤戦棶锛岃涓庡鏈嶈仈绯伙紝閭鏄細support@tai-online.com銆�");
- builder.append("\n");
- builder.append("璋㈣阿!").append("\n");
- builder.append("{Company}");
+ builder.append("璋㈣阿!");
String type = SenderType.sms.getType();
processParams(memberIds, testId, mmap, builder.toString(), type);
return prefix + "/sendSms";
diff --git a/src/main/resources/application-sand.yml b/src/main/resources/application-sand.yml
index a35a5ef..9d58a68 100644
--- a/src/main/resources/application-sand.yml
+++ b/src/main/resources/application-sand.yml
@@ -84,7 +84,7 @@
# 杩滅▼娉板浗璁＄畻鏈嶅姟
ATSTai:
- host: 127.0.0.1
+ host: 47.114.179.216
port: 9123
jasypt:
encryptor:
--
Gitblit v1.9.1