Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-admin/src/main/java/com/dsk/web/controller/system/SysLoginController.java

@@ -67,16 +67,12 @@ public class SysLoginController {
     @SaIgnore
     @PostMapping("/login")
     public R<LoginVo> login(@Validated @RequestBody LoginBody loginBody, HttpServletRequest request) {
-
-
 //        Map<String, Object> ajax = new HashMap<>();
         // 生成令牌
 //        LoginVo loginVo = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
 //            loginBody.getUuid());
 //        ajax.put(Constants.TOKEN, token);
 //        return R.ok(ajax);
-
-
         String ipAddr = IpUtil.getIpAddr(request);
         LoginVo loginVo = loginService.passwordLogin(loginBody, ipAddr);
         return R.ok(loginVo);

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

@@ -49,9 +49,9 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://47.104.91.229:3306/dsk_operate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-          username: dev
-          password: zfTFIJjaN#6xB83r
+          url: jdbc:mysql://120.46.64.239:3306/dsk_operate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: dskdev
+          password: encPHwi8dbKeL8ZX
         # 从库数据源
 #        slave:
 #          lazy: true
@@ -101,7 +101,7 @@ spring:
 --- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
 spring:
   redis:
-    host: 139.9.157.49
+    host: 120.46.64.239
     # 端口，默认为6379
     port: 6379
     # 数据库索引

dsk-common/src/main/java/com/dsk/common/core/domain/model/LoginBody.java

@@ -30,7 +30,7 @@ public class LoginBody {
      * 用户密码
      */
     @NotBlank(message = "{user.password.not.blank}")
-    @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
+    //@Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
     private String password;
 
     /**

dsk-common/src/main/java/com/dsk/common/core/domain/model/RegisterBody.java

 package com.dsk.common.core.domain.model;
 
+import com.dsk.common.constant.UserConstants;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
 
 /**
  * 用户注册对象
@@ -11,7 +15,16 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class RegisterBody extends LoginBody {
+    /**
+     * 用户密码
+     */
+    @NotBlank(message = "{user.password.not.blank}")
+    @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
+    private String password;
 
+    /**
+     * 用户类型
+     */
     private String userType;
 
 }

dsk-common/src/main/java/com/dsk/common/utils/file/FileUploadUtils.java

@@ -116,7 +116,8 @@ public class FileUploadUtils
 //        String fileName = extractFilename(file);
 
 //        String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
-        String absPath = getAbsoluteFile(baseDir, file.getOriginalFilename()).getAbsolutePath();
+        String fileName = new String(file.getOriginalFilename().getBytes("ISO-8859-1"), "UTF-8");
+        String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
         file.transferTo(Paths.get(absPath));
 //        return getPathFileName(baseDir, fileName);
         return baseDir+file.getOriginalFilename();

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/controller/BusinessFileController.java

@@ -78,7 +78,7 @@ public class BusinessFileController extends BaseController {
     public AjaxResult uploadFolder(@RequestPart("file") MultipartFile file, HttpServletRequest request) {
         try {
             //获取文件名
-            String filename = file.getOriginalFilename();
+            String filename = new String(file.getOriginalFilename().getBytes("ISO-8859-1"),"UTF-8");
             String businessFileName = request.getHeader("FilePath");
             // 上传文件路径
             String filePath = FileUploadUtils.getDefaultBaseDir() + businessFileName + "/";

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/RegionalEconomicDataController.java

@@ -78,6 +78,7 @@ public class RegionalEconomicDataController {
     @PostMapping(value = "location")
     public AjaxResult location(@RequestBody OpRegionalLocalDto vo, HttpServletRequest request){
         String ip = IpUtil.getIpAddr(request);
+        log.info("location=====================================================>" +ip);
         vo.setIp(ip);
         return economicService.location(vo);
     }

dsk-system/src/main/java/com/dsk/system/service/impl/SysUserServiceImpl.java

@@ -21,6 +21,7 @@ import com.dsk.common.core.service.UserService;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.helper.DataBaseHelper;
 import com.dsk.common.helper.LoginHelper;
+import com.dsk.common.tenant.helper.TenantHelper;
 import com.dsk.common.utils.PasswordUtils;
 import com.dsk.common.utils.StreamUtils;
 import com.dsk.common.utils.StringUtils;
@@ -465,7 +466,6 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         SysRole adminRole = roleMapper.selectOne(new LambdaQueryWrapper<SysRole>()
                 .select(SysRole::getRoleId)
                 .eq(SysRole::getStatus, UserConstants.USER_NORMAL)
-                .eq(SysRole::getDelFlag, UserConstants.USER_NORMAL)
                 .eq(SysRole::getRoleKey, TenantConstants.TENANT_SUPER_ADMIN_ROLE_KEY));
         //如果目前企业管理员角色下仅有1个账号
         List<Long> userIds = userRoleMapper.selectUserIdsByRoleId(adminRole.getRoleId());
@@ -650,9 +650,12 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         for (Long userId : userIds) {
             checkUserAllowed(new SysUser(userId));
             checkUserDataScope(userId);
+
             //校验企业管理员角色下是否至少有一个账号
+            if (LoginHelper.isTenantAdmin()) {
                 checkAdminHasUsers(baseMapper.selectUserById(userId));
             }
+        }
 
         List<Long> ids = Arrays.asList(userIds);
         // 删除用户与角色关联