linzhijie
2021-03-28 345eab350d41d832c040d63011a178689696b650
更改短信默认模板
3个文件已修改
88 ■■■■ 已修改文件
.idea/workspace.xml 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ots/project/exam/controller/EntTestMemberController.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-sand.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
.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>
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";
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: