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

admin/target/maven-archiver/pom.properties

 #Generated by Maven
-#Thu Aug 05 16:15:02 CST 2021
+#Thu Aug 19 16:25:20 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=admin

bootstrap/target/maven-archiver/pom.properties

 #Generated by Maven
-#Thu Aug 05 16:15:40 CST 2021
+#Thu Aug 19 16:25:47 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=bootstrap

config/src/main/resources/config/application-uat.yml

 spring-boot-plus:
-  # 是否启用ansi控制台输出有颜色的字体，local环境建议开启，服务器环境设置为false
-  enable-ansi: false
+  # 是否启用ansi控制台输出有颜色的字体，dev环境建议开启，服务器环境设置为false
+  enable-ansi: true
   # 当前环境服务IP地址
-  server-ip:
-  # AOP配置
-  aop:
-    log:
-      enable: true
-      log-print-type: LINE
-      request-log-format: false
-      response-log-format: false
+  server-ip: 123.57.2.247
+  # 文件上传下载配置
+  upload-path: /opt/upload/
+  taskstatus: 1
+
 
 spring:
   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
-    password: root
+    password: changfa123$
 
   # Redis配置
   redis:
     database: 0
+    # redis   bus123$ 8976   127.0.0.1  dapchina  6390
     host: 127.0.0.1
-    password: dapchina
-    port: 6390
+    password: bus123$
+    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\\

config/target/maven-archiver/pom.properties

 #Generated by Maven
-#Thu Aug 05 16:15:07 CST 2021
+#Thu Aug 19 16:25:24 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=config

distribution/target/maven-archiver/pom.properties

 #Generated by Maven
-#Thu Aug 05 16:15:41 CST 2021
+#Thu Aug 19 16:25:47 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=distribution

framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
 
 @Generated(
     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)"
 )
 public class LoginSysUserVoConvertImpl implements LoginSysUserVoConvert {

framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java

@@ -6,7 +6,7 @@ import javax.annotation.Generated;
 
 @Generated(
     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)"
 )
 public class ShiroMapstructConvertImpl implements ShiroMapstructConvert {

framework/target/maven-archiver/pom.properties

 #Generated by Maven
-#Thu Aug 05 16:15:22 CST 2021
+#Thu Aug 19 16:25:32 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=framework

generator/target/maven-archiver/pom.properties

 #Generated by Maven
-#Thu Aug 05 16:15:43 CST 2021
+#Thu Aug 19 16:25:50 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=generator

hongxinhui/src/main/java/com/hongxinhui/controller/NoticeController.java

@@ -172,7 +172,7 @@ public class NoticeController extends BaseController {
     @OperationLog(name = "详情", type = OperationLogType.INFO)
     @ApiOperation(value = "详情", response = Notice.class)
     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()));
         return ApiResult.ok(notice);
     }

hongxinhui/src/main/java/com/hongxinhui/controller/WxController.java

@@ -45,6 +45,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 微信公众号接口
@@ -209,7 +210,7 @@ public class WxController {
             e.printStackTrace();
         }
         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: " + redisTemplate.opsForValue().get("VERIFY_CODE_SESSION_KEY"));
     }

hongxinhui/src/main/java/com/hongxinhui/mapper/NoticeMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hongxinhui.entity.Notice;
 import com.hongxinhui.param.NoticePageParam;
 
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -21,4 +22,6 @@ import java.io.Serializable;
 public interface NoticeMapper extends BaseMapper<Notice> {
 
 
+    @Select(" select * from notice where id = #{id} ")
+    Notice selectOneById(Long id);
 }

hongxinhui/src/main/java/com/hongxinhui/mapper/SurveyfileMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hongxinhui.entity.Surveyfile;
 import com.hongxinhui.param.SurveyfilePageParam;
 
+import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -21,4 +22,6 @@ import java.io.Serializable;
 public interface SurveyfileMapper extends BaseMapper<Surveyfile> {
 
 
+    @Update(" update surveyfile set surveyId = null where surveyId = #{surveyid}  ")
+    int updateSurveyId(int surveyid);
 }

hongxinhui/src/main/java/com/hongxinhui/service/NoticeService.java

@@ -52,4 +52,6 @@ public interface NoticeService extends BaseService<Notice> {
     Paging<Notice> getNoticePageList(NoticePageParam noticePageParam) throws Exception;
 
     boolean updateStatus(Notice notice);
+
+    Notice getOneById(Long id);
 }

hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java

@@ -37,6 +37,7 @@ import java.time.Duration;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -191,21 +192,6 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
             hashMap.put("code","200");
             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;
     }
@@ -259,21 +245,6 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
             hashMap.put("code","200");
             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;
     }
@@ -297,6 +268,11 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
             hashMap.put("info","用户不存在!");
             return hashMap;
         }
