闵行修复添加人员不显示问题、添加上传文件服务

base-modules/service-file/pom.xml

@@ -18,16 +18,16 @@
     <dependencies>
     	
     	<!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
+<!--        </dependency>-->
         
         <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+<!--        </dependency>-->
         
         <!-- SpringCloud Alibaba Sentinel -->
 <!--        <dependency>-->
@@ -48,11 +48,11 @@
         </dependency>
         
         <!-- Minio -->
-        <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-            <version>${minio.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>io.minio</groupId>-->
+<!--            <artifactId>minio</artifactId>-->
+<!--            <version>${minio.version}</version>-->
+<!--        </dependency>-->
         
         <!-- RuoYi Api System -->
         <dependency>

base-modules/service-file/src/main/java/com/ruoyi/file/config/MinioConfig.java

@@ -1,82 +1,82 @@
-package com.ruoyi.file.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import io.minio.MinioClient;
-
-/**
- * Minio 配置信息
- *
- * @author ruoyi
- */
-@Configuration
-@ConfigurationProperties(prefix = "minio")
-public class MinioConfig
-{
-    /**
-     * 服务地址
-     */
-    private String url;
-
-    /**
-     * 用户名
-     */
-    private String accessKey;
-
-    /**
-     * 密码
-     */
-    private String secretKey;
-
-    /**
-     * 存储桶名称
-     */
-    private String bucketName;
-
-    public String getUrl()
-    {
-        return url;
-    }
-
-    public void setUrl(String url)
-    {
-        this.url = url;
-    }
-
-    public String getAccessKey()
-    {
-        return accessKey;
-    }
-
-    public void setAccessKey(String accessKey)
-    {
-        this.accessKey = accessKey;
-    }
-
-    public String getSecretKey()
-    {
-        return secretKey;
-    }
-
-    public void setSecretKey(String secretKey)
-    {
-        this.secretKey = secretKey;
-    }
-
-    public String getBucketName()
-    {
-        return bucketName;
-    }
-
-    public void setBucketName(String bucketName)
-    {
-        this.bucketName = bucketName;
-    }
-
-    @Bean
-    public MinioClient getMinioClient()
-    {
-        return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build();
-    }
-}
+// package com.ruoyi.file.config;
+//
+// import org.springframework.boot.context.properties.ConfigurationProperties;
+// import org.springframework.context.annotation.Bean;
+// import org.springframework.context.annotation.Configuration;
+// import io.minio.MinioClient;
+//
+// /**
+//  * Minio 配置信息
+//  *
+//  * @author ruoyi
+//  */
+// @Configuration
+// @ConfigurationProperties(prefix = "minio")
+// public class MinioConfig
+// {
+//     /**
+//      * 服务地址
+//      */
+//     private String url;
+//
+//     /**
+//      * 用户名
+//      */
+//     private String accessKey;
+//
+//     /**
+//      * 密码
+//      */
+//     private String secretKey;
+//
+//     /**
+//      * 存储桶名称
+//      */
+//     private String bucketName;
+//
+//     public String getUrl()
+//     {
+//         return url;
+//     }
+//
+//     public void setUrl(String url)
+//     {
+//         this.url = url;
+//     }
+//
+//     public String getAccessKey()
+//     {
+//         return accessKey;
+//     }
+//
+//     public void setAccessKey(String accessKey)
+//     {
+//         this.accessKey = accessKey;
+//     }
+//
+//     public String getSecretKey()
+//     {
+//         return secretKey;
+//     }
+//
+//     public void setSecretKey(String secretKey)
+//     {
+//         this.secretKey = secretKey;
+//     }
+//
+//     public String getBucketName()
+//     {
+//         return bucketName;
+//     }
+//
+//     public void setBucketName(String bucketName)
+//     {
+//         this.bucketName = bucketName;
+//     }
+//
+//     @Bean
+//     public MinioClient getMinioClient()
+//     {
+//         return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build();
+//     }
+// }

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

@@ -0,0 +1,33 @@
+# Tomcat
+server:
+  port: 9300
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: service-file
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 500MB
+
+# 本地文件上传
+file:
+    domain: https://mhxfzd.shmh.gov.cn
+    path: /home/service/usky-file
+    prefix: /usky-file
+
+# FastDFS配置
+fdfs:
+  domain: http://8.129.231.12
+  soTimeout: 3000
+  connectTimeout: 2000
+  trackerList: 8.129.231.12:22122
+
+## Minio配置
+#minio:
+#  url: http://8.129.231.12:9000
+#  accessKey: minioadmin
+#  secretKey: minioadmin
+#  bucketName: test

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

@@ -1,29 +0,0 @@
-# Tomcat
-server:
-  port: 9300
-
-# Spring
-spring: 
-  application:
-    # 应用名称
-    name: service-file
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 500MB
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: usky-cloud-nacos:8848
-      config:
-        # 配置中心地址
-        server-addr: usky-cloud-nacos:8848
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

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

@@ -82,43 +82,44 @@ public class SysUserController extends BaseController {
     @Transactional
     @PostMapping
     public ApiResult<Void> add(@Validated @RequestBody SysUser user) {
-//        SysCheckCode sysCheckCode = new SysCheckCode();
+       SysCheckCode sysCheckCode = new SysCheckCode();
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName(), SecurityUtils.getTenantId()))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         }
-//        user.setUserType("00");
-//        user.setTenantId(SecurityUtils.getTenantId());
-//        user.setCreateBy(SecurityUtils.getUsername());
-//
-//        sysCheckCode.setPlaintext(user.getPassword());
-//        try {
-//            sysCheckCode.setCheckCode(operation.CBCMAC(user.getPassword().getBytes("UTF-8")));//存密码校验码
-//        } catch (UnsupportedEncodingException e) {
-//            e.printStackTrace();
-//        }
-//        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));//让校验码工具先获取原始明文密码的校验码在进行加密存储到sys_user表中
+       user.setUserType("00");
+       user.setTenantId(SecurityUtils.getTenantId());
+       user.setCreateBy(SecurityUtils.getUsername());
+       user.setDelFlag("0");
+
+       sysCheckCode.setPlaintext(user.getPassword());
+       try {
+           sysCheckCode.setCheckCode(operation.CBCMAC(user.getPassword().getBytes("UTF-8")));//存密码校验码
+       } catch (UnsupportedEncodingException e) {
+           e.printStackTrace();
+       }
+       user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));//让校验码工具先获取原始明文密码的校验码在进行加密存储到sys_user表中
         int row = userService.insertUser(user);//将数据插入user表中后才生成user_id与表sys_check_code表关联
 
