From 1b3201852eaf02a27e26386975da522d78d85bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Thu, 22 Nov 2018 18:52:16 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E3=80=82=20fix=20#4=20#5=20#6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-auth/src/main/resources/bootstrap.yml        |  2 +-
 .../common/core/constant/ServiceNameConstant.java |  6 +++---
 .../src/main/resources/logback-spring.xml         |  4 +---
 pigx-config/src/main/resources/bootstrap.yml      |  2 +-
 .../src/main/resources/config/application-dev.yml |  6 ------
 .../{pigx-upms-dev.yml => pigx-upms-biz-dev.yml}  |  0
 pigx-config/src/main/resources/logback-spring.xml | 15 +++++++--------
 pigx-eureka/src/main/resources/bootstrap.yml      |  4 ++--
 pigx-eureka/src/main/resources/logback-spring.xml |  3 ---
 pigx-gateway/src/main/resources/bootstrap.yml     |  2 +-
 .../src/main/resources/bootstrap.yml              |  2 +-
 .../src/main/resources/bootstrap.yml              |  2 +-
 .../pigx-codegen/src/main/resources/bootstrap.yml |  5 +----
 .../pigx-daemon/src/main/resources/bootstrap.yml  |  4 ++--
 .../pigx-monitor/src/main/resources/bootstrap.yml |  2 +-
 .../src/main/resources/bootstrap.yml              |  4 +---
 .../src/main/resources/bootstrap.yml              |  2 +-
 17 files changed, 24 insertions(+), 41 deletions(-)
 rename pigx-config/src/main/resources/config/{pigx-upms-dev.yml => pigx-upms-biz-dev.yml} (100%)

diff --git a/pigx-auth/src/main/resources/bootstrap.yml b/pigx-auth/src/main/resources/bootstrap.yml
index 4a98cab0c..d1ad7b973 100644
--- a/pigx-auth/src/main/resources/bootstrap.yml
+++ b/pigx-auth/src/main/resources/bootstrap.yml
@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: pigx-auth
+    name: @artifactId@
   # 配置中心
   cloud:
     config:
diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/ServiceNameConstant.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/ServiceNameConstant.java
index 62e02ec15..163299cc2 100644
--- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/ServiceNameConstant.java
+++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/ServiceNameConstant.java
@@ -26,17 +26,17 @@ package com.pig4cloud.pigx.common.core.constant;
  */
 public interface ServiceNameConstant {
 	/**
-	 * 认证服务的SERVICEID（zuul 配置的对应）
+	 * 认证中心
 	 */
 	String AUTH_SERVICE = "pigx-auth";
 
 	/**
 	 * UMPS模块
 	 */
-	String UMPS_SERVICE = "pigx-upms";
+	String UMPS_SERVICE = "pigx-upms-biz";
 
 	/**
 	 * 分布式事务协调服务
 	 */
-	String  TX_MANAGER = "pigx-tx-manager";
+	String TX_MANAGER = "pigx-tx-manager";
 }
diff --git a/pigx-common/pigx-common-core/src/main/resources/logback-spring.xml b/pigx-common/pigx-common-core/src/main/resources/logback-spring.xml
index b000418dc..dac7f9c6d 100644
--- a/pigx-common/pigx-common-core/src/main/resources/logback-spring.xml
+++ b/pigx-common/pigx-common-core/src/main/resources/logback-spring.xml
@@ -51,9 +51,7 @@
 	</logger>
 
 	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-	<root level="WARN">
+	<root level="INFO">
 		<appender-ref ref="console" />
-		<appender-ref ref="debug" />
-		<appender-ref ref="error" />
 	</root>
 </configuration>
diff --git a/pigx-config/src/main/resources/bootstrap.yml b/pigx-config/src/main/resources/bootstrap.yml
index b175a2426..66b989783 100644
--- a/pigx-config/src/main/resources/bootstrap.yml
+++ b/pigx-config/src/main/resources/bootstrap.yml
@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: pigx-config
+    name: @artifactId@
   profiles:
     active: native
   # 配置中心
diff --git a/pigx-config/src/main/resources/config/application-dev.yml b/pigx-config/src/main/resources/config/application-dev.yml
index d301cd029..23c7ed93f 100644
--- a/pigx-config/src/main/resources/config/application-dev.yml
+++ b/pigx-config/src/main/resources/config/application-dev.yml
@@ -106,9 +106,3 @@ security:
     resource:
       loadBalanced: true
       token-info-uri: http://pigx-auth/oauth/check_token
