luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' into dev_temp 

# Conflicts:
#	epmet-gateway/pom.xml
#	epmet-module/epmet-common-service/common-service-server/pom.xml
#	epmet-module/epmet-ext/epmet-ext-server/pom.xml
#	epmet-module/epmet-heart/epmet-heart-server/pom.xml
#	epmet-module/epmet-job/epmet-job-server/pom.xml
#	epmet-module/epmet-oss/epmet-oss-server/pom.xml
#	epmet-module/gov-access/gov-access-server/pom.xml
#	epmet-module/gov-grid/gov-grid-server/pom.xml
#	epmet-module/gov-issue/gov-issue-server/pom.xml
#	epmet-module/oper-crm/oper-crm-server/pom.xml
#	epmet-module/resi-group/resi-group-server/pom.xml
#	epmet-module/resi-hall/resi-hall-server/pom.xml
#	epmet-module/resi-mine/resi-mine-server/pom.xml
#	epmet-module/resi-partymember/resi-partymember-server/pom.xml
#	epmet-user/epmet-user-server/pom.xml
master
wxz 5 years ago
parent
0277866c11 0aea19925e
commit
9c1539e91b
56 changed files with 61 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-gateway/deploy/docker-compose-prod.yml
  2. 4
      epmet-gateway/pom.xml
  3. 2
      epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
  4. 2
      epmet-module/data-report/data-report-server/pom.xml
  5. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
  6. 2
      epmet-module/data-statistical/data-statistical-server/pom.xml
  7. 2
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
  8. 2
      epmet-module/epmet-common-service/common-service-server/pom.xml
  9. 2
      epmet-module/epmet-ext/epmet-ext-server/Dockerfile
  10. 2
      epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
  11. 2
      epmet-module/epmet-ext/epmet-ext-server/pom.xml
  12. 2
      epmet-module/epmet-heart/epmet-heart-server/Dockerfile
  13. 2
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
  14. 2
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  15. 2
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
  16. 2
      epmet-module/epmet-job/epmet-job-server/pom.xml
  17. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
  18. 2
      epmet-module/epmet-message/epmet-message-server/pom.xml
  19. 2
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
  20. 2
      epmet-module/epmet-oss/epmet-oss-server/pom.xml
  21. 2
      epmet-module/epmet-third/epmet-third-server/Dockerfile
  22. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
  23. 2
      epmet-module/epmet-third/epmet-third-server/pom.xml
  24. 4
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SubscribeServiceImpl.java
  25. 2
      epmet-module/gov-access/gov-access-server/Dockerfile
  26. 2
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
  27. 2
      epmet-module/gov-access/gov-access-server/pom.xml
  28. 2
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
  29. 2
      epmet-module/gov-grid/gov-grid-server/pom.xml
  30. 2
      epmet-module/gov-issue/gov-issue-server/Dockerfile
  31. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
  32. 2
      epmet-module/gov-issue/gov-issue-server/pom.xml
  33. 2
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
  34. 2
      epmet-module/gov-org/gov-org-server/Dockerfile
  35. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
  36. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  37. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
  38. 2
      epmet-module/gov-project/gov-project-server/pom.xml
  39. 2
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
  40. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
  41. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  42. 2
      epmet-module/resi-group/resi-group-server/Dockerfile
  43. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
  44. 2
      epmet-module/resi-group/resi-group-server/pom.xml
  45. 2
      epmet-module/resi-hall/resi-hall-server/Dockerfile
  46. 2
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml
  47. 2
      epmet-module/resi-hall/resi-hall-server/pom.xml
  48. 2
      epmet-module/resi-mine/resi-mine-server/Dockerfile
  49. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
  50. 2
      epmet-module/resi-mine/resi-mine-server/pom.xml
  51. 2
      epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
  52. 2
      epmet-module/resi-partymember/resi-partymember-server/pom.xml
  53. 2
      epmet-user/epmet-user-server/Dockerfile
  54. 2
      epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
  55. 2
      epmet-user/epmet-user-server/pom.xml
  56. 3
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