-//        sysCheckCode.setUserId(user.getUserId());
-//        sysCheckCode.setUserName(user.getUserName());
-//        sysCheckCode.setDeptId(user.getDeptId());
-//        sysCheckCode.setTenantId(user.getTenantId());
-//        sysCheckCode.setCheckCodeType(1);
-//        sysCheckCodeMapper.insert(sysCheckCode);
-//
-//        sysCheckCode.setUserId(user.getUserId());
-//        sysCheckCode.setUserName(user.getUserName());
-//        sysCheckCode.setDeptId(user.getDeptId());
-//        sysCheckCode.setTenantId(user.getTenantId());
-//        sysCheckCode.setPlaintext(user.getPhonenumber());
-//        try {
-//            sysCheckCode.setCheckCode(operation.CBCMAC(user.getPhonenumber().getBytes("UTF-8")));//存手机校验码
-//            sysCheckCode.setCiphertext(operation.SM4CBCEnc(user.getPhonenumber().getBytes("UTF-8")));//存手机号密文
-//        } catch (UnsupportedEncodingException e) {
-//            e.printStackTrace();
-//        }
-//        sysCheckCode.setCheckCodeType(2);
-//        sysCheckCodeMapper.insert(sysCheckCode);
+       sysCheckCode.setUserId(user.getUserId());
+       sysCheckCode.setUserName(user.getUserName());
+       sysCheckCode.setDeptId(user.getDeptId());
+       sysCheckCode.setTenantId(user.getTenantId());
+       sysCheckCode.setCheckCodeType(1);
+       sysCheckCodeMapper.insert(sysCheckCode);
+
+       sysCheckCode.setUserId(user.getUserId());
+       sysCheckCode.setUserName(user.getUserName());
+       sysCheckCode.setDeptId(user.getDeptId());
+       sysCheckCode.setTenantId(user.getTenantId());
+       sysCheckCode.setPlaintext(user.getPhonenumber());
+       try {
+           sysCheckCode.setCheckCode(operation.CBCMAC(user.getPhonenumber().getBytes("UTF-8")));//存手机校验码
+           sysCheckCode.setCiphertext(operation.SM4CBCEnc(user.getPhonenumber().getBytes("UTF-8")));//存手机号密文
+       } catch (UnsupportedEncodingException e) {
+           e.printStackTrace();
+       }
+       sysCheckCode.setCheckCodeType(2);
+       sysCheckCodeMapper.insert(sysCheckCode);
         return toAjax(row);
     }
 
