diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java index 41649ac..e36aabe 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java @@ -2,10 +2,14 @@ import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class AppUserLoginDTO { + @NotNull private String username; + @NotNull private String password; private String openId; private String weChatName; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java index 41649ac..e36aabe 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java @@ -2,10 +2,14 @@ import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class AppUserLoginDTO { + @NotNull private String username; + @NotNull private String password; private String openId; private String weChatName; diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 8703f91..c8b5ad9 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -5,7 +5,7 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://139.198.18.188:3306/product_device_cs?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://139.198.18.188:3306/product_device_cs?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: brroot password: brroot#203 initial-size: 2 diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java index 41649ac..e36aabe 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java @@ -2,10 +2,14 @@ import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class AppUserLoginDTO { + @NotNull private String username; + @NotNull private String password; private String openId; private String weChatName; diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 8703f91..c8b5ad9 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -5,7 +5,7 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://139.198.18.188:3306/product_device_cs?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://139.198.18.188:3306/product_device_cs?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: brroot password: brroot#203 initial-size: 2 diff --git a/pom.xml b/pom.xml index 0c43994..770e714 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 2.6.11 5.1.38 0.9.0 - 4.0.0 + 5.7.2 11.1.0.7.0 @@ -68,7 +68,6 @@ ${casic.version} - @@ -172,7 +171,7 @@ cn.hutool - hutool-http + hutool-core ${hutool.version}