Skip to content

C
cmeeting
提交 b1d257ad 作者: 洪东保
操作

日志修复 

本地配置修改
重新服务不自动
父级 aaa48f4b
正在显示 包含 196 行增加 和 45 行删除
pom.xml
...@@ -337,6 +337,28 @@ ...@@ -337,6 +337,28 @@
</executions> </executions>
<version>2.7.0</version> <version>2.7.0</version>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<!-- 默认删除 target 目录 -->
<fileset>
<directory>target</directory>
<followSymlinks>false</followSymlinks>
</fileset>
<!-- 额外删除 logs 目录 -->
<fileset>
<directory>logs</directory>
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>log.path_IS_UNDEFINED</directory>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
......
src/main/java/com/cmeeting/job/CmeetingJob.java
...@@ -40,16 +40,16 @@ public class CmeetingJob { ...@@ -40,16 +40,16 @@ public class CmeetingJob {
@Resource @Resource
private UserIdMapper userIdMapper; private UserIdMapper userIdMapper;
@PostConstruct // @PostConstruct
public void weComUserInit(){ public void weComUserInit(){
weComUserSync(); weComUserSync();
} }
@PostConstruct // @PostConstruct
public void tencentUserInit(){ public void tencentUserInit(){
TencentUserSync(); TencentUserSync();
} }
@PostConstruct // @PostConstruct
public void userBindInit(){ public void userBindInit(){
userBind(); userBind();
} }
......
src/main/java/com/cmeeting/job/FileProcessTask.java
...@@ -268,7 +268,7 @@ public class FileProcessTask { ...@@ -268,7 +268,7 @@ public class FileProcessTask {
//获取系统模板 //获取系统模板
List<MeetingRecordTemplate> recordTemplateList = meetingRecordTemplateMapper.selectList( List<MeetingRecordTemplate> recordTemplateList = meetingRecordTemplateMapper.selectList(
new LambdaQueryWrapper<MeetingRecordTemplate>().eq(MeetingRecordTemplate::getType, RecordTemplateConstant.TEMPLATE_TYPE_SYSTEM) new LambdaQueryWrapper<MeetingRecordTemplate>().eq(MeetingRecordTemplate::getType, RecordTemplateConstant.TEMPLATE_TYPE_SYSTEM)
.eq(MeetingRecordTemplate::getIsDel,Boolean.FALSE).isNotNull(MeetingRecordTemplate::getTemplate)); .eq(MeetingRecordTemplate::getIsDel, Boolean.FALSE).isNotNull(MeetingRecordTemplate::getTemplate));
Map<Integer, List<String>> authorizedUserMap = authorizedUsers.stream().collect(Collectors.toMap(item -> item.getRecordTemplateId(), item -> item.getUserIdList())); Map<Integer, List<String>> authorizedUserMap = authorizedUsers.stream().collect(Collectors.toMap(item -> item.getRecordTemplateId(), item -> item.getUserIdList()));
List<EmailPush.Attachment> attachments = new ArrayList<>(); List<EmailPush.Attachment> attachments = new ArrayList<>();
String hostUid = meetingInfo.getHostUid(); String hostUid = meetingInfo.getHostUid();
......
src/main/resources/application.yml
server: server:
port: 8081 port: 8105
############################################################## minio ############################################################## minio
MINIO_ADDRESS: http://192.168.10.154:9000 MINIO_ADDRESS: http://192.168.10.153:9000
MINIO_BUCKET: zhongji MINIO_BUCKET: zhongji
MINIO_USERNAME: minio MINIO_USERNAME: qizhi
MINIO_PASSWORD: minio123 MINIO_PASSWORD: qizhi123
############################################################## redis ############################################################## redis
REDIS_ADDRESS: 192.168.10.154 REDIS_ADDRESS: 192.168.10.157
REDIS_PORT: 6380 REDIS_PORT: 6379
REDIS_PASS: standard123 REDIS_PASS: standard123
REDIS_DATABASE: 8 REDIS_DATABASE: 3
############################################################## llm ############################################################## llm
# local # local
LLM_API_ADDR: https://bedrock.chatbot.cn LLM_API_ADDR: https://bedrock.chatbot.cn
...@@ -43,24 +43,24 @@ EMAIL_SENDER_PWD: scyou@xih45g6@xih4 ...@@ -43,24 +43,24 @@ EMAIL_SENDER_PWD: scyou@xih45g6@xih4
EMAIL_SMTP_HOST: smtp.office365.com EMAIL_SMTP_HOST: smtp.office365.com
############################################################## permission ############################################################## permission
PERMISSION_APPLiCATION_ID: 1928343847335759872 PERMISSION_APPLiCATION_ID: 1945681039926104064
PERMISSION_TENANT_ID: 1928343652791357440 PERMISSION_TENANT_ID: 1945678078692954112
PERMISSION_ADMIN_WHITE_USERS: 1928343652791357440 PERMISSION_ADMIN_WHITE_USERS: 00015545,1945678083671592960
spring: spring:
datasource: datasource:
# 主数据源 # 主数据源
master: master:
jdbc-url: jdbc:mysql://192.168.10.154:3307/aigc-zhongji-test?useSSL=false&characterEncoding=utf8&serverTimezone=UTC jdbc-url: jdbc:mysql://192.168.10.157:3306/zhongji-aigc?useSSL=false&characterEncoding=utf8&serverTimezone=UTC
username: root username: root
password: 123456 password: qizhi123
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
# 从数据源 # 从数据源
slave: slave:
jdbc-url: jdbc:mysql://192.168.10.154:3307/useradmin-zhongji-test?useSSL=false&characterEncoding=utf8&serverTimezone=UTC jdbc-url: jdbc:mysql://192.168.10.157:3306/zhongji-user?useSSL=false&characterEncoding=utf8&serverTimezone=UTC
username: root username: root
password: 123456 password: qizhi123
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
redis: redis:
database: ${REDIS_DATABASE} database: ${REDIS_DATABASE}
...@@ -75,9 +75,6 @@ spring: ...@@ -75,9 +75,6 @@ spring:
timeout: 6000ms timeout: 6000ms
password: ${REDIS_PASS} password: ${REDIS_PASS}
# MyBatis ??
# mybatis.mapper-locations=classpath:mapper/primary/*.xml
mybatis.type-aliases-package: com.cmeeting.pojo\ mybatis.type-aliases-package: com.cmeeting.pojo\
mybatis: mybatis:
configuration: configuration:
...@@ -110,7 +107,8 @@ tencent: ...@@ -110,7 +107,8 @@ tencent:
sdkId: ${TENCENT_SDKID} sdkId: ${TENCENT_SDKID}
secretId: ${TENCENT_SECRETID} secretId: ${TENCENT_SECRETID}
secretKey: ${TENCENT_SECRETKEY} secretKey: ${TENCENT_SECRETKEY}
admin.userId: ${TENCENT_ADMIN_USERID} admin:
userId: ${TENCENT_ADMIN_USERID}
meeting: meeting:
token: QQZNb7xWQB47MpZF4C2DFAkv8 token: QQZNb7xWQB47MpZF4C2DFAkv8
aesKey: agy6ALUePp34lljWz1uIQWa7yQq3dgxxQNmfaN9GROm aesKey: agy6ALUePp34lljWz1uIQWa7yQq3dgxxQNmfaN9GROm
...@@ -123,7 +121,7 @@ email: ...@@ -123,7 +121,7 @@ email:
smtp-host: ${EMAIL_SMTP_HOST} smtp-host: ${EMAIL_SMTP_HOST}
push-switch: true #邮件推送总开关，高优先级 push-switch: true #邮件推送总开关，高优先级
environment: test #test推给本公司人员，prod推给用户 environment: test #test推给本公司人员，prod推给用户
test-receiver: duanxincheng@chatbot.cn #用于测试的收方邮箱 test-receiver: hongdongbao@chatbot.cn #用于测试的收方邮箱
llm: llm:
api-addr: ${LLM_API_ADDR} api-addr: ${LLM_API_ADDR}
...@@ -141,14 +139,12 @@ ldap: ...@@ -141,14 +139,12 @@ ldap:
domain: '@cimc.com' domain: '@cimc.com'
userAdmin: userAdmin:
domain: http://192.168.10.154:8303 domain: http://192.168.10.157:8103
systemDomain: http://192.168.10.154:8301 systemDomain: http://192.168.10.157:8101
appId: af94e0ec9cc0bef2bfa63f470f6f4351 appId: af94e0ec9cc0bef2bfa63f470f6f4351
secret: 4luHTMYMyXzOmDHN0ZOSMwOst702plcr9EKqAHtT8Nag6EPlP0VSFvqv9Zq0NRDE secret: 4luHTMYMyXzOmDHN0ZOSMwOst702plcr9EKqAHtT8Nag6EPlP0VSFvqv9Zq0NRDE
file-download-path: /download/minio/ file-download-path: /download/minio/
docDomain: http://192.168.10.154:8302/knowledgePlatform docDomain: http://192.168.10.157:8102/knowledgePlatform
removeMenus: 关键词回复,业务词库,同义词管理,答案库
jwt: jwt:
header: Authorization header: Authorization
...@@ -163,9 +159,3 @@ permission: ...@@ -163,9 +159,3 @@ permission:
applicationId: ${PERMISSION_APPLiCATION_ID} applicationId: ${PERMISSION_APPLiCATION_ID}
tenantId: ${PERMISSION_TENANT_ID} tenantId: ${PERMISSION_TENANT_ID}
admin-white_users: ${PERMISSION_ADMIN_WHITE_USERS} admin-white_users: ${PERMISSION_ADMIN_WHITE_USERS}
logging:
level:
com.cmeeting.mapper.primary: TRACE
com.cmeeting.mapper.secondary: TRACE
root: DEBUG
\ No newline at end of file
src/main/resources/logback-spring.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<configuration
scan="true"
scanPeriod="10 seconds">
<contextName>
logback
</contextName>
<springProperty
scope="context"
name="springAppName"
source="spring.application.name"/>
<springProperty
scope="context"
name="logPath"
source="spring.application.logPath"/>
<!-- 日志储存空间位置 -->
<springProperty
name="log.path"
source="logPath"
defaultValue="./logs"/>
<!-- 彩色日志 -->
<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"/>
<!-- 彩色日志格式 -->
<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}}"/>
<!-- 输出到控制台 -->
<appender
name="CONSOLE"
class="ch.qos.logback.core.ConsoleAppender">
<!-- 此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息 -->
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>
debug
</level>
</filter>
<encoder>
<Pattern>
${CONSOLE_LOG_PATTERN}
</Pattern>
<!-- 设置字符集 -->
<charset>
UTF-8
</charset>
</encoder>
</appender>
<!-- 输出到文件 -->
<appender
name="FILE_ALL"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<!-- <file>-->
<!-- ${log.path}/log_all.log-->
<!-- </file>-->
<!-- 日志文件输出格式 -->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
<charset>
UTF-8
</charset>
<!-- 设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志归档 -->
<fileNamePattern>
${log.path}/cmeeting_%d{yyyyMMdd}_%i.log
</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>
200MB
</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!-- 日志文件保留天数 -->
<maxHistory>
15
</maxHistory>
</rollingPolicy>
</appender>
<!-- 时间滚动输出 level为 ERROR 日志 -->
<appender
name="ERROR_FILE"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>
${log.path}/log_error.log
</file>
<!-- 日志文件输出格式 -->
<encoder>
<pattern>
%date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level%logger{36}.%M\(%line\)-%msg%n
</pattern>
<charset>
UTF-8
</charset>
<!-- 此处设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
<rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>
${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log.gz
</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>
100MB
</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!-- 日志文件保留天数 -->
<maxHistory>
15
</maxHistory>
</rollingPolicy>
<!-- 过滤出ERROR级别的日志 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level> ERROR </level>
<onMatch> ACCEPT </onMatch>
<onMismatch> DENY </onMismatch>
</filter>
</appender>
<!-- MyBatis SQL 日志 -->
<logger name="java.sql.Connection" level="TRACE"/>
<logger name="java.sql.Statement" level="TRACE"/>
<logger name="java.sql.PreparedStatement" level="TRACE"/>
<logger name="java.sql.ResultSet" level="TRACE"/>
<!-- DAO 包路径（替换为你的Mapper接口包名） -->
<logger name="com.cmeeting.mapper.primary" level="TRACE"/>
<logger name="com.cmeeting.mapper.secondary" level="TRACE"/>
<!-- 日志总开关 -->
<root level="info">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE_ALL"/>
<appender-ref ref="ERROR_FILE"/>
</root>
</configuration>
src/main/resources/logback.xml deleted 100644 → 0
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<root level="DEBUG">
<appender-ref ref="STDOUT" />
</root>
</configuration>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论