@@ -151,37 +152,37 @@ public class SysUserController extends BaseController {
         user.setUpdateBy(SecurityUtils.getUsername());
         userService.updateCheckPhoneNumber(user);
         //更新手机号校验数据
-//        LambdaQueryWrapper<SysCheckCode> wrapper = new LambdaQueryWrapper<>();
-//        wrapper.select(SysCheckCode::getId)
-//                .eq(SysCheckCode::getUserId, user.getUserId())
-//                .eq(SysCheckCode::getCheckCodeType, 2);
-//        SysCheckCode sysCheckCode = sysCheckCodeMapper.selectOne(wrapper);
-//        if (sysCheckCode != null) {
-//            sysCheckCode.setPlaintext(user.getPhonenumber());
-//            try {
-//                sysCheckCode.setCiphertext(operation.SM4CBCEnc(user.getPhonenumber().getBytes("UTF-8")));
-//                sysCheckCode.setCheckCode(operation.CBCMAC(user.getPhonenumber().getBytes("UTF-8")));
-//                String SignatureValue = operation.HMAC(user.toString().getBytes("UTF-8"));//存入第一次计算的签名值
-//                SysCheckCode sysCheckCode1 = new SysCheckCode();
-//                sysCheckCode1.setUserId(user.getUserId());
-//                sysCheckCode1.setDeptId(user.getDeptId());
-//                sysCheckCode1.setTenantId(user.getTenantId());
-//                sysCheckCode1.setUserName(user.getUserName());//被修改手机号用户名
-//                sysCheckCode1.setCheckCode(SignatureValue);
-//                sysCheckCode1.setPlaintext("更新手机号");
-//                sysCheckCode1.setCheckCodeType(6);
-//                sysCheckCodeMapper.insert(sysCheckCode1);
-//                String SignatureValue1 = operation.HMAC(user.toString().getBytes("UTF-8"));
-//                if (SignatureValue.equals(SignatureValue1)) {
-//                    sysCheckCode.setVerificationResults(1);
-//                } else {
-//                    sysCheckCode.setVerificationResults(2);
-//                }
-//            } catch (UnsupportedEncodingException e) {
-//                e.printStackTrace();
-//            }
-//        }
-//        sysCheckCodeMapper.updateById(sysCheckCode);
+       LambdaQueryWrapper<SysCheckCode> wrapper = new LambdaQueryWrapper<>();
+       wrapper.select(SysCheckCode::getId)
+               .eq(SysCheckCode::getUserId, user.getUserId())
+               .eq(SysCheckCode::getCheckCodeType, 2);
+       SysCheckCode sysCheckCode = sysCheckCodeMapper.selectOne(wrapper);
+       if (sysCheckCode != null) {
+           sysCheckCode.setPlaintext(user.getPhonenumber());
+           try {
+               sysCheckCode.setCiphertext(operation.SM4CBCEnc(user.getPhonenumber().getBytes("UTF-8")));
+               sysCheckCode.setCheckCode(operation.CBCMAC(user.getPhonenumber().getBytes("UTF-8")));
+               String SignatureValue = operation.HMAC(user.toString().getBytes("UTF-8"));//存入第一次计算的签名值
+               SysCheckCode sysCheckCode1 = new SysCheckCode();
+               sysCheckCode1.setUserId(user.getUserId());
+               sysCheckCode1.setDeptId(user.getDeptId());
+               sysCheckCode1.setTenantId(user.getTenantId());
+               sysCheckCode1.setUserName(user.getUserName());//被修改手机号用户名
+               sysCheckCode1.setCheckCode(SignatureValue);
+               sysCheckCode1.setPlaintext("更新手机号");
+               sysCheckCode1.setCheckCodeType(6);
+               sysCheckCodeMapper.insert(sysCheckCode1);
+               String SignatureValue1 = operation.HMAC(user.toString().getBytes("UTF-8"));
+               if (SignatureValue.equals(SignatureValue1)) {
+                   sysCheckCode.setVerificationResults(1);
+               } else {
+                   sysCheckCode.setVerificationResults(2);
+               }
+           } catch (UnsupportedEncodingException e) {
+               e.printStackTrace();
+           }
+       }
+       sysCheckCodeMapper.updateById(sysCheckCode);
         return toAjax(userService.updateUser(user));
     }
 
