update config file

5 files changed, 27 insertions, 93 deletions

diff --git a/galaxy-admin-server/config/application-dev.properties b/galaxy-admin-server/config/application-dev.properties
deleted file mode 100644
index 62680cb..0000000
--- a/galaxy-admin-server/config/application-dev.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#服务端口配置
-server.port=8800
-#表示eureka-client间隔多久去拉取服务注册信息
-eureka.client.registry-fetch-interval-seconds=5
-#表示eureka-client发送心跳给server端的频率
-eureka.instance.lease-renewal-interval-in-seconds=10
-#健康检查页面的URL
-eureka.instance.health-check-url-path=/actuator/health
-#服务注册中心地址
-eureka.client.serviceUrl.defaultZone=http://admin:admin@localhost:8501/eureka/
-#该实例相较于hostname是否优先使用IP
-eureka.instance.prefer-ip-address=true
-#该实例注册到服务中心的唯一ID
-eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port}
-#暴露所有端点
-management.endpoints.web.exposure.include=*
-#详细的应用健康信息
-management.endpoint.health.show-details=always
-#安全配置-用户名
-spring.security.user.name=admin
-#安全配置-密码
-spring.security.user.password=admin
-#自定义metadata
-eureka.instance.metadata-map.user.name=${spring.security.user.name}
-#自定义metadata
-eureka.instance.metadata-map.user.password=${spring.security.user.password}
\ No newline at end of file
diff --git a/galaxy-admin-server/config/application-prod.properties b/galaxy-admin-server/config/application-prod.properties
deleted file mode 100644
index 62680cb..0000000
--- a/galaxy-admin-server/config/application-prod.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#服务端口配置
-server.port=8800
-#表示eureka-client间隔多久去拉取服务注册信息
-eureka.client.registry-fetch-interval-seconds=5
-#表示eureka-client发送心跳给server端的频率
-eureka.instance.lease-renewal-interval-in-seconds=10
-#健康检查页面的URL
-eureka.instance.health-check-url-path=/actuator/health
-#服务注册中心地址
-eureka.client.serviceUrl.defaultZone=http://admin:admin@localhost:8501/eureka/
-#该实例相较于hostname是否优先使用IP
-eureka.instance.prefer-ip-address=true
-#该实例注册到服务中心的唯一ID
-eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port}
-#暴露所有端点
-management.endpoints.web.exposure.include=*
-#详细的应用健康信息
-management.endpoint.health.show-details=always
-#安全配置-用户名
-spring.security.user.name=admin
-#安全配置-密码
-spring.security.user.password=admin
-#自定义metadata
-eureka.instance.metadata-map.user.name=${spring.security.user.name}
-#自定义metadata
-eureka.instance.metadata-map.user.password=${spring.security.user.password}
\ No newline at end of file
diff --git a/galaxy-admin-server/config/application-test.properties b/galaxy-admin-server/config/application-test.properties
deleted file mode 100644
index eaabd87..0000000
--- a/galaxy-admin-server/config/application-test.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#服务端口配置
-server.port=8800
-#表示eureka-client间隔多久去拉取服务注册信息
-eureka.client.registry-fetch-interval-seconds=5
-#表示eureka-client发送心跳给server端的频率
-eureka.instance.lease-renewal-interval-in-seconds=10
-#健康检查页面的URL
-eureka.instance.health-check-url-path=/actuator/health
-#服务注册中心地址
-eureka.client.serviceUrl.defaultZone=http://admin:[email protected]:8501/eureka/,http://admin:[email protected]:8501/eureka/
-#该实例相较于hostname是否优先使用IP
-eureka.instance.prefer-ip-address=true
-#该实例注册到服务中心的唯一ID
-eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port}
-#暴露所有端点
-management.endpoints.web.exposure.include=*
-#详细的应用健康信息
-management.endpoint.health.show-details=always
-#安全配置-用户名
-spring.security.user.name=admin
-#安全配置-密码
-spring.security.user.password=admin
-#自定义metadata
-eureka.instance.metadata-map.user.name=${spring.security.user.name}
-#自定义metadata
-eureka.instance.metadata-map.user.password=${spring.security.user.password}
\ No newline at end of file
diff --git a/galaxy-admin-server/config/application.properties b/galaxy-admin-server/config/application.properties
index 3fb0ef0..ab87051 100644
--- a/galaxy-admin-server/config/application.properties
+++ b/galaxy-admin-server/config/application.properties
@@ -1,6 +1,20 @@
-#当前激活的环境配置
-spring.profiles.active=dev
-#应用名称配置
+#application config
+server.port=8800
 spring.application.name=galaxy-admin-server
