Browse Source

Merge branch 'dev' into release

dev_shibei_match
wxz 5 years ago
parent
commit
77ee4035ee
  1. 4
      epmet-admin/epmet-admin-server/pom.xml
  2. 4
      epmet-auth/pom.xml
  3. 4
      epmet-gateway/pom.xml
  4. 4
      epmet-module/data-report/data-report-server/pom.xml
  5. 4
      epmet-module/data-statistical/data-statistical-server/pom.xml
  6. 4
      epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
  7. 4
      epmet-module/epmet-common-service/common-service-server/pom.xml
  8. 4
      epmet-module/epmet-demo/epmet-demo-server/pom.xml
  9. 4
      epmet-module/epmet-ext/epmet-ext-server/pom.xml
  10. 4
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  11. 4
      epmet-module/epmet-job/epmet-job-server/pom.xml
  12. 4
      epmet-module/epmet-message/epmet-message-server/pom.xml
  13. 4
      epmet-module/epmet-oss/epmet-oss-server/pom.xml
  14. 4
      epmet-module/epmet-point/epmet-point-server/pom.xml
  15. 36
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdAndSrcFormDTO.java
  16. 27
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdFormDTO.java
  17. 26
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AuthAccessTokenClientResultDTO.java
  18. 41
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerTokensResultDTO.java
  19. 4
      epmet-module/epmet-third/epmet-third-server/pom.xml
  20. 4
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
  21. 30
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
  22. 9
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java
  23. 9
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java
  24. 18
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java
  25. 20
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
  26. 56
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
  27. 12
      epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml
  28. 11
      epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentAccessTokenDao.xml
  29. 50
      epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
  30. 4
      epmet-module/gov-access/gov-access-server/pom.xml
  31. 4
      epmet-module/gov-grid/gov-grid-server/pom.xml
  32. 4
      epmet-module/gov-issue/gov-issue-server/pom.xml
  33. 4
      epmet-module/gov-mine/gov-mine-server/pom.xml
  34. 4
      epmet-module/gov-org/gov-org-server/pom.xml
  35. 10
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
  36. 4
      epmet-module/gov-project/gov-project-server/pom.xml
  37. 9
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
  38. 9
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java
  39. 15
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
  40. 5
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java
  41. 12
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
  42. 4
      epmet-module/gov-voice/gov-voice-server/pom.xml
  43. 4
      epmet-module/oper-access/oper-access-server/pom.xml
  44. 4
      epmet-module/oper-crm/oper-crm-server/pom.xml
  45. 4
      epmet-module/oper-customize/oper-customize-server/pom.xml
  46. 4
      epmet-module/resi-group/resi-group-server/pom.xml
  47. 4
      epmet-module/resi-guide/resi-guide-server/pom.xml
  48. 4
      epmet-module/resi-hall/resi-hall-server/pom.xml
  49. 4
      epmet-module/resi-home/resi-home-server/pom.xml
  50. 4
      epmet-module/resi-mine/resi-mine-server/pom.xml
  51. 4
      epmet-module/resi-partymember/resi-partymember-server/pom.xml
  52. 4
      epmet-module/resi-voice/resi-voice-server/pom.xml
  53. 4
      epmet-openapi/epmet-openapi-scan/pom.xml
  54. 2
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java
  55. 4
      epmet-user/epmet-user-server/pom.xml

4
epmet-admin/epmet-admin-server/pom.xml

@ -104,8 +104,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-auth/pom.xml

@ -170,8 +170,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-gateway/pom.xml

@ -100,8 +100,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/data-report/data-report-server/pom.xml

@ -118,8 +118,8 @@
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/data-statistical/data-statistical-server/pom.xml

@ -160,8 +160,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/epmet-activiti/epmet-activiti-server/pom.xml

@ -178,8 +178,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/epmet-common-service/common-service-server/pom.xml

@ -114,8 +114,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/epmet-demo/epmet-demo-server/pom.xml

@ -121,8 +121,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/epmet-ext/epmet-ext-server/pom.xml

@ -192,8 +192,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/epmet-heart/epmet-heart-server/pom.xml

