From 4d63e6f4bfd7f9b4263bffe29f042ed83b512356 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Jul 2020 15:24:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/epmet-third/epmet-third-server/pom.xml          | 4 ++--
 .../officialaccount/OfficialAccountCallBackController.java   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml
index b74743ebc9..a8bba9e38c 100644
--- a/epmet-module/epmet-third/epmet-third-server/pom.xml
+++ b/epmet-module/epmet-third/epmet-third-server/pom.xml
@@ -170,7 +170,7 @@
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
-                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.register-enabled>true</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>
@@ -192,7 +192,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_third_platform?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/officialaccount/OfficialAccountCallBackController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/officialaccount/OfficialAccountCallBackController.java
index aff2d6c4bd..376f4c9940 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/officialaccount/OfficialAccountCallBackController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/officialaccount/OfficialAccountCallBackController.java
@@ -1,5 +1,6 @@
 package com.epmet.controller.officialaccount;
 
+import com.epmet.commons.tools.utils.Result;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -57,5 +58,9 @@ public class OfficialAccountCallBackController {
         }
     }
 
+    @GetMapping(value = "test")
+    public Result test(){
+        return new Result<>().ok("test");
+    }
 
 }