正式服务器无误，表格导出中是否授权暂未改

.idea/workspace.xml

@@ -2,91 +2,19 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ebc05332-7d4a-4b94-9ccd-3e5ff3d4f574" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/bo/ValidReporting.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/common/http/HttpsClient.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/controller/phone" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/entity/Message.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/entity/SubscribeMessages.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/entity/TemplateData.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/mapper/SubscribeMessagesMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/service/SubscribeMessagesService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/service/impl/SubscribeMessagesServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/SubscribeMessagesMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/H3cReportingApplication.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/anno/AdminLoginCheck.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/anno/ParamCheck.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/anno/UserLoginCheck.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/aop/LoginCheckAspect.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/aop/ParamCheckAspect.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/bo/CloseReporting.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/bo/DeleteIds.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/bo/DeleteReporting.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/bo/ValidReporting.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/common/exception/BizCodeEnume.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/common/exception/MyExceptionHandler.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/common/exception/RRException.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/common/http/HttpsClient.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/common/utils/BaseResult.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/common/utils/CommonResult.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/common/utils/MyQuery.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/common/utils/PageParam.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/common/utils/PageUtils.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/common/utils/SQLFilter.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/config/JacksonConfig.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/config/MybatisPlusPageConfig.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/controller/FileController.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/controller/InformationReportingController.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/controller/UserController.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/controller/WxController.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/controller/request/AdminLoginRequest.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/controller/request/AdminPasswordUpdateRequest.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/controller/request/ReportQueryRequest.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/controller/request/UserQueryRequest.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/conver/LocalDateTimeConverter.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/conver/StatusConverter.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/dto/InformationReportingDTO.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/dto/ReportingDownloadDTO.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/dto/UserDTO$UserDTOBuilder.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/dto/UserDTO.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/entity/InformationReporting.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/entity/Message.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/entity/SubscribeMessages.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/entity/TemplateData.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/entity/User.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/mapper/InformationReportingMapper.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/mapper/SubscribeMessagesMapper.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/mapper/UserMapper.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/service/InformationReportingService.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/service/SubscribeMessagesService.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/service/UserService.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/service/impl/InformationReportingServiceImpl.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/service/impl/SubscribeMessagesServiceImpl.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/service/impl/UserServiceImpl.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/util/CommonUtil.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/util/JWTUtil.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/util/RSAUtils.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/vo/AddUserVO.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/vo/InformationReportingVO.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/vo/UserVO$UserVOBuilder.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/vo/UserVO.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/mapper/InformationReportingMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/mapper/SubscribeMessagesMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/mapper/UserMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/smart-doc.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/static/doc/AllInOne.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/static/doc/index.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/classes/static/doc/search.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/h3c_reporting-0.0.1-SNAPSHOT.jar" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/h3c_reporting-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/maven-archiver/pom.properties" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/surefire-reports/TEST-com.chuanghai.h3c_reporting.H3cReportingApplicationTests.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/surefire-reports/com.chuanghai.h3c_reporting.H3cReportingApplicationTests.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/target/test-classes/com/chuanghai/h3c_reporting/H3cReportingApplicationTests.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/controller/InformationReportingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/controller/InformationReportingController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/controller/WxController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/controller/WxController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/entity/InformationReporting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/h3c_reporting/entity/InformationReporting.java" 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/static/doc/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/doc/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/common/http/HttpsClient.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/common/http/HttpsClient.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/controller/InformationReportingController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/controller/InformationReportingController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/controller/WxController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/h3c_reporting/controller/WxController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/static/doc/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/doc/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/h3c_reporting-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/h3c_reporting-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/surefire-reports/TEST-com.chuanghai.h3c_reporting.H3cReportingApplicationTests.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/surefire-reports/TEST-com.chuanghai.h3c_reporting.H3cReportingApplicationTests.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/surefire-reports/com.chuanghai.h3c_reporting.H3cReportingApplicationTests.txt" beforeDir="false" afterPath="$PROJECT_DIR$/target/surefire-reports/com.chuanghai.h3c_reporting.H3cReportingApplicationTests.txt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -103,6 +31,7 @@
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="UPDATE_TYPE" value="MERGE" />
   </component>
   <component name="MavenImportPreferences">
     <option name="generalSettings">
@@ -201,7 +130,8 @@
       <workItem from="1697708892263" duration="1087000" />
       <workItem from="1697785629436" duration="10281000" />
       <workItem from="1698052897305" duration="1601000" />
-      <workItem from="1698129951556" duration="271000" />
+      <workItem from="1698129951556" duration="15701000" />
+      <workItem from="1698215009572" duration="8593000" />
     </task>
     <task id="LOCAL-00001" summary="项目迭代">
       <created>1698130112975</created>
@@ -210,7 +140,14 @@
       <option name="project" value="LOCAL" />
       <updated>1698130112975</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="项目迭代">