@ -130,8 +130,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/epmet-job/epmet-job-server/pom.xml

@ -127,8 +127,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/epmet-message/epmet-message-server/pom.xml

@ -144,8 +144,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/epmet-oss/epmet-oss-server/pom.xml

@ -140,8 +140,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/epmet-point/epmet-point-server/pom.xml

@ -135,8 +135,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

36
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdAndSrcFormDTO.java

@ -0,0 +1,36 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description 公众号客户删除入参DTO
* @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323482
* @ClassName CommonCustomerIdAndSrcFormDTO
* @Auth wangc
* @Date 2020-08-25 11:02
*/
@Data
public class CommonCustomerIdAndSrcFormDTO implements Serializable {
private static final long serialVersionUID = -2945388338786885295L;
public interface CustomerAndSrcGroup extends CustomerClientShowGroup{}
/**
* 客户Id
* */
@NotBlank(message = "客户Id不能为空",groups = CustomerAndSrcGroup.class)
private String customerId;
/**
* 数据来源(dev:开发 test:体验 prod:生产)
* */
@NotBlank(message = "数据来源不能为空",groups = CustomerAndSrcGroup.class)
private String source;
@NotBlank(message = "用户Id不能为空",groups = CustomerAndSrcGroup.class)
private String userId;
}

27
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdFormDTO.java

@ -0,0 +1,27 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description 获取客户第三方token 入参DTO
* @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323480
* @ClassName CommonCustomerIdFormDTO
* @Auth wangc
* @Date 2020-08-25 10:57
*/
@Data
public class CommonCustomerIdFormDTO implements Serializable {
private static final long serialVersionUID = 3160741101286756024L;
public interface PaCustomerIdGroup extends CustomerClientShowGroup{}
/**
* 客户Id
* */
@NotBlank(message = "客户Id不能为空" , groups = PaCustomerIdGroup.class)
private String customerId;
}

26
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AuthAccessTokenClientResultDTO.java

@ -0,0 +1,26 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description 授权accessToken和app端的查询返参
* @ClassName AuthAccessTokenClientResultDTO
* @Auth wangc
* @Date 2020-08-25 13:41
*/
@Data
public class AuthAccessTokenClientResultDTO implements Serializable {
private static final long serialVersionUID = -642465145534993509L;
/**
* 客户端类型
* */
private String clientType;
/**
* 调用令牌
* */
private String accessToken;
}

41
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerTokensResultDTO.java

@ -0,0 +1,41 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description
* @ClassName CustomerTokensResultDTO
* @Auth wangc
* @Date 2020-08-25 11:16
*/
@Data
public class CustomerTokensResultDTO implements Serializable {
private static final long serialVersionUID = -6811282503588315365L;
/**
* 客户Id
* */
private String customerId = "";
/**
* 客户名称
* */
private String customerName = "";
/**
* 第三方token
* */
private String componentAccessToken = "";
/**
* 授权方居民端token
* */
private String resiAuthorizerToken = "";
/**
* 授权方工作端token
* */
private String workAuthorizerToken = "";
}

4
epmet-module/epmet-third/epmet-third-server/pom.xml

@ -203,8 +203,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java

@ -116,5 +116,9 @@ public interface ModuleConstant {
int EIGHTY_NINE_THOUSAND_AND_THREE = 89003;
int EIGHTY_NINE_THOUSAND_AND_FOUR = 89004;
/**
* 数据来源 生产环境
* */
String SRC_PROD = "prod";
}

30
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java