2
epmet-gateway/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-gateway-server:
container_name: epmet-gateway-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.39
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.42
ports:
- "8080:8080"
network_mode: host # 使用现有网络

4
epmet-gateway/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.45</version>
<version>0.3.42</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>
@ -188,7 +188,7 @@
<!-- <gateway.routes.data-report-server.uri>http://localhost:8109</gateway.routes.data-report-server.uri>-->
<!-- 29、统计服务 -->
<gateway.routes.data-statistical-server.uri>lb://data-statistical-server</gateway.routes.data-statistical-server.uri>
<!--<gateway.routes.data-statistical-server.uri>http://localhost:8108</gateway.routes.data-statistical-server.uri>-->
<!-- <gateway.routes.data-statistical-server.uri>http://localhost:8108</gateway.routes.data-statistical-server.uri>-->
<!-- 30、内容审核服务 -->
<gateway.routes.epmet-openapi-scan.uri>lb://epmet-openapi-scan</gateway.routes.epmet-openapi-scan.uri>
<!-- <gateway.routes.epmet-openapi-scan.uri>http://localhost:8107</gateway.routes.epmet-openapi-scan.uri>-->

2
epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
data-report-server:
container_name: data-report-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.45
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.52
ports:
- "8108:8108"
network_mode: host # 使用现有网络

2
epmet-module/data-report/data-report-server/pom.xml
View File

@ -3,7 +3,7 @@
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">
<version>0.3.45</version>
<version>0.3.52</version>
<artifactId>data-report-server</artifactId>
<parent>

2
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
data-statistical-server:
container_name: data-statistical-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.69
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.74
ports:
- "8108:8108"
network_mode: host # 使用现有网络

2
epmet-module/data-statistical/data-statistical-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<version>0.3.69</version>
<version>0.3.74</version>
<parent>
<artifactId>data-statistical</artifactId>
<groupId>com.epmet</groupId>

2
epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
common-service-server:
container_name: common-service-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.24
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.25
ports:
- "8103:8103"
network_mode: host # 使用现有网络

2
epmet-module/epmet-common-service/common-service-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.28</version>
<version>0.3.25</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-common-service</artifactId>

2
epmet-module/epmet-ext/epmet-ext-server/Dockerfile
View File

@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-ext.jar
EXPOSE 8113
ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

2
epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-ext-server:
container_name: epmet-ext-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.8
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.13
ports:
- "8113:8113"
network_mode: host # 使用现有网络

2
epmet-module/epmet-ext/epmet-ext-server/pom.xml
View File

@ -2,7 +2,7 @@
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.0.9</version>
<version>0.0.13</version>
<parent>
<groupId>com.epmet</groupId>

2
epmet-module/epmet-heart/epmet-heart-server/Dockerfile
View File

@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-heart.jar
EXPOSE 8090
ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

2
epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-heart-server:
container_name: epmet-heart-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.54
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.57
ports:
- "8111:8111"
network_mode: host # 使用现有网络

2
epmet-module/epmet-heart/epmet-heart-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.0.56</version>
<version>0.0.57</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-heart</artifactId>

2
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-job-server:
container_name: epmet-job-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.27
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.29
ports:
- "8084:8084"
network_mode: host # 使用现有网络

2
epmet-module/epmet-job/epmet-job-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.35</version>
<version>0.3.29</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-job</artifactId>

2
epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-message-server:
container_name: epmet-message-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.29
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.32
ports:
- "8085:8085"
network_mode: host # 使用现有网络

2
epmet-module/epmet-message/epmet-message-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.29</version>
<version>0.3.32</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-message</artifactId>

2
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
View File

@ -3,7 +3,7 @@ services:
epmet-oss-server:
container_name: epmet-oss-server-prod
# image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.25
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.27
ports:
- "8083:8083"
network_mode: host # 使用现有网络

