refactor(ci): 重构CI/CD配置并更新测试环境配置
- 移除开发环境的构建和部署配置 - 更新测试环境构建配置,修改标签从mes-test到blog-test - 修改生产环境镜像标签格式,添加版本号v1.0.0 - 更新测试环境应用配置,修改端口从11024到1024 - 修改测试环境context-path从根路径到/mowen-blog - 更新日志目录配置为动态路径 - 修改测试环境数据库连接信息,包括主机地址、用户名和密码 - 更新Redis连接配置,修改数据库编号、主机地址和密码 - 设置token有效期为永久有效(-1)
This commit is contained in:
@@ -18,25 +18,6 @@ stages:
|
||||
- deploy
|
||||
|
||||
# ==================== 构建阶段 ====================
|
||||
build-dev:jdk17:
|
||||
stage: build
|
||||
image: moshangjunmowen/maven-jdk17:v3
|
||||
script:
|
||||
- echo "=============== 开始编译打包任务(dev) ==============="
|
||||
- mvn clean package -DskipTests -P dev
|
||||
# 将 Dockerfile 和 jar 收集到 build 目录,供 artifacts 传递
|
||||
- mkdir -p build
|
||||
- cp Dockerfile build/
|
||||
- cp mowen-admin/target/mowen-admin-dev-1.0.0.jar build/
|
||||
artifacts:
|
||||
paths:
|
||||
- build/
|
||||
expire_in: 1 day # 产物保留时间,按需调整
|
||||
only:
|
||||
- dev
|
||||
tags:
|
||||
- blog-dev
|
||||
|
||||
build-test:jdk17:
|
||||
stage: build
|
||||
image: moshangjunmowen/maven-jdk17:v3
|
||||
@@ -50,10 +31,8 @@ build-test:jdk17:
|
||||
paths:
|
||||
- build/
|
||||
expire_in: 1 day
|
||||
only:
|
||||
- test
|
||||
tags:
|
||||
- mes-test
|
||||
- blog-test
|
||||
|
||||
build-prod:jdk17:
|
||||
stage: build
|
||||
@@ -74,24 +53,6 @@ build-prod:jdk17:
|
||||
- pioneer-mes-prod
|
||||
|
||||
# ==================== 部署阶段 ====================
|
||||
deploy-dev:jdk17:
|
||||
stage: deploy
|
||||
image: docker:29.4.3 # 使用 docker 镜像执行部署命令
|
||||
needs: ["build-dev:jdk17"] # 明确依赖构建产物,确保顺序
|
||||
script:
|
||||
- echo "=============== 开始部署应用(dev) ==============="
|
||||
- cd build # 进入 artifacts 传递过来的目录
|
||||
- docker ps -a | grep $MES_BACK_CONTAINER && docker stop $MES_BACK_CONTAINER && docker rm $MES_BACK_CONTAINER || echo "not exist"
|
||||
- docker images | grep $MES_BACK_IMAGE && docker rmi -f $MES_BACK_IMAGE || echo "not exist"
|
||||
# 构建上下文为当前目录(build/),直接使用 Dockerfile 和 jar
|
||||
- docker build --build-arg JAR_FILE=mowen-admin-dev-1.0.0.jar -t $MES_BACK_IMAGE .
|
||||
- docker network ls | grep -w jun-boot || docker network create jun-boot
|
||||
- docker run -d --restart=always -p $MES_BACK_PORT:1024 --network=jun-boot --log-opt max-size=50m --log-opt max-file=3 --name $MES_BACK_CONTAINER $MES_BACK_IMAGE
|
||||
only:
|
||||
- dev
|
||||
tags:
|
||||
- dev
|
||||
|
||||
deploy-test:jdk17:
|
||||
stage: deploy
|
||||
image: docker:29.4.3
|
||||
@@ -101,13 +62,11 @@ deploy-test:jdk17:
|
||||
- cd build
|
||||
- docker ps -a | grep $MES_BACK_CONTAINER && docker stop $MES_BACK_CONTAINER && docker rm $MES_BACK_CONTAINER || echo "not exist"
|
||||
- docker images | grep $MES_BACK_IMAGE && docker rmi -f $MES_BACK_IMAGE || echo "not exist"
|
||||
- docker build --build-arg JAR_FILE=mowen-admin-test-1.0.0.jar -t $MES_BACK_IMAGE .
|
||||
- docker build --build-arg JAR_FILE=mowen-admin-test-1.0.0.jar -t $MES_BACK_IMAGE:v1.0.0 .
|
||||
- docker network ls | grep -w jun-boot || docker network create jun-boot
|
||||
- docker run -d --restart=always -p $MES_BACK_PORT:1024 --network=jun-boot --log-opt max-size=50m --log-opt max-file=3 --name $MES_BACK_CONTAINER $MES_BACK_IMAGE
|
||||
only:
|
||||
- test
|
||||
tags:
|
||||
- mes-test
|
||||
- blog-test
|
||||
|
||||
deploy-prod:jdk17:
|
||||
stage: deploy
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
# 项目配置: 名称、日志目录
|
||||
project:
|
||||
name: mowen-blog-admin
|
||||
log-directory: /home/project/smartadmin/test/log
|
||||
log-directory: ${localPath:/home}/logs/mowen-blog/${project.name}/${spring.profiles.active}
|
||||
|
||||
# 项目端口和url根路径
|
||||
server:
|
||||
port: 11024
|
||||
port: 1024
|
||||
servlet:
|
||||
context-path: /
|
||||
context-path: /mowen-blog
|
||||
|
||||
# 环境
|
||||
spring:
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
spring:
|
||||
# 数据库连接信息
|
||||
datasource:
|
||||
url: jdbc:p6spy:mysql://127.0.0.1:3306/mowen-blog?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
|
||||
username: root
|
||||
password: SmartAdmin666
|
||||
url: jdbc:p6spy:mysql://10.126.126.1:43706/mowen-blog?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
|
||||
username: mowen-blog
|
||||
password: junmowen
|
||||
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
|
||||
initial-size: 2
|
||||
min-idle: 2
|
||||
@@ -23,10 +23,10 @@ spring:
|
||||
# redis 连接池配置信息
|
||||
data:
|
||||
redis:
|
||||
database: 1
|
||||
host: 127.0.0.1
|
||||
port: 6379
|
||||
password:
|
||||
database: 3
|
||||
host: 10.126.126.1
|
||||
port: 36579
|
||||
password: junmowen
|
||||
timeout: 10000ms
|
||||
lettuce:
|
||||
pool:
|
||||
@@ -154,7 +154,7 @@ sa-token:
|
||||
# token 前缀 例如:Bearer
|
||||
token-prefix: Bearer
|
||||
# token 有效期(单位:秒) 默认30天(2592000秒),-1 代表永久有效
|
||||
timeout: 2592000
|
||||
timeout: -1
|
||||
# token 最低活跃频率(单位:秒),如果 token 超过此时间没有访问系统就会被冻结,默认-1 代表不限制,永不冻结
|
||||
active-timeout: -1
|
||||
# 是否允许同一账号多地同时登录 (为 true 时允许一起登录, 为 false 时新登录挤掉旧登录)
|
||||
|
||||
Reference in New Issue
Block a user