@ -192,5 +192,35 @@ public class PaCustomerController {
return new Result<PageData>().ok(pageData);
}
/**
* @Description 获取客户第三方token
* @NEI https://nei.netease.com/interface/detail/req/?pid=52285&id=323480
* @param param CommonCustomerIdFormDTO.class
* @return Result<CustomerTokensResultDTO>
* @author wangc
* @date 2020.08.25 15:39
**/
@PostMapping("tokenlist")
public Result<CustomerTokensResultDTO> tokenList(@RequestBody CommonCustomerIdFormDTO param){
ValidatorUtils.validateEntity(param, CustomerUserFormDTO.CustomerIdGroup.class);
return new Result<CustomerTokensResultDTO>().ok(paCustomerService.tokenList(param));
}
/**
* @Description 公众号客户删除
* @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323482
* @param token
* @param param
* @return
* @author wangc
* @date 2020.08.25 15:46
**/
@PostMapping("deletepubliccustomer")
public Result deletePublicCustomer(@LoginUser TokenDto token , @RequestBody CommonCustomerIdAndSrcFormDTO param){
param.setUserId(token.getUserId());
ValidatorUtils.validateEntity(param, CommonCustomerIdAndSrcFormDTO.CustomerAndSrcGroup.class);
paCustomerService.clearPublicCustomer(param);
return new Result();
}
}

9
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java

@ -22,6 +22,7 @@ import com.epmet.dto.AuthorizationInfoDTO;
import com.epmet.dto.form.AuthorizationInfoFormDTO;
import com.epmet.dto.form.AuthorizerAccessTokenFormDTO;
import com.epmet.dto.form.CustomerAccessTokenInfoFormDTO;
import com.epmet.dto.result.AuthAccessTokenClientResultDTO;
import com.epmet.dto.result.AuthCodeResultDTO;
import com.epmet.dto.result.CustomerAccessTokenInfoResultDTO;
import com.epmet.dto.result.WillOverDueResultDTO;
@ -109,4 +110,12 @@ public interface AuthorizationInfoDao extends BaseDao<AuthorizationInfoEntity> {
*/
List<CustomerAccessTokenInfoResultDTO> getCustomerAccessTokenInfo(CustomerAccessTokenInfoFormDTO customerAccessTokenInfoFormDTO);
/**
* @Description 查询来源端对应的accessToken
* @param customerId
* @return List<AuthAccessTokenClientResultDTO>
* @author wangc
* @date 2020.08.25 15:24
**/
List<AuthAccessTokenClientResultDTO> selectClientToken(@Param("customerId") String customerId);
}

9
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java

@ -69,4 +69,13 @@ public interface ComponentAccessTokenDao extends BaseDao<ComponentAccessTokenEnt
*/
String getComponentAccessToken();
/**
* @Description 查询ComponentAccessToken唯一
* @param
* @return String
* @author wangc
* @date 2020.08.25 15:14
**/
String selectComponentAccessToken();
}

18
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java

@ -102,4 +102,22 @@ public interface PaCustomerDao extends BaseDao<PaCustomerEntity> {
* @Description 查询客户及管理员信息
*/
CustomerAndUserResultDTO selectCustomerAndUser(@Param("customerId") String customerId);
/**
* @Description 清除第三方库中客户的信息
* @param customerId
* @return
* @author wangc
* @date 2020.08.26 10:44
**/
void clearCustomerInfo(@Param("customerId") String customerId);
/**
* @Description 根据客户Id查询当前客户的来源
* @param customerId
* @return
* @author wangc
* @date 2020.08.26 10:59
**/
String selectSourceById(@Param("customerId") String customerId,@Param("source") String source);
}

20
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java

@ -213,4 +213,24 @@ public interface PaCustomerService extends BaseService<PaCustomerEntity> {
* @return com.epmet.commons.tools.page.PageData
*/
PageData getCustomerList(UploadListFormDTO formDTO);
/**
* @Description 获取客户第三方token
* @NEI https://nei.netease.com/interface/detail/res/?pid=52285&id=323480
* @param param
* @return
* @author wangc
* @date 2020.08.25 14:51
**/
CustomerTokensResultDTO tokenList(CommonCustomerIdFormDTO param);
/**
* @Description 公众号客户删除
* @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323482
* @param param
* @return
* @author wangc
* @date 2020.08.25 15:46
**/
void clearPublicCustomer(CommonCustomerIdAndSrcFormDTO param);
}

56
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java