2
epmet-module/epmet-oss/epmet-oss-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.26</version>
<version>0.3.27</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-oss</artifactId>

2
epmet-module/epmet-third/epmet-third-server/Dockerfile
View File

@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-third.jar
EXPOSE 8110
ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

2
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-third-server:
container_name: epmet-third-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.149
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.156
ports:
- "8110:8110"
network_mode: host # 使用现有网络

2
epmet-module/epmet-third/epmet-third-server/pom.xml
View File

@ -2,7 +2,7 @@
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.0.149</version>
<version>0.0.156</version>
<parent>
<groupId>com.epmet</groupId>

4
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/SubscribeServiceImpl.java
View File

@ -284,6 +284,7 @@ public class SubscribeServiceImpl implements SubscribeService {
}
String tmplId = wxResult.getData();
PersonalTemplateDTO personalTemplate = ConvertUtils.sourceToTarget(templateDTO, PersonalTemplateDTO.class);
personalTemplate.setId(null);
personalTemplate.setPriTmplId(tmplId);
personalTemplate.setCustomerId(formDTO.getCustomerId());
personalTemplate.setClientType("resi");
@ -312,9 +313,10 @@ public class SubscribeServiceImpl implements SubscribeService {
}
String tmplId = wxResult.getData();
PersonalTemplateDTO personalTemplate = ConvertUtils.sourceToTarget(templateDTO, PersonalTemplateDTO.class);
personalTemplate.setId(null);
personalTemplate.setPriTmplId(tmplId);
personalTemplate.setCustomerId(formDTO.getCustomerId());
personalTemplate.setClientType("resi");
personalTemplate.setClientType("work");
personalTemplate.setAppId(authInfo.getAuthorizerAppid());
personalTemplateService.save(personalTemplate);
});

2
epmet-module/gov-access/gov-access-server/Dockerfile
View File

