Browse Source

auth0.3.19

dev_shibei_match
handaolin 5 years ago
parent
commit
944afa5cb9
  1. 2
      epmet-auth/deploy/docker-compose-dev.yml
  2. 2
      epmet-auth/pom.xml
  3. 4
      epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java
  4. 11
      epmet-auth/src/main/java/com/epmet/dto/form/SendSmsCodeFormDTO.java
  5. 11
      epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsFormDTO.java

2
epmet-auth/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-auth-server: epmet-auth-server:
container_name: epmet-auth-server-dev container_name: epmet-auth-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.18 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.19
ports: ports:
- "8081:8081" - "8081:8081"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-auth/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.18</version> <version>0.3.19</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId> <artifactId>epmet-cloud</artifactId>

4
epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java

@ -53,7 +53,7 @@ public class GovLoginController {
**/ **/
@PostMapping(value = "/loginwxmp/sendsmscode") @PostMapping(value = "/loginwxmp/sendsmscode")
public Result sendSmsCode(@RequestBody SendSmsCodeFormDTO formDTO) { public Result sendSmsCode(@RequestBody SendSmsCodeFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO); ValidatorUtils.validateEntity(formDTO,SendSmsCodeFormDTO.AddUserShowGroup.class);
govLoginService.sendSmsCode(formDTO); govLoginService.sendSmsCode(formDTO);
return new Result(); return new Result();
} }
@ -67,7 +67,7 @@ public class GovLoginController {
**/ **/
@PostMapping(value = "/loginwxmp/getmyorg") @PostMapping(value = "/loginwxmp/getmyorg")
public Result<List<StaffOrgsResultDTO>> getmyorg(@RequestBody StaffOrgsFormDTO formDTO) { public Result<List<StaffOrgsResultDTO>> getmyorg(@RequestBody StaffOrgsFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO); ValidatorUtils.validateEntity(formDTO,StaffOrgsFormDTO.AddUserShowGroup.class);
List<StaffOrgsResultDTO> staffOrgs=govLoginService.getMyOrg(formDTO); List<StaffOrgsResultDTO> staffOrgs=govLoginService.getMyOrg(formDTO);
return new Result<List<StaffOrgsResultDTO>>().ok(staffOrgs); return new Result<List<StaffOrgsResultDTO>>().ok(staffOrgs);
} }

11
epmet-auth/src/main/java/com/epmet/dto/form/SendSmsCodeFormDTO.java

@ -1,5 +1,6 @@
package com.epmet.dto.form; package com.epmet.dto.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
@ -13,7 +14,13 @@ import java.io.Serializable;
@Data @Data
public class SendSmsCodeFormDTO implements Serializable { public class SendSmsCodeFormDTO implements Serializable {
private static final long serialVersionUID = -1852541457359282018L; private static final long serialVersionUID = -1852541457359282018L;
/**
@NotBlank(message = "手机号不能为空") * 添加用户操作的用户可见异常分组
* 该分组用于校验需要返回给前端错误信息提示的列需要继承CustomerClientShowGroup
* 返回错误码为8999提示信息为DTO中具体的列的校验注解message的内容
*/
public interface AddUserShowGroup extends CustomerClientShowGroup {
}
@NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
private String mobile; private String mobile;
} }

11
epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsFormDTO.java

@ -1,5 +1,6 @@
package com.epmet.dto.form; package com.epmet.dto.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
@ -13,11 +14,17 @@ import java.io.Serializable;
@Data @Data
public class StaffOrgsFormDTO implements Serializable { public class StaffOrgsFormDTO implements Serializable {
private static final long serialVersionUID = 4193133227120225342L; private static final long serialVersionUID = 4193133227120225342L;
/**
* 添加用户操作的用户可见异常分组
* 该分组用于校验需要返回给前端错误信息提示的列需要继承CustomerClientShowGroup
* 返回错误码为8999提示信息为DTO中具体的列的校验注解message的内容
*/
public interface AddUserShowGroup extends CustomerClientShowGroup {
}
/** /**
* 手机号 * 手机号
*/ */
@NotBlank(message = "手机号不能为空") @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
private String mobile; private String mobile;
/** /**

Loading…
Cancel
Save