@ -31,6 +31,8 @@ import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.CpUserDetailRedis;
import com.epmet.constant.CodeConstant;
import com.epmet.constant.ModuleConstant;
import com.epmet.constant.PaConstant;
import com.epmet.dao.*;
import com.epmet.dto.*;
@ -102,6 +104,8 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
private WxMaCodeService wxMaCodeService;
@Autowired
private AuthorizationInfoDao authorizationInfoDao;
@Autowired
private ComponentAccessTokenDao componentAccessTokenDao;
@Override
public PageData<PaCustomerDTO> page(Map<String, Object> params) {
@ -641,4 +645,56 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
return new PageData<>(list, pageInfo.getTotal());
}
/**
* @Description 获取客户第三方token
* @NEI https://nei.netease.com/interface/detail/res/?pid=52285&id=323480
* @param param
* @return
* @author wangc
* @date 2020.08.25 14:51
**/
@Override
public CustomerTokensResultDTO tokenList(CommonCustomerIdFormDTO param) {
CustomerTokensResultDTO result = new CustomerTokensResultDTO();
String customerName = baseDao.selectCustomerName(param.getCustomerId());
String componentAccessToken = componentAccessTokenDao.selectComponentAccessToken();
List<AuthAccessTokenClientResultDTO> clientList = authorizationInfoDao.selectClientToken(param.getCustomerId());
result.setCustomerId(param.getCustomerId());
result.setComponentAccessToken(StringUtils.isBlank(componentAccessToken) ? "" : componentAccessToken);
result.setCustomerName(StringUtils.isBlank(customerName) ? "" : customerName);
if(null != clientList || !clientList.isEmpty()){
clientList.forEach(client -> {
if(StringUtils.equals(CodeConstant.WORK,client.getClientType())){
result.setWorkAuthorizerToken(client.getAccessToken());
}else if(StringUtils.equals(CodeConstant.RESI,client.getClientType())){
result.setResiAuthorizerToken(client.getAccessToken());
}
});
}
return result;
}
/**
* @Description 公众号客户删除
* @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323482
* @param param
* @return
* @author wangc
* @date 2020.08.25 15:46
**/
@Override
@Transactional(rollbackFor = Exception.class)
public void clearPublicCustomer(CommonCustomerIdAndSrcFormDTO param) {
if(StringUtils.equals(ModuleConstant.SRC_PROD,param.getSource())){
logger.warn("有人试图删除用户的生产数据,试图删除的客户Id:{},操作者Id:{}",param.getCustomerId(),param.getUserId());
throw new RenException("禁止对生产环境数据进行删除操作!");
}
String check = baseDao.selectSourceById(param.getCustomerId(),param.getSource());
if (!StringUtils.equals(check,param.getCustomerId())) {
logger.warn("com.epmet.service.impl.PaCustomerServiceImpl.clearPublicCustomer,客户来源信息不匹配,客户Id:{},来源:{}",param.getCustomerId(),param.getSource());
return ;
}
baseDao.clearCustomerInfo(param.getCustomerId());
}
}

12
epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml

@ -121,4 +121,16 @@
</if>
</select>
<!-- 查询来源端对应的accessToken -->
<select id="selectClientToken" resultType="com.epmet.dto.result.AuthAccessTokenClientResultDTO">
SELECT
CLIENT_TYPE,
AUTHORIZER_ACCESS_TOKEN AS accessToken
FROM
authorization_info
WHERE
DEL_FLAG = '0'
AND CUSTOMER_ID = #{customerId}
</select>
</mapper>

11
epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentAccessTokenDao.xml

@ -48,4 +48,15 @@
AND (UNIX_TIMESTAMP(expires_in_time) - UNIX_TIMESTAMP(NOW())) <![CDATA[ <= ]]> 900
</select>
<!-- 查询ComponentAccessToken【唯一】 -->
<select id="selectComponentAccessToken" resultType="java.lang.String">
SELECT
COMPONENT_ACCESS_TOKEN
FROM
component_access_token
WHERE
DEL_FLAG = '0'
ORDER BY UPDATED_TIME DESC
LIMIT 1
</select>
</mapper>

50
epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml

