Merge remote-tracking branch 'origin/dev_heart' into dev_heart

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<String> initWxMaService() {
+		return customerAppWxServiceUtil.initWxMaService();
+	}
+}

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<String> initWxMaService() {
 		Map<String, WxMaService> maServicesNew = Maps.newConcurrentMap();
 		SetOperations appSet = null;
 		List<CustomerAppDTO> 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();
 	}
 }

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 # 使用现有网络

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.1
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.3
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

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:

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:

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.1</version>
+    <version>0.0.3</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

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 # 使用现有网络

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 # 使用现有网络

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:

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:

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.2</version>
+    <version>0.0.3</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/epmet-point/pom.xml

@@ -15,8 +15,8 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>epmet-point-server</module>
         <module>epmet-point-client</module>
+        <module>epmet-point-server</module>
     </modules>
 
 </project>

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 # 使用现有网络