From 2c408576288527b33c27d138f2ed6180539036af Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 27 Jul 2020 11:16:57 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-gateway/deploy/docker-compose-test.yml b/epmet-gateway/deploy/docker-compose-test.yml index c4dd828dca..870ebc774e 100644 --- a/epmet-gateway/deploy/docker-compose-test.yml +++ b/epmet-gateway/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.26 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.27 ports: - "8080:8080" network_mode: host # 使用现有网络 From 1cbf26ff6285e4735e7c2ee7acc59678b038e282 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 27 Jul 2020 16:24:07 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-test.yml | 2 +- .../epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml | 2 +- .../epmet-third-server/deploy/docker-compose-test.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-test.yml b/epmet-auth/deploy/docker-compose-test.yml index ef83cd722f..4477f9d0f3 100644 --- a/epmet-auth/deploy/docker-compose-test.yml +++ b/epmet-auth/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.48 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.51 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml index a5faa3f669..00aef6ff53 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml @@ -3,7 +3,7 @@ services: epmet-oss-server: container_name: epmet-oss-server-test # 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-release/epmet-oss-server:0.3.22 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-oss-server:0.3.23 ports: - "8083:8083" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml index c396270821..8731e93ccb 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.58 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.64 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml index c0efd1fb64..0fbcebd7b3 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.79 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.80 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From fd59d0732b7bd351081694f856cec7f9a3182f63 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 28 Jul 2020 09:27:12 +0800 Subject: [PATCH 3/8] heart-work:heart+1 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index f26cbd716e..03c207c23e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.1 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.2 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 52a56bea7c..83bdd4921c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.1 + 0.0.2 com.epmet epmet-heart From 0b662023206a47f70f1aa3dc1abbd8c58dbb2f96 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 28 Jul 2020 09:33:30 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=E9=97=A8?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/BackDoorController.java | 29 +++++++++++++++++++ .../epmet/redis/CustomerAppWxServiceUtil.java | 11 +++++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java diff --git a/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java b/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java new file mode 100644 index 0000000000..b87e071a50 --- /dev/null +++ b/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java @@ -0,0 +1,29 @@ +package com.epmet.controller; + +import com.epmet.redis.CustomerAppWxServiceUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Set; + +/** + * @author jianjun liu + * @date 2020-06-04 20:39 + **/ +@RestController +@RequestMapping("opback") +public class BackDoorController { + @Autowired + private CustomerAppWxServiceUtil customerAppWxServiceUtil; + + /** + * 数据库添加新客户app后 + * + * @return + */ + @RequestMapping("reloadcustomerapp") + public Set initWxMaService() { + return customerAppWxServiceUtil.initWxMaService(); + } +} diff --git a/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java b/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java index a7f36c75f0..e641d17ed6 100644 --- a/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java +++ b/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java @@ -65,6 +65,10 @@ public class CustomerAppWxServiceUtil implements ApplicationRunner { @Override public void run(ApplicationArguments args) { + initWxMaService(); + } + + public Set initWxMaService() { Map maServicesNew = Maps.newConcurrentMap(); SetOperations appSet = null; List result = null; @@ -91,7 +95,7 @@ public class CustomerAppWxServiceUtil implements ApplicationRunner { logger.info("wxMaService operCrmOpenFeignClient.getConfigAllApp result:{}", JSON.toJSONString(configAllAppResult)); if (configAllAppResult == null || !configAllAppResult.success()) { logger.info("wxMaService operCrmOpenFeignClient.getConfigAllApp fail"); - return; + return maServicesNew.keySet(); } result = configAllAppResult.getData(); result.forEach(app -> { @@ -110,8 +114,11 @@ public class CustomerAppWxServiceUtil implements ApplicationRunner { if (maServicesNew.size() > 0) { maServices = maServicesNew; if (appSet != null && result != null) { - appSet.add(appKey, result); + for (CustomerAppDTO app : result) { + appSet.add(appKey, app); + } } } + return maServicesNew.keySet(); } } From 2bde728533ee5992ef0df9c94c355a29625b917b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 28 Jul 2020 09:39:11 +0800 Subject: [PATCH 5/8] heart-work:pointpom change --- epmet-module/epmet-point/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-point/pom.xml b/epmet-module/epmet-point/pom.xml index 460ce0de13..b246a8dd46 100644 --- a/epmet-module/epmet-point/pom.xml +++ b/epmet-module/epmet-point/pom.xml @@ -15,8 +15,8 @@ pom - epmet-point-server epmet-point-client + epmet-point-server \ No newline at end of file From 69974842ef53c39449174f9f988f312456ebaeca Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 28 Jul 2020 09:44:16 +0800 Subject: [PATCH 6/8] heart-work:heart+1 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 4 ++-- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 03c207c23e..69bb46e905 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -1,8 +1,8 @@ version: "3.7" services: - oper-crm-server: + epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.2 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.3 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 83bdd4921c..13589f1e64 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.2 + 0.0.3 com.epmet epmet-heart From 0619dfc051a6091186b34b3e88928e32a444be49 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 28 Jul 2020 09:45:02 +0800 Subject: [PATCH 7/8] heart-work:point+1 --- .../epmet-point-server/deploy/docker-compose-dev.yml | 4 ++-- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index d37df7459f..28246db531 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -1,8 +1,8 @@ version: "3.7" services: - oper-crm-server: + epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.2 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.3 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 1b8007a7b7..c031fc496e 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/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"> 4.0.0 - 0.0.2 + 0.0.3 epmet-point com.epmet From a7f5109345ba6278f20c62f02487d8746e082092 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 28 Jul 2020 09:51:16 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9heart=E3=80=81point?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-heart-server/deploy/docker-compose-test.yml | 2 +- .../epmet-point-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-point-server/deploy/docker-compose-test.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index 8a981b9839..48b1d7310e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml @@ -1,6 +1,6 @@ version: "3.7" services: - oper-crm-server: + epmet-heart-server: container_name: epmet-heart-server-prod image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.1 ports: diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml index 7e11fabd04..1156199182 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml @@ -1,6 +1,6 @@ version: "3.7" services: - oper-crm-server: + epmet-heart-server: container_name: epmet-heart-server-test image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.1 ports: diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml index a53ebe7fe4..31c7258001 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml @@ -1,6 +1,6 @@ version: "3.7" services: - oper-crm-server: + epmet-point-server: container_name: epmet-point-server-prod image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.1 ports: diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml index 42c92bd168..adaebe09d4 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml @@ -1,6 +1,6 @@ version: "3.7" services: - oper-crm-server: + epmet-point-server: container_name: epmet-point-server-test image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.1 ports: