Commit e4f6b5b1 authored by YazhouChen's avatar YazhouChen

修改用户信息的redis 过期一小时

parent 7437aac3
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="d78dbbd2-2fbf-4680-80a9-30edd19c4d7f" name="Default Changelist" comment=""> <list default="true" id="d78dbbd2-2fbf-4680-80a9-30edd19c4d7f" 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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin/target/admin-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/admin-2.0.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/admin/target/admin-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/admin-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin/target/admin-2.0.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/admin-2.0.jar.original" afterDir="false" /> <change beforePath="$PROJECT_DIR$/admin/target/admin-2.0.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/admin-2.0.jar.original" afterDir="false" />
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<change beforePath="$PROJECT_DIR$/bootstrap/target/bootstrap-2.0.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/bootstrap-2.0.jar.original" afterDir="false" /> <change beforePath="$PROJECT_DIR$/bootstrap/target/bootstrap-2.0.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/bootstrap-2.0.jar.original" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/target/hongxinhui.jar" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/hongxinhui.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/bootstrap/target/hongxinhui.jar" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/hongxinhui.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-archiver/pom.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/bootstrap/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/src/main/resources/config/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/config/src/main/resources/config/application-dev.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/config/src/main/resources/config/application-uat.yml" beforeDir="false" afterPath="$PROJECT_DIR$/config/src/main/resources/config/application-uat.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/target/config-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/config-2.0.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/config/target/config-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/config-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/maven-archiver/pom.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/config/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/distribution/target/distribution-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/distribution/target/distribution-2.0.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/distribution/target/distribution-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/distribution/target/distribution-2.0.jar" afterDir="false" />
...@@ -23,35 +23,31 @@ ...@@ -23,35 +23,31 @@
<change beforePath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/framework/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/maven-archiver/pom.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/framework/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/SpringBootPlusGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/generator/src/main/java/io/geekidea/springbootplus/generator/SpringBootPlusGenerator.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generator/target/classes/io/geekidea/springbootplus/generator/SpringBootPlusGenerator.class" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/classes/io/geekidea/springbootplus/generator/SpringBootPlusGenerator.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generator/target/generator-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/generator-2.0.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/generator/target/generator-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/generator-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generator/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-archiver/pom.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/generator/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/NoticeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/NoticeController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/WxController.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/WxController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/WxController.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/WxController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/MembersService.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/MembersService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/NoticeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/NoticeMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/SurveyfileMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/SurveyfileMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticeService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticeServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticeServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/SurveyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/SurveyServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/WxServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/WxServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/SendMail.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/SendMail.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/controller/NoticeController.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/controller/NoticeController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/controller/WxController.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/controller/WxController.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/controller/WxController.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/controller/WxController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/MembersService.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/MembersService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/mapper/NoticeMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/mapper/NoticeMapper.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/mapper/SurveyfileMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/mapper/SurveyfileMapper.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/NoticeService.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/NoticeService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/MembersServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/MembersServiceImpl.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/MembersServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/MembersServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/NoticeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/NoticeServiceImpl.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/NoticeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/NoticeServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/SurveyServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/SurveyServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/WxServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/WxServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/utils/SendMail.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/utils/SendMail.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/example-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/example-2.0.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/hongxinhui/target/example-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/example-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/maven-archiver/pom.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/hongxinhui/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" /> <change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-2021-07-06.0.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-2021-06-28.0.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-2021-06-29.0.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-2021-06-30.0.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-2021-07-01.0.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-2021-07-02.0.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-2021-07-05.0.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-error-2021-06-28.0.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-error-2021-06-29.0.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-error-2021-06-30.0.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-error-2021-07-01.0.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-error-2021-07-02.0.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-error-2021-07-05.0.log" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/spring-boot-plus-error.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/spring-boot-plus.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/logs/spring-boot-plus.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/spring-boot-plus.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scheduled/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/maven-archiver/pom.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/scheduled/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scheduled/target/scheduled-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/scheduled-2.0.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/scheduled/target/scheduled-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/scheduled-2.0.jar" afterDir="false" />
...@@ -145,6 +141,9 @@ ...@@ -145,6 +141,9 @@
<property name="restartRequiresConfirmation" value="false" /> <property name="restartRequiresConfirmation" value="false" />
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" /> <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
</component> </component>
<component name="RebelAgentSelection">
<selection>jr</selection>
</component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY"> <key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.hongxinhui.utils" /> <recent name="com.hongxinhui.utils" />
...@@ -253,8 +252,8 @@ ...@@ -253,8 +252,8 @@
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.SpringBootPlusGenerator" />
<item itemvalue="Application.SendMail (1)" /> <item itemvalue="Application.SendMail (1)" />
<item itemvalue="Application.SpringBootPlusGenerator" />
<item itemvalue="Application.SendMail" /> <item itemvalue="Application.SendMail" />
<item itemvalue="Application.PhoneUtil" /> <item itemvalue="Application.PhoneUtil" />
<item itemvalue="Application.IdCardUtil" /> <item itemvalue="Application.IdCardUtil" />
...@@ -479,7 +478,22 @@ ...@@ -479,7 +478,22 @@
<workItem from="1627953723969" duration="13000" /> <workItem from="1627953723969" duration="13000" />
<workItem from="1627953770588" duration="929000" /> <workItem from="1627953770588" duration="929000" />
<workItem from="1628145328675" duration="2773000" /> <workItem from="1628145328675" duration="2773000" />
<workItem from="1628151174879" duration="1528000" /> <workItem from="1628151174879" duration="1638000" />
<workItem from="1628213625947" duration="1624000" />
<workItem from="1628471827089" duration="3621000" />
<workItem from="1628492379256" duration="6599000" />
<workItem from="1628558228712" duration="3644000" />
<workItem from="1628572343629" duration="1317000" />
<workItem from="1628749085823" duration="1372000" />
<workItem from="1628751755885" duration="2073000" />
<workItem from="1628758151347" duration="20000" />
<workItem from="1628764033188" duration="502000" />
<workItem from="1629272710253" duration="946000" />
<workItem from="1629280776386" duration="613000" />
<workItem from="1629336644630" duration="17000" />
<workItem from="1629349143446" duration="6819000" />
<workItem from="1629422843618" duration="181000" />
<workItem from="1629423059205" duration="4000" />
</task> </task>
<task id="LOCAL-00001" summary="上传项目"> <task id="LOCAL-00001" summary="上传项目">
<created>1625797686627</created> <created>1625797686627</created>
...@@ -502,17 +516,38 @@ ...@@ -502,17 +516,38 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1627956156116</updated> <updated>1627956156116</updated>
</task> </task>
<option name="localTasksCounter" value="4" /> <task id="LOCAL-00004" summary="增加 办法">
<created>1628157834318</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1628157834318</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="COLUMN_ORDER" />
</State>
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="上传项目" /> <MESSAGE value="上传项目" />
<MESSAGE value="增加注册成功发送邮件" /> <MESSAGE value="增加注册成功发送邮件" />
<MESSAGE value="删除注释" /> <MESSAGE value="删除注释" />
<option name="LAST_COMMIT_MESSAGE" value="删除注释" /> <MESSAGE value="增加 办法" />
<option name="LAST_COMMIT_MESSAGE" value="增加 办法" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="361" y="74" key="#Plugins" timestamp="1624963006648"> <state x="361" y="74" key="#Plugins" timestamp="1624963006648">
...@@ -523,10 +558,14 @@ ...@@ -523,10 +558,14 @@
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="223" y="67" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824@0.0.1536.824" timestamp="1625040317986" /> <state x="223" y="67" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824@0.0.1536.824" timestamp="1625040317986" />
<state x="574" y="116" key="#com.intellij.ide.util.MemberChooser" timestamp="1628147386925"> <state x="574" y="116" key="#com.intellij.ide.util.MemberChooser" timestamp="1628753267636">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="574" y="116" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1628753267636" />
<state x="586" y="22" key="#com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog" timestamp="1628749112112">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="574" y="116" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1628147386925" /> <state x="586" y="22" key="#com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog/0.0.1536.824@0.0.1536.824" timestamp="1628749112112" />
<state x="495" y="252" width="618" height="319" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1624930043181"> <state x="495" y="252" width="618" height="319" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1624930043181">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
...@@ -543,54 +582,54 @@ ...@@ -543,54 +582,54 @@
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="434" y="57" width="661" height="767" key="#xdebugger.evaluate/0.0.1536.824@0.0.1536.824" timestamp="1625564326839" /> <state x="434" y="57" width="661" height="767" key="#xdebugger.evaluate/0.0.1536.824@0.0.1536.824" timestamp="1625564326839" />
<state x="346" y="0" key="CommitChangelistDialog2" timestamp="1628157823347"> <state x="346" y="0" key="CommitChangelistDialog2" timestamp="1629361466602">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="346" y="0" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1628157823347" /> <state x="346" y="0" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1629361466602" />
<state width="657" height="618" key="DebuggerActiveHint" timestamp="1625564044324"> <state width="657" height="618" key="DebuggerActiveHint" timestamp="1625564044324">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state width="657" height="618" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1625564044324" /> <state width="657" height="618" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1625564044324" />
<state x="122" y="80" width="1350" height="638" key="DiffContextDialog" timestamp="1625797922016"> <state x="122" y="80" width="1350" height="638" key="DiffContextDialog" timestamp="1629361463528">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="122" y="80" width="1350" height="638" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1625797922016" /> <state x="122" y="80" width="1350" height="638" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1629361463528" />
<state x="549" y="167" key="FileChooserDialogImpl" timestamp="1625797418458"> <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1625797418458">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1625797418458" /> <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1625797418458" />
<state width="1493" height="162" key="GridCell.Tab.0.bottom" timestamp="1628151289808"> <state width="1493" height="163" key="GridCell.Tab.0.bottom" timestamp="1629361869501">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state width="1493" height="162" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1628151289808" /> <state width="1493" height="163" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1629361869501" />
<state width="1493" height="162" key="GridCell.Tab.0.center" timestamp="1628151289807"> <state width="1493" height="163" key="GridCell.Tab.0.center" timestamp="1629361869501">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state width="1493" height="162" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1628151289807" /> <state width="1493" height="163" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1629361869501" />
<state width="1493" height="162" key="GridCell.Tab.0.left" timestamp="1628151289807"> <state width="1493" height="163" key="GridCell.Tab.0.left" timestamp="1629361869501">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state width="1493" height="162" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1628151289807" /> <state width="1493" height="163" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1629361869501" />
<state width="1493" height="162" key="GridCell.Tab.0.right" timestamp="1628151289807"> <state width="1493" height="163" key="GridCell.Tab.0.right" timestamp="1629361869501">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state width="1493" height="162" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1628151289807" /> <state width="1493" height="163" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1629361869501" />
<state width="1493" height="334" key="GridCell.Tab.1.bottom" timestamp="1628149343359"> <state width="1493" height="251" key="GridCell.Tab.1.bottom" timestamp="1628503705679">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state width="1493" height="334" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1628149343359" /> <state width="1493" height="251" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1628503705679" />
<state width="1493" height="334" key="GridCell.Tab.1.center" timestamp="1628149343359"> <state width="1493" height="251" key="GridCell.Tab.1.center" timestamp="1628503705679">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state width="1493" height="334" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1628149343359" /> <state width="1493" height="251" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1628503705679" />
<state width="1493" height="334" key="GridCell.Tab.1.left" timestamp="1628149343358"> <state width="1493" height="251" key="GridCell.Tab.1.left" timestamp="1628503705679">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state width="1493" height="334" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1628149343358" /> <state width="1493" height="251" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1628503705679" />
<state width="1493" height="334" key="GridCell.Tab.1.right" timestamp="1628149343359"> <state width="1493" height="251" key="GridCell.Tab.1.right" timestamp="1628503705679">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state width="1493" height="334" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1628149343359" /> <state width="1493" height="251" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1628503705679" />
<state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1624930037217"> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1624930037217">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
...@@ -603,10 +642,10 @@ ...@@ -603,10 +642,10 @@
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="249" y="0" width="1250" height="824" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1625044058689" /> <state x="249" y="0" width="1250" height="824" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1625044058689" />
<state x="361" y="127" key="Vcs.Push.Dialog.v2" timestamp="1627956157708"> <state x="361" y="127" key="Vcs.Push.Dialog.v2" timestamp="1628157836117">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="361" y="127" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1627956157708" /> <state x="361" y="127" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1628157836117" />
<state width="775" height="419" key="XDebugger.FullValuePopup" timestamp="1625564074239"> <state width="775" height="419" key="XDebugger.FullValuePopup" timestamp="1625564074239">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
...@@ -619,18 +658,18 @@ ...@@ -619,18 +658,18 @@
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1625562177079" /> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1625562177079" />
<state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1625621492209"> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1629272807133">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1625621492209" /> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1629272807133" />
<state x="421" y="62" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1625021359303"> <state x="421" y="62" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1625021359303">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="421" y="62" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1536.824@0.0.1536.824" timestamp="1625021359303" /> <state x="421" y="62" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1536.824@0.0.1536.824" timestamp="1625021359303" />
<state x="437" y="78" width="836" height="746" key="find.popup" timestamp="1628153542093"> <state x="437" y="78" width="836" height="746" key="find.popup" timestamp="1629361867274">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="437" y="78" width="836" height="746" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1628153542093" /> <state x="437" y="78" width="836" height="746" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1629361867274" />
<state x="550" y="185" key="git4idea.merge.GitPullDialog" timestamp="1625797427678"> <state x="550" y="185" key="git4idea.merge.GitPullDialog" timestamp="1625797427678">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
...@@ -639,10 +678,10 @@ ...@@ -639,10 +678,10 @@
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1625651453194" /> <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1625651453194" />
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1627444918841"> <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1629360820879">
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1627444918841" /> <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1629360820879" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
......
#Generated by Maven #Generated by Maven
#Thu Aug 05 16:15:02 CST 2021 #Thu Aug 19 16:25:20 CST 2021
version=2.0 version=2.0
groupId=io.geekidea.springbootplus groupId=io.geekidea.springbootplus
artifactId=admin artifactId=admin
#Generated by Maven #Generated by Maven
#Thu Aug 05 16:15:40 CST 2021 #Thu Aug 19 16:25:47 CST 2021
version=2.0 version=2.0
groupId=io.geekidea.springbootplus groupId=io.geekidea.springbootplus
artifactId=bootstrap artifactId=bootstrap
spring-boot-plus: spring-boot-plus:
# 是否启用ansi控制台输出有颜色的字体,local环境建议开启,服务器环境设置为false # 是否启用ansi控制台输出有颜色的字体,dev环境建议开启,服务器环境设置为false
enable-ansi: false enable-ansi: true
# 当前环境服务IP地址 # 当前环境服务IP地址
server-ip: server-ip: 123.57.2.247
# AOP配置 # 文件上传下载配置
aop: upload-path: /opt/upload/
log: taskstatus: 1
enable: true
log-print-type: LINE
request-log-format: false
response-log-format: false
spring: spring:
datasource: datasource:
url: jdbc:mysql://localhost:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true url: jdbc:mysql://123.57.2.247:3306/hxh?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: root password: changfa123$
# Redis配置 # Redis配置
redis: redis:
database: 0 database: 0
# redis bus123$ 8976 127.0.0.1 dapchina 6390
host: 127.0.0.1 host: 127.0.0.1
password: dapchina password: bus123$
port: 6390 port: 6379
# 打印SQL语句和结果集,本地开发环境可开启,线上注释掉
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
data:
path:
template: D:\\svn-repository\\spms\\template\\
produce: D:\\svn-repository\\spms\\produce\\
#Generated by Maven #Generated by Maven
#Thu Aug 05 16:15:07 CST 2021 #Thu Aug 19 16:25:24 CST 2021
version=2.0 version=2.0
groupId=io.geekidea.springbootplus groupId=io.geekidea.springbootplus
artifactId=config artifactId=config
#Generated by Maven #Generated by Maven
#Thu Aug 05 16:15:41 CST 2021 #Thu Aug 19 16:25:47 CST 2021
version=2.0 version=2.0
groupId=io.geekidea.springbootplus groupId=io.geekidea.springbootplus
artifactId=distribution artifactId=distribution
...@@ -6,7 +6,7 @@ import javax.annotation.Generated; ...@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated( @Generated(
value = "org.mapstruct.ap.MappingProcessor", value = "org.mapstruct.ap.MappingProcessor",
date = "2021-08-05T16:15:17+0800", date = "2021-08-19T16:31:26+0800",
comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_131 (Oracle Corporation)" comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_131 (Oracle Corporation)"
) )
public class LoginSysUserVoConvertImpl implements LoginSysUserVoConvert { public class LoginSysUserVoConvertImpl implements LoginSysUserVoConvert {
......
...@@ -6,7 +6,7 @@ import javax.annotation.Generated; ...@@ -6,7 +6,7 @@ import javax.annotation.Generated;
@Generated( @Generated(
value = "org.mapstruct.ap.MappingProcessor", value = "org.mapstruct.ap.MappingProcessor",
date = "2021-08-05T16:15:17+0800", date = "2021-08-19T16:31:26+0800",
comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_131 (Oracle Corporation)" comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_131 (Oracle Corporation)"
) )
public class ShiroMapstructConvertImpl implements ShiroMapstructConvert { public class ShiroMapstructConvertImpl implements ShiroMapstructConvert {
......
#Generated by Maven #Generated by Maven
#Thu Aug 05 16:15:22 CST 2021 #Thu Aug 19 16:25:32 CST 2021
version=2.0 version=2.0
groupId=io.geekidea.springbootplus groupId=io.geekidea.springbootplus
artifactId=framework artifactId=framework
#Generated by Maven #Generated by Maven
#Thu Aug 05 16:15:43 CST 2021 #Thu Aug 19 16:25:50 CST 2021
version=2.0 version=2.0
groupId=io.geekidea.springbootplus groupId=io.geekidea.springbootplus
artifactId=generator artifactId=generator
...@@ -172,7 +172,7 @@ public class NoticeController extends BaseController { ...@@ -172,7 +172,7 @@ public class NoticeController extends BaseController {
@OperationLog(name = "详情", type = OperationLogType.INFO) @OperationLog(name = "详情", type = OperationLogType.INFO)
@ApiOperation(value = "详情", response = Notice.class) @ApiOperation(value = "详情", response = Notice.class)
public ApiResult<Notice> getNotice(@PathVariable("id") Long id) throws Exception { public ApiResult<Notice> getNotice(@PathVariable("id") Long id) throws Exception {
Notice notice = noticeService.getById(id); Notice notice = noticeService.getOneById(id);
notice.setContent(StringEscapeUtils.unescapeHtml4( notice.getContent())); notice.setContent(StringEscapeUtils.unescapeHtml4( notice.getContent()));
return ApiResult.ok(notice); return ApiResult.ok(notice);
} }
......
...@@ -45,6 +45,7 @@ import java.net.InetAddress; ...@@ -45,6 +45,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
/** /**
* 微信公众号接口 * 微信公众号接口
...@@ -209,7 +210,7 @@ public class WxController { ...@@ -209,7 +210,7 @@ public class WxController {
e.printStackTrace(); e.printStackTrace();
} }
String code = VerifyCodeUtils.outPrint(rsp); String code = VerifyCodeUtils.outPrint(rsp);
redisTemplate.opsForValue().set("VERIFY_CODE_SESSION_KEY",code); redisTemplate.opsForValue().set("VERIFY_CODE_SESSION_KEY",code,5 , TimeUnit.MINUTES);//5分钟过期
System.out.println("code: " + code); System.out.println("code: " + code);
System.out.println("code: " + redisTemplate.opsForValue().get("VERIFY_CODE_SESSION_KEY")); System.out.println("code: " + redisTemplate.opsForValue().get("VERIFY_CODE_SESSION_KEY"));
} }
......
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hongxinhui.entity.Notice; import com.hongxinhui.entity.Notice;
import com.hongxinhui.param.NoticePageParam; import com.hongxinhui.param.NoticePageParam;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -21,4 +22,6 @@ import java.io.Serializable; ...@@ -21,4 +22,6 @@ import java.io.Serializable;
public interface NoticeMapper extends BaseMapper<Notice> { public interface NoticeMapper extends BaseMapper<Notice> {
@Select(" select * from notice where id = #{id} ")
Notice selectOneById(Long id);
} }
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hongxinhui.entity.Surveyfile; import com.hongxinhui.entity.Surveyfile;
import com.hongxinhui.param.SurveyfilePageParam; import com.hongxinhui.param.SurveyfilePageParam;
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -21,4 +22,6 @@ import java.io.Serializable; ...@@ -21,4 +22,6 @@ import java.io.Serializable;
public interface SurveyfileMapper extends BaseMapper<Surveyfile> { public interface SurveyfileMapper extends BaseMapper<Surveyfile> {
@Update(" update surveyfile set surveyId = null where surveyId = #{surveyid} ")
int updateSurveyId(int surveyid);
} }
...@@ -52,4 +52,6 @@ public interface NoticeService extends BaseService<Notice> { ...@@ -52,4 +52,6 @@ public interface NoticeService extends BaseService<Notice> {
Paging<Notice> getNoticePageList(NoticePageParam noticePageParam) throws Exception; Paging<Notice> getNoticePageList(NoticePageParam noticePageParam) throws Exception;
boolean updateStatus(Notice notice); boolean updateStatus(Notice notice);
Notice getOneById(Long id);
} }
...@@ -37,6 +37,7 @@ import java.time.Duration; ...@@ -37,6 +37,7 @@ import java.time.Duration;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
...@@ -191,21 +192,6 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members> ...@@ -191,21 +192,6 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
hashMap.put("code","200"); hashMap.put("code","200");
hashMap.put("info","注册成功"); hashMap.put("info","注册成功");
SendMail sendMail = new SendMail();
sendMail.setSubject("请保管好您的账号密码");
// sendMail.setContent("请保管好您的账号密码:</br>账号:"+personalMembers.getPhone()+"</br>密码:"+personalMembers.getPassword());
sendMail.setContent("尊敬的会员:您好!\n" +
"感谢您注册宜春弘鑫汇资产服务有限公司的会员。 \n" +
"您的登录账号为: "+personalMembers.getPhone()+" ;密码为 :"+personalMembers.getPassword()+"\n" +
"重要提示:请妥善保管您的会员账号和密码;若忘记登录密码,请申请重置密码。如有任何疑问可通过以下方式联系我方,非常感谢您的理解与支持。有疑问通过以下方式咨询:xiangmubu@hxhsevice.com\n" +
"宜春弘鑫汇资产服务有限公司");
//收件人电子邮箱
sendMail.setToAccount(personalMembers.getEmail());
//抄送人电子邮箱
sendMail.setToAccountAdd("");
//发送邮件方法
SendMail.sendMailMessage(sendMail);
} }
return hashMap; return hashMap;
} }
...@@ -259,21 +245,6 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members> ...@@ -259,21 +245,6 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
hashMap.put("code","200"); hashMap.put("code","200");
hashMap.put("info","注册成功"); hashMap.put("info","注册成功");
SendMail sendMail = new SendMail();
sendMail.setSubject("请保管好您的账号密码");
// sendMail.setContent("请保管好您的账号密码:</br>账号:"+enterpriseMembers.getPhone()+"</br>密码:"+enterpriseMembers.getPassword());
sendMail.setContent("尊敬的会员:您好!\n" +
"感谢您注册宜春弘鑫汇资产服务有限公司的会员。 \n" +
"您的登录账号为: "+enterpriseMembers.getPhone()+" ;密码为 :"+enterpriseMembers.getPassword()+"\n" +
"重要提示:请妥善保管您的会员账号和密码;若忘记登录密码,请申请重置密码。如有任何疑问可通过以下方式联系我方,非常感谢您的理解与支持。有疑问通过以下方式咨询:xiangmubu@hxhsevice.com\n" +
"宜春弘鑫汇资产服务有限公司");
//收件人电子邮箱
sendMail.setToAccount(enterpriseMembers.getEmail());
//抄送人电子邮箱
sendMail.setToAccountAdd("");
//发送邮件方法
SendMail.sendMailMessage(sendMail);
} }
return hashMap; return hashMap;
} }
...@@ -297,6 +268,11 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members> ...@@ -297,6 +268,11 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
hashMap.put("info","用户不存在!"); hashMap.put("info","用户不存在!");
return hashMap; return hashMap;
} }
if(members.getCheckstatus()==0){
hashMap.put("code","500");
hashMap.put("info","账号正在审核中!");
return hashMap;
}
if(!members.getPassword().equals(DigestUtils.md5Hex(pwd) )){ if(!members.getPassword().equals(DigestUtils.md5Hex(pwd) )){
hashMap.put("code","500"); hashMap.put("code","500");
hashMap.put("info","密码错误请重新输入!"); hashMap.put("info","密码错误请重新输入!");
...@@ -313,20 +289,20 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members> ...@@ -313,20 +289,20 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
log.debug("token:{}", token); log.debug("token:{}", token);
// 创建AuthenticationToken // 创建AuthenticationToken
JwtToken jwtToken = JwtToken.build(token, username, newSalt, expireSecond); // JwtToken jwtToken = JwtToken.build(token, username, newSalt, expireSecond);
//
boolean enableShiro = springBootPlusProperties.getShiro().isEnable(); // boolean enableShiro = springBootPlusProperties.getShiro().isEnable();
if (enableShiro) { // if (enableShiro) {
// 从SecurityUtils里边创建一个 subject // // 从SecurityUtils里边创建一个 subject
Subject subject = SecurityUtils.getSubject(); // Subject subject = SecurityUtils.getSubject();
// 执行认证登录 // // 执行认证登录
subject.login(jwtToken); // subject.login(jwtToken);
} else { // } else {
log.warn("未启用Shiro"); // log.warn("未启用Shiro");
} // }
// 缓存登录信息到Redis // 缓存登录信息到Redis
loginRedisService.cacheLoginInfo(jwtToken, members1); // loginRedisService.cacheLoginInfo(jwtToken, members1);
log.debug("登录成功,username:{}", username); log.debug("登录成功,username:{}", username);
log.debug("token:{}", token); log.debug("token:{}", token);
...@@ -335,7 +311,7 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members> ...@@ -335,7 +311,7 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
members.setLastLoginTime(new Date()); members.setLastLoginTime(new Date());
membersMapper.updateById(members); membersMapper.updateById(members);
redisTemplate.opsForValue().set("USER_"+token,members); redisTemplate.opsForValue().set("USER_"+token,members ,60 , TimeUnit.MINUTES);//60分钟过期
hashMap.put("code","200"); hashMap.put("code","200");
hashMap.put("info","登录成功!"); hashMap.put("info","登录成功!");
hashMap.put("data",members); hashMap.put("data",members);
...@@ -352,7 +328,14 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members> ...@@ -352,7 +328,14 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
hashMap.put("info","请先去登录!"); hashMap.put("info","请先去登录!");
return hashMap; return hashMap;
} }
String token = weChartUser.getToken();
weChartUser = membersMapper.selectById(weChartUser.getId()); weChartUser = membersMapper.selectById(weChartUser.getId());
if(weChartUser==null){
hashMap.put("code","501");
hashMap.put("info","请先去登录!");
redisTemplate.opsForValue().set("USER_"+token,null);
return hashMap;
}
hashMap.put("code","200"); hashMap.put("code","200");
hashMap.put("info","登录成功!"); hashMap.put("info","登录成功!");
hashMap.put("data",weChartUser); hashMap.put("data",weChartUser);
...@@ -391,6 +374,26 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members> ...@@ -391,6 +374,26 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
if(count>0){ if(count>0){
hashMap.put("code","200"); hashMap.put("code","200");
hashMap.put("info","操作成功"); hashMap.put("info","操作成功");
if(status==1){
members = membersMapper.selectById(id);
SendMail sendMail = new SendMail();
sendMail.setSubject("请保管好您的账号密码");
// sendMail.setContent("请保管好您的账号密码:</br>账号:"+personalMembers.getPhone()+"</br>密码:"+personalMembers.getPassword());
sendMail.setContent("尊敬的会员:您好!\n" +
"<div style='margin-left:50px;'>感谢您注册宜春弘鑫汇资产服务有限公司的会员。 \n" +
"</br>您的登录账号为: "+members.getPhone()+" ;</br>密码为 :"+members.getPwd()+"\n" +
"</br><span style='color:red;'>重要提示</span>:请妥善保管您的会员账号和密码;若忘记登录密码,请申请重置密码。</br>如有任何疑问可通过以下方式联系我方,非常感谢您的理解与支持。有疑问通过以下方式咨询:xiangmubu@hxhsevice.com</div>\n" +
"</br></br>宜春弘鑫汇资产服务有限公司");
//收件人电子邮箱
sendMail.setToAccount(members.getEmail());
//抄送人电子邮箱
sendMail.setToAccountAdd("");
//发送邮件方法
SendMail.sendMailMessage(sendMail);
}
}else{ }else{
hashMap.put("code","500"); hashMap.put("code","500");
hashMap.put("info","操作失败"); hashMap.put("info","操作失败");
......
...@@ -118,4 +118,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp ...@@ -118,4 +118,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
return count>0; return count>0;
} }
@Override
public Notice getOneById(Long id) {
return noticeMapper.selectOneById(id);
}
} }
...@@ -78,6 +78,7 @@ public class SurveyServiceImpl extends BaseServiceImpl<SurveyMapper, Survey> imp ...@@ -78,6 +78,7 @@ public class SurveyServiceImpl extends BaseServiceImpl<SurveyMapper, Survey> imp
Survey survey = new Survey(); Survey survey = new Survey();
BeanUtils.copyProperties(surveyAdd, survey); BeanUtils.copyProperties(surveyAdd, survey);
//修改附件表 项目id //修改附件表 项目id
surveyfileMapper.updateSurveyId(survey.getId().intValue());
if(!StringUtils.isEmpty( surveyAdd.getFileIdlist())){ if(!StringUtils.isEmpty( surveyAdd.getFileIdlist())){
String[] split = surveyAdd.getFileIdlist().split(","); String[] split = surveyAdd.getFileIdlist().split(",");
for (String string:split) { for (String string:split) {
......
...@@ -32,10 +32,10 @@ import com.aliyun.darabonbastring.*; ...@@ -32,10 +32,10 @@ import com.aliyun.darabonbastring.*;
@Service @Service
public class WxServiceImpl implements WxService { public class WxServiceImpl implements WxService {
private static String ACCESS_KEY_ID = "LTAI4G7XyhByzvGdFmc2QQaW"; private static String ACCESS_KEY_ID = "LTAI5tNUfJkga18DbPpLsTU9";//LTAI4G7XyhByzvGdFmc2QQaW
private static String ACCESS_KEY_SECRET = "nE4zpWrRfROeBnbBCJuNOihwVXlr1H"; private static String ACCESS_KEY_SECRET = "bEpqNidt2b5zw4EbUauOy3eDDgZFzM";//nE4zpWrRfROeBnbBCJuNOihwVXlr1H
private static String SignName = "陈亚洲"; private static String SignName = "宜春弘鑫汇";//陈亚洲
private static String TemplateCode = "SMS_126295224"; private static String TemplateCode = "SMS_221535153";//SMS_126295224
@SneakyThrows @SneakyThrows
@Override @Override
...@@ -69,4 +69,5 @@ public class WxServiceImpl implements WxService { ...@@ -69,4 +69,5 @@ public class WxServiceImpl implements WxService {
} }
return hashMap; return hashMap;
} }
} }
...@@ -343,7 +343,11 @@ public class SendMail { ...@@ -343,7 +343,11 @@ public class SendMail {
public static void main(String[] args) { public static void main(String[] args) {
SendMail sendMail = new SendMail(); SendMail sendMail = new SendMail();
sendMail.setSubject("标题1"); sendMail.setSubject("标题1");
sendMail.setContent("请保管好您的账号密码:</br>账号:</br>密码:"); sendMail.setContent("尊敬的会员:您好!\n" +
"<div style='margin-left:50px;'>感谢您注册宜春弘鑫汇资产服务有限公司的会员。 \n" +
"</br>您的登录账号为: "+1+" ;</br>密码为 :"+1+"\n" +
"</br><span style='color:red;'>重要提示</span>:请妥善保管您的会员账号和密码;若忘记登录密码,请申请重置密码。如有任何疑问可通过以下方式联系我方,非常感谢您的理解与支持。有疑问通过以下方式咨询:xiangmubu@hxhsevice.com</div>\n" +
"</br>宜春弘鑫汇资产服务有限公司");
//收件人电子邮箱 //收件人电子邮箱
sendMail.setToAccount("2227078853@qq.com"); sendMail.setToAccount("2227078853@qq.com");
//抄送人电子邮箱 //抄送人电子邮箱
......
#Generated by Maven #Generated by Maven
#Thu Aug 05 16:15:34 CST 2021 #Thu Aug 19 16:25:41 CST 2021
version=2.0 version=2.0
groupId=io.geekidea.springbootplus groupId=io.geekidea.springbootplus
artifactId=example artifactId=example
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
#Generated by Maven #Generated by Maven
#Thu Aug 05 16:15:45 CST 2021 #Thu Aug 19 16:25:51 CST 2021
version=2.0 version=2.0
groupId=io.geekidea.springbootplus groupId=io.geekidea.springbootplus
artifactId=scheduled artifactId=scheduled
#Generated by Maven #Generated by Maven
#Thu Aug 05 16:15:35 CST 2021 #Thu Aug 19 16:25:43 CST 2021
version=2.0 version=2.0
groupId=io.geekidea.springbootplus groupId=io.geekidea.springbootplus
artifactId=system artifactId=system
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment