diff --git a/README.md b/README.md index ebe4e31..e2fa63d 100644 --- a/README.md +++ b/README.md @@ -1 +1,231 @@ # 小鹿超市项目 + +## 后端技术栈 + +| 核心技术 | +| :----------------------------------------------------------- | +| SpringBoot:简化新Spring应用的初始搭建以及开发过程 | +| SpringCloud:基于Spring Boot实现的云原生应用开发工具,SpringCloud使用的技术:(Spring Cloud Gateway、Spring Cloud OpenFeign、Spring Cloud Alibaba Nacos等) | +| MyBatis-Plus:持久层框架 | +| Redis:缓存数据库 | +| Redisson:基于redis的Java驻内存数据网格,实现分布式锁 | +| RabbitMQ:消息中间件 | +| ElasticSearch + Kibana: 全文检索服务器 +可视化数据监控 | +| ThreadPoolExecutor:线程池来实现异步操作,提高效率 | +| OSS/MinIO:文件存储服务 | +| Knife4j(Swagger):Api接口文档工具 | +| Nginx:负载均衡 | +| MySQL:关系型数据库 | +| 微信支付 | +| 微信小程序 | +| Docker:容器技术 | +| DockerFile:管理Docker镜像命令文本 | +| SkyWalking:链路追踪、日志、监控框架 | +| | +| | + +## 前端技术栈 + +| 核心技术 | +| ------------------ | +| UinApp | +| vue-admin-template | +| ElementUI | +| Axios | +| Node.js | +| Npm | +| | +| | +| | + + + +## 开发工具 + +| 开发工具 | 版本 | +| ----------------------------- | -------------- | +| Intellil IDEA Ultimate | 2023.3.2 | +| DataGrip | 2023.3.2 | +| WebStorm | 2023.3.2 | +| HBuilderx | 3.8.12 | +| Google Chrome | 120.0.6099.216 | +| Another Redis Desktop Manager | 1.6 | +| Apifox | 2.3.19 | +| Parallels Desktop | 18.1.1 | +| Termius | 8.4.0 | +| 微信开发者工具 | 1.06.2306020 | + +## 操作系统 + +| 开发工具 | 版本 | +| ------------------- | ------ | +| Mac OS Ventura | 13.6.3 | +| Linux CentOS Stream | 9 | +| Linux CentOS | 7.9 | + +## 项目环境部署 + +### Mysql 数据库 + +```shell +docker run --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -d mysql:latest +``` + +### Redis 缓存 + +```shell +docker run -itd --name redis -p 6379:6379 redis +``` + +### RabbitMQ 消息队列 + +```shell +docker run -d --restart=always -p 5672:5672 -p 15672:15672 --name rabbitmq rabbitmq:3.8-management + +docker exec -it rabbit /bin/bash +#安装插件 +rabbitmq-plugins enable rabbitmq_management +``` + +### Nacos 注册中心 + +```shell +docker run -d --name nacos-server -p 8848:8848 -p 9848:9848 \ +-e MODE=standalone \ +-e JVM_XMS=512m \ +-e JVM_XMX=512m \ +-v /logs/nacos:/home/nacos/logs \ +nacos/nacos-server:v2.2.3 +``` + +### ES + Kibana 分词器 + +```shell +docker run -p 9200:9200 -p 9300:9300 --name elasticsearch \ +-e "discovery.type=single-node" \ +-e ES_JAVA_OPTS="-Xms512m -Xmx512m" \ +-d elasticsearch:7.8.0 + +docker exec -it elasticsearch /bin/bash + +./bin/elasticsearch-plugin install https://github.com/medcl/elasticsearch-analysis-ik/releases/download/v7.17.5/elasticsearch-analysis-ik-7.17.5.zip + +docker restart elasticsearch + +docker run -d --name kibana --link elasticsearch:elasticsearch -p 5601:5601 kibana:7.8.0 +``` + +### GrayLog 日志框架 (已弃用,日志服务整合到 SkyWalking) + +```shell +#部署Elasticsearch +docker run -d \ + --name elasticsearch \ + -e "ES_JAVA_OPTS=-Xms512m -Xmx512m" \ + -e "discovery.type=single-node" \ + -v es-data:/usr/share/elasticsearch/data \ + -v es-plugins:/usr/share/elasticsearch/plugins \ + --privileged \ + -p 9200:9200 \ + -p 9300:9300 \ +elasticsearch:7.17.5 + +#部署MongoDB(使用之前部署的服务即可) +docker run -d \ +--name mongodb \ +-p 27017:27017 \ +--restart=always \ +-v mongodb:/data/db \ +-e MONGO_INITDB_ROOT_USERNAME=xlcs \ +-e MONGO_INITDB_ROOT_PASSWORD=123321 \ +mongo:4.4 + +#部署 +docker run \ +--name graylog \ +-p 9000:9000 \ +-p 12201:12201/udp \ +-e GRAYLOG_HTTP_EXTERNAL_URI=http://:9000/ \ +-e GRAYLOG_ELASTICSEARCH_HOSTS=http://:9200/ \ +-e GRAYLOG_ROOT_TIMEZONE="Asia/Shanghai" \ +-e GRAYLOG_WEB_ENDPOINT_URI="http://:9000/:9000/api" \ +-e GRAYLOG_PASSWORD_SECRET="somepasswordpepper" \ +-e GRAYLOG_ROOT_PASSWORD_SHA2=8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918 \ +-e GRAYLOG_MONGODB_URI=mongodb://xlcs:123321@:27017/admin \ +-d \ +graylog/graylog:4.3 +``` + +### SkyWalking 链路追踪、日志、监控框架 + +```yaml +version: "3" +services: + elasticsearch: + image: elasticsearch:8.4.2 + container_name: elasticsearchsky + ports: + - "9200:9200" + healthcheck: + test: ["CMD-SHELL", "curl -sf http://localhost:9200/_cluster/health || exit 1"] #⼼跳检测,成功之后不再执⾏后⾯的退出 + interval: 60s #⼼跳检测间隔周期 + timeout: 10s + retries: 3 + start_period: 60s #⾸次检测延迟时间 + environment: + discovery.type: single-node #单节点模式 + ingest.geoip.downloader.enabled: "false" + bootstrap.memory_lock: "true" + ES_JAVA_OPTS: "-Xms512m -Xmx512m" + TZ: "Asia/Shanghai" + xpack.security.enabled: "false" #单机模式 + ulimits: + memlock: + soft: -1 + hard: -1 + skywalking-oap: + image: apache/skywalking-oap-server:9.4.0 + container_name: skywalking-oap + depends_on: + elasticsearch: + condition: service_healthy + links: + - elasticsearch + environment: + SW_HEALTH_CHECKER: default + SW_STORAGE: elasticsearch + SW_STORAGE_ES_CLUSTER_NODES: 124.70.87.134:9200 + JAVA_OPTS: "-Xms2048m -Xmx2048m" + TZ: Asia/Shanghai + SW_TELEMETRY: prometheus + healthcheck: + test: ["CMD-SHELL", "/skywalking/bin/swctl ch"] + interval: 30s + timeout: 10s + retries: 3 + start_period: 10s + restart: on-failure + ports: + - "11800:11800" + - "12800:12800" + skywalking-ui: + image: apache/skywalking-ui:9.4.0 + container_name: skywalking-ui + depends_on: + skywalking-oap: + condition: service_healthy + links: + - skywalking-oap + ports: + - "8080:8080" + environment: + SW_OAP_ADDRESS: http://124.70.87.134:12800 + SW_HEALTH_CHECKER: default + TZ: Asia/Shanghai + healthcheck: + test: ["CMD-SHELL", "curl -sf http://localhost:8080 || exit 1"] #⼼跳检测,成功之后不再执⾏后⾯的退出 + interval: 60s #⼼跳检测间隔周期 + timeout: 10s + retries: 3 + start_period: 60s #⾸次检测延迟时间 +``` diff --git a/xlcs-parent/service-gateway/pom.xml b/xlcs-parent/service-gateway/pom.xml index feaa3be..06b8175 100644 --- a/xlcs-parent/service-gateway/pom.xml +++ b/xlcs-parent/service-gateway/pom.xml @@ -12,10 +12,25 @@ service-gateway + + + + + + + - biz.paluch.logging - logstash-gelf - 1.15.0 + org.apache.skywalking + apm-toolkit-trace + 9.1.0 + + + + + + org.apache.skywalking + apm-toolkit-logback-1.x + 9.1.0 com.yovinchen diff --git a/xlcs-parent/service-gateway/src/main/resources/logback-spring.xml b/xlcs-parent/service-gateway/src/main/resources/logback-spring.xml index 78032f5..4631abc 100644 --- a/xlcs-parent/service-gateway/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service-gateway/src/main/resources/logback-spring.xml @@ -6,11 +6,11 @@ - + - + @@ -36,7 +36,7 @@ - + ${LOG_HOME}/${APP_NAME}/debug/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -60,7 +60,7 @@ - + ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -85,7 +85,6 @@ - ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -108,7 +107,7 @@ - + ${LOG_HOME}/${APP_NAME}/druid/SlowSql_${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -128,39 +127,48 @@ - + - - - - - - - - - - udp:10.211.55.50 - - 12201 - 1.1 - - ${APP_NAME} - true - true - true - yyyy-MM-dd HH:mm:ss,SSS - 8192 - + + + + + + + + + + + + + + + + + + + + + + + + + ${APM_PATTERN} + + + - + + @@ -171,7 +179,8 @@ - + + @@ -182,7 +191,8 @@ - + + diff --git a/xlcs-parent/service/pom.xml b/xlcs-parent/service/pom.xml index 6300d22..38ce5d5 100644 --- a/xlcs-parent/service/pom.xml +++ b/xlcs-parent/service/pom.xml @@ -32,11 +32,28 @@ 3.9.1 + + + + + + + + - biz.paluch.logging - logstash-gelf - 1.15.0 + org.apache.skywalking + apm-toolkit-trace + 9.1.0 + + + + + org.apache.skywalking + apm-toolkit-logback-1.x + 9.1.0 + + com.yovinchen diff --git a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/AdminServiceImpl.java b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/AdminServiceImpl.java index 7787a61..394e51f 100644 --- a/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/AdminServiceImpl.java +++ b/xlcs-parent/service/service-acl/src/main/java/com/yovinchen/xlcs/acl/service/impl/AdminServiceImpl.java @@ -1,14 +1,15 @@ package com.yovinchen.xlcs.acl.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yovinchen.xlcs.acl.mapper.AdminMapper; import com.yovinchen.xlcs.acl.service.AdminService; import com.yovinchen.xlcs.acl.service.RoleService; import com.yovinchen.xlcs.model.acl.Admin; import com.yovinchen.xlcs.vo.acl.AdminQueryVo; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -21,6 +22,7 @@ import org.springframework.util.StringUtils; * @author yovinchen * @Create 2023/9/14 10:44 */ +@Slf4j @Service public class AdminServiceImpl extends ServiceImpl implements AdminService { @@ -32,6 +34,7 @@ public class AdminServiceImpl extends ServiceImpl implements @Override public IPage selectPage(Page pageParam, AdminQueryVo userQueryVo) { + log.info("获取管理用户分页列表入参{}", pageParam.toString() + userQueryVo.toString()); //获取用户名称条件值 String name = userQueryVo.getName(); //创建条件构造器 diff --git a/xlcs-parent/service/service-acl/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-acl/src/main/resources/logback-spring.xml index db6718a..9776f5d 100644 --- a/xlcs-parent/service/service-acl/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-acl/src/main/resources/logback-spring.xml @@ -10,7 +10,7 @@ - + @@ -36,7 +36,7 @@ - + ${LOG_HOME}/${APP_NAME}/debug/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -60,7 +60,7 @@ - + ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -107,7 +107,7 @@ - + ${LOG_HOME}/${APP_NAME}/druid/SlowSql_${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -127,39 +127,48 @@ - + - - + - - - udp:10.211.55.50 - - 12201 - 1.1 - - ${APP_NAME} - true - true - true - yyyy-MM-dd HH:mm:ss,SSS - 8192 + + + + + + + + + + + + + + + + + + + + ${APM_PATTERN} + + - - + + @@ -170,7 +179,8 @@ - + + @@ -181,7 +191,8 @@ - + + diff --git a/xlcs-parent/service/service-activity/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-activity/src/main/resources/logback-spring.xml index df5fe94..9776f5d 100644 --- a/xlcs-parent/service/service-activity/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-activity/src/main/resources/logback-spring.xml @@ -6,11 +6,11 @@ - + - + @@ -36,7 +36,7 @@ - + ${LOG_HOME}/${APP_NAME}/debug/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -60,7 +60,7 @@ - + ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -85,7 +85,6 @@ - ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -108,7 +107,7 @@ - + ${LOG_HOME}/${APP_NAME}/druid/SlowSql_${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -128,39 +127,48 @@ - + - - + - - - udp:10.211.55.50 - - 12201 - 1.1 - - ${APP_NAME} - true - true - true - yyyy-MM-dd HH:mm:ss,SSS - 8192 + + + + + + + + + + + + + + + + + + + + ${APM_PATTERN} + + - - + + @@ -171,7 +179,8 @@ - + + @@ -182,7 +191,8 @@ - + + diff --git a/xlcs-parent/service/service-cart/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-cart/src/main/resources/logback-spring.xml index df5fe94..9776f5d 100644 --- a/xlcs-parent/service/service-cart/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-cart/src/main/resources/logback-spring.xml @@ -6,11 +6,11 @@ - + - + @@ -36,7 +36,7 @@ - + ${LOG_HOME}/${APP_NAME}/debug/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -60,7 +60,7 @@ - + ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -85,7 +85,6 @@ - ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -108,7 +107,7 @@ - + ${LOG_HOME}/${APP_NAME}/druid/SlowSql_${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -128,39 +127,48 @@ - + - - + - - - udp:10.211.55.50 - - 12201 - 1.1 - - ${APP_NAME} - true - true - true - yyyy-MM-dd HH:mm:ss,SSS - 8192 + + + + + + + + + + + + + + + + + + + + ${APM_PATTERN} + + - - + + @@ -171,7 +179,8 @@ - + + @@ -182,7 +191,8 @@ - + + diff --git a/xlcs-parent/service/service-home/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-home/src/main/resources/logback-spring.xml index df5fe94..9776f5d 100644 --- a/xlcs-parent/service/service-home/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-home/src/main/resources/logback-spring.xml @@ -6,11 +6,11 @@ - + - + @@ -36,7 +36,7 @@ - + ${LOG_HOME}/${APP_NAME}/debug/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -60,7 +60,7 @@ - + ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -85,7 +85,6 @@ - ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -108,7 +107,7 @@ - + ${LOG_HOME}/${APP_NAME}/druid/SlowSql_${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -128,39 +127,48 @@ - + - - + - - - udp:10.211.55.50 - - 12201 - 1.1 - - ${APP_NAME} - true - true - true - yyyy-MM-dd HH:mm:ss,SSS - 8192 + + + + + + + + + + + + + + + + + + + + ${APM_PATTERN} + + - - + + @@ -171,7 +179,8 @@ - + + @@ -182,7 +191,8 @@ - + + diff --git a/xlcs-parent/service/service-order/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-order/src/main/resources/logback-spring.xml index df5fe94..9776f5d 100644 --- a/xlcs-parent/service/service-order/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-order/src/main/resources/logback-spring.xml @@ -6,11 +6,11 @@ - + - + @@ -36,7 +36,7 @@ - + ${LOG_HOME}/${APP_NAME}/debug/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -60,7 +60,7 @@ - + ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -85,7 +85,6 @@ - ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -108,7 +107,7 @@ - + ${LOG_HOME}/${APP_NAME}/druid/SlowSql_${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -128,39 +127,48 @@ - + - - + - - - udp:10.211.55.50 - - 12201 - 1.1 - - ${APP_NAME} - true - true - true - yyyy-MM-dd HH:mm:ss,SSS - 8192 + + + + + + + + + + + + + + + + + + + + ${APM_PATTERN} + + - - + + @@ -171,7 +179,8 @@ - + + @@ -182,7 +191,8 @@ - + + diff --git a/xlcs-parent/service/service-payment/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-payment/src/main/resources/logback-spring.xml index df5fe94..9776f5d 100644 --- a/xlcs-parent/service/service-payment/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-payment/src/main/resources/logback-spring.xml @@ -6,11 +6,11 @@ - + - + @@ -36,7 +36,7 @@ - + ${LOG_HOME}/${APP_NAME}/debug/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -60,7 +60,7 @@ - + ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -85,7 +85,6 @@ - ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -108,7 +107,7 @@ - + ${LOG_HOME}/${APP_NAME}/druid/SlowSql_${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -128,39 +127,48 @@ - + - - + - - - udp:10.211.55.50 - - 12201 - 1.1 - - ${APP_NAME} - true - true - true - yyyy-MM-dd HH:mm:ss,SSS - 8192 + + + + + + + + + + + + + + + + + + + + ${APM_PATTERN} + + - - + + @@ -171,7 +179,8 @@ - + + @@ -182,7 +191,8 @@ - + + diff --git a/xlcs-parent/service/service-product/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-product/src/main/resources/logback-spring.xml index df5fe94..9776f5d 100644 --- a/xlcs-parent/service/service-product/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-product/src/main/resources/logback-spring.xml @@ -6,11 +6,11 @@ - + - + @@ -36,7 +36,7 @@ - + ${LOG_HOME}/${APP_NAME}/debug/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -60,7 +60,7 @@ - + ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -85,7 +85,6 @@ - ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -108,7 +107,7 @@ - + ${LOG_HOME}/${APP_NAME}/druid/SlowSql_${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -128,39 +127,48 @@ - + - - + - - - udp:10.211.55.50 - - 12201 - 1.1 - - ${APP_NAME} - true - true - true - yyyy-MM-dd HH:mm:ss,SSS - 8192 + + + + + + + + + + + + + + + + + + + + ${APM_PATTERN} + + - - + + @@ -171,7 +179,8 @@ - + + @@ -182,7 +191,8 @@ - + + diff --git a/xlcs-parent/service/service-search/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-search/src/main/resources/logback-spring.xml index df5fe94..9776f5d 100644 --- a/xlcs-parent/service/service-search/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-search/src/main/resources/logback-spring.xml @@ -6,11 +6,11 @@ - + - + @@ -36,7 +36,7 @@ - + ${LOG_HOME}/${APP_NAME}/debug/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -60,7 +60,7 @@ - + ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -85,7 +85,6 @@ - ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -108,7 +107,7 @@ - + ${LOG_HOME}/${APP_NAME}/druid/SlowSql_${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -128,39 +127,48 @@ - + - - + - - - udp:10.211.55.50 - - 12201 - 1.1 - - ${APP_NAME} - true - true - true - yyyy-MM-dd HH:mm:ss,SSS - 8192 + + + + + + + + + + + + + + + + + + + + ${APM_PATTERN} + + - - + + @@ -171,7 +179,8 @@ - + + @@ -182,7 +191,8 @@ - + + diff --git a/xlcs-parent/service/service-sys/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-sys/src/main/resources/logback-spring.xml index df5fe94..9776f5d 100644 --- a/xlcs-parent/service/service-sys/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-sys/src/main/resources/logback-spring.xml @@ -6,11 +6,11 @@ - + - + @@ -36,7 +36,7 @@ - + ${LOG_HOME}/${APP_NAME}/debug/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -60,7 +60,7 @@ - + ${LOG_HOME}/${APP_NAME}/info/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -85,7 +85,6 @@ - ${LOG_HOME}/${APP_NAME}/error/${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -108,7 +107,7 @@ - + ${LOG_HOME}/${APP_NAME}/druid/SlowSql_${APP_NAME}-%d{yyyy-MM-dd}-%i.log ${LOG_FILE_MAX_SIZE} @@ -128,39 +127,48 @@ - + - - + - - - udp:10.211.55.50 - - 12201 - 1.1 - - ${APP_NAME} - true - true - true - yyyy-MM-dd HH:mm:ss,SSS - 8192 + + + + + + + + + + + + + + + + + + + + ${APM_PATTERN} + + - - + + @@ -171,7 +179,8 @@ - + + @@ -182,7 +191,8 @@ - + + diff --git a/xlcs-parent/service/service-user/src/main/resources/logback-spring.xml b/xlcs-parent/service/service-user/src/main/resources/logback-spring.xml index 78032f5..579d431 100644 --- a/xlcs-parent/service/service-user/src/main/resources/logback-spring.xml +++ b/xlcs-parent/service/service-user/src/main/resources/logback-spring.xml @@ -128,12 +128,11 @@ - + - - +