修改配置

build.gradle

@@ -16,6 +16,7 @@ buildscript {
         shiro_version = '1.4.0'
         swagger_version = '2.7.0'
         nacosVersion='2.1.0.RELEASE'
+        logstashVersion = '5.3'
     }
     repositories {
         maven { url 'https://maven.aliyun.com/repository/central' }
@@ -115,6 +116,8 @@ subprojects {
 
         compile('javax.xml.bind:jaxb-api:2.3.0')
 
+        compile ("net.logstash.logback:logstash-logback-encoder:${logstashVersion}")
+
         ext.jarTree = fileTree(dir: 'libs', include: '**/*.jar')
         compile jarTree
     }

docker-compose.yml

@@ -5,6 +5,8 @@ services:
     image: registry.cn-hangzhou.aliyuncs.com/tuon/eureka_config:1.0.1
     ports:
       - "12121:12121"
+    expose:
+      - "12121"
     container_name: eureka_config
     environment:
       - spring.profiles.active=sit,jdbc
@@ -14,5 +16,13 @@ services:
     deploy:
       restart_policy:
         condition: on-failure
+      resources:
+        limits:
+          memory: 768m
+        reservations:
+          memory: 256m
+    ulimits:
+      memory: 768m
+
 
 

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/Constants.kt

@@ -1,7 +0,0 @@
-package cn.gygxzc.cloud.config
-
-
-/**
- * 配置中心分割点
- */
-const val SEP_DOT="."

envir-config/src/main/kotlin/cn/tonyandmoney/config/Constants.kt

@@ -0,0 +1,7 @@
+package cn.tonyandmoney.config
+
+
+/**
+ * 配置中心分割点
+ */
+const val SEP_DOT="."

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/bus/RabbitConfiguration.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/bus/RabbitConfiguration.kt

@@ -1,4 +1,4 @@
-package cn.gygxzc.cloud.config.bus
+package cn.tonyandmoney.config.bus
 
 import org.springframework.amqp.core.Queue
 import org.springframework.context.annotation.Bean

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/controller/CommonConfigController.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/controller/CommonConfigController.kt

@@ -1,7 +1,7 @@
-package cn.gygxzc.cloud.config.controller
+package cn.tonyandmoney.config.controller
 
-import cn.gygxzc.cloud.config.model.CommonConfig
-import cn.gygxzc.cloud.config.service.ICommonConfigService
+import cn.tonyandmoney.config.model.CommonConfig
+import cn.tonyandmoney.config.service.ICommonConfigService
 import cn.tonyandmoney.tuonq.core.req.PageReq
 import com.baomidou.mybatisplus.core.metadata.IPage
 import org.springframework.beans.factory.annotation.Autowired

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/controller/PropertyLabelController.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/controller/PropertyLabelController.kt

@@ -1,7 +1,7 @@
-package cn.gygxzc.cloud.config.controller
+package cn.tonyandmoney.config.controller
 
-import cn.gygxzc.cloud.config.model.PropertyLabel
-import cn.gygxzc.cloud.config.service.ILabelService
+import cn.tonyandmoney.config.model.PropertyLabel
+import cn.tonyandmoney.config.service.ILabelService
 import cn.tonyandmoney.tuonq.core.req.PageReq
 import com.baomidou.mybatisplus.core.metadata.IPage
 import org.springframework.beans.factory.annotation.Autowired

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/controller/PropertyMgrController.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/controller/PropertyMgrController.kt

@@ -1,7 +1,7 @@
-package cn.gygxzc.cloud.config.controller
+package cn.tonyandmoney.config.controller
 
-import cn.gygxzc.cloud.config.model.ConfigProperty
-import cn.gygxzc.cloud.config.service.IConfigPropService
+import cn.tonyandmoney.config.model.ConfigProperty
+import cn.tonyandmoney.config.service.IConfigPropService
 import cn.tonyandmoney.tuonq.core.req.PageReq
 import com.baomidou.mybatisplus.core.metadata.IPage
 import io.swagger.annotations.Api

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/controller/RefreshConfigController.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/controller/RefreshConfigController.kt

@@ -1,4 +1,4 @@
-package cn.gygxzc.cloud.config.controller
+package cn.tonyandmoney.config.controller
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/dao/ICommonConfigDao.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/dao/ICommonConfigDao.kt

@@ -1,6 +1,6 @@
-package cn.gygxzc.cloud.config.dao
+package cn.tonyandmoney.config.dao
 
-import cn.gygxzc.cloud.config.model.CommonConfig
+import cn.tonyandmoney.config.model.CommonConfig
 import com.baomidou.mybatisplus.core.mapper.BaseMapper
 import org.springframework.stereotype.Repository
 

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/dao/ILabelDao.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/dao/ILabelDao.kt

@@ -1,6 +1,6 @@
-package cn.gygxzc.cloud.config.dao
+package cn.tonyandmoney.config.dao
 
-import cn.gygxzc.cloud.config.model.PropertyLabel
+import cn.tonyandmoney.config.model.PropertyLabel
 import com.baomidou.mybatisplus.core.mapper.BaseMapper
 import org.springframework.stereotype.Repository
 

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/dao/IPropertyDao.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/dao/IPropertyDao.kt

@@ -1,6 +1,6 @@
-package cn.gygxzc.cloud.config.dao
+package cn.tonyandmoney.config.dao
 
-import cn.gygxzc.cloud.config.model.ConfigProperty
+import cn.tonyandmoney.config.model.ConfigProperty
 import com.baomidou.mybatisplus.core.mapper.BaseMapper
 import org.springframework.stereotype.Repository
 

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/model/CommonConfig.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/model/CommonConfig.kt

@@ -1,4 +1,4 @@
-package cn.gygxzc.cloud.config.model
+package cn.tonyandmoney.config.model
 
 import com.baomidou.mybatisplus.annotation.TableId
 import com.baomidou.mybatisplus.annotation.TableName

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/model/ConfigProperty.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/model/ConfigProperty.kt

@@ -1,4 +1,4 @@
-package cn.gygxzc.cloud.config.model
+package cn.tonyandmoney.config.model
 
 import com.baomidou.mybatisplus.annotation.IdType
 import com.baomidou.mybatisplus.annotation.TableField

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/model/PropertyLabel.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/model/PropertyLabel.kt

@@ -1,4 +1,4 @@
-package cn.gygxzc.cloud.config.model
+package cn.tonyandmoney.config.model
 
 import com.baomidou.mybatisplus.annotation.IdType
 import com.baomidou.mybatisplus.annotation.TableId

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/service/ICommonConfigService.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/service/ICommonConfigService.kt

@@ -1,6 +1,6 @@
-package cn.gygxzc.cloud.config.service
+package cn.tonyandmoney.config.service
 
-import cn.gygxzc.cloud.config.model.CommonConfig
+import cn.tonyandmoney.config.model.CommonConfig
 import cn.tonyandmoney.tuonq.core.req.PageReq
 import com.baomidou.mybatisplus.core.metadata.IPage
 import com.baomidou.mybatisplus.extension.service.IService

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/service/IConfigPropService.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/service/IConfigPropService.kt

@@ -1,6 +1,6 @@
-package cn.gygxzc.cloud.config.service
+package cn.tonyandmoney.config.service
 
-import cn.gygxzc.cloud.config.model.ConfigProperty
+import cn.tonyandmoney.config.model.ConfigProperty
 import cn.tonyandmoney.tuonq.core.req.PageReq
 import com.baomidou.mybatisplus.core.metadata.IPage
 

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/service/ILabelService.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/service/ILabelService.kt

@@ -1,6 +1,6 @@
-package cn.gygxzc.cloud.config.service
+package cn.tonyandmoney.config.service
 
-import cn.gygxzc.cloud.config.model.PropertyLabel
+import cn.tonyandmoney.config.model.PropertyLabel
 import cn.tonyandmoney.tuonq.core.req.PageReq
 import com.baomidou.mybatisplus.core.metadata.IPage
 import reactor.core.publisher.Mono

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/service/impl/CommonConfigService.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/service/impl/CommonConfigService.kt

@@ -1,8 +1,8 @@
-package cn.gygxzc.cloud.config.service.impl
+package cn.tonyandmoney.config.service.impl
 
-import cn.gygxzc.cloud.config.dao.ICommonConfigDao
-import cn.gygxzc.cloud.config.model.CommonConfig
-import cn.gygxzc.cloud.config.service.ICommonConfigService
+import cn.tonyandmoney.config.dao.ICommonConfigDao
+import cn.tonyandmoney.config.model.CommonConfig
+import cn.tonyandmoney.config.service.ICommonConfigService
 import cn.tonyandmoney.tuonq.core.req.PageReq
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
 import com.baomidou.mybatisplus.core.metadata.IPage

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/service/impl/ConfigPropService.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/service/impl/ConfigPropService.kt

@@ -1,8 +1,8 @@
-package cn.gygxzc.cloud.config.service.impl
+package cn.tonyandmoney.config.service.impl
 
-import cn.gygxzc.cloud.config.dao.IPropertyDao
-import cn.gygxzc.cloud.config.model.ConfigProperty
-import cn.gygxzc.cloud.config.service.IConfigPropService
+import cn.tonyandmoney.config.dao.IPropertyDao
+import cn.tonyandmoney.config.model.ConfigProperty
+import cn.tonyandmoney.config.service.IConfigPropService
 import cn.tonyandmoney.tuonq.core.SessionUtils
 import cn.tonyandmoney.tuonq.core.req.PageReq
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/service/impl/LabelService.kt → envir-config/src/main/kotlin/cn/tonyandmoney/config/service/impl/LabelService.kt

@@ -1,9 +1,9 @@
-package cn.gygxzc.cloud.config.service.impl
+package cn.tonyandmoney.config.service.impl
 
-import cn.gygxzc.cloud.config.SEP_DOT
-import cn.gygxzc.cloud.config.dao.ILabelDao
-import cn.gygxzc.cloud.config.model.PropertyLabel
-import cn.gygxzc.cloud.config.service.ILabelService
+import cn.tonyandmoney.config.SEP_DOT
+import cn.tonyandmoney.config.dao.ILabelDao
+import cn.tonyandmoney.config.model.PropertyLabel
+import cn.tonyandmoney.config.service.ILabelService
 import cn.tonyandmoney.tuonq.core.req.PageReq
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
 import com.baomidou.mybatisplus.core.metadata.IPage

eureka-web/src/main/java/cn/gygxzc/cloud/tina/eureka/MainApplication.java → eureka-web/src/main/java/cn/tonyandmoney/eureka/MainApplication.java

@@ -1,4 +1,4 @@
-package cn.gygxzc.cloud.tina.eureka;
+package cn.tonyandmoney.eureka;
 
 import de.codecentric.boot.admin.server.config.EnableAdminServer;
 import org.mybatis.spring.annotation.MapperScan;

eureka-web/src/main/java/cn/gygxzc/cloud/tina/eureka/config/MybatisPlusConfig.java → eureka-web/src/main/java/cn/tonyandmoney/eureka/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package cn.gygxzc.cloud.tina.eureka.config;
+package cn.tonyandmoney.eureka.config;
 
 import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;

eureka-web/src/main/java/cn/gygxzc/cloud/tina/eureka/web/test/RetryController.java → eureka-web/src/main/java/cn/tonyandmoney/eureka/controller/RetryController.java

@@ -1,4 +1,4 @@
-package cn.gygxzc.cloud.tina.eureka.web.test;
+package cn.tonyandmoney.eureka.controller;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

eureka-web/src/main/resources/application-dev.yml

@@ -13,10 +13,6 @@ spring:
     host: 10.8.0.1
     port: 5672
   redis:
-#    cluster:
-#      nodes:
-#        - 10.8.0.1:6379
-#        - 10.8.0.1:6377
     sentinel:
       master: tuonq
       nodes:

eureka-web/src/main/resources/application.yml

@@ -74,3 +74,9 @@ management:
   endpoint:
     health:
       show-details: always
+
+
+
+#elk日志分析系统配置
+logstash:
+  host: 10.8.0.1:5044

eureka-web/src/main/resources/bootstrap.yml

@@ -17,7 +17,4 @@ spring:
       label: master
     bus:
       trace:
-        enabled: true
-
-logging:
-  path: .logs/${spring.application.name}
+        enabled: true

eureka-web/src/main/resources/logback-spring.xml

@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true">
+
+    <springProperty scope="context" name="appName" source="spring.application.name"/>
+    <springProperty scope="context" name="logstashHost" source="logstash.host" defaultValue="10.8.0.1:5044"/>
+    <springProperty scope="context" name="springProfilesActive" source="spring.profiles.active"/>
+
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <contextName>${appName}</contextName>
+    <property name="LOG_PATH" value="logs"/>
+    <!--设置系统日志目录-->
+    <property name="APPDIR" value="${appName}"/>
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <!-- %m输出的信息,%p日志级别,%t线程名,%d日期,%c类的全名,,,, -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <!--<pattern>%d %p (%file:%line\)- %m%n</pattern>-->
+            <!--格式化输出：%d:表示日期    %thread:表示线程名     %-5level:级别从左显示5个字符宽度  %msg:日志消息    %n:是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <param name="Encoding" value="UTF-8"/>
+        <destination>${logstashHost}</destination>
+        <keepAliveDuration>5 minutes</keepAliveDuration>
+        <connectionStrategy>
+            <roundRobin>
+                <connectionTTL>5 minutes</connectionTTL>
+            </roundRobin>
+        </connectionStrategy>
+        <reconnectionDelay>10 second</reconnectionDelay>
+        <writeBufferSize>8192</writeBufferSize>
+        <queueSize>8192</queueSize>
+
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
+            <includeCallerData>true</includeCallerData>
+            <customFields>{"springProfilesActive":"${springProfilesActive}"}</customFields>
+        </encoder>
+    </appender>
+
+
+    <!--
+          说明：
+          1、日志级别及文件
+              日志记录采用分级记录，级别与日志文件名相对应，不同级别的日志信息记录到不同的日志文件中
+              例如：error级别记录到log_error_xxx.log或log_error.log（该文件为当前记录的日志文件），而log_error_xxx.log为归档日志，
+              日志文件按日期记录，同一天内，若日志文件大小等于或大于2M，则按0、1、2...顺序分别命名
+              例如log-level-2013-12-21.0.log
+              其它级别的日志也是如此。
+          2、文件路径
+              若开发、测试用，在Eclipse中运行项目，则到Eclipse的安装路径查找logs文件夹，以相对路径../logs。
+              若部署到Tomcat下，则在Tomcat下的logs文件中
+          3、Appender
+              FILEERROR对应error级别，文件名以log-error-xxx.log形式命名
+              FILEWARN对应warn级别，文件名以log-warn-xxx.log形式命名
+              FILEINFO对应info级别，文件名以log-info-xxx.log形式命名
+              FILEDEBUG对应debug级别，文件名以log-debug-xxx.log形式命名
+              CONSOLE将日志信息输出到控制上，为方便开发测试使用
+       -->
+    <!-- 日志记录器，日期滚动记录 -->
+    <appender name="FILEERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${LOG_PATH}/${APPDIR}/error.log</file>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <maxHistory>30</maxHistory>
+            <!-- 归档的日志文件的路径，例如今天是2013-12-21日志，当前写的日志文件路径为file节点指定，可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
+            而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，
+            命名日志文件，例如log-error-2013-12-21.0.log -->
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>2MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <!-- 追加方式记录日志 -->
+        <append>true</append>
+        <!-- 日志文件的格式 -->
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <!-- 此日志文件只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>error</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 日志记录器，日期滚动记录 -->
+    <appender name="FILEINFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${LOG_PATH}/${APPDIR}/info.log</file>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 归档的日志文件的路径，例如今天是2013-12-21日志，当前写的日志文件路径为file节点指定，可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
+            而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/info/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，
+            命名日志文件，例如log-error-2013-12-21.0.log -->
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>2MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 追加方式记录日志 -->
+        <append>true</append>
+        <!-- 日志文件的格式 -->
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <!-- 此日志文件只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 日志记录器，日期滚动记录 -->
+    <appender name="FILEWARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${LOG_PATH}/${APPDIR}/warn.log</file>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 归档的日志文件的路径，例如今天是2013-12-21日志，当前写的日志文件路径为file节点指定，可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
+            而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
+            <maxHistory>7</maxHistory>
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/warn/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，
+            命名日志文件，例如log-error-2013-12-21.0.log -->
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>2MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <!-- 追加方式记录日志 -->
+        <append>true</append>
+        <!-- 日志文件的格式 -->
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <!-- 此日志文件只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.FileAppender">
+        <file>${LOG_PATH}/${APPDIR}/log.log</file>
+        <append>false</append>
+        <encoder>
+            <!--<pattern>%d %p (%file:%line\)- %m%n</pattern>-->
+            <!--格式化输出：%d:表示日期    %thread:表示线程名     %-5level:级别从左显示5个字符宽度  %msg:日志消息    %n:是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+
+
+    <logger name="org.springframework.data.mybatis" level="DEBUG"/>
+    <logger name="org.springframework.aop.aspectj" level="ERROR"/>
+
+    <logger name="javax.activation" level="WARN"/>
+    <logger name="javax.mail" level="WARN"/>
+    <logger name="javax.xml.bind" level="WARN"/>
+    <logger name="ch.qos.logback" level="ERROR"/>
+
+    <logger name="org.springframework.web" level="INFO"/>
+    <logger name="jdbc.connection" level="ERROR"/>
+
+    <!--<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">-->
+    <!--<resetJUL>true</resetJUL>-->
+    <!--</contextListener>-->
+
+    <springProfile name="dev">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+        </root>
+    </springProfile>
+
+
+    <springProfile name="sit">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="FILEERROR"/>
+            <appender-ref ref="FILEWARN"/>
+            <appender-ref ref="FILEINFO"/>
+            <appender-ref ref="LOGSTASH"/>
+        </root>
+    </springProfile>
+
+    <springProfile name="prod">
+        <root level="INFO">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="FILEERROR"/>
+            <appender-ref ref="FILEWARN"/>
+            <appender-ref ref="FILEINFO"/>
+            <appender-ref ref="LOGSTASH"/>
+        </root>
+    </springProfile>
+
+</configuration>

eureka-web/src/test/cn.tonyandmoney.tuonq.registry.test/LabelServiceTest.kt

@@ -1,23 +0,0 @@
-package cn.tonyandmoney.tuonq.registy.test
-
-import cn.gygxzc.cloud.config.service.ILabelService
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.context.junit4.SpringRunner
-
-
-@SpringBootTest()
-@RunWith(SpringRunner::class)
-class LabelServiceTest {
-
-    @Autowired
-    private lateinit var labelService: ILabelService
-
-    @Test
-    fun addLabel(){
-        println("println ")
-    }
-
-}