+        if(members.getCheckstatus()==0){
+            hashMap.put("code","500");
+            hashMap.put("info","账号正在审核中!");
+            return hashMap;
+        }
         if(!members.getPassword().equals(DigestUtils.md5Hex(pwd) )){
             hashMap.put("code","500");
             hashMap.put("info","密码错误请重新输入!");
@@ -313,20 +289,20 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
         log.debug("token:{}", token);
 
         // 创建AuthenticationToken
-        JwtToken jwtToken = JwtToken.build(token, username, newSalt, expireSecond);
-
-        boolean enableShiro = springBootPlusProperties.getShiro().isEnable();
-        if (enableShiro) {
-            // 从SecurityUtils里边创建一个 subject
-            Subject subject = SecurityUtils.getSubject();
-            // 执行认证登录
-            subject.login(jwtToken);
-        } else {
-            log.warn("未启用Shiro");
-        }
+//        JwtToken jwtToken = JwtToken.build(token, username, newSalt, expireSecond);
+//
+//        boolean enableShiro = springBootPlusProperties.getShiro().isEnable();
+//        if (enableShiro) {
+//            // 从SecurityUtils里边创建一个 subject
+//            Subject subject = SecurityUtils.getSubject();
+//            // 执行认证登录
+//            subject.login(jwtToken);
+//        } else {
+//            log.warn("未启用Shiro");
+//        }
 
         // 缓存登录信息到Redis
-        loginRedisService.cacheLoginInfo(jwtToken, members1);
+//        loginRedisService.cacheLoginInfo(jwtToken, members1);
         log.debug("登录成功,username:{}", username);
 
         log.debug("token:{}", token);
@@ -335,7 +311,7 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
         members.setLastLoginTime(new Date());
         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("info","登录成功!");
         hashMap.put("data",members);
@@ -352,7 +328,14 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
             hashMap.put("info","请先去登录!");
             return hashMap;
         }
+        String token = weChartUser.getToken();
         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("info","登录成功!");
         hashMap.put("data",weChartUser);
@@ -391,6 +374,26 @@ public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members>
         if(count>0){
             hashMap.put("code","200");
             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{
             hashMap.put("code","500");
             hashMap.put("info","操作失败");

hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticeServiceImpl.java

@@ -118,4 +118,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
         return count>0;
     }
 
+    @Override
+    public Notice getOneById(Long id) {
+        return noticeMapper.selectOneById(id);
+    }
+
 }

hongxinhui/src/main/java/com/hongxinhui/service/impl/SurveyServiceImpl.java

@@ -78,6 +78,7 @@ public class SurveyServiceImpl extends BaseServiceImpl<SurveyMapper, Survey> imp
         Survey survey = new Survey();
         BeanUtils.copyProperties(surveyAdd, survey);
         //修改附件表 项目id
+        surveyfileMapper.updateSurveyId(survey.getId().intValue());
         if(!StringUtils.isEmpty( surveyAdd.getFileIdlist())){
             String[] split = surveyAdd.getFileIdlist().split(",");
             for (String string:split) {

hongxinhui/src/main/java/com/hongxinhui/service/impl/WxServiceImpl.java

@@ -32,10 +32,10 @@ import com.aliyun.darabonbastring.*;
 @Service
 public class WxServiceImpl implements WxService {
 
-    private static String ACCESS_KEY_ID = "LTAI4G7XyhByzvGdFmc2QQaW";
-    private static String ACCESS_KEY_SECRET = "nE4zpWrRfROeBnbBCJuNOihwVXlr1H";
-    private static String SignName = "陈亚洲";
-    private static String TemplateCode = "SMS_126295224";
+    private static String ACCESS_KEY_ID = "LTAI5tNUfJkga18DbPpLsTU9";//LTAI4G7XyhByzvGdFmc2QQaW
+    private static String ACCESS_KEY_SECRET = "bEpqNidt2b5zw4EbUauOy3eDDgZFzM";//nE4zpWrRfROeBnbBCJuNOihwVXlr1H
+    private static String SignName = "宜春弘鑫汇";//陈亚洲
+    private static String TemplateCode = "SMS_221535153";//SMS_126295224
 
     @SneakyThrows
     @Override
@@ -69,4 +69,5 @@ public class WxServiceImpl implements WxService {
         }
         return hashMap;
     }
+
 }

hongxinhui/src/main/java/com/hongxinhui/utils/SendMail.java

@@ -343,7 +343,11 @@ public class SendMail {
     public static void main(String[] args) {
         SendMail sendMail = new SendMail();
         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");
         //抄送人电子邮箱

hongxinhui/target/maven-archiver/pom.properties

 #Generated by Maven
-#Thu Aug 05 16:15:34 CST 2021
+#Thu Aug 19 16:25:41 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=example

scheduled/target/maven-archiver/pom.properties

 #Generated by Maven
-#Thu Aug 05 16:15:45 CST 2021
+#Thu Aug 19 16:25:51 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=scheduled

system/target/maven-archiver/pom.properties

 #Generated by Maven
-#Thu Aug 05 16:15:35 CST 2021
+#Thu Aug 19 16:25:43 CST 2021
 version=2.0
 groupId=io.geekidea.springbootplus
 artifactId=system