1.放行手机号登录

2.放行用户信息输入

src/main/java/vvpkassistant/User/service/UserServiceImpl.java

@@ -333,9 +333,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserModel> implements
             throw new BusinessException(ErrorCode.USER_DOES_NOT_EXIST);
         }
         if (userModelDTO.getPassword().equals(userModelDTO.getConfirmPassword())) {
-            UserModel updateEntity = BeanUtil.copyProperties(userModelDTO, UserModel.class);
-            updateEntity.setPassword(BcryptUtils.encryptPassword(updateEntity.getPassword()));
-            return userDao.updateById(updateEntity) == 1;
+            userModel.setPassword(BcryptUtils.encryptPassword(userModelDTO.getPassword()));
+            return userDao.updateById(userModel) == 1;
         }
         return false;
     }

src/main/java/vvpkassistant/config/SaTokenConfigure.java

@@ -31,7 +31,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
     private String[] getExcludePaths() {
         return new String[]{
             // Swagger & Knife4j 相关
-                "/error",
+             "/error",
             "/doc.html",
             "/webjars/**",
             "/swagger-resources/**",
@@ -55,7 +55,11 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 "/user/checkUserName",
                 "/user/verification",
                 "/user/forgetMail",
-                "/user/resetPassword/"
+                "/user/loginWithPhoneNumber",
+                "/user/inputUserInfo",
+                "/user/resetPassword",
+                "/pk/pkList",
+                "/systemMessage/list"
 
         };
     }

src/main/java/vvpkassistant/controller/UserController.java

@@ -460,7 +460,7 @@ public class UserController {
     }
 
 //    用户通过邮件验证链接重设密码接口
-    @PostMapping("/resetPassword/")
+    @PostMapping("/resetPassword")
     public ResponseData<Object>resetPassWord(@RequestBody UserModelDTO userModelDTO){
         return ResponseData.success(userService.resetPassWord(userModelDTO));
     }

src/main/resources/application-dev.yml

@@ -8,7 +8,6 @@ spring:
     url: jdbc:mysql://mysql.text.zhukeping.com:3326/vv_assistant?allowMultiQueries=true
 
 
-
 chat:
   appId: 1600092688
   appKey: 9bb6df04907a8cff9292eee8d6b32158d008350198acba11607068d91cb65f66

src/main/resources/application.yml

@@ -4,7 +4,6 @@ server:
 spring:
   profiles:
     active: local
-  task:
     # Spring 执行器配置，对应 TaskExecutionProperties 配置类。对于 Spring 异步任务，会使用该执行器。
     execution:
       thread-name-prefix: mail-task  # 线程池的线程名的前缀。默认为 task- ，建议根据自己应用来设置
@@ -42,9 +41,9 @@ sa-token:
   # 是否输出操作日志
   is-log: true
 
-activateUrl: http://192.168.1.174:8086/user/activate?token=
-verificationMailUrl: http://192.168.1.174:8086/user/verificationMail?token=
-forgetPassWordUrl: http://192.168.1.174:8086/user/resetPassword/?token=
+activateUrl: https://pk.webapp.yolozs.com/activationSuccessful/
+verificationMailUrl: https://pk.webapp.yolozs.com/verifyAccount/
+forgetPassWordUrl: https://pk.webapp.yolozs.com/resetPassword/
 
 dromara:
   x-file-storage: #文件存储配置

target/classes/application-dev.yml

@@ -8,7 +8,6 @@ spring:
     url: jdbc:mysql://mysql.text.zhukeping.com:3326/vv_assistant?allowMultiQueries=true
 
 
-
 chat:
   appId: 1600092688
   appKey: 9bb6df04907a8cff9292eee8d6b32158d008350198acba11607068d91cb65f66

target/classes/application.yml

@@ -4,7 +4,6 @@ server:
 spring:
   profiles:
     active: local
-  task:
     # Spring 执行器配置，对应 TaskExecutionProperties 配置类。对于 Spring 异步任务，会使用该执行器。
     execution:
       thread-name-prefix: mail-task  # 线程池的线程名的前缀。默认为 task- ，建议根据自己应用来设置
@@ -42,9 +41,9 @@ sa-token:
   # 是否输出操作日志
   is-log: true
 
-activateUrl: http://192.168.1.174:8086/user/activate?token=
-verificationMailUrl: http://192.168.1.174:8086/user/verificationMail?token=
-forgetPassWordUrl: http://192.168.1.174:8086/user/resetPassword/?token=
+activateUrl: https://pk.webapp.yolozs.com/activationSuccessful/
+verificationMailUrl: https://pk.webapp.yolozs.com/verifyAccount/
+forgetPassWordUrl: https://pk.webapp.yolozs.com/resetPassword/
 
 dromara:
   x-file-storage: #文件存储配置