+      <created>1698215785748</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1698215785748</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -229,30 +166,30 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="515" y="221" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1536.824@0.0.1536.824" timestamp="1698052940942" />
-    <state x="354" y="9" key="CommitChangelistDialog2" timestamp="1698130111986">
+    <state x="354" y="9" key="CommitChangelistDialog2" timestamp="1698215782405">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="354" y="9" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1698130111986" />
+    <state x="354" y="9" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1698215782405" />
     <state x="549" y="171" key="FileChooserDialogImpl" timestamp="1694504766669">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="549" y="171" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1694504766669" />
-    <state width="1493" height="168" key="GridCell.Tab.0.bottom" timestamp="1697796769285">
+    <state width="1493" height="23" key="GridCell.Tab.0.bottom" timestamp="1698221442036">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="168" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1697796769285" />
-    <state width="1493" height="168" key="GridCell.Tab.0.center" timestamp="1697796769284">
+    <state width="1493" height="23" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1698221442036" />
+    <state width="1493" height="23" key="GridCell.Tab.0.center" timestamp="1698221442036">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="168" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1697796769284" />
-    <state width="1493" height="168" key="GridCell.Tab.0.left" timestamp="1697796769283">
+    <state width="1493" height="23" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1698221442036" />
+    <state width="1493" height="23" key="GridCell.Tab.0.left" timestamp="1698221442036">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="168" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1697796769283" />
-    <state width="1493" height="168" key="GridCell.Tab.0.right" timestamp="1697796769285">
+    <state width="1493" height="23" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1698221442036" />
+    <state width="1493" height="23" key="GridCell.Tab.0.right" timestamp="1698221442036">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="168" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1697796769285" />
+    <state width="1493" height="23" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1698221442036" />
     <state width="1493" height="168" key="GridCell.Tab.1.bottom" timestamp="1697796769288">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
@@ -273,29 +210,45 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="299" y="71" key="Maven.ArtifactSearchDialog/0.0.1536.824@0.0.1536.824" timestamp="1695718699243" />
-    <state x="272" y="0" key="SettingsEditor" timestamp="1695719126491">
+    <state x="147" y="71" key="MergeDialog" timestamp="1698217488883">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="147" y="71" key="MergeDialog/0.0.1536.824@0.0.1536.824" timestamp="1698217488883" />
+    <state x="477" y="129" key="MultipleFileMergeDialog" timestamp="1698217491215">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="477" y="129" key="MultipleFileMergeDialog/0.0.1536.824@0.0.1536.824" timestamp="1698217491215" />
+    <state x="272" y="0" key="SettingsEditor" timestamp="1698131743337">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="272" y="0" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1695719126491" />
-    <state x="461" y="241" key="com.intellij.ide.util.TipDialog" timestamp="1698129980598">
+    <state x="272" y="0" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1698131743337" />
+    <state x="461" y="241" key="com.intellij.ide.util.TipDialog" timestamp="1698215009122">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="461" y="241" key="com.intellij.ide.util.TipDialog/0.0.1536.824@0.0.1536.824" timestamp="1698129980598" />
+    <state x="461" y="241" key="com.intellij.ide.util.TipDialog/0.0.1536.824@0.0.1536.824" timestamp="1698215009122" />
     <state x="508" y="314" key="com.intellij.jarRepository.RepositoryAttachDialog-DOWNLOAD" timestamp="1695719124910">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="508" y="314" key="com.intellij.jarRepository.RepositoryAttachDialog-DOWNLOAD/0.0.1536.824@0.0.1536.824" timestamp="1695719124910" />
-    <state x="327" y="155" width="1092" height="548" key="find.popup" timestamp="1697444511399">
+    <state x="564" y="331" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1698217455008">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="564" y="331" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1536.824@0.0.1536.824" timestamp="1698217455008" />
+    <state x="327" y="155" width="1092" height="548" key="find.popup" timestamp="1698161515705">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="327" y="155" width="1092" height="548" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1697444511399" />
-    <state x="178" y="29" key="new project wizard" timestamp="1694758574905">
+    <state x="327" y="155" width="1092" height="548" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1698161515705" />
+    <state x="178" y="29" key="new project wizard" timestamp="1698166079568">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="178" y="29" key="new project wizard/0.0.1536.824@0.0.1536.824" timestamp="1694758574905" />
+    <state x="178" y="29" key="new project wizard/0.0.1536.824@0.0.1536.824" timestamp="1698166079568" />
     <state x="425" y="187" width="672" height="677" key="run.anything.popup" timestamp="1694504735027">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="425" y="187" width="672" height="677" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1694504735027" />
+    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1698215071304">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1698215071304" />
   </component>
 </project>

src/main/java/com/chuanghai/h3c_reporting/controller/InformationReportingController.java