-
-# log配置
-logging:
-  level:
-    root: error
-    com.pig4cloud.pigx: info
diff --git a/pigx-config/src/main/resources/config/pigx-upms-dev.yml b/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml
similarity index 100%
rename from pigx-config/src/main/resources/config/pigx-upms-dev.yml
rename to pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml
diff --git a/pigx-config/src/main/resources/logback-spring.xml b/pigx-config/src/main/resources/logback-spring.xml
index 453ad895a..cb5aabfc8 100644
--- a/pigx-config/src/main/resources/logback-spring.xml
+++ b/pigx-config/src/main/resources/logback-spring.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false" scan="false">
 	<springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
-	<property name="log.path" value="logs/${spring.application.name}" />
+	<property name="log.path" value="logs/${spring.application.name}"/>
 	<!-- 彩色日志格式 -->
 	<property name="CONSOLE_LOG_PATTERN"
-			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
+			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 	<!-- 彩色日志依赖的渲染类 -->
-	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+	<conversionRule conversionWord="wex"
+					converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
 	<conversionRule conversionWord="wEx"
-					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
 	<!-- Console log output -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
@@ -48,8 +49,6 @@
 
 	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
 	<root level="INFO">
-		<appender-ref ref="console" />
-		<appender-ref ref="debug" />
-		<appender-ref ref="error" />
+		<appender-ref ref="console"/>
 	</root>
 </configuration>
diff --git a/pigx-eureka/src/main/resources/bootstrap.yml b/pigx-eureka/src/main/resources/bootstrap.yml
index ac184d19e..582202b2a 100644
--- a/pigx-eureka/src/main/resources/bootstrap.yml
+++ b/pigx-eureka/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
       name: pig
       password: pig
   application:
-    name: pig-eureka
+    name: @artifactId@
   cloud:
     config:
       enabled: false
@@ -15,7 +15,7 @@ spring:
 # 类似的 redis 使用pigx-redis ,gateway 换成 pigx-gateway
 eureka:
   instance:
-    hostname: lengleng
+    hostname: pigx-eureka
     prefer-ip-address: true
   client:
     register-with-eureka: false
diff --git a/pigx-eureka/src/main/resources/logback-spring.xml b/pigx-eureka/src/main/resources/logback-spring.xml
index 74e81d81d..31bc1bb5b 100644
--- a/pigx-eureka/src/main/resources/logback-spring.xml
+++ b/pigx-eureka/src/main/resources/logback-spring.xml
@@ -46,10 +46,7 @@
 		</filter>
 	</appender>
 
-	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
 	<root level="INFO">
 		<appender-ref ref="console" />
-		<appender-ref ref="debug" />
-		<appender-ref ref="error" />
 	</root>
 </configuration>
diff --git a/pigx-gateway/src/main/resources/bootstrap.yml b/pigx-gateway/src/main/resources/bootstrap.yml
index 5916dfdb8..a3191ee0d 100644
--- a/pigx-gateway/src/main/resources/bootstrap.yml
+++ b/pigx-gateway/src/main/resources/bootstrap.yml
@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: pigx-gateway
+    name: @artifactId@
   # 配置中心
   cloud:
     config:
diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml
index 1d1ccfd2d..de3c57d38 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml
@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: pigx-upms
+    name: @artifactId@
   # dev环境
   profiles:
     active: dev
diff --git a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml
index 18e6a560b..602a4d2cf 100644
--- a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml
@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: pigx-activiti
+    name: @artifactId@
   # 配置中心
   cloud:
     config:
diff --git a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml
index 5d94b0eeb..7455228c7 100644
--- a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml
@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: pigx-codegen
+    name: @artifactId@
   #配置中心
   cloud:
     config:
@@ -21,6 +21,3 @@ eureka:
   client:
     service-url:
       defaultZone: http://pig:pig@pigx-eureka:1025/eureka/
-logging:
-  level:
-    root: info
diff --git a/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml
index a26b93e08..7455228c7 100644
--- a/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml
@@ -1,9 +1,9 @@
 server:
-  port: 5001
+  port: 5003
 
 spring:
   application:
-    name: pigx-daemon
+    name: @artifactId@
   #配置中心
   cloud:
     config:
diff --git a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml
index cb726381a..938fd81d1 100644
--- a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml
@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: pigx-monitor
+    name: @artifactId@
   #配置中心
   cloud:
     config:
diff --git a/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml b/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml
index 6a1a44ed0..44ffe7402 100644
--- a/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml
@@ -3,8 +3,6 @@ server:
   servlet:
     context-path: /sso1
 
-
-
 security:
   oauth2:
     client:
@@ -19,7 +17,7 @@ security:
 
 spring:
   application:
-    name: pig-sso-client-demo
+    name: @artifactId@
 # 注册中心
 eureka:
   instance:
diff --git a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml
index 9d47a0818..1bea72f6b 100644
--- a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml
+++ b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml
@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: pigx-tx-manager
+    name: @artifactId@
   #配置中心
   cloud:
     config: