Browse Source

Merge branches 'dev' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

master
jianjun 4 years ago
parent
commit
731b30ce02
  1. 4
      epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml
  2. 2
      epmet-admin/epmet-admin-server/pom.xml
  3. 4
      epmet-auth/deploy/docker-compose-prod.yml
  4. 2
      epmet-auth/pom.xml
  5. 2
      epmet-gateway/deploy/docker-compose-prod.yml
  6. 2
      epmet-gateway/pom.xml
  7. 2
      epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml
  8. 1
      epmet-module/data-aggregator/data-aggregator-server/pom.xml
  9. 2
      epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
  10. 2
      epmet-module/data-report/data-report-server/pom.xml
  11. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
  12. 2
      epmet-module/data-statistical/data-statistical-server/pom.xml
  13. 4
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
  14. 2
      epmet-module/epmet-common-service/common-service-server/pom.xml
  15. 2
      epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
  16. 2
      epmet-module/epmet-ext/epmet-ext-server/pom.xml
  17. 4
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
  18. 2
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  19. 4
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
  20. 2
      epmet-module/epmet-job/epmet-job-server/pom.xml
  21. 4
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml
  22. 2
      epmet-module/epmet-message/epmet-message-server/pom.xml
  23. 2
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
  24. 2
      epmet-module/epmet-oss/epmet-oss-server/pom.xml
  25. 4
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
  26. 2
      epmet-module/epmet-point/epmet-point-server/pom.xml
  27. 4
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
  28. 2
      epmet-module/epmet-third/epmet-third-server/pom.xml
  29. 2
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
  30. 2
      epmet-module/gov-access/gov-access-server/pom.xml
  31. 4
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml
  32. 4
      epmet-module/gov-grid/gov-grid-server/pom.xml
  33. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
  34. 2
      epmet-module/gov-issue/gov-issue-server/pom.xml
  35. 4
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
  36. 4
      epmet-module/gov-mine/gov-mine-server/pom.xml
  37. 4
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
  38. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  39. 4
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
  40. 4
      epmet-module/gov-project/gov-project-server/pom.xml
  41. 4
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml
  42. 4
      epmet-module/gov-voice/gov-voice-server/pom.xml
  43. 2
      epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml
  44. 2
      epmet-module/oper-access/oper-access-server/pom.xml
  45. 4
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
  46. 4
      epmet-module/oper-crm/oper-crm-server/pom.xml
  47. 84
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
  48. 4
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
  49. 2
      epmet-module/oper-customize/oper-customize-server/pom.xml
  50. 4
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
  51. 2
      epmet-module/resi-group/resi-group-server/pom.xml
  52. 4
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml
  53. 2
      epmet-module/resi-guide/resi-guide-server/pom.xml
  54. 4
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml
  55. 4
      epmet-module/resi-hall/resi-hall-server/pom.xml
  56. 4
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml
  57. 4
      epmet-module/resi-home/resi-home-server/pom.xml
  58. 4
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
  59. 2
      epmet-module/resi-mine/resi-mine-server/pom.xml
  60. 4
      epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
  61. 2
      epmet-module/resi-partymember/resi-partymember-server/pom.xml
  62. 4
      epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml
  63. 4
      epmet-module/resi-voice/resi-voice-server/pom.xml
  64. 4
      epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml
  65. 4
      epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml
  66. 4
      epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml
  67. 4
      epmet-openapi/epmet-openapi-scan/pom.xml
  68. 4
      epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
  69. 2
      epmet-user/epmet-user-server/pom.xml
  70. 12
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

4
epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-admin-server:
container_name: epmet-admin-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.15
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.20
ports:
- "8082:8082"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

2
epmet-admin/epmet-admin-server/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"
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.15</version>
<version>0.3.20</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-admin</artifactId>

4
epmet-auth/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-auth-server:
container_name: epmet-auth-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.70
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.86
ports:
- "8081:8081"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

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"
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.70</version>
<version>0.3.86</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>

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

@ -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.43
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.50
ports:
- "8080:8080"
network_mode: host # 使用现有网络

2
epmet-gateway/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"
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.43</version>
<version>0.3.50</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>

2
epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml

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

1
epmet-module/data-aggregator/data-aggregator-server/pom.xml

@ -2,6 +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.11</version>
<parent>
<artifactId>data-aggregator</artifactId>
<groupId>com.epmet</groupId>

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

@ -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.59
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.111
ports:
- "8108:8108"
network_mode: host # 使用现有网络

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

@ -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.59</version>
<version>0.3.111</version>
<artifactId>data-report-server</artifactId>
<parent>

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

@ -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.81
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.141
ports:
- "8108:8108"
network_mode: host # 使用现有网络

