feat:修复已知问题,提升系统稳定性
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<parent>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-cloud</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</parent>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<description>remi-sys-api</description>
|
||||
|
||||
<parent>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</parent>
|
||||
@@ -29,12 +29,12 @@
|
||||
<dependencies>
|
||||
<!--remi-comm-feign-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.comm</groupId>
|
||||
<groupId>ai.remi.top.comm</groupId>
|
||||
<artifactId>remi-comm-feign</artifactId>
|
||||
</dependency>
|
||||
<!--remi-sys-domain-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys-domain</artifactId>
|
||||
</dependency>
|
||||
<!--servlet-api-->
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<description>remi-sys-app</description>
|
||||
|
||||
<parent>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</parent>
|
||||
@@ -71,19 +71,19 @@
|
||||
|
||||
<!--remi-comm-feign-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.comm</groupId>
|
||||
<groupId>ai.remi.top.comm</groupId>
|
||||
<artifactId>remi-comm-feign</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!--remi-sys-job-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys-job</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!--引入内部模块-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys-server</artifactId>
|
||||
</dependency>
|
||||
<!--slf4j-->
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<description>remi-sys-domain</description>
|
||||
|
||||
<parent>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</parent>
|
||||
@@ -29,12 +29,12 @@
|
||||
<dependencies>
|
||||
<!--remi-comm-domain-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.comm</groupId>
|
||||
<groupId>ai.remi.top.comm</groupId>
|
||||
<artifactId>remi-comm-domain</artifactId>
|
||||
</dependency>
|
||||
<!--remi-comm-swagger-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.comm</groupId>
|
||||
<groupId>ai.remi.top.comm</groupId>
|
||||
<artifactId>remi-comm-swagger</artifactId>
|
||||
</dependency>
|
||||
<!-- Lombok -->
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<description>remi-sys-infra</description>
|
||||
|
||||
<parent>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</parent>
|
||||
@@ -29,12 +29,12 @@
|
||||
<dependencies>
|
||||
<!--remi-comm-jdbc-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.comm</groupId>
|
||||
<groupId>ai.remi.top.comm</groupId>
|
||||
<artifactId>remi-comm-jdbc</artifactId>
|
||||
</dependency>
|
||||
<!--remi-sys-domain-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys-domain</artifactId>
|
||||
</dependency>
|
||||
<!--slf4j-->
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<description>remi-sys-job</description>
|
||||
|
||||
<parent>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</parent>
|
||||
@@ -29,12 +29,12 @@
|
||||
<dependencies>
|
||||
<!--remi-comm-job-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.comm</groupId>
|
||||
<groupId>ai.remi.top.comm</groupId>
|
||||
<artifactId>remi-comm-job</artifactId>
|
||||
</dependency>
|
||||
<!--remi-sys-server-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys-server</artifactId>
|
||||
</dependency>
|
||||
<!--slf4j-->
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<description>remi-sys-server</description>
|
||||
|
||||
<parent>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</parent>
|
||||
@@ -29,28 +29,28 @@
|
||||
<dependencies>
|
||||
<!--remi-sys-infra-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys-infra</artifactId>
|
||||
</dependency>
|
||||
<!--启迪公共模块-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.comm</groupId>
|
||||
<groupId>ai.remi.top.comm</groupId>
|
||||
<artifactId>remi-comm-exception</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ai.remi.comm</groupId>
|
||||
<groupId>ai.remi.top.comm</groupId>
|
||||
<artifactId>remi-comm-minio</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ai.remi.comm</groupId>
|
||||
<groupId>ai.remi.top.comm</groupId>
|
||||
<artifactId>remi-comm-redis</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ai.remi.comm</groupId>
|
||||
<groupId>ai.remi.top.comm</groupId>
|
||||
<artifactId>remi-comm-thread</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ai.remi.comm</groupId>
|
||||
<groupId>ai.remi.top.comm</groupId>
|
||||
<artifactId>remi-comm-util</artifactId>
|
||||
</dependency>
|
||||
<!--slf4j-->
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<description>remi-sys-web</description>
|
||||
|
||||
<parent>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</parent>
|
||||
@@ -71,31 +71,31 @@
|
||||
|
||||
<!--remi-comm-web-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.comm</groupId>
|
||||
<groupId>ai.remi.top.comm</groupId>
|
||||
<artifactId>remi-comm-web</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!--remi-comm-log-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.comm</groupId>
|
||||
<groupId>ai.remi.top.comm</groupId>
|
||||
<artifactId>remi-comm-log</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!--remi-ids-server-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys-server</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!--remi-ids-job-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys-job</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!--remi-ids-api-->
|
||||
<dependency>
|
||||
<groupId>ai.remi.cloud</groupId>
|
||||
<groupId>ai.remi.top.cloud</groupId>
|
||||
<artifactId>remi-sys-api</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
@@ -6,32 +6,46 @@ spring:
|
||||
application:
|
||||
name: remi-sys-web
|
||||
profiles:
|
||||
#active: dev
|
||||
active: sit
|
||||
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.200}:${NACOS_PORT:30888}
|
||||
#namespace: ${SERVICE_NAME_SPACE_NAME:dev}
|
||||
namespace: ${NAME_SPACE:sit}
|
||||
#group: ${SERVICE_DISCOVERY_GROUP_NAME:dev}
|
||||
group: ${GROUP_NAME:sit}
|
||||
# 配置中心的地址
|
||||
server-addr: ${NACOS_HOST:192.168.31.18}:${NACOS_PORT:8848}
|
||||
#server-addr: ${NACOS_HOST:192.168.31.200}:${NACOS_PORT:30888}
|
||||
#命名空间
|
||||
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: ${NACOS_HOST:192.168.31.18}:${NACOS_PORT:8848}
|
||||
server-addr: ${NACOS_HOST:192.168.31.200}:${NACOS_PORT:30888}
|
||||
#namespace: ${SERVICE_NAME_SPACE_NAME:dev}
|
||||
namespace: ${NAME_SPACE:sit}
|
||||
#group: ${SERVICE_DISCOVERY_GROUP_NAME:dev}
|
||||
group: ${GROUP_NAME:sit}
|
||||
# 配置中心的地址
|
||||
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
|
||||
refresh-enabled: true
|
||||
# 配置的编码
|
||||
encode: UTF-8
|
||||
# 是否开启监听和自动刷新
|
||||
refresh-enabled: true
|
||||
# 共享配置
|
||||
shared-configs:
|
||||
- dataId: remi-cloud-${spring.profiles.active}.yaml
|
||||
group: ${SERVICE_DISCOVERY_GROUP_NAME:sit}
|
||||
# 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
|
||||
|
||||
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
# 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
|
||||
@@ -1,5 +0,0 @@
|
||||
```shell
|
||||
sh ./docker_deploy.sh
|
||||
|
||||
docker logs -f gateway
|
||||
```
|
||||
@@ -1,16 +0,0 @@
|
||||
#先删除原有的镜像
|
||||
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
|
||||
@@ -1,59 +0,0 @@
|
||||
## Service
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: sit-remi-sys-web
|
||||
labels:
|
||||
app: sit-remi-sys-web
|
||||
spec:
|
||||
type: NodePort
|
||||
ports:
|
||||
- name: sit-remi-sys-web
|
||||
port: 1010
|
||||
protocol: TCP
|
||||
targetPort: 1010
|
||||
nodePort: 30010
|
||||
selector:
|
||||
app: sit-remi-sys-web
|
||||
---
|
||||
## Deployment
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: sit-remi-sys-web
|
||||
labels:
|
||||
app: sit-remi-sys-web
|
||||
spec:
|
||||
replicas: 2
|
||||
selector:
|
||||
matchLabels:
|
||||
app: sit-remi-sys-web
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: sit-remi-sys-web
|
||||
spec:
|
||||
containers:
|
||||
- image: harbor.njydsz.com/remi-top/sit-remi-sys-web
|
||||
imagePullPolicy: Always
|
||||
name: sit-remi-sys-web
|
||||
ports:
|
||||
- containerPort: 1010
|
||||
protocol: TCP
|
||||
env:
|
||||
- name: spring.profiles.active
|
||||
value: sit #改环境
|
||||
resources:
|
||||
limits:
|
||||
cpu: "1"
|
||||
memory: "500Mi"
|
||||
requests:
|
||||
cpu: "0.2"
|
||||
memory: "200Mi"
|
||||
volumeMounts:
|
||||
- name: logs
|
||||
mountPath: /logs
|
||||
volumes:
|
||||
- name: logs
|
||||
persistentVolumeClaim:
|
||||
claimName: remi-log
|
||||
Reference in New Issue
Block a user