Merge branch 'JCB-KF' of uskycloud/usky-cloud into master

base-modules/service-file/src/main/resources/bootstrap.yml

@@ -7,6 +7,10 @@ spring:
   application:
     # 应用名称
     name: service-file
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 500MB
   profiles:
     # 环境配置
     active: dev

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/UserConfigController.java

@@ -1,5 +1,6 @@
 package com.usky.system.controller.web;
 
+import com.usky.common.core.util.StringUtils;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
@@ -66,7 +67,9 @@ public class UserConfigController extends BaseController {
     @Transactional
     @PostMapping("/updateserData")
     public ApiResult<Void> updateserData(@Validated @RequestBody SysUser user) {
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        if(StringUtils.isNotBlank(user.getPassword())){
+            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        }
         user.setUpdateBy(SecurityUtils.getUsername());
         user.setUpdateTime(new Date());
         return toAjax(userService.updateUserData(user));