2
epmet-module/data-statistical/data-statistical-server/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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.81</version>
<version>0.3.141</version>
<parent>
<artifactId>data-statistical</artifactId>
<groupId>com.epmet</groupId>

4
epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml

@ -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.26
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.38
ports:
- "8103:8103"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

2
epmet-module/epmet-common-service/common-service-server/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"
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.38</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-common-service</artifactId>

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

@ -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.13
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.18
ports:
- "8113:8113"
network_mode: host # 使用现有网络

2
epmet-module/epmet-ext/epmet-ext-server/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"
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.13</version>
<version>0.0.18</version>
<parent>
<groupId>com.epmet</groupId>

4
epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml

@ -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.57
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.59
ports:
- "8111:8111"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

2
epmet-module/epmet-heart/epmet-heart-server/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"
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.57</version>
<version>0.0.59</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-heart</artifactId>

4
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml

@ -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.29
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.31
ports:
- "8084:8084"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

2
epmet-module/epmet-job/epmet-job-server/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"
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.31</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-job</artifactId>

4
epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml

@ -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.33
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.44
ports:
- "8085:8085"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

2
epmet-module/epmet-message/epmet-message-server/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"
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.33</version>
<version>0.3.44</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-message</artifactId>

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

@ -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.28
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.34
ports:
- "8083:8083"
network_mode: host # 使用现有网络

2
epmet-module/epmet-oss/epmet-oss-server/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"
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.34</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-oss</artifactId>

4
epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-point-server:
container_name: epmet-point-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.42
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.48
ports:
- "8112:8112"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

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

@ -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.0.42</version>
<version>0.0.48</version>
<parent>
<artifactId>epmet-point</artifactId>
<groupId>com.epmet</groupId>

4
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

@ -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.157
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.171
ports:
- "8110:8110"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

2
epmet-module/epmet-third/epmet-third-server/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"
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.157</version>
<version>0.0.171</version>
<parent>
<groupId>com.epmet</groupId>

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

@ -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.45
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.49
ports:
- "8099:8099"
network_mode: host # 使用现有网络

2
epmet-module/gov-access/gov-access-server/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"
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.49</version>
<parent>
<artifactId>gov-access</artifactId>
<groupId>com.epmet</groupId>

4
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml

@ -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.40
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.43
ports:
- "8097:8097"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

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

@ -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.40</version>
<version>0.3.43</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-grid</artifactId>
@ -226,4 +226,4 @@
</profiles>
</project>
</project>

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

@ -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.60
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.74
ports:
- "8101:8101"
network_mode: host # 使用现有网络

2
epmet-module/gov-issue/gov-issue-server/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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.60</version>
<version>0.3.74</version>
<parent>
<artifactId>gov-issue</artifactId>
<groupId>com.epmet</groupId>

4
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml

@ -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.36
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.40
ports:
- "8098:8098"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

4
epmet-module/gov-mine/gov-mine-server/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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.36</version>
<version>0.3.40</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-mine</artifactId>
@ -234,4 +234,4 @@
</profile>
</profiles>
</project>
</project>

4
epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml

@ -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.97
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.110
ports:
- "8092:8092"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

2
epmet-module/gov-org/gov-org-server/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"
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.97</version>
<version>0.3.110</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId>

4
epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml

@ -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.48
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.65
ports:
- "8102:8102"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

4
epmet-module/gov-project/gov-project-server/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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.48</version>
<version>0.3.65</version>
<parent>
<artifactId>gov-project</artifactId>
<groupId>com.epmet</groupId>
@ -294,4 +294,4 @@
</profile>
</profiles>
</project>
</project>

4
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml

@ -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.69
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.70
ports:
- "8105:8105"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

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

@ -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.69</version>
<version>0.3.70</version>
<parent>
<artifactId>gov-voice</artifactId>
<groupId>com.epmet</groupId>
@ -258,4 +258,4 @@
</profiles>
</project>
</project>

2
epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml

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

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

@ -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.18</version>
<version>0.3.19</version>
<parent>
<artifactId>oper-access</artifactId>
<groupId>com.epmet</groupId>

4
epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml

@ -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.72
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.81
ports:
- "8090:8090"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

4
epmet-module/oper-crm/oper-crm-server/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"
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.72</version>
<version>0.3.81</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId>
@ -255,7 +255,7 @@
</activation>-->
<properties>
<server.port>8090</server.port>
<spring.profiles.active>test</spring.profiles.active>
<spring.profiles.active>prod</spring.profiles.active>
<!-- 数据库配置-->
<spring.datasource.druid.url>