@@ -212,19 +213,19 @@ public class SysUserController extends BaseController {
         userService.checkUserAllowed(user);
         userService.updateCheckPassword(user);
 //        //更新密码数据
-//        LambdaQueryWrapper<SysCheckCode> wrapper = new LambdaQueryWrapper<>();
-//        wrapper.eq(SysCheckCode::getUserId, user.getUserId())
-//                .eq(SysCheckCode::getCheckCodeType, 1);
-//        SysCheckCode sysCheckCode = sysCheckCodeMapper.selectOne(wrapper);
-//        if (sysCheckCode != null) {
-//            try {
-//                sysCheckCode.setCheckCode(operation.CBCMAC(user.getPassword().getBytes("UTF-8")));
-//            } catch (UnsupportedEncodingException e) {
-//                e.printStackTrace();
-//            }
-//        }
-//        sysCheckCode.setPlaintext(user.getPassword());
-//        sysCheckCodeMapper.updateById(sysCheckCode);
+       LambdaQueryWrapper<SysCheckCode> wrapper = new LambdaQueryWrapper<>();
+       wrapper.eq(SysCheckCode::getUserId, user.getUserId())
+               .eq(SysCheckCode::getCheckCodeType, 1);
+       SysCheckCode sysCheckCode = sysCheckCodeMapper.selectOne(wrapper);
+       if (sysCheckCode != null) {
+           try {
+               sysCheckCode.setCheckCode(operation.CBCMAC(user.getPassword().getBytes("UTF-8")));
+           } catch (UnsupportedEncodingException e) {
+               e.printStackTrace();
+           }
+       }
+       sysCheckCode.setPlaintext(user.getPassword());
+       sysCheckCodeMapper.updateById(sysCheckCode);
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.resetPwd(user));

base-modules/service-system/service-system-biz/src/main/resources/application.yml

@@ -40,13 +40,13 @@ spring:
     dynamic:
       datasource:
         master:
-          password: usky
-          url: jdbc:mysql://172.16.120.165:3306/usky-cloud?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true
-          username: Yt#75Usky
-#          driver-class-name: dm.jdbc.driver.DmDriver
-#          password: Yt#75Usky
-#          url: jdbc:dm://localhost:5237/usky_cloud?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
-#          username: usky_cloud
+#          password: yt123456
+#          url: jdbc:mysql://192.168.10.165:3306/usky-cloud?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true
+#          username: root
+          driver-class-name: dm.jdbc.driver.DmDriver
+          password: Yt#75Usky
+          url: jdbc:dm://localhost:5237/usky_cloud?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
+          username: usky_cloud
       druid:
         initial-size: 5
         min-idle: 5

base-modules/service-system/service-system-biz/src/test/java/com/usky/system/DcsArchetypeApplicationTests.java

@@ -1,3 +1,4 @@
+/*
 package com.usky.system;
 
 
@@ -47,3 +48,4 @@ class DcsArchetypeApplicationTests {
 
     }
 }
+*/