@@ -104,7 +104,7 @@ public class InformationReportingController {
         //String openid = getOpenId(staffEntity.getCode());
         String openid = getOpenidByCode(staffEntity.getCode());
 
-        System.out.println("add方法里从wx拿到的openid："+ openid);
+        System.out.println("add方法里从wx拿到的openid：" + openid);
 
         reporting.setOpenid(openid);
 
@@ -186,10 +186,10 @@ public class InformationReportingController {
         //向方法传入openid、ps、title
         String ps = reporting.getPs();
         if (ps.equals("")) {
-            String a = wxController.send(openid, "无备注", "项目有效");
+            wxController.send(openid, "无备注", "项目有效", in.getEntryName());
             System.out.println("有效备注为（无备注）:" + ps);
-        }else {
-            String a = wxController.send(openid, ps, "项目有效");
+        } else {
+            wxController.send(openid, ps, "项目有效", in.getEntryName());
             System.out.println("有效备注为（有备注）:" + ps);
         }
 
@@ -244,10 +244,10 @@ public class InformationReportingController {
         String ps = reporting.getPs();
 
         if (ps.equals("")) {
-            String a = wxController.send(openid, "无备注", "项目无效");
+            wxController.send(openid, "无备注", "项目无效", in.getEntryName());
             System.out.println("失效备注为（无备注）:" + ps);
-        }else {
-            String a = wxController.send(openid, ps, "项目无效");
+        } else {
+            wxController.send(openid, ps, "项目无效", in.getEntryName());
             System.out.println("失效备注为（有备注）:" + ps);
         }
 
@@ -271,8 +271,6 @@ public class InformationReportingController {
     }
 
 
-
-
 //    public String getOpenId(String code) throws IOException {
 //
 //        // access_token是存在有效期的，过期就刷新

src/main/java/com/chuanghai/h3c_reporting/controller/WxController.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Controller;
@@ -57,7 +58,7 @@ public class WxController {
     @Value("${wx.template_id}")
     private String template_id;
 
-    public String access_token = "";
+    private String access_token = "";
 
     InformationReporting reporting = new InformationReporting();
 
@@ -207,7 +208,7 @@ public class WxController {
     /**
      * 小程序订阅消息
      */
-    public String send(String openid, String ps, String title) {
+    public void send(String openid, String ps, String title,String itemName) {
 
         // access_token是存在有效期的，过期就刷新
         if (access_token.equals("")) {
@@ -234,13 +235,37 @@ public class WxController {
         JSONObject thing5 = new JSONObject();
         thing5.put("value", ps);
 
+        // 申请项目
+        JSONObject thing6 = new JSONObject();
+        thing6.put("value", itemName);
+
         // 审核结果
         data.put("thing1", thing1);
         // 备注
         data.put("thing5", thing5);
+        // 申请项目
+        data.put("thing6", thing6);
 
         message.put("data", data);
         System.out.println(message);
-        return HttpsClient.sendJson("https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + access_token, message);
+
+
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = new HttpHeaders();
+
+        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+        headers.setContentType(type);
+        headers.add("Accept", MediaType.APPLICATION_JSON.toString());
+
+        HttpEntity<String> formEntity = new HttpEntity<String>(message.toString(), headers);
+
+        String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + access_token;
+
+        ResponseEntity<String> result = restTemplate.postForEntity(url, formEntity, String.class);
+        JSONObject objParam = JSON.parseObject(result.getBody());
+
+        System.out.println("消息订阅返回: " + objParam);
+
+//        return HttpsClient.sendJson("https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + access_token, message);
     }
 }

src/main/java/com/chuanghai/h3c_reporting/entity/InformationReporting.java

@@ -151,6 +151,7 @@ public class InformationReporting implements Serializable {
     @Pattern(regexp = "[0-3]", message = "项目状态为0、1、2、3中的一个")
     private Integer status;
 
+    @ExcelIgnore
     private String openid;
 
 }

src/main/resources/application.yml

@@ -44,7 +44,7 @@ my-security:
 wx:
   app_id: wxc0c7fcf01e0a3442
   secret: 5ef167b75add4e2d7a6a031b06946265
-  template_id: I3o8CRAiaaNbug3Ukkmv1t-pCIbzxU8OicqMWvdR9lc
+  template_id: I3o8CRAiaaNbug3Ukkmv1o3S7l1FZlAKMUAJzIJ4zhs
 
 file:
   # 存

target/classes/application.yml

@@ -44,7 +44,7 @@ my-security:
 wx:
   app_id: wxc0c7fcf01e0a3442
   secret: 5ef167b75add4e2d7a6a031b06946265
-  template_id: I3o8CRAiaaNbug3Ukkmv1t-pCIbzxU8OicqMWvdR9lc
+  template_id: I3o8CRAiaaNbug3Ukkmv1o3S7l1FZlAKMUAJzIJ4zhs
 
 file:
   # 存

target/surefire-reports/com.chuanghai.h3c_reporting.H3cReportingApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.chuanghai.h3c_reporting.H3cReportingApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.865 s - in com.chuanghai.h3c_reporting.H3cReportingApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.874 s - in com.chuanghai.h3c_reporting.H3cReportingApplicationTests