1. 移除 target 内容

2. 修改部分配置文件和端口
3. 更新 admin 模块 pom.xml

.gitignore

+/hmit-common/target/
+/hmit-admin/target/
+/hmit-api/target/

hmit-admin/pom.xml

@@ -99,6 +99,10 @@
             <artifactId>cos_api</artifactId>
             <version>${qcloud.cos.version}</version>
             <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-log4j12</artifactId>

hmit-admin/src/main/java/io/hmit/modules/security/controller/LoginController.java

@@ -4,6 +4,7 @@ import io.hmit.common.exception.ErrorCode;
 import io.hmit.common.exception.HmitException;
 import io.hmit.common.utils.IpUtils;
 import io.hmit.common.utils.Result;
+import io.hmit.common.utils.sm.SMUtil;
 import io.hmit.common.validator.AssertUtils;
 import io.hmit.common.validator.ValidatorUtils;
 import io.hmit.modules.log.entity.SysLogLoginEntity;
@@ -89,6 +90,8 @@ public class LoginController {
         //用户信息
         SysUserDTO user = sysUserService.getByUsername(login.getUsername());
 
+        login.setPassword(SMUtil.SMDecryptSM2AndSM4(login.getKey(), login.getPassword()));
+
         SysLogLoginEntity log = new SysLogLoginEntity();
         log.setOperation(LoginOperationEnum.LOGIN.value());
         log.setCreateDate(new Date());

hmit-admin/src/main/java/io/hmit/modules/security/dto/LoginDTO.java

@@ -34,4 +34,7 @@ public class LoginDTO implements Serializable {
     @NotBlank(message = "{sysuser.uuid.require}")
     private String uuid;
 
+    @ApiModelProperty(value = "密钥")
+    private String key;
+
 }
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/sys/controller/SysUserController.java

@@ -7,6 +7,7 @@ import io.hmit.common.page.PageData;
 import io.hmit.common.utils.ConvertUtils;
 import io.hmit.common.utils.ExcelUtils;
 import io.hmit.common.utils.Result;
+import io.hmit.common.utils.sm.SMUtil;
 import io.hmit.common.validator.AssertUtils;
 import io.hmit.common.validator.ValidatorUtils;
 import io.hmit.common.validator.group.AddGroup;
@@ -100,6 +101,10 @@ public class SysUserController {
 
         UserDetail user = SecurityUser.getUser();
 
+        // 对密码解密
+        dto.setPassword(SMUtil.SMDecryptSM2AndSM4(dto.getKey(), dto.getPassword()));
+        dto.setNewPassword(SMUtil.SMDecryptSM2AndSM4(dto.getKey(), dto.getNewPassword()));
+
         //原密码不正确
         if (!PasswordUtils.matches(dto.getPassword(), user.getPassword())) {
             return new Result().error(ErrorCode.PASSWORD_ERROR);
@@ -119,6 +124,9 @@ public class SysUserController {
         //校验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
 
+        // 对密码解密
+        dto.setPassword(SMUtil.SMDecryptSM2AndSM4(dto.getKey(), dto.getPassword()));
+
         sysUserService.save(dto);
 
         return new Result();

hmit-admin/src/main/java/io/hmit/modules/sys/dto/PasswordDTO.java

@@ -27,4 +27,7 @@ public class PasswordDTO implements Serializable {
     @NotBlank(message = "{sysuser.password.require}")
     private String newPassword;
 
+    @ApiModelProperty(value = "密钥")
+    private String key;
+
 }
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/sys/dto/SysUserDTO.java

@@ -95,5 +95,7 @@ public class SysUserDTO implements Serializable {
     @ApiModelProperty(value = "身份证号码")
     private String idCardNo;
 
+    @ApiModelProperty(value = "密钥")
+    private String key;
 
 }

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

@@ -5,9 +5,9 @@ spring:
 #      driver-class-name: com.mysql.cj.jdbc.Driver
       driver-class-name: com.mysql.jdbc.Driver
 #      url: jdbc:mysql://112.51.130.215:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-      url: jdbc:mysql://sh-cdb-jsrwe2i2.sql.tencentcdb.com:60548/bl_appointment?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-      username: root
-      password: Hmit@2020
+      url: jdbc:mysql://119.3.143.77:3306/bl_appointment_dev?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+      username: hmit_user
+      password: HmitUser@1234
 #      #Oracle
 #      driver-class-name: oracle.jdbc.OracleDriver
 #      url: jdbc:oracle:thin:@localhost:1521:xe

hmit-admin/target/classes/application-dev.yml

-spring:
-  datasource:
-    druid:
-      #MySQL
-#      driver-class-name: com.mysql.cj.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
-#      url: jdbc:mysql://112.51.130.215:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-      url: jdbc:mysql://sh-cdb-jsrwe2i2.sql.tencentcdb.com:60548/bl_appointment?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-      username: root
-      password: Hmit@2020
-#      #Oracle
-#      driver-class-name: oracle.jdbc.OracleDriver
-#      url: jdbc:oracle:thin:@localhost:1521:xe
-#      username: hmit_security
-#      password: 123456
-#      #SQLServer
-#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#      url: jdbc:sqlserver://localhost:1433;DatabaseName=security_enterprise
-#      username: sa
-#      password: 123456
-#      #postgresql
-#      driver-class-name: org.postgresql.Driver
-#      url: jdbc:postgresql://localhost:5432/security_enterprise
-#      username: postgres
-#      password: 123456
-      initial-size: 10
-      max-active: 100
-      min-idle: 10
-      max-wait: 6000
-      pool-prepared-statements: true
-      max-pool-prepared-statement-per-connection-size: 20
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      #Oracle需要打开注释
-      #validation-query: SELECT 1 FROM DUAL
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        #login-username: admin
-        #login-password: admin
-      filter:
-        stat:
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: false
-        wall:
-          config:
-            multi-statement-allow: true
-
-##多数据源的配置，需要引用hmit-dynamic-datasource
-#dynamic:
-#  datasource:
-#    slave1:
-#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#      url: jdbc:sqlserver://123456:1433;DatabaseName=security_enterprise
-#      username: sa
-#      password: 123456
-#    slave2:
-#      driver-class-name: org.postgresql.Driver
-#      url: jdbc:postgresql://123456:5432/security_enterprise
-#      username: postgres
-#      password: 123456

hmit-admin/target/classes/application-prod.yml

-spring:
-  datasource:
-    druid:
-      #MySQL
-#      driver-class-name: com.mysql.cj.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
-#      url: jdbc:mysql://122.51.130.215:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-      url: jdbc:mysql://sh-cdb-jsrwe2i2.sql.tencentcdb.com:60548/bl_appointment?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-      username: root
-      password: Hmit@2020
-      initial-size: 10
-      max-active: 100
-      min-idle: 10
-      max-wait: 60000
-      pool-prepared-statements: true
-      max-pool-prepared-statement-per-connection-size: 20
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      #Oracle需要打开注释
-      #validation-query: SELECT 1 FROM DUAL
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        #login-username: admin
-        #login-password: admin
-      filter:
-        stat:
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: false
-        wall:
-          config:
-            multi-statement-allow: true

hmit-admin/target/classes/application.yml

-# Tomcat
-server:
-  tomcat:
-    uri-encoding: UTF-8
-    max-threads: 1000
-    min-spare-threads: 30
-  port: 8080
-  connection-timeout: 5000ms
-  servlet:
-    context-path: /hmit-admin
-    session:
-      cookie:
-        http-only: true
-
-spring:
-  # 环境 dev|test|prod
-  profiles:
-    active: dev
-  messages:
-    encoding: UTF-8
-    basename: i18n/messages
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
-      enabled: true
-  redis:
-    database: 0
-    host: 192.168.10.10
-    port: 6379
-    password:    # 密码（默认为空）
-    timeout: 6000ms  # 连接超时时长（毫秒）
-    jedis:
-      pool:
-        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
-        max-wait: -1ms      # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-idle: 10      # 连接池中的最大空闲连接
-        min-idle: 5       # 连接池中的最小空闲连接
-  activiti:
-    check-process-definitions: false
-
-
-fdfs:
-  so-timeout: 600000
-  connect-timeout: 6000
-  tracker-list:            #TrackerList参数,支持多个
-    - 192.168.10.10:22122
-
-# 是否开启redis缓存  true开启   false关闭
-hmit.redis.open: false
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/**/*.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: io.hmit.modules.*.entity
-  global-config:
-    #数据库相关配置
-    db-config:
-      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
-      id-type: ID_WORKER
-    banner: false
-  #原生配置
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-    call-setters-on-nulls: true
-    jdbc-type-for-null: 'null'

hmit-admin/target/classes/banner.txt

-====================================================================================================================
-
-                    欢迎使用 hmit-enterprise - Powered By Hmit
-
-====================================================================================================================
\ No newline at end of file