84
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@ -495,48 +495,48 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
throw new RenException("发送(初始化客户信息)系统消息到message服务失败:{}", sendMsgResult.getInternalMsg());
}
////3.调用epmet-user服务,初始化客户对应的角色;调用access服务给角色分配权限信息
//Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(formDTO.getCustomerId());
//if (!initResult.success()) {
// throw new RenException("客户新增:调用user服务为客户初始化角色数据失败:".concat(initResult.toString()));
//}
//
////4.调用oper-customize服务,初始化客户定制化首页模板数据
//CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
//initHomeForm.setCustomerId(formDTO.getCustomerId());
//Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
//if (!initHomeResult.success()) {
// throw new RenException("初始化客户首页数据失败:".concat(initHomeResult.getInternalMsg()));
//}
//
////5.调用gov-org服务,初始化客户根级组织信息、客户管理员信息
//AddAgencyAndStaffFormDTO agencyAndStaff = new AddAgencyAndStaffFormDTO();
////客户组织信息
//CustomerAgencyDTO agencyDTO = new CustomerAgencyDTO();
//agencyDTO.setId(paAgency.getId());
//agencyDTO.setCustomerId(formDTO.getCustomerId());
//agencyDTO.setOrganizationName(paAgency.getAgencyName());
//agencyDTO.setLevel(paAgency.getLevel());
//agencyDTO.setAreaCode(paAgency.getAreaCode());
//agencyDTO.setProvince(paAgency.getProvince());
//agencyDTO.setCity(paAgency.getCity());
//agencyDTO.setDistrict(paAgency.getDistrict());
//agencyAndStaff.setAgencyDTO(agencyDTO);
//
////客户管理员信息
//AdminStaffFromDTO staffSubmitFrom = new AdminStaffFromDTO();
//staffSubmitFrom.setCustomerId(formDTO.getCustomerId());
//staffSubmitFrom.setAgencyId(paAgency.getId());
//staffSubmitFrom.setGender(Integer.parseInt(paUser.getGender()));
//staffSubmitFrom.setMobile(paUser.getPhone());
//staffSubmitFrom.setName(paUser.getRealName());
//staffSubmitFrom.setWorkType(UserWorkType.FULL_TIME);
//agencyAndStaff.setStaffDTO(staffSubmitFrom);
//
//Result agencyResult = govOrgOpenFeignClient.saveRootAgency(agencyAndStaff);
//if (!agencyResult.success()) {
// throw new RenException(agencyResult.getCode(), agencyResult.getInternalMsg());
//}
/*//3.调用epmet-user服务,初始化客户对应的角色;调用access服务给角色分配权限信息
Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(formDTO.getCustomerId());
if (!initResult.success()) {
throw new RenException("客户新增:调用user服务为客户初始化角色数据失败:".concat(initResult.toString()));
}
//4.调用oper-customize服务,初始化客户定制化首页模板数据
CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
initHomeForm.setCustomerId(formDTO.getCustomerId());
Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
if (!initHomeResult.success()) {
throw new RenException("初始化客户首页数据失败:".concat(initHomeResult.getInternalMsg()));
}
//5.调用gov-org服务,初始化客户根级组织信息、客户管理员信息
AddAgencyAndStaffFormDTO agencyAndStaff = new AddAgencyAndStaffFormDTO();
//客户组织信息
CustomerAgencyDTO agencyDTO = new CustomerAgencyDTO();
agencyDTO.setId(paAgency.getId());
agencyDTO.setCustomerId(formDTO.getCustomerId());
agencyDTO.setOrganizationName(paAgency.getAgencyName());
agencyDTO.setLevel(paAgency.getLevel());
agencyDTO.setAreaCode(paAgency.getAreaCode());
agencyDTO.setProvince(paAgency.getProvince());
agencyDTO.setCity(paAgency.getCity());
agencyDTO.setDistrict(paAgency.getDistrict());
agencyAndStaff.setAgencyDTO(agencyDTO);
//客户管理员信息
AdminStaffFromDTO staffSubmitFrom = new AdminStaffFromDTO();
staffSubmitFrom.setCustomerId(formDTO.getCustomerId());
staffSubmitFrom.setAgencyId(paAgency.getId());
staffSubmitFrom.setGender(Integer.parseInt(paUser.getGender()));
staffSubmitFrom.setMobile(paUser.getPhone());
staffSubmitFrom.setName(paUser.getRealName());
staffSubmitFrom.setWorkType(UserWorkType.FULL_TIME);
agencyAndStaff.setStaffDTO(staffSubmitFrom);
Result agencyResult = govOrgOpenFeignClient.saveRootAgency(agencyAndStaff);
if (!agencyResult.success()) {
throw new RenException(agencyResult.getCode(), agencyResult.getInternalMsg());
}*/
//6.更新第三方数据库中客户数据状态为已初始化
String customerUrl = "https://epmet-cloud.elinkservice.cn/api/third/pacustomer/updatecustomer/" + formDTO.getCustomerId();

