Merge remote-tracking branch 'origin/master'

This commit is contained in:
liubozhi 2025-03-20 21:52:48 +08:00
commit 53ea800d5c
16 changed files with 64 additions and 56 deletions

View File

@ -6,9 +6,9 @@ spring:
cloud:
nacos:
discovery:
server-addr: ${NACOS_HOST:192.168.193.128}:${NACOS_PORT:8848}
server-addr: ${NACOS_HOST:101.37.204.35}:${NACOS_PORT:8848}
username: nacos
password: ${NACOS_PASSWORD:hn02le.34lkdLKD}
password: ${NACOS_PASSWORD:BYzL!Z3C}
namespace: ${NACOS_NAMESPACE:}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}

View File

@ -1,5 +1,6 @@
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<property name="PROJECT_PATH" value="/opt/projects/tmerclub"/>
<property name="PROJECT_PATH" value="/data/app/java/logs"/>
<property name="APPLICATION_NAME" value="im"/>
<property name="LOG_FILE_MAX_HISTORY" value="30"/>
<property name="LOG_FILE_MAX_SIZE" value="50MB"/>
@ -20,13 +21,13 @@
<pattern>${FILE_LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
</encoder>
<file>${PROJECT_PATH}/log/api.log</file>
<file>${PROJECT_PATH}/im/im.log</file>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>${logging.level}</level>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${PROJECT_PATH}/log/api/%d{yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<fileNamePattern>${PROJECT_PATH}/${APPLICATION_NAME}/%d{yyyy-MM}/im-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<maxHistory>${LOG_FILE_MAX_HISTORY}</maxHistory>
</rollingPolicy>
@ -37,8 +38,8 @@
<appender-ref ref="ASYNC"/>
</root>
<logger name="com.moyuer.cloud" level="debug"/>
<logger name="com.tmerclub.cloud" level="debug"/>
<logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="debug"/>
<logger name="springfox.documentation.swagger.readers.operation.OperationImplicitParameterReader" level="off"/>
<logger name="org.reflections.Reflections" level="off"/>
</configuration>
</configuration>

View File

@ -6,9 +6,9 @@ spring:
cloud:
nacos:
discovery:
server-addr: ${NACOS_HOST:192.168.193.128}:${NACOS_PORT:8848}
server-addr: ${NACOS_HOST:101.37.204.35}:${NACOS_PORT:8848}
username: nacos
password: ${NACOS_PASSWORD:hn02le.34lkdLKD}
password: ${NACOS_PASSWORD:BYzL!Z3C}
namespace: ${NACOS_NAMESPACE:}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}

View File

@ -1,5 +1,6 @@
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<property name="PROJECT_PATH" value="/opt/projects/tmerclub"/>
<property name="PROJECT_PATH" value="/data/app/java/logs"/>
<property name="APPLICATION_NAME" value="marketing"/>
<property name="LOG_FILE_MAX_HISTORY" value="30"/>
<property name="LOG_FILE_MAX_SIZE" value="50MB"/>
@ -20,13 +21,13 @@
<pattern>${FILE_LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
</encoder>
<file>${PROJECT_PATH}/log/api.log</file>
<file>${PROJECT_PATH}/marketing/marketing.log</file>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>${logging.level}</level>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${PROJECT_PATH}/log/api/%d{yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<fileNamePattern>${PROJECT_PATH}/${APPLICATION_NAME}/%d{yyyy-MM}/marketing-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<maxHistory>${LOG_FILE_MAX_HISTORY}</maxHistory>
</rollingPolicy>
@ -37,8 +38,8 @@
<appender-ref ref="ASYNC"/>
</root>
<logger name="com.moyuer.cloud" level="debug"/>
<logger name="com.tmerclub.cloud" level="debug"/>
<logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="debug"/>
<logger name="springfox.documentation.swagger.readers.operation.OperationImplicitParameterReader" level="off"/>
<logger name="org.reflections.Reflections" level="off"/>
</configuration>
</configuration>

View File

@ -6,9 +6,9 @@ spring:
cloud:
nacos:
discovery:
server-addr: ${NACOS_HOST:192.168.193.128}:${NACOS_PORT:8848}
server-addr: ${NACOS_HOST:101.37.204.35}:${NACOS_PORT:8848}
username: nacos
password: ${NACOS_PASSWORD:hn02le.34lkdLKD}
password: ${NACOS_PASSWORD:BYzL!Z3C}
namespace: ${NACOS_NAMESPACE:}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}

View File

@ -1,5 +1,6 @@
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<property name="PROJECT_PATH" value="/opt/projects/tmerclub"/>
<property name="PROJECT_PATH" value="/data/app/java/logs"/>
<property name="APPLICATION_NAME" value="order"/>
<property name="LOG_FILE_MAX_HISTORY" value="30"/>
<property name="LOG_FILE_MAX_SIZE" value="50MB"/>
@ -20,13 +21,13 @@
<pattern>${FILE_LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
</encoder>
<file>${PROJECT_PATH}/log/api.log</file>
<file>${PROJECT_PATH}/order/order.log</file>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>${logging.level}</level>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${PROJECT_PATH}/log/api/%d{yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<fileNamePattern>${PROJECT_PATH}/${APPLICATION_NAME}/%d{yyyy-MM}/order-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<maxHistory>${LOG_FILE_MAX_HISTORY}</maxHistory>
</rollingPolicy>
@ -37,8 +38,8 @@
<appender-ref ref="ASYNC"/>
</root>
<logger name="com.moyuer.cloud" level="debug"/>
<logger name="com.tmerclub.cloud" level="debug"/>
<logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="debug"/>
<logger name="springfox.documentation.swagger.readers.operation.OperationImplicitParameterReader" level="off"/>
<logger name="org.reflections.Reflections" level="off"/>
</configuration>
</configuration>

View File

@ -6,9 +6,9 @@ spring:
cloud:
nacos:
discovery:
server-addr: ${NACOS_HOST:192.168.193.128}:${NACOS_PORT:8848}
server-addr: ${NACOS_HOST:101.37.204.35}:${NACOS_PORT:8848}
username: nacos
password: ${NACOS_PASSWORD:hn02le.34lkdLKD}
password: ${NACOS_PASSWORD:BYzL!Z3C}
namespace: ${NACOS_NAMESPACE:}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}

View File

@ -1,5 +1,6 @@
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<property name="PROJECT_PATH" value="/opt/projects/tmerclub"/>
<property name="PROJECT_PATH" value="/data/app/java/logs"/>
<property name="APPLICATION_NAME" value="payment"/>
<property name="LOG_FILE_MAX_HISTORY" value="30"/>
<property name="LOG_FILE_MAX_SIZE" value="50MB"/>
@ -20,13 +21,13 @@
<pattern>${FILE_LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
</encoder>
<file>${PROJECT_PATH}/log/api.log</file>
<file>${PROJECT_PATH}/payment/payment.log</file>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>${logging.level}</level>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${PROJECT_PATH}/log/api/%d{yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<fileNamePattern>${PROJECT_PATH}/${APPLICATION_NAME}/%d{yyyy-MM}/payment-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<maxHistory>${LOG_FILE_MAX_HISTORY}</maxHistory>
</rollingPolicy>
@ -37,8 +38,8 @@
<appender-ref ref="ASYNC"/>
</root>
<logger name="com.moyuer.cloud" level="debug"/>
<logger name="com.tmerclub.cloud" level="debug"/>
<logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="debug"/>
<logger name="springfox.documentation.swagger.readers.operation.OperationImplicitParameterReader" level="off"/>
<logger name="org.reflections.Reflections" level="off"/>
</configuration>
</configuration>

View File

@ -6,9 +6,9 @@ spring:
cloud:
nacos:
discovery:
server-addr: ${NACOS_HOST:192.168.193.128}:${NACOS_PORT:8848}
server-addr: ${NACOS_HOST:101.37.204.35}:${NACOS_PORT:8848}
username: nacos
password: ${NACOS_PASSWORD:hn02le.34lkdLKD}
password: ${NACOS_PASSWORD:BYzL!Z3C}
namespace: ${NACOS_NAMESPACE:}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}

View File

@ -1,5 +1,6 @@
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<property name="PROJECT_PATH" value="/opt/projects/tmerclub"/>
<property name="PROJECT_PATH" value="/data/app/java/logs"/>
<property name="APPLICATION_NAME" value="product"/>
<property name="LOG_FILE_MAX_HISTORY" value="30"/>
<property name="LOG_FILE_MAX_SIZE" value="50MB"/>
@ -20,13 +21,13 @@
<pattern>${FILE_LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
</encoder>
<file>${PROJECT_PATH}/log/api.log</file>
<file>${PROJECT_PATH}/product/product.log</file>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>${logging.level}</level>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${PROJECT_PATH}/log/api/%d{yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<fileNamePattern>${PROJECT_PATH}/${APPLICATION_NAME}/%d{yyyy-MM}/product-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<maxHistory>${LOG_FILE_MAX_HISTORY}</maxHistory>
</rollingPolicy>
@ -37,8 +38,8 @@
<appender-ref ref="ASYNC"/>
</root>
<logger name="com.moyuer.cloud" level="debug"/>
<logger name="com.tmerclub.cloud" level="debug"/>
<logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="debug"/>
<logger name="springfox.documentation.swagger.readers.operation.OperationImplicitParameterReader" level="off"/>
<logger name="org.reflections.Reflections" level="off"/>
</configuration>
</configuration>

View File

@ -6,9 +6,9 @@ spring:
cloud:
nacos:
discovery:
server-addr: ${NACOS_HOST:192.168.193.128}:${NACOS_PORT:8848}
server-addr: ${NACOS_HOST:101.37.204.35}:${NACOS_PORT:8848}
username: nacos
password: ${NACOS_PASSWORD:hn02le.34lkdLKD}
password: ${NACOS_PASSWORD:BYzL!Z3C}
namespace: ${NACOS_NAMESPACE:}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}

View File

@ -1,5 +1,6 @@
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<property name="PROJECT_PATH" value="/opt/projects/tmerclub"/>
<property name="PROJECT_PATH" value="/data/app/java/logs"/>
<property name="APPLICATION_NAME" value="search"/>
<property name="LOG_FILE_MAX_HISTORY" value="30"/>
<property name="LOG_FILE_MAX_SIZE" value="50MB"/>
@ -20,13 +21,13 @@
<pattern>${FILE_LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
</encoder>
<file>${PROJECT_PATH}/log/api.log</file>
<file>${PROJECT_PATH}/search/search.log</file>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>${logging.level}</level>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${PROJECT_PATH}/log/api/%d{yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<fileNamePattern>${PROJECT_PATH}/${APPLICATION_NAME}/%d{yyyy-MM}/search-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<maxHistory>${LOG_FILE_MAX_HISTORY}</maxHistory>
</rollingPolicy>
@ -37,8 +38,8 @@
<appender-ref ref="ASYNC"/>
</root>
<logger name="com.moyuer.cloud" level="debug"/>
<logger name="com.tmerclub.cloud" level="debug"/>
<logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="debug"/>
<logger name="springfox.documentation.swagger.readers.operation.OperationImplicitParameterReader" level="off"/>
<logger name="org.reflections.Reflections" level="off"/>
</configuration>
</configuration>

View File

@ -6,9 +6,9 @@ spring:
cloud:
nacos:
discovery:
server-addr: ${NACOS_HOST:192.168.193.128}:${NACOS_PORT:8848}
server-addr: ${NACOS_HOST:101.37.204.35}:${NACOS_PORT:8848}
username: nacos
password: ${NACOS_PASSWORD:hn02le.34lkdLKD}
password: ${NACOS_PASSWORD:BYzL!Z3C}
namespace: ${NACOS_NAMESPACE:}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}

View File

@ -1,5 +1,6 @@
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<property name="PROJECT_PATH" value="/opt/projects/tmerclub"/>
<property name="PROJECT_PATH" value="/data/app/java/logs"/>
<property name="APPLICATION_NAME" value="seckill"/>
<property name="LOG_FILE_MAX_HISTORY" value="30"/>
<property name="LOG_FILE_MAX_SIZE" value="50MB"/>
@ -20,13 +21,13 @@
<pattern>${FILE_LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
</encoder>
<file>${PROJECT_PATH}/log/api.log</file>
<file>${PROJECT_PATH}/seckill/seckill.log</file>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>${logging.level}</level>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${PROJECT_PATH}/log/api/%d{yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<fileNamePattern>${PROJECT_PATH}/${APPLICATION_NAME}/%d{yyyy-MM}/seckill-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<maxHistory>${LOG_FILE_MAX_HISTORY}</maxHistory>
</rollingPolicy>
@ -37,8 +38,8 @@
<appender-ref ref="ASYNC"/>
</root>
<logger name="com.moyuer.cloud" level="debug"/>
<logger name="com.tmerclub.cloud" level="debug"/>
<logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="debug"/>
<logger name="springfox.documentation.swagger.readers.operation.OperationImplicitParameterReader" level="off"/>
<logger name="org.reflections.Reflections" level="off"/>
</configuration>
</configuration>

View File

@ -6,9 +6,9 @@ spring:
cloud:
nacos:
discovery:
server-addr: ${NACOS_HOST:192.168.193.128}:${NACOS_PORT:8848}
server-addr: ${NACOS_HOST:101.37.204.35}:${NACOS_PORT:8848}
username: nacos
password: ${NACOS_PASSWORD:hn02le.34lkdLKD}
password: ${NACOS_PASSWORD:BYzL!Z3C}
namespace: ${NACOS_NAMESPACE:}
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}

View File

@ -1,5 +1,6 @@
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<property name="PROJECT_PATH" value="/opt/projects/tmerclub"/>
<property name="PROJECT_PATH" value="/data/app/java/logs"/>
<property name="APPLICATION_NAME" value="user"/>
<property name="LOG_FILE_MAX_HISTORY" value="30"/>
<property name="LOG_FILE_MAX_SIZE" value="50MB"/>
@ -20,13 +21,13 @@
<pattern>${FILE_LOG_PATTERN}</pattern>
<charset>UTF-8</charset>
</encoder>
<file>${PROJECT_PATH}/log/api.log</file>
<file>${PROJECT_PATH}/user/user.log</file>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>${logging.level}</level>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${PROJECT_PATH}/log/api/%d{yyyy-MM}/api-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<fileNamePattern>${PROJECT_PATH}/${APPLICATION_NAME}/%d{yyyy-MM}/user-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
<maxFileSize>${LOG_FILE_MAX_SIZE}</maxFileSize>
<maxHistory>${LOG_FILE_MAX_HISTORY}</maxHistory>
</rollingPolicy>
@ -37,8 +38,8 @@
<appender-ref ref="ASYNC"/>
</root>
<logger name="com.moyuer.cloud" level="debug"/>
<logger name="com.tmerclub.cloud" level="debug"/>
<logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="debug"/>
<logger name="springfox.documentation.swagger.readers.operation.OperationImplicitParameterReader" level="off"/>
<logger name="org.reflections.Reflections" level="off"/>
</configuration>
</configuration>