-#日志配置文件路径
+#spring cloud eureka config
+eureka.instance.prefer-ip-address=true
+eureka.client.registry-fetch-interval-seconds=5
+eureka.instance.lease-renewal-interval-in-seconds=10
+eureka.instance.health-check-url-path=/actuator/health
+eureka.instance.metadata-map.user.name=${spring.security.user.name}
+eureka.instance.metadata-map.user.password=${spring.security.user.password}
+eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port}
+eureka.client.serviceUrl.defaultZone=http://admin:[email protected]:8501/eureka/
+#management config
+management.endpoints.web.exposure.include=*
+management.endpoint.health.show-details=always
+#spring security config
+spring.security.user.name=admin
+spring.security.user.password=admin
+#log file path config
 logging.config=./config/logback-spring.xml
\ No newline at end of file
diff --git a/galaxy-admin-server/config/logback-spring.xml b/galaxy-admin-server/config/logback-spring.xml
index ac3d947..13f5549 100644
--- a/galaxy-admin-server/config/logback-spring.xml
+++ b/galaxy-admin-server/config/logback-spring.xml
@@ -4,18 +4,17 @@
     <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
     <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
 
-    <!-- 开发环境-日志输出控制台格式 -->
     <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-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}}"/>
-    <!--日志文件输出格式-->
+
     <property name="FILE_LOG_PATTERN" value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-    <!-- 测试环境-文件路径 -->
+
     <property name="TEST_FILE_PATH" value="/home/galaxy/galaxy-admin-server/logs" />
-    <!-- 生产环境-文件路径 -->
+
     <property name="PROD_FILE_PATH" value="/home/galaxy/galaxy-admin-server/logs" />
-    <!--文件名称-->
+
     <property name="LOG_NAME" value="galaxy-admin-server" />
 
-    <!-- 开发环境 -->
+    <!-- dev env -->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>${CONSOLE_LOG_PATTERN}</pattern>
@@ -25,9 +24,8 @@
         <appender-ref ref="CONSOLE" />
     </root>
 
-    <!-- 测试环境 -->
+    <!-- test env -->
     <springProfile name="test">
-        <!-- 每天产生一个文件 -->
         <appender name="TEST_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
             <encoder>
                 <pattern>${FILE_LOG_PATTERN}</pattern>
@@ -36,7 +34,7 @@
             <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
                 <!-- rollover daily -->
                 <fileNamePattern>${TEST_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-                <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+                <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB -->
                 <maxHistory>30</maxHistory>
                 <maxFileSize>100MB</maxFileSize>
             </rollingPolicy>
@@ -46,7 +44,7 @@
         </root>
     </springProfile>
 
-    <!-- 生产环境 -->
+    <!-- prod env -->
     <springProfile name="prod">
         <appender name="PROD_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
             <encoder>
@@ -56,7 +54,7 @@
             <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
                 <!-- rollover daily -->
                 <fileNamePattern>${PROD_FILE_PATH}${file.separator}${LOG_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-                <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+                <!-- each file should be at most 100MB, keep 30 days worth of history, but at most 20GB -->
                 <maxHistory>30</maxHistory>
                 <maxFileSize>100MB</maxFileSize>
             </rollingPolicy>