Merge branch 'master' of http://60.171.161.56:20000/tjf/ruoyi_plus

ruoyi-admin/src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@
 boman:
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: D:/ruoyi/uploadPath/wuye
-  passwordDeft: 123456
+  passwordDeft: 1qaz!QAZ
 
 --- # 监控中心配置
 spring.boot.admin.client:

ruoyi-admin/src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@
 boman:
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: /home/ruoyi/uploadPath/wuye
-  passwordDeft: 123456
+  passwordDeft: 1qaz!QAZ
 --- # 临时文件存储位置 避免临时文件被系统清理报错
 spring.servlet.multipart.location: /ruoyi/server/temp
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java

@@ -119,7 +119,7 @@ public class SysProfileController extends BaseController {
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @SaIgnore
     @GetMapping("/appCheck")
-    public R<Void> appCheck(@RequestParam("code") String code, @RequestParam("phone") String phone, @RequestParam("password") String password) {
+    public R<Void> appCheck(@RequestParam("code") String code, @RequestParam("phonenumber") String phone, @RequestParam("password") String password) {
         String verifyKey = GlobalConstants.SMS_CAPTCHA_CODE_KEY + THR + ":" + StringUtils.blankToDefault(phone, "");
         String captcha = RedisUtils.getCacheObject(verifyKey);
         if (ObjectUtils.isNotEmpty(captcha)) {