From a6a715ce6a407782ce8e653209a27b8089fa12e4 Mon Sep 17 00:00:00 2001
From: rongchao <rongchao@elink-cn.com>
Date: Sat, 24 Aug 2019 13:41:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E5=B8=83=E5=BC=8F?=
 =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |  3 ++
 .../mybatis/config/DataSourceConfig.java      |  1 -
 .../epdc-activiti-server/pom.xml              | 44 ++++++++++++++++++-
 .../src/main/resources/application.yml        | 35 +++++++--------
 4 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
index 9675363d5..497b1273c 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml
@@ -20,6 +20,9 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+  alibaba:
+    seata:
+      tx-service-group: epdc-admin-server-fescar-service-group
 
 management:
   endpoints:
diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/config/DataSourceConfig.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/config/DataSourceConfig.java
index 09958f30f..1f1b5a389 100644
--- a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/config/DataSourceConfig.java
+++ b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/config/DataSourceConfig.java
@@ -84,7 +84,6 @@ public class DataSourceConfig implements InitializingBean {
     }
 
     @Bean
-    @ConditionalOnMissingBean
     public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
         DataSourceProxy dataSourceProxy = new DataSourceProxy(dataSource);
         MybatisSqlSessionFactoryBean factory = new MybatisSqlSessionFactoryBean();
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml
index 8ec0a37fa..3bc851d19 100644
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/pom.xml
@@ -41,8 +41,8 @@
             <artifactId>spring-context-support</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         <dependency>
             <groupId>de.codecentric</groupId>
@@ -95,6 +95,46 @@
         </dependency>
     </dependencies>
 
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <server.port>9057</server.port>
+                <spring.profiles.active>dev</spring.profiles.active>
+
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <server.port>9057</server.port>
+                <spring.profiles.active>test</spring.profiles.active>
+
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <server.port>9057</server.port>
+                <spring.profiles.active>prod</spring.profiles.active>
+
+                <!-- nacos -->
+                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>
+        </profile>
+    </profiles>
+
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml
index a56356afa..688922823 100644
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8086
+  port: @server.port@
   servlet:
     context-path: /activiti
 
@@ -18,17 +18,25 @@ spring:
   activiti:
     check-process-definitions: false
   redis:
-    database: 0
-    host: redis
+    database: 6
+    host: 47.104.224.45
     timeout: 30s
     port: 6379
-    password: 123456
+    password: elink@888
   datasource:
     druid:
       driver-class-name: com.mysql.jdbc.Driver
-      url: jdbc:mysql://localhost:3306/renren_cloud?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-      username: renren
-      password: 123456
+      url: jdbc:mysql://47.104.224.45:3308/epdc_activiti?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+      username: root
+      password: shibei@888
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        register-enabled: @nacos.register-enabled@
+    alibaba:
+      seata:
+        tx-service-group: epdc-activiti-server-fescar-service-group
       #Oracle
 #      driver-class-name: oracle.jdbc.OracleDriver
 #      url: jdbc:oracle:thin:@localhost:1521:xe
@@ -54,19 +62,6 @@ management:
     health:
       show-details: ALWAYS
 
-eureka:
-  instance:
-    prefer-ip-address: true
-    instance-id: ${spring.cloud.client.ip-address}:${server.port}
-    metadata-map:
-      management:
-        context-path: ${server.servlet.context-path}/actuator
-    health-check-url-path: ${server.servlet.context-path}/actuator/health
-    status-page-url-path: ${server.servlet.context-path}/actuator/info
-  client:
-    service-url:
-      defaultZone: http://eureka:8761/eureka/
-
 mybatis-plus:
   mapper-locations: classpath:/mapper/**/*.xml
   #实体扫描，多个package用逗号或者分号分隔