feat:修复已知问题，提升系统稳定性
This commit is contained in:
dianjiu
52
remi-sys/remi-sys-web/src/main/resources/bootstrap.yml
Normal file
52
remi-sys/remi-sys-web/src/main/resources/bootstrap.yml
Normal file
@@ -0,0 +1,52 @@
|
||||
# 服务端口号
|
||||
server:
|
||||
port: 1010
|
||||
|
||||
spring:
|
||||
application:
|
||||
name: remi-sys-web
|
||||
profiles:
|
||||
active: dev
|
||||
#active: sit
|
||||
cloud:
|
||||
# nacos
|
||||
nacos:
|
||||
# 注册中心
|
||||
username: nacos
|
||||
password: nacos
|
||||
discovery:
|
||||
# 配置中心的地址
|
||||
server-addr: ${NACOS_HOST:192.168.31.18}:${NACOS_PORT:8848}
|
||||
#server-addr: ${NACOS_HOST:192.168.31.201}:${NACOS_PORT:8848}
|
||||
#命名空间
|
||||
namespace: ${SERVICE_NAME_SPACE_NAME:dev}
|
||||
#namespace: ${SERVICE_NAME_SPACE_NAME:sit}
|
||||
# 配置文件的环境
|
||||
group: ${SERVICE_DISCOVERY_GROUP_NAME:dev}
|
||||
#group: ${SERVICE_DISCOVERY_GROUP_NAME:sit}
|
||||
# 配置中心
|
||||
config:
|
||||
# 配置中心的地址
|
||||
server-addr: ${spring.cloud.nacos.discovery.server-addr}
|
||||
#命名空间
|
||||
namespace: ${spring.cloud.nacos.discovery.namespace}
|
||||
# 配置文件prefix
|
||||
prefix: ${spring.application.name}
|
||||
# 配置文件的环境
|
||||
group: ${spring.cloud.nacos.discovery.group}
|
||||
# 配置文件的格式
|
||||
file-extension: yaml
|
||||
# 配置的编码
|
||||
encode: UTF-8
|
||||
# 是否开启监听和自动刷新
|
||||
refresh-enabled: true
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
# Data Id 的默认完整格式为： ${prefix}-${spring.profile.active}.${file-extension}。
|
||||
- dataId: remi-cloud-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
group: ${spring.cloud.nacos.discovery.group}
|
||||
#是否自动刷新
|
||||
refresh: true
|
||||
|
||||
|
||||
|
||||
24
remi-sys/remi-sys-web/src/main/resources/docker/Dockerfile
Normal file
24
remi-sys/remi-sys-web/src/main/resources/docker/Dockerfile
Normal file
@@ -0,0 +1,24 @@
|
||||
# Docker image for springboot application
|
||||
# VERSION 0.0.1
|
||||
# Author: DianJiu
|
||||
# 指定基础镜像，这是分阶段构建的前期阶段
|
||||
FROM harbor.njydsz.com/library/jdk:17 as builder
|
||||
# 维护者
|
||||
MAINTAINER Remi <remi@yundingshuzi.com>
|
||||
#VOLUME：挂载目录
|
||||
VOLUME /temp
|
||||
|
||||
#ADD 将app.jar文件将拷贝到容器中，默认拷贝到根路径下
|
||||
#也可以直接写成ADD app.jar /app.jar 或者 ADD app.jar /
|
||||
ADD remi-sys-web-3.1.0.jar remi-sys-web.jar
|
||||
|
||||
#修改app.jar这个文件的访问时间和修改时间为当前时间，而不会修改文件的内容。
|
||||
RUN bash -c "touch /remi-sys-web.jar"
|
||||
|
||||
#ENTRYPOINT 应用启动命令 参数设定
|
||||
#由于tomcat的session id的生成主要通过java.security.SecureRandom生成随机数来实现，导致启动过程很慢
|
||||
#通过-Djava.security.egd=file:/dev/./urandom参数可以加快随机数产生过程
|
||||
ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/remi-sys-web.jar"]
|
||||
|
||||
#EXPOSE 容器暴露端口
|
||||
EXPOSE 1010
|
||||
@@ -0,0 +1,5 @@
|
||||
```shell
|
||||
sh ./docker_deploy.sh
|
||||
|
||||
docker logs -f gateway
|
||||
```
|
||||
@@ -0,0 +1,16 @@
|
||||
#先删除原有的镜像
|
||||
docker stop sit-remi-sys-web
|
||||
docker rm -f sit-remi-sys-web
|
||||
docker images | grep sit-remi-sys-web | awk '{print $3}' | xargs docker rmi -f
|
||||
docker build -t sit-remi-sys-web .
|
||||
docker images | grep sit-remi-sys-web
|
||||
#把新镜像推送到私服
|
||||
docker login -uadmin -pYdsz1020 harbor.njydsz.com
|
||||
docker tag sit-remi-sys-web harbor.njydsz.com/remi/sit-remi-sys-web:3.1.0
|
||||
docker tag sit-remi-sys-web harbor.njydsz.com/remi/sit-remi-sys-web:latest
|
||||
docker push harbor.njydsz.com/remi/sit-remi-sys-web:3.1.0
|
||||
docker push harbor.njydsz.com/remi/sit-remi-sys-web:latest
|
||||
#启动最新的镜像服务
|
||||
docker run --restart=always -t -dit -p 1010:1010 --name sit-remi-sys-web sit-remi-sys-web
|
||||
docker ps -a
|
||||
docker logs -f sit-remi-sys-web
|
||||
@@ -0,0 +1,33 @@
|
||||
#****************************????****************************
|
||||
business.error=Operate failed
|
||||
illegal.argument=Illegal argument
|
||||
not.logged.in=not logged in or token is invalid
|
||||
#****************************????****************************
|
||||
system.error=System error
|
||||
assert.error=Verify error
|
||||
add.dept.error=The same department already exists?
|
||||
delete.dept.error=There are sub-dept or user under the current dept that have not been removed?
|
||||
delete.company.error=There are sub-company or dept under the current company that have not been removed?
|
||||
only.support.code.error=Only the authorization code method is supported
|
||||
check.app.secret.error=Verify the appSecret is exceptional
|
||||
check.auth.code.error=The code is incorrect or out of date
|
||||
check.userinfo.token.error=The Token is incorrect or out of date
|
||||
check.ticket.error=No ticket exist, please log in again
|
||||
app.code.error=Generate an AppCode that collides more than 10 times, please regenerate it
|
||||
add.menu.error=The same menu already exists?
|
||||
add.groupUser.error=The same user {0} already exists?
|
||||
add.roleUser.error=The same user {0} already exists?
|
||||
add.roleCord.error=The same cord {0} already exists?
|
||||
add.rolePost.error=The same post {0} already exists?
|
||||
add.roleGroup.error=The same group {0} already exists?
|
||||
check.login.error=The username or password is wrong, please check and try again!
|
||||
#****************************????****************************
|
||||
other.system.error=Other system error
|
||||
call.feign.error=Call feign error
|
||||
call.sql.error=Call sql error
|
||||
call.redis.error=Call redis error
|
||||
call.minio.error=Call minio error
|
||||
call.nacos.error=call nacos error
|
||||
call.job.error=Call job error
|
||||
call.mq.error=Call mq error
|
||||
call.es.error=Call es error
|
||||
@@ -0,0 +1,34 @@
|
||||
#****************************操作异常****************************
|
||||
business.error=操作失败
|
||||
illegal.argument=非法参数
|
||||
not.logged.in=未登录或Token失效
|
||||
|
||||
#****************************系统异常****************************
|
||||
system.error=系统异常
|
||||
assert.error=校验失败
|
||||
add.dept.error=当前公司下已存在相同部门，请检查部门名称和部门编码！
|
||||
delete.dept.error=当前部门下有子部门或员工未移除，不允许直接被删除！
|
||||
delete.company.error=当前公司下有子子公司或部门未移除，不允许直接被删除！
|
||||
only.support.code.error=仅支持授权码方式
|
||||
check.app.secret.error=校验appSecret异常
|
||||
check.auth.code.error=code有误或已过期
|
||||
check.userinfo.token.error=token有误或已过期
|
||||
check.ticket.error=不存在凭证，请重新登陆
|
||||
app.code.error=尝试生成AppCode发生碰撞超过10次，请重新生成！
|
||||
add.menu.error=当前应用下已存在相同菜单，请检查菜单名称和菜单编码！
|
||||
add.groupUser.error=当前用户组下已存在该用户，请检查用户:{0}！
|
||||
add.roleUser.error=当前角色下已存在该用户，请检查用户:{0}！
|
||||
add.roleCord.error=当前角色下已存在该组织，请检查组织:{0}！
|
||||
add.rolePost.error=当前角色下已存在该岗位，请检查岗位:{0}！
|
||||
add.roleGroup.error=当前角色下已存在该用户组，请检查用户组:{0}！
|
||||
check.login.error=用户名或密码错误，请检查后重试！
|
||||
#****************************三方异常****************************
|
||||
other.system.error=三方系统异常
|
||||
call.feign.error=调用Feign异常
|
||||
call.sql.error=调用数据库异常
|
||||
call.redis.error=调用Redis异常
|
||||
call.minio.error=调用MinIO异常
|
||||
call.nacos.error=调用Nacos异常
|
||||
call.job.error=调用Job异常
|
||||
call.mq.error=调用MQ异常
|
||||
call.es.error=调用ES异常
|
||||
152
remi-sys/remi-sys-web/src/main/resources/logback-spring.xml
Normal file
152
remi-sys/remi-sys-web/src/main/resources/logback-spring.xml
Normal file
@@ -0,0 +1,152 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration>
|
||||
<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为INFO，则低于INFO级别的信息都不会输出 -->
|
||||
<!-- scan:默认值为true，当此属性设置为true时，配置文件如果发生改变，将会被重新加载 -->
|
||||
<!-- scanPeriod:设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
|
||||
<!-- debug:默认值为false。当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。 -->
|
||||
<contextName>logback</contextName>
|
||||
|
||||
<!--application.yml 传递参数，不能使用logback 自带的<property>标签 -->
|
||||
<springProperty scope="context" name="logDir" source="logback.logDir"/>
|
||||
<springProperty scope="context" name="appName" source="spring.application.name"/>
|
||||
|
||||
<!-- 彩色日志格式 -->
|
||||
<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}}"/>
|
||||
<!-- 彩色日志依赖的渲染类 -->
|
||||
<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"/>
|
||||
|
||||
<!--输出到控制台-->
|
||||
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
||||
<level>debug</level>
|
||||
</filter>
|
||||
<encoder>
|
||||
<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
|
||||
<charset>UTF-8</charset>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<!-- debug日志输出文件 -->
|
||||
<appender name="debug_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${logDir}/debug.log</file>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 每天对日志归档 -->
|
||||
<fileNamePattern>${logDir}/debug-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
|
||||
<maxHistory>30</maxHistory>
|
||||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
|
||||
<maxFileSize>500MB</maxFileSize>
|
||||
</timeBasedFileNamingAndTriggeringPolicy>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger [%file : %line] - %msg%n</pattern>
|
||||
<charset>UTF-8</charset>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
<level>DEBUG</level>
|
||||
<onMatch>ACCEPT</onMatch>
|
||||
<onMismatch>DENY</onMismatch>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<!-- info日志输出文件 -->
|
||||
<appender name="info_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${logDir}/info.log</file>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 每天对日志归档 -->
|
||||
<fileNamePattern>${logDir}/info-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
|
||||
<maxHistory>30</maxHistory>
|
||||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
|
||||
<maxFileSize>500MB</maxFileSize>
|
||||
</timeBasedFileNamingAndTriggeringPolicy>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger [%file : %line] - %msg%n</pattern>
|
||||
<charset>UTF-8</charset>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
<level>INFO</level>
|
||||
<onMatch>ACCEPT</onMatch>
|
||||
<onMismatch>DENY</onMismatch>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<!-- warn日志输出文件 -->
|
||||
<appender name="warn_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${logDir}/warn.log</file>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 每天对日志归档 -->
|
||||
<fileNamePattern>${logDir}/warn-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
|
||||
<maxHistory>30</maxHistory>
|
||||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
|
||||
<maxFileSize>500MB</maxFileSize>
|
||||
</timeBasedFileNamingAndTriggeringPolicy>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger [%file : %line] - %msg%n</pattern>
|
||||
<charset>UTF-8</charset>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
<level>WARN</level>
|
||||
<onMatch>ACCEPT</onMatch>
|
||||
<onMismatch>DENY</onMismatch>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<!-- error日志输出文件 -->
|
||||
<appender name="error_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<file>${logDir}/error.log</file>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 每天对日志归档 -->
|
||||
<fileNamePattern>${logDir}/error-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
|
||||
<maxHistory>30</maxHistory>
|
||||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
|
||||
<maxFileSize>500MB</maxFileSize>
|
||||
</timeBasedFileNamingAndTriggeringPolicy>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger [%file : %line] - %msg%n</pattern>
|
||||
<charset>UTF-8</charset>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
<level>ERROR</level>
|
||||
<onMatch>ACCEPT</onMatch>
|
||||
<onMismatch>DENY</onMismatch>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<!--全量日志-->
|
||||
<appender name="detail_file" class="ch.qos.logback.core.rolling.RollingFileAppender" additivity="false">
|
||||
<File>${logDir}/${appName}.log</File>
|
||||
<encoder>
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger [%file : %line] - %msg%n</pattern>
|
||||
</encoder>
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<fileNamePattern>${logDir}/${appName}-%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
</rollingPolicy>
|
||||
</appender>
|
||||
|
||||
|
||||
<!--开发环境:打印控制台-->
|
||||
<springProfile name="dev">
|
||||
<logger name="ai.remi" level="debug"/>
|
||||
</springProfile>
|
||||
<springProfile name="!dev">
|
||||
<logger name="ai.remi" level="info"/>
|
||||
</springProfile>
|
||||
|
||||
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
|
||||
<root>
|
||||
<level value="info"/>
|
||||
<appender-ref ref="console"/>
|
||||
<appender-ref ref="debug_file"/>
|
||||
<appender-ref ref="info_file"/>
|
||||
<appender-ref ref="warn_file"/>
|
||||
<appender-ref ref="error_file"/>
|
||||
<appender-ref ref="detail_file"/>
|
||||
</root>
|
||||
</configuration>
|
||||
Reference in New Issue
Block a user