夏文涛 2 anos atrás
pai
commit
e3ade7231a

+ 61 - 19
.idea/workspace.xml

@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
   <component name="ChangeListManager">
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="be7aa737-81a4-4fa1-848a-b64feaec2f6c" name="Default Changelist" comment="">
     <list default="true" id="be7aa737-81a4-4fa1-848a-b64feaec2f6c" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartVisitorController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" />
+=======
+    <list default="true" id="36922be1-416a-4a25-9739-9814e01883a6" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+>>>>>>> 678fbbf6788b3304f5df8b5725dd74a977b78d1c
     </list>
     </list>
-    <ignored path="$PROJECT_DIR$/classes/" />
-    <ignored path="$PROJECT_DIR$/target/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   </component>
+<<<<<<< HEAD
   <component name="DefaultGradleProjectSettings">
   <component name="DefaultGradleProjectSettings">
     <option name="testRunner" value="GRADLE" />
     <option name="testRunner" value="GRADLE" />
     <option name="delegatedBuild" value="true" />
     <option name="delegatedBuild" value="true" />
@@ -124,6 +130,8 @@
       </file>
       </file>
     </leaf>
     </leaf>
   </component>
   </component>
+=======
+>>>>>>> 678fbbf6788b3304f5df8b5725dd74a977b78d1c
   <component name="FindInProjectRecents">
   <component name="FindInProjectRecents">
     <findStrings>
     <findStrings>
       <find>visitingAgencys</find>
       <find>visitingAgencys</find>
@@ -151,11 +159,15 @@
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="MavenImportPreferences">
   <component name="MavenImportPreferences">
     <option name="generalSettings">
     <option name="generalSettings">
       <MavenGeneralSettings>
       <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/Software/Develop/Maven/apache-maven-3.3.9" />
-        <option name="userSettingsFile" value="D:\Software\Develop\Maven\apache-maven-3.3.9\conf\settings.xml" />
+        <option name="mavenHome" value="D:/soft/maven/apache-maven-3.8.6" />
+        <option name="useMavenConfig" value="true" />
+        <option name="userSettingsFile" value="D:\soft\maven\apache-maven-3.8.6\conf\settings.xml" />
       </MavenGeneralSettings>
       </MavenGeneralSettings>
     </option>
     </option>
   </component>
   </component>
@@ -183,6 +195,7 @@
     <option name="width" value="958" />
     <option name="width" value="958" />
     <option name="height" value="1039" />
     <option name="height" value="1039" />
   </component>
   </component>
+  <component name="ProjectId" id="2bnFTIauC6hkDzZ6PKgW5F8o008" />
   <component name="ProjectView">
   <component name="ProjectView">
     <navigator proportions="" version="1">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
       <foldersAlwaysOnTop value="true" />
@@ -281,6 +294,7 @@
       <pane id="PackagesPane" />
       <pane id="PackagesPane" />
     </panes>
     </panes>
   </component>
   </component>
+<<<<<<< HEAD
   <component name="PropertiesComponent">
   <component name="PropertiesComponent">
     <property name="RequestMappingsPanelOrder0" value="0" />
     <property name="RequestMappingsPanelOrder0" value="0" />
     <property name="RequestMappingsPanelOrder1" value="1" />
     <property name="RequestMappingsPanelOrder1" value="1" />
@@ -292,22 +306,31 @@
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
+=======
+  <component name="ProjectViewState">
+    <option name="showExcludedFiles" value="false" />
+    <option name="showLibraryContents" value="true" />
+>>>>>>> 678fbbf6788b3304f5df8b5725dd74a977b78d1c
   </component>
   </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RequestMappingsPanelOrder0": "0",
+    "RequestMappingsPanelOrder1": "1",
+    "RequestMappingsPanelWidth0": "75",
+    "RequestMappingsPanelWidth1": "75",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "project.structure.last.edited": "Project",
+    "project.structure.proportion": "0.15",
+    "project.structure.side.proportion": "0.0",
+    "settings.editor.selected.configurable": "MavenSettings"
+  }
+}]]></component>
   <component name="RebelAgentSelection">
   <component name="RebelAgentSelection">
     <selection>jr</selection>
     <selection>jr</selection>
   </component>
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
   <component name="RunManager">
   <component name="RunManager">
     <configuration name="MybatisPlusApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <configuration name="MybatisPlusApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="mybatis_plus" />
       <module name="mybatis_plus" />
@@ -317,17 +340,25 @@
       </method>
       </method>
     </configuration>
     </configuration>
   </component>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="SshConsoleOptionsProvider">
+    <option name="myEncoding" value="UTF-8" />
+  </component>
   <component name="SvnConfiguration">
   <component name="SvnConfiguration">
     <configuration />
     <configuration />
   </component>
   </component>
   <component name="TaskManager">
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="be7aa737-81a4-4fa1-848a-b64feaec2f6c" name="Default Changelist" comment="" />
       <created>1706770138891</created>
       <created>1706770138891</created>
       <option name="number" value="Default" />
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1706770138891</updated>
       <updated>1706770138891</updated>
+<<<<<<< HEAD
       <workItem from="1706770142017" duration="13022000" />
       <workItem from="1706770142017" duration="13022000" />
+=======
+      <workItem from="1706770142017" duration="4313000" />
+      <workItem from="1706842947127" duration="21000" />
+>>>>>>> 678fbbf6788b3304f5df8b5725dd74a977b78d1c
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
@@ -378,7 +409,18 @@
     </layout>
     </layout>
   </component>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="3" />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
   </component>
   <component name="XDebuggerManager">
   <component name="XDebuggerManager">
     <breakpoint-manager>
     <breakpoint-manager>

+ 3 - 2
src/main/java/com/template/common/utils/SendSms.java

@@ -44,7 +44,8 @@ public class SendSms {
 
 
     //模板Id
     //模板Id
 //    private static String templateId="1770016";
 //    private static String templateId="1770016";
-    private static String templateId = "2065770";
+    private static String templateId = "2060673"; //验证码
+    private static String templateId2 = "2065770"; //预约短信
 
 
     //验证码有效时长
     //验证码有效时长
     private static String smsMin = "1";
     private static String smsMin = "1";
@@ -186,7 +187,7 @@ public class SendSms {
             SendSmsRequest req = new SendSmsRequest();
             SendSmsRequest req = new SendSmsRequest();
             req.setSmsSdkAppId(sdkAppid);
             req.setSmsSdkAppId(sdkAppid);
             req.setSignName(signName);
             req.setSignName(signName);
-            req.setTemplateId("2065770");
+            req.setTemplateId(templateId2);
             String[] templateParamSet = {year, month, day, startTime, endTime, code};
             String[] templateParamSet = {year, month, day, startTime, endTime, code};
             req.setTemplateParamSet(templateParamSet);
             req.setTemplateParamSet(templateParamSet);
             String[] phoneNumbers = {phoneNumber};
             String[] phoneNumbers = {phoneNumber};