@ -146,4 +146,54 @@
AND id = #{oldCustomerId}
</update>
<!-- 清除用户信息 -->
<delete id="clearCustomerInfo">
DELETE FROM auth_code WHERE CUSTOMER_ID = #{customerId};
DELETE FROM auth_result_record WHERE CUSTOMER_ID = #{customerId};
DELETE FROM authorization_info WHERE CUSTOMER_ID = #{customerId};
DELETE FROM binding_account WHERE CUSTOMER_ID = #{customerId};
DELETE FROM business_info WHERE CUSTOMER_ID = #{customerId};
DELETE FROM code_audit_record WHERE CUSTOMER_ID = #{customerId};
DELETE FROM code_audit_result WHERE CUSTOMER_ID = #{customerId};
DELETE FROM code_customer WHERE CUSTOMER_ID = #{customerId};
DELETE FROM code_operation_history WHERE CUSTOMER_ID = #{customerId};
DELETE FROM customer_mp WHERE CUSTOMER_ID = #{customerId};
DELETE FROM func_info WHERE CUSTOMER_ID = #{customerId};
DELETE FROM mini_category_info WHERE CUSTOMER_ID = #{customerId};
DELETE FROM mini_info WHERE CUSTOMER_ID = #{customerId};
DELETE FROM mini_network_info WHERE CUSTOMER_ID = #{customerId};
DELETE FROM open_platform_account WHERE CUSTOMER_ID = #{customerId};
DELETE FROM pa_customer_agency WHERE CUSTOMER_ID = #{customerId};
DELETE FROM pa_customer_user_agency WHERE CUSTOMER_ID = #{customerId};
DELETE FROM pa_customer WHERE ID = #{customerId};
</delete>
<!-- 根据客户Id查询当前客户的来源 -->
<select id="selectSourceById" resultType="java.lang.String">
SELECT
ID
FROM
PA_CUSTOMER
WHERE
ID = #{customerId}
AND
SOURCE = #{source}
</select>
</mapper>

4
epmet-module/gov-access/gov-access-server/pom.xml

@ -121,8 +121,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/gov-grid/gov-grid-server/pom.xml

@ -107,8 +107,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/gov-issue/gov-issue-server/pom.xml

@ -139,8 +139,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/gov-mine/gov-mine-server/pom.xml

@ -133,8 +133,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/gov-org/gov-org-server/pom.xml

@ -139,8 +139,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

10
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java

@ -48,10 +48,18 @@ public class ProjectDetailResultDTO implements Serializable {
* 处理状态(是否由我处理)
*/
private Boolean processable;
/**
* 是否是转项目节点
*/
private Boolean isCreated;
/**
* 当前跟进部门
*/
private List<String> departmentNameList;
/**
* 当前跟进部门
*/
private List<DepartmentNameListBean> departmentNameList;
private List<DepartmentNameListBean> departmentList;
@NoArgsConstructor
@Data

4
epmet-module/gov-project/gov-project-server/pom.xml

@ -139,8 +139,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

9
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java

@ -70,4 +70,13 @@ public interface ProjectStaffDao extends BaseDao<ProjectStaffEntity> {
* @Description 查询当前处于项目节点中的切工作未处理的工作人员
**/
List<ProjectStaffDTO> selectProjectTransferStaffList(ProjectStaffDTO dto);
/**
* 获取未处理的转项目节点
* @author zhaoqifeng
* @date 2020/8/27 14:26
* @param dto
* @return java.util.List<java.lang.String>
*/
List<String> selectCreatedProcess(ProjectStaffDTO dto);
}

9
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java

@ -131,4 +131,13 @@ public interface ProjectStaffService extends BaseService<ProjectStaffEntity> {
* @return java.util.List<java.lang.String>
*/
List<String> getStaffsByProjectId(String projectId);
/**
* 获取未处理的转项目节点
* @author zhaoqifeng
* @date 2020/8/27 14:30
* @param dto
* @return java.util.List<java.lang.String>
*/
List<String> getCreatedProcess(ProjectStaffDTO dto);
}

15
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@ -266,6 +266,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
ProjectDetailResultDTO resultDTO = baseDao.selectProjectDetail(fromDTO.getProjectId());
if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
resultDTO.setProcessable(false);
resultDTO.setIsCreated(false);
} else {
//获取我未处理的部门
ProjectStaffDTO projectStaffDTO = new ProjectStaffDTO();
@ -277,14 +278,22 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
} else {
resultDTO.setProcessable(false);
}
List<String> created = projectStaffService.getCreatedProcess(projectStaffDTO);
if (null != created && created.size() > NumConstant.ZERO) {
resultDTO.setIsCreated(true);
} else {
resultDTO.setIsCreated(false);
}
}
//获取当前跟进部门
List<String> departments = new ArrayList<>();
List<ProjectStaffDTO> departmentNameList = new ArrayList<>();
List<ProjectDetailResultDTO.DepartmentNameListBean> departmentList = new ArrayList<>();
if (ProjectConstant.CLOSED.equals(resultDTO.getProjectStatus())) {
//项目已结案,跟进部门为空
resultDTO.setDepartmentNameList(departmentList);
resultDTO.setDepartmentList(departmentList);
resultDTO.setDepartmentNameList(departments);
} else {
//项目未结案,找出所有跟进部门
ProjectDTO projectDTO = new ProjectDTO();
@ -313,8 +322,10 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
staffDto.getStaffId().equals(staffInfo.getStaffId())).map((StaffSinGridResultDTO::getStaffName))).collect(Collectors.toList());
bean.setStaffList(staffNameList);
departmentList.add(bean);
departments.add(departmentName);
}
resultDTO.setDepartmentNameList(departmentList);
resultDTO.setDepartmentList(departmentList);
resultDTO.setDepartmentNameList(departments);
}
return resultDTO;