@ -8,4 +8,4 @@ COPY ./target/*.jar ./gov-access.jar
EXPOSE 8099
ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

2
epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-access-server:
container_name: gov-access-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.39
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.44
ports:
- "8099:8099"
network_mode: host # 使用现有网络

2
epmet-module/gov-access/gov-access-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<version>0.3.41</version>
<version>0.3.44</version>
<parent>
<artifactId>gov-access</artifactId>
<groupId>com.epmet</groupId>

2
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-grid-server:
container_name: gov-grid-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.37
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.39
ports:
- "8097:8097"
network_mode: host # 使用现有网络

2
epmet-module/gov-grid/gov-grid-server/pom.xml
View File

@ -3,7 +3,7 @@
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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.38</version>
<version>0.3.39</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-grid</artifactId>

2
epmet-module/gov-issue/gov-issue-server/Dockerfile
View File

@ -8,4 +8,4 @@ COPY ./target/*.jar ./gov-issue.jar
EXPOSE 8101
ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

2
epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-issue-server:
container_name: gov-issue-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.52
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.57
ports:
- "8101:8101"
network_mode: host # 使用现有网络

2
epmet-module/gov-issue/gov-issue-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<version>0.3.54</version>
<version>0.3.57</version>
<parent>
<artifactId>gov-issue</artifactId>
<groupId>com.epmet</groupId>

2
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-mine-server:
container_name: gov-mine-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.34
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.35
ports:
- "8098:8098"
network_mode: host # 使用现有网络

2
epmet-module/gov-org/gov-org-server/Dockerfile
View File

@ -8,4 +8,4 @@ COPY ./target/*.jar ./gov-org.jar
EXPOSE 8092
ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

2
epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.92
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.96
ports:
- "8092:8092"
network_mode: host # 使用现有网络

2
epmet-module/gov-org/gov-org-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.92</version>
<version>0.3.96</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId>

2
epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-project-server:
container_name: gov-project-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.46
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.48
ports:
- "8102:8102"
network_mode: host # 使用现有网络

2
epmet-module/gov-project/gov-project-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<version>0.3.46</version>
<version>0.3.48</version>
<parent>
<artifactId>gov-project</artifactId>
<groupId>com.epmet</groupId>

2
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-voice-server:
container_name: gov-voice-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.68
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.69
ports:
- "8105:8105"
network_mode: host # 使用现有网络

2
epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
oper-crm-server:
container_name: oper-crm-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.71
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.72
ports:
- "8090:8090"
network_mode: host # 使用现有网络

2
epmet-module/oper-crm/oper-crm-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.74</version>
<version>0.3.72</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId>

2
epmet-module/resi-group/resi-group-server/Dockerfile
View File

@ -8,4 +8,4 @@ COPY ./target/*.jar ./resi-group.jar
EXPOSE 8095
ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

2
epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-group-server:
container_name: resi-group-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.67
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.76
ports:
- "8095:8095"
network_mode: host # 使用现有网络

2
epmet-module/resi-group/resi-group-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.68</version>
<version>0.3.76</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-group</artifactId>

2
epmet-module/resi-hall/resi-hall-server/Dockerfile
View File

@ -8,4 +8,4 @@ COPY ./target/*.jar ./resi-hall.jar
EXPOSE 8100
ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

2
epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-hall-server:
container_name: resi-hall-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.22
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.24
ports:
- "8100:8100"
network_mode: host # 使用现有网络

2
epmet-module/resi-hall/resi-hall-server/pom.xml
View File

@ -3,7 +3,7 @@
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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.23</version>
<version>0.3.24</version>
<parent>
<artifactId>resi-hall</artifactId>
<groupId>com.epmet</groupId>

2
epmet-module/resi-mine/resi-mine-server/Dockerfile
View File

@ -8,4 +8,4 @@ COPY ./target/*.jar ./resi-mine.jar
EXPOSE 8094
ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

2
epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-mine-server:
container_name: resi-mine-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.42
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.45
ports:
- "8094:8094"
network_mode: host # 使用现有网络

2
epmet-module/resi-mine/resi-mine-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.41</version>
<version>0.3.45</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-mine</artifactId>

2
epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-partymember-server:
container_name: resi-partymember-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.58
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.61
ports:
- "8096:8096"
network_mode: host # 使用现有网络

2
epmet-module/resi-partymember/resi-partymember-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.60</version>
<version>0.3.61</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-partymember</artifactId>

2
epmet-user/epmet-user-server/Dockerfile
View File

@ -8,4 +8,4 @@ COPY ./target/*.jar ./epmet-user.jar
EXPOSE 8087
ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"]
ENTRYPOINT ["sh", "-c", "exec $RUN_INSTRUCT"]

2
epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-user-server:
container_name: epmet-user-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.129
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.137
ports:
- "8087:8087"
network_mode: host # 不会创建新的网络

2
epmet-user/epmet-user-server/pom.xml
View File

@ -2,7 +2,7 @@
<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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.139</version>
<version>0.3.137</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId>

3
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
View File

@ -192,6 +192,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
@Override
public Result<List<StaffGridListDTO>> selectStaffGridListByUserId(List<UserIdAndPidDTO> customerStaffGridDTOS) {
if (CollectionUtils.isEmpty(customerStaffGridDTOS)){
return new Result<List<StaffGridListDTO>>().ok(new ArrayList<>());
}
List<GovStaffRoleResultDTO> gridManager = staffRoleService.listStaffsInRole(UserRoleConstant.GRID_MANAGER, customerStaffGridDTOS.get(0).getPid(), DataScope.getDefault());
List<StaffGridListDTO> staffGridListDTOS = baseDao.selectStaffGridListByUserId(customerStaffGridDTOS);
for (GovStaffRoleResultDTO govStaffRoleResultDTO : gridManager) {

Write Preview
Loading…
Cancel
Save