From 5749cd56c7ac7d3767b59c85cb5260b424550ab6 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Tue, 7 Jan 2020 15:51:54 +0800
Subject: [PATCH] =?UTF-8?q?job=E7=9A=84dev=E9=85=8D=E7=BD=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=BB=8Enacos=E8=8E=B7=E5=8F=96=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-job/epdc-job-server/pom.xml          | 13 +++-
 .../src/main/resources/application.yml        | 72 ++++---------------
 2 files changed, 24 insertions(+), 61 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
index 92da80a20..9ef794b99 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
@@ -75,6 +75,10 @@
             <artifactId>springfox-swagger-ui</artifactId>
             <version>${swagger.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba.boot</groupId>
+            <artifactId>nacos-config-spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -111,7 +115,7 @@
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <properties>
+            <!--<properties>
                 <spring.profiles.active>dev</spring.profiles.active>
 
                 <server.port>9061</server.port>
@@ -129,6 +133,13 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+            </properties>-->
+            <properties>
+                <server.port>9061</server.port>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.config.namespace>513d6635-3cfe-401f-b8b6-a04417288f47</nacos.config.namespace>
+                <nacos.config.group>EPDC_JOB</nacos.config.group>
+                <nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
             </properties>
         </profile>
 
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml
index bcf5e0101..7dd8860f5 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml
@@ -3,66 +3,18 @@ server:
   servlet:
     context-path: /job
 
+nacos:
+  config:
+    server-addr: @nacos.server-addr@
+    type: YAML
+    namespace: @nacos.config.namespace@
+    group: @nacos.config.group@
+    dataId: epdc-job-server
+    bootstrap:
+      enable: true
+      log:
+        enable: @nacos.config.bootstrap.log.enable@
+
 spring:
   application:
     name: epdc-job-server
-  # 环境 dev|test|prod
-  profiles:
-    active: @spring.profiles.active@
-  messages:
-    encoding: UTF-8
-    basename: i18n/messages,i18n/messages_common
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-  redis:
-    database: @spring.redis.index@
-    host: @spring.redis.host@
-    timeout: 30s
-    port: @spring.redis.port@
-    password: @spring.redis.password@
-  cloud:
-    nacos:
-      discovery:
-        server-addr: @nacos.server-addr@
-        register-enabled: @nacos.register-enabled@
-    alibaba:
-      seata:
-        tx-service-group: epdc-job-server-fescar-service-group
-  datasource:
-    druid:
-      driver-class-name: com.mysql.jdbc.Driver
-      url: @spring.datasource.druid.url@
-      username: @spring.datasource.druid.username@
-      password: @spring.datasource.druid.password@
-
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    health:
-      show-details: ALWAYS
-
-mybatis-plus:
-  mapper-locations: classpath:/mapper/**/*.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
-  global-config:
-    #数据库相关配置
-    db-config:
-      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
-      id-type: ID_WORKER
-      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
-      field-strategy: NOT_NULL
-      #驼峰下划线转换
-      column-underline: true
-    banner: false
-  #原生配置
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-    call-setters-on-nulls: true
-    jdbc-type-for-null: 'null'