Merge branch 'master' of http://47.101.34.182:6767/r/iot-zkpt

eladmin-system/src/main/java/me/zhengjie/modules/dm/user/domain/DmUser.java

@@ -117,7 +117,7 @@ public class DmUser extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "用户编号")
     private String userCode;
 
-    @NotNull
+    //@NotNull
     @ApiModelProperty(value = "人员状态：1启用、0禁用")
     private Boolean status;
 

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java

@@ -76,7 +76,7 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "DM单位")
     private DmCompany dmCompany;
 
-    @NotBlank
+    //@NotBlank
     @Column(unique = true)
     @ApiModelProperty(value = "用户名称")
     private String username;
@@ -90,7 +90,7 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "邮箱")
     private String email;
 
-    @NotBlank
+    //@NotBlank
     @ApiModelProperty(value = "电话号码")
     private String phone;
 
@@ -106,7 +106,7 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "密码")
     private String password;
 
-    @NotNull
+    //@NotNull
     @ApiModelProperty(value = "是否启用")
     private Boolean enabled;
 
@@ -117,11 +117,11 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "最后修改密码的时间", hidden = true)
     private Date pwdResetTime;
 
-    @NotNull
+    //@NotNull
     @ApiModelProperty(value = "初始密码", hidden = true)
     private String orgPassword;
 
-    @NotNull
+    //@NotNull
     @ApiModelProperty(value = "限制次数", hidden = true)
     private Integer errLimit = 3;
 

eladmin-system/src/main/resources/config/application-dev.yml

@@ -15,9 +15,12 @@ spring:
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:eladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
 #      username: ${DB_USER:root}
 #      password: ${DB_PWD:123456}
-      url: jdbc:log4jdbc:mysql://114.55.24.6:3308/dm_zkpt?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
-      username: root
-      password: shimao@123
+#      url: jdbc:log4jdbc:mysql://114.55.24.6:3308/dm_zkpt?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+#      username: root
+#      password: shimao@123
+      url: jdbc:log4jdbc:mysql://47.101.34.182:3306/dm_zkpt?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+      username: dev
+      password: root
       # 初始连接数
       initial-size: 5
       # 最小连接数

eladmin-system/src/main/resources/config/application-prod.yml

@@ -1,15 +1,20 @@
 #配置数据源
 spring:
+  data:
+    mongodb:
+      host: 10.23.39.2
+      port: 27018
+      database: dm_zkpt
+      authentication-database: admin
+      username: smart_park
+      password: 'UJu6kYgG'
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-#      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:eladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
-#      username: ${DB_USER:root}
-#      password: ${DB_PWD:123456}
-      url: jdbc:log4jdbc:mysql://114.55.24.6:3308/dm_zkpt?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
-      username: root
-      password: shimao@123
+      url: jdbc:log4jdbc:mysql://47.101.34.182:3306/dm_zkpt?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+      username: dev
+      password: root
       # 初始连接数
       initial-size: 5
       # 最小连接数

eladmin-system/src/main/resources/config/application.yml

@@ -25,9 +25,11 @@ spring:
   redis:
     #数据库索引
     database: ${REDIS_DB:2}
-    host: ${REDIS_HOST:114.55.24.6}
+#    host: ${REDIS_HOST:114.55.24.6}
 #    port: ${REDIS_PORT:6386}
 #    host: ${REDIS_HOST:127.0.0.1}
+#    port: ${REDIS_PORT:6386}
+    host: ${REDIS_HOST:10.21.39.1}
     port: ${REDIS_PORT:6386}
     password: ${REDIS_PWD:}
     #连接超时时间