4
epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
oper-customize-server:
container_name: oper-customize-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.49
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.58
ports:
- "8089:8089"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

2
epmet-module/oper-customize/oper-customize-server/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"
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.49</version>
<version>0.3.58</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-customize</artifactId>

4
epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml

@ -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.82
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.104
ports:
- "8095:8095"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

2
epmet-module/resi-group/resi-group-server/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"
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.82</version>
<version>0.3.104</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-group</artifactId>

4
epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-guide-server:
container_name: resi-guide-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.21
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.28
ports:
- "8091:8091"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

2
epmet-module/resi-guide/resi-guide-server/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"
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.21</version>
<version>0.3.28</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-guide</artifactId>

4
epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml

@ -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.24
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.27
ports:
- "8100:8100"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

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

@ -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.24</version>
<version>0.3.27</version>
<parent>
<artifactId>resi-hall</artifactId>
<groupId>com.epmet</groupId>
@ -207,4 +207,4 @@
</properties>
</profile>
</profiles>
</project>
</project>

4
epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-home-server:
container_name: resi-home-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.16
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.17
ports:
- "8104:8104"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

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

@ -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.16</version>
<version>0.3.17</version>
<parent>
<artifactId>resi-home</artifactId>
@ -214,4 +214,4 @@
</profiles>
</project>
</project>

4
epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml

@ -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.45
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.48
ports:
- "8094:8094"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

2
epmet-module/resi-mine/resi-mine-server/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"
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.48</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-mine</artifactId>

4
epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml

@ -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.62
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.70
ports:
- "8096:8096"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

2
epmet-module/resi-partymember/resi-partymember-server/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"
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.62</version>
<version>0.3.70</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-partymember</artifactId>

4
epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-voice-server:
container_name: resi-voice-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:0.3.7
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:0.3.9
ports:
- "8106:8106"
network_mode: host # 使用现有网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

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

@ -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.7</version>
<version>0.3.9</version>
<parent>
<artifactId>resi-voice</artifactId>
<groupId>com.epmet</groupId>
@ -207,4 +207,4 @@
</profile>
</profiles>
</project>
</project>

4
epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-openapi-adv-server:
container_name: epmet-openapi-adv-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-adv-server:0.3.3
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-adv-server:0.3.4
ports:
- "8015:8015"
network_mode: host # 不会创建新的网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

4
epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml

@ -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.3</version>
<version>0.3.4</version>
<parent>
<artifactId>epmet-openapi-adv</artifactId>
<groupId>com.epmet</groupId>
@ -224,4 +224,4 @@
</profile>
</profiles>
</project>
</project>

4
epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-openapi-scan:
container_name: epmet-openapi-scan-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.24
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.29
ports:
- "8107:8107"
network_mode: host # 不会创建新的网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

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

@ -4,7 +4,7 @@
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.24</version>
<version>0.3.29</version>
<artifactId>epmet-openapi-scan</artifactId>
<packaging>jar</packaging>
@ -205,4 +205,4 @@
</profile>
</profiles>
</project>
</project>

4
epmet-user/epmet-user-server/deploy/docker-compose-prod.yml

@ -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.138
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.162
ports:
- "8087:8087"
network_mode: host # 不会创建新的网络
@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
memory: 600M
memory: 600M

2
epmet-user/epmet-user-server/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"
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.138</version>
<version>0.3.162</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId>

12
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@ -253,9 +253,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
//微信昵称:nickname 头像:headImgUrl 性别:gender
List<UserWechatEntity> wechat = userWechatService.selectByUserId(userResiInfoDTO.getUserId());
if(null != wechat && !wechat.isEmpty()){
baseInfo.setHeadImgUrl(wechat.get(NumConstant.ZERO).getHeadImgUrl());
baseInfo.setGender(wechat.get(NumConstant.ZERO).getSex().toString());
baseInfo.setNickname(wechat.get(NumConstant.ZERO).getNickname());
UserWechatEntity wechatEntity = wechat.get(NumConstant.ZERO);
baseInfo.setHeadImgUrl(wechatEntity.getHeadImgUrl());
if (wechatEntity.getSex() == null){
//设置未知
baseInfo.setGender(NumConstant.ZERO_STR);
}else{
baseInfo.setGender(String.valueOf(wechatEntity.getSex()));
}
baseInfo.setNickname(wechatEntity.getNickname());
}
userBaseInfoService.insertOrUpdate(baseInfo);
}

Loading…
Cancel
Save