From 11c10ed2ab97702c9352efb0b6059477c849446c Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 27 Jul 2020 17:14:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E7=BD=B2auth=E5=92=8Ccrm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-auth/deploy/docker-compose-dev.yml                      | 2 +-
 epmet-auth/deploy/docker-compose-prod.yml                     | 2 +-
 epmet-auth/deploy/docker-compose-test.yml                     | 2 +-
 epmet-auth/pom.xml                                            | 2 +-
 .../oper-crm/oper-crm-server/deploy/docker-compose-prod.yml   | 2 +-
 .../oper-crm/oper-crm-server/deploy/docker-compose-test.yml   | 2 +-
 epmet-module/oper-crm/oper-crm-server/pom.xml                 | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml
index 5f9e8bf5c8..7ffa6c4330 100644
--- a/epmet-auth/deploy/docker-compose-dev.yml
+++ b/epmet-auth/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.51
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.52
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络
diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml
index 13ddca93b7..d93125d3c8 100644
--- a/epmet-auth/deploy/docker-compose-prod.yml
+++ b/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.36
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.52
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络
diff --git a/epmet-auth/deploy/docker-compose-test.yml b/epmet-auth/deploy/docker-compose-test.yml
index ef83cd722f..4e82e0d7f7 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.52
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index c055af7405..4a26daab63 100644
--- a/epmet-auth/pom.xml
+++ b/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.51</version>
+    <version>0.3.53</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
index f2e667a0b5..d12b2293d7 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml
+++ b/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.25
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.53
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
index 97697a5f27..673e33995e 100644
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.30
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.53
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index 6f9b5a7942..ce987a2c75 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/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.30</version>
+    <version>0.3.53</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-crm</artifactId>
@@ -134,7 +134,7 @@
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
+                <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.config.namespace></nacos.config.namespace>