孙永军 1 rok pred
rodič
commit
b4c44c0b78

+ 2 - 0
src/main/java/com/smcic/api/admin/entity/AdminUsers.java

@@ -9,6 +9,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -32,6 +33,7 @@ public class AdminUsers implements Serializable {
 
     private String phone;
 
+    @JsonIgnore
     private String password;
 
     private String name;

+ 3 - 0
src/main/java/com/smcic/api/admin/service/impl/AdminUsersServiceImpl.java

@@ -90,6 +90,9 @@ public class AdminUsersServiceImpl extends ServiceImpl<AdminUsersMapper, AdminUs
                 return adminUserRole;
             }).collect(Collectors.toList()));
         }
+        if(!TextUtils.isEmpty(adminUsers.getPassword())){
+            adminUsers.setPassword(user.getPassword());
+        }
         updateById(adminUsers);
     }
 

+ 4 - 0
src/main/resources/application.yml

@@ -35,6 +35,10 @@ spring:
           url: jdbc:mysql://rm-2vc3039h858t9ab7sfo.mysql.cn-chengdu.rds.aliyuncs.com:3306/neican?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&nullCatalogMeansCurrent=true
           username: cxzx
           password: sxtvs53$68HD
+        tibig:
+          url: jdbc:mysql://172.16.101.1:4000/youmei?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&nullCatalogMeansCurrent=true
+          username: root
+          password: msstar
 
   jackson:
     time-zone: GMT+8