5
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java

@ -150,4 +150,9 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl<ProjectStaffDao, Pr
return baseDao.selectStaffsByProjectId(projectId);
}
@Override
public List<String> getCreatedProcess(ProjectStaffDTO dto) {
return baseDao.selectCreatedProcess(dto);
}
}

12
epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml

@ -53,5 +53,17 @@
AND project_id = #{projectId}
AND is_handle = #{isHandle}
</select>
<select id="selectCreatedProcess" resultType="java.lang.String" parameterType="com.epmet.dto.ProjectStaffDTO">
SELECT
pp.ID
FROM
project_staff ps
INNER JOIN project_process pp ON ps.PROCESS_ID = pp.ID AND pp.DEL_FLAG = '0' AND pp.OPERATION = 'created'
WHERE
ps.DEL_FLAG = '0'
AND ps.PROJECT_ID = #{projectId}
AND STAFF_ID = #{staffId}
AND IS_HANDLE = 'unhandled'
</select>
</mapper>

4
epmet-module/gov-voice/gov-voice-server/pom.xml

@ -126,8 +126,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/oper-access/oper-access-server/pom.xml

@ -114,8 +114,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/oper-crm/oper-crm-server/pom.xml

@ -135,8 +135,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/oper-customize/oper-customize-server/pom.xml

@ -112,8 +112,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/resi-group/resi-group-server/pom.xml

@ -142,8 +142,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/resi-guide/resi-guide-server/pom.xml

@ -135,8 +135,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/resi-hall/resi-hall-server/pom.xml

@ -93,8 +93,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/resi-home/resi-home-server/pom.xml

@ -113,8 +113,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/resi-mine/resi-mine-server/pom.xml

@ -137,8 +137,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/resi-partymember/resi-partymember-server/pom.xml

@ -141,8 +141,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-module/resi-voice/resi-voice-server/pom.xml

@ -99,8 +99,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

4
epmet-openapi/epmet-openapi-scan/pom.xml

@ -101,8 +101,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

2
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java

@ -82,7 +82,7 @@ public class InfoSubmitFromDTO implements Serializable {
/**
* 手机验证码
*/
@NotBlank(message = "手机验证码不能为空")
//@NotBlank(message = "手机验证码不能为空")
@Length(max=6,message = "手机验证码不能超过6位")
private String mobileCode;

4
epmet-user/epmet-user-server/pom.xml

@ -150,8 +150,8 @@
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.server-addr>192.168.1.130:8848</nacos.server-addr>
<nacos.discovery.namespace>6ceab336-d004-4acf-89c6-e121d06f4988</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>

Loading…
Cancel
Save