Skip to content
GitLab

从master到 32

Merged 郑小燕 requested to merge master into 32
Compare
and
11 files
+ 186
- 69
ser‎ver‎
cloud-auth/src‎/main/resources‎
applicatio‎n-test.yml‎ +4 -4
application-‎zhuozheng.yml‎ +2 -0
bootstrap‎-test.yml‎ +3 -2
cloud-base/src‎/main/resources‎
applicatio‎n-test.yml‎ +6 -6
bootstrap‎-test.yml‎ +3 -2
cloud-gateway/sr‎c/main/resources‎
bootstrap‎-test.yml‎ +1 -0
cloud-syb/src/‎main/resources‎
applicatio‎n-test.yml‎ +6 -6
bootstrap‎-test.yml‎ +3 -2
pom‎.xml‎ +2 -2
web/cloud-au‎th-web/config‎
test.‎env.js‎ +2 -2
.gitlab‎-ci.yml‎ +154 -43
server/cloud-auth/src/main/resources/application-test.yml
+ 4
- 4
@@ -4,23 +4,23 @@ spring:
cloud:
nacos:
discovery:
# ip: 192.168.0.130 #指定服务暴露的ip
ip: ${server-addr} #指定服务暴露的ip
# 数据库
datasource:
druid:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/cloud-auth?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
url: jdbc:log4jdbc:mysql://${server-addr}:3306/cloud-auth?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username: syb_test
password: syb123456
# redis
redis:
# 数据库索引
database: 0
host: 127.0.0.1
host: ${server-addr}
port: 6379
password: syb123456
# rabbitMq
rabbitmq:
host: 127.0.0.1
host: ${server-addr}
port: 5672
username: admin
password: syb123456
server/cloud-auth/src/main/resources/application-test.yml
+ 4
- 4
@@ -4,23 +4,23 @@ spring:
cloud:
nacos:
discovery:
# ip: 192.168.0.130 #指定服务暴露的ip
ip: ${server-addr} #指定服务暴露的ip
# 数据库
datasource:
druid:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/cloud-auth?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
url: jdbc:log4jdbc:mysql://${server-addr}:3306/cloud-auth?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username: syb_test
password: syb123456
# redis
redis:
# 数据库索引
database: 0
host: 127.0.0.1
host: ${server-addr}
port: 6379
password: syb123456
# rabbitMq
rabbitmq:
host: 127.0.0.1
host: ${server-addr}
port: 5672
username: admin
password: syb123456
server/cloud-auth/src/main/resources/application-zhuozheng.yml
+ 2
- 0
@@ -32,6 +32,8 @@ spring:
username: syb_zz
password: syb_zz@rabbitmq
auth-server-url: http://${server-addr}:${server.port}
# 业务数据配置
shusi:
switch:
server/cloud-auth/src/main/resources/bootstrap-test.yml
+ 3
- 2
server-addr: 192.168.0.180
# spring相关设置
spring:
profiles:
@@ -8,10 +9,10 @@ spring:
# dashboard: 139.159.153.102:8849 #配置限流、监控服务的应用
nacos:
discovery:
server-addr: 127.0.0.1:8848 #Nacos地址
server-addr: ${server-addr}:8848 #Nacos地址
namespace: 10fa81b2-23d2-4cbe-b19e-43c2c2cef00a #命名空间，不同的环境注册到不同命名空间
config:
server-addr: 127.0.0.1:8848 #Nacos地址
server-addr: ${server-addr}:8848 #Nacos地址
file-extension: yaml #这里我们获取的yaml格式的配置
management:
server/cloud-base/src/main/resources/application-test.yml
+ 6
- 6
# 认证服务器
auth-server-url: http://127.0.0.1:8010/cloud-auth
auth-server-url: http://${server-addr}:8010/cloud-auth
spring:
application:
name: cloud-base
cloud:
nacos:
discovery:
# ip: 192.168.0.130 #指定服务暴露的ip
ip: ${server-addr} #指定服务暴露的ip
# 数据库
datasource:
druid:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/cloud-base?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
url: jdbc:log4jdbc:mysql://${server-addr}:3306/cloud-base?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username: syb_test
password: syb123456
redis:
# 数据库索引
database: 0
host: 127.0.0.1
host: ${server-addr}
port: 6379
password: syb123456
# rabbitMq
rabbitmq:
host: 127.0.0.1
host: ${server-addr}
port: 5672
username: admin
password: syb123456
@@ -44,7 +44,7 @@ shusi:
#base路由
gateway:
server: http://127.0.0.1:8010/cloud-base
server: http://${server-addr}:8010/cloud-base
logging:
# 压缩存放的路径
server/cloud-base/src/main/resources/bootstrap-test.yml
+ 3
- 2
server-addr: 192.168.0.180
# spring相关设置
spring:
profiles:
@@ -8,10 +9,10 @@ spring:
# dashboard: 139.159.153.102:8849 #配置限流、监控服务的应用
nacos:
discovery:
server-addr: 127.0.0.1:8848 #Nacos地址
server-addr: ${server-addr}:8848 #Nacos地址
namespace: 10fa81b2-23d2-4cbe-b19e-43c2c2cef00a #命名空间，不同的环境注册到不同命名空间
config:
server-addr: 127.0.0.1:8848 #Nacos地址
server-addr: ${server-addr}:8848 #Nacos地址
file-extension: yaml #这里我们获取的yaml格式的配置
management:
server/cloud-gateway/src/main/resources/bootstrap-test.yml
+ 1
- 0
server-addr: 192.168.0.66
# spring相关设置
spring:
application:
server/cloud-syb/src/main/resources/application-test.yml
+ 6
- 6
# 认证服务器
auth-server-url: http://127.0.0.1:8010/cloud-auth
auth-server-url: http://${server-addr}:8010/cloud-auth
spring:
application:
name: cloud-syb
cloud:
nacos:
discovery:
# ip: 192.168.0.130 #指定服务暴露的ip
ip: ${server-addr} #指定服务暴露的ip
# 数据库
datasource:
druid:
url: jdbc:log4jdbc:mysql://127.0.0.1:3306/cloud-syb?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
url: jdbc:log4jdbc:mysql://${server-addr}:3306/cloud-syb?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username: syb_test
password: syb123456
# redis
redis:
# 数据库索引
database: 0
host: 127.0.0.1
host: ${server-addr}
port: 6379
password: syb123456
# rabbitMq
rabbitmq:
host: 127.0.0.1
host: ${server-addr}
port: 5672
username: admin
password: syb123456
@@ -34,7 +34,7 @@ xxl:
enabled: true
admin:
### 调度中心部署跟地址 [选填]：如调度中心集群部署存在多个地址则用逗号分隔。执行器将会使用该地址进行"执行器心跳注册"和"任务结果回调"；为空则关闭自动注册；
addresses: http://127.0.0.1:8845/xxl-job-admin
addresses: http://${server-addr}:8845/xxl-job-admin
executor:
logpath: /mnt/b2b/xxl/
server/cloud-syb/src/main/resources/bootstrap-test.yml
+ 3
- 2
server-addr: 192.168.0.180
# spring相关设置
spring:
profiles:
@@ -8,11 +9,11 @@ spring:
# dashboard: 124.71.100.95:8849 #配置限流、监控服务的应用
nacos:
discovery:
server-addr: 127.0.0.1:8848 #Nacos地址
server-addr: ${server-addr}:8848 #Nacos地址
namespace: 10fa81b2-23d2-4cbe-b19e-43c2c2cef00a #命名空间，不同的环境注册到不同命名空间
# group: chenzp
config:
server-addr: 127.0.0.1:8848 #Nacos地址
server-addr: ${server-addr}:8848 #Nacos地址
file-extension: yaml #这里我们获取的yaml格式的配置
management:
server/pom.xml
+ 2
- 2
@@ -242,11 +242,11 @@
<distributionManagement>
<repository>
<id>nexus-release</id>
<url>http://121.37.188.223:8081/repository/maven-releases/</url>
<url>http://nexus-repo.suoyoubao.top/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>nexus-snapshots</id>
<url>http://121.37.188.223:8081/repository/maven-snapshots/</url>
<url>http://nexus-repo.suoyoubao.top/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
web/cloud-auth-web/config/test.env.js
+ 2
- 2
@@ -11,8 +11,8 @@ module.exports = merge(prodEnv, {
TOKEN_KEY: '"cloud-token"',
PRINCIPAL_KEY: '"principal"',
NODE_ENV: '"test"',
BASE_API: '"http://192.168.124.228:8010"',
PORTAL_API: '"https://www.suoyoubao.com.cn"'
BASE_API: '"http://gatetest.suoyoubao.top"',
PORTAL_API: '"http://test.suoyoubao.top"'
})
.gitlab-ci.yml
+ 154
- 43
@@ -102,6 +102,36 @@ variables:
- echo "$SSH_66_PUB_KEY" > ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
# 检查前端缓存
.web_check_code:
script: &web_check_code
- PGO='e'
- PGN='e'
- >
if [ -f package-back.json ]; then
PGO=`md5sum package-back.json | awk '{ print $1 }'`
PGN=`md5sum package.json | awk '{ print $1 }'`
else
echo "不存在package-back.json"
fi
- >
if [ "$PGO" == "$PGN" ]; then
echo "package.json未变化不需要重新打包"
cp package.json package-back.json
else
echo "package.json发生变更重新打包"
npm --version
npm install #安装项目中的依赖
cp package.json package-back.json
fi
- >
if [ ! -d './node_modules' ]; then
echo "不存在node_modules文件重新安装"
npm --version
npm install #安装项目中的依赖
fi
#---------------------------------------------------------------------------自定义锚点区end-------------------------------------------------------------------
# 脚本执行完后的钩子，执行所需脚本
@@ -123,22 +153,15 @@ after_script:
门户端构建:
stage: build
before_script:
- *ssh_syb_application
- ssh $B2C_TEST_USER@$B2C_TEST_IP 'echo 1111'
script:
- cd ./cloud-syb-portal
- mvn -Dmaven.test.skip=true clean install -U
- mv ./target/cloud-syb-portal-0.0.1-SNAPSHOT.jar $B2C_LOCAL_SAVE_PATH/$CI_COMMIT_SHA.jar
# 推送包文件到B2C测试服务器
- scp $B2C_LOCAL_SAVE_PATH/$CI_COMMIT_SHA.jar $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/$CI_COMMIT_SHA-portal.jar
tags:
- b2c_local
后端服务构建:
stage: build
before_script:
- *ssh_syb_application
script:
- cd ./server/cloud-gateway
- mvn -Dmaven.test.skip=true clean install -U
@@ -148,11 +171,6 @@ after_script:
- mv ./cloud-base/target/cloud-base-0.0.1-SNAPSHOT.jar $B2C_LOCAL_SAVE_PATH/base_$CI_COMMIT_SHA.jar
- mv ./cloud-gateway/target/cloud-gateway-0.0.1-SNAPSHOT.jar $B2C_LOCAL_SAVE_PATH/gateway_$CI_COMMIT_SHA.jar
- mv ./cloud-syb/target/cloud-syb-0.0.1-SNAPSHOT.jar $B2C_LOCAL_SAVE_PATH/syb_$CI_COMMIT_SHA.jar
# 推送包文件到B2C测试服务器
- scp $B2C_LOCAL_SAVE_PATH/auth_$CI_COMMIT_SHA.jar $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/auth_$CI_COMMIT_SHA.jar
- scp $B2C_LOCAL_SAVE_PATH/base_$CI_COMMIT_SHA.jar $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/base_$CI_COMMIT_SHA.jar
- scp $B2C_LOCAL_SAVE_PATH/gateway_$CI_COMMIT_SHA.jar $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/gateway_$CI_COMMIT_SHA.jar
- scp $B2C_LOCAL_SAVE_PATH/syb_$CI_COMMIT_SHA.jar $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/syb_$CI_COMMIT_SHA.jar
tags:
- b2c_local
@@ -168,31 +186,7 @@ after_script:
# - /^dev.*/
script:
- cd ./web/cloud-syb-web
- PGO='e'
- PGN='e'
- >
if [ -f package-back.json ]; then
PGO=`md5sum package-back.json | awk '{ print $1 }'`
PGN=`md5sum package.json | awk '{ print $1 }'`
else
echo "不存在package-back.json"
fi
- >
if [ "$PGO" == "$PGN" ]; then
echo "package.json未变化不需要重新打包"
cp package.json package-back.json
else
echo "package.json发生变更重新打包"
npm --version
npm install #安装项目中的依赖
cp package.json package-back.json
fi
- >
if [ ! -d './node_modules' ]; then
echo "不存在node_modules文件重新安装"
npm --version
npm install #安装项目中的依赖
fi
- *web_check_code
- npm run build-test
- cd dist
- rm -rf *.tar.gz
@@ -202,9 +196,43 @@ after_script:
- find ./ -mtime +7 -name "*.tar.gz" -exec rm -rf {} \;
- echo "编译完成"
统一认证前端编译:
stage: build
when: manual
tags:
- b2c_local
# only:
# - master
# - /^V.*/
# - /^P.*/
# - /^dev.*/
script:
- cd ./web/cloud-auth-web
- *web_check_code
- npm run build-test
- cd dist
- rm -rf *.tar.gz
# 找出创建时间超过七天包并删除
- tar -zcvf $B2C_LOCAL_SAVE_PATH/$CI_COMMIT_SHA-cloud-syb-auth-web.tar.gz *
- cd $B2C_LOCAL_SAVE_PATH
- find ./ -mtime +7 -name "*.tar.gz" -exec rm -rf {} \;
- echo "编译完成"
# ------------------------------------------------------------------------------ 门户端测试发布 start --------------------------------------------------------------------------
门户端代码推送:
stage: test
needs: [门户端发布测试]
when: manual
before_script:
- *ssh_syb_application
script:
# 推送包文件到B2C测试服务器
- scp $B2C_LOCAL_SAVE_PATH/$CI_COMMIT_SHA.jar $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/$CI_COMMIT_SHA-portal.jar
tags:
- b2c_local
门户端发布测试: # This job runs in the build stage, which runs first.
stage: test
needs: [门户端构建]
@@ -228,6 +256,23 @@ after_script:
# ------------------------------------------------------------------------------ 后端服务测试发布 start --------------------------------------------------------------------------
后端代码推送:
stage: test
needs: [后端全量发布测试]
when: manual
before_script:
- *ssh_syb_application
script:
# 推送包文件到B2C测试服务器
- scp $B2C_LOCAL_SAVE_PATH/auth_$CI_COMMIT_SHA.jar $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/auth_$CI_COMMIT_SHA.jar
- scp $B2C_LOCAL_SAVE_PATH/base_$CI_COMMIT_SHA.jar $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/base_$CI_COMMIT_SHA.jar
- scp $B2C_LOCAL_SAVE_PATH/gateway_$CI_COMMIT_SHA.jar $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/gateway_$CI_COMMIT_SHA.jar
- scp $B2C_LOCAL_SAVE_PATH/syb_$CI_COMMIT_SHA.jar $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/syb_$CI_COMMIT_SHA.jar
tags:
- b2c_local
后端业务发布测试: # This job runs in the test stage.
stage: test # It only starts when the job in the build stage completes successfully.
needs: [后端服务构建]
@@ -294,6 +339,26 @@ after_script:
- scp $B2C_LOCAL_SAVE_PATH/$CI_COMMIT_SHA-cloud-syb-web.tar.gz $TEST_GITLAB_USER@$TEST_IP:$TEST_B2B_SAVE_PATH/web/cloud-syb-web.tar.gz
- ssh $TEST_GITLAB_USER@$TEST_IP $PUSH_NEW_PACKAGE_COMMAND
统一认证发布测试:
stage: test
when: manual
needs: [前端编译]
tags:
- b2c_local
# only:
# - master
# - /^V.*/
# - /^P.*/
# - /^dev.*/
before_script:
- *ssh_223_test_template
script:
- DELETE_OLD_PACKAGE_COMMAND=$(printf 'cd %s/auth-web && rm -rf %s/auth-web/*' $TEST_B2B_SAVE_PATH $TEST_B2B_SAVE_PATH)
- PUSH_NEW_PACKAGE_COMMAND=$(printf 'cd %s/auth-web && tar -zxvf syb-auth-web.tar.gz' $TEST_B2B_SAVE_PATH)
- ssh $TEST_GITLAB_USER@$TEST_IP $DELETE_OLD_PACKAGE_COMMAND
- scp $B2C_LOCAL_SAVE_PATH/$CI_COMMIT_SHA-cloud-syb-auth-web.tar.gz $TEST_GITLAB_USER@$TEST_IP:$TEST_B2B_SAVE_PATH/auth-web/syb-auth-web.tar.gz
- ssh $TEST_GITLAB_USER@$TEST_IP $PUSH_NEW_PACKAGE_COMMAND
# ------------------------------------------------------------------------------ 前端发布测试环境 end --------------------------------------------------------------------------
@@ -355,7 +420,7 @@ after_script:
后端生产发布-数科:
stage: deploy
needs: [后端全量发布测试]
needs: [后端代码推送,后端全量发布测试]
tags:
- b2c
rules:
@@ -375,7 +440,7 @@ after_script:
后端生产发布-智联:
stage: deploy
needs: [后端全量发布测试]
needs: [后端代码推送,后端全量发布测试]
when: manual
tags:
- b2c
@@ -398,7 +463,7 @@ after_script:
后端生产发布-卓正:
stage: deploy
when: manual
needs: [后端全量发布测试]
needs: [后端代码推送,后端全量发布测试]
tags:
- b2c
rules:
@@ -436,7 +501,7 @@ after_script:
- rm -rf *.tar.gz
# 找出创建时间超过七天包并删除
- tar -zcvf $B2C_LOCAL_SAVE_PATH/b2b/$CI_COMMIT_SHA-pro-cloud-syb-web.tar.gz *
- cd $ERP_LOCAL_2_SAVE_PATH
- cd $B2C_LOCAL_SAVE_PATH
- find ./ -mtime +1 -name "*.tar.gz" -exec rm -rf {} \;
# 推送包文件到B2C测试服务器
- scp $B2C_LOCAL_SAVE_PATH/$CI_COMMIT_SHA-pro-cloud-syb-web.tar.gz $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/$CI_COMMIT_SHA-pro-cloud-syb-web.tar.gz
@@ -460,7 +525,7 @@ after_script:
- rm -rf *.tar.gz
# 找出创建时间超过七天包并删除
- tar -zcvf $B2C_LOCAL_SAVE_PATH/$CI_COMMIT_SHA-zhuozheng-cloud-syb-web.tar.gz *
- cd $ERP_LOCAL_2_SAVE_PATH
- cd $B2C_LOCAL_SAVE_PATH
- find ./ -mtime +1 -name "*.tar.gz" -exec rm -rf {} \;
# 推送包文件到B2C测试服务器
- scp $B2C_LOCAL_SAVE_PATH/$CI_COMMIT_SHA-zhuozheng-cloud-syb-web.tar.gz $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/$CI_COMMIT_SHA-zhuozheng-cloud-syb-web.tar.gz
@@ -484,7 +549,7 @@ after_script:
- rm -rf *.tar.gz
# 找出创建时间超过七天包并删除
- tar -zcvf $B2C_LOCAL_SAVE_PATH/$CI_COMMIT_SHA-zhilian-cloud-syb-web.tar.gz *
- cd $ERP_LOCAL_2_SAVE_PATH
- cd $B2C_LOCAL_SAVE_PATH
- find ./ -mtime +1 -name "*.tar.gz" -exec rm -rf {} \;
# 推送包文件到B2C测试服务器
- scp $B2C_LOCAL_SAVE_PATH/$CI_COMMIT_SHA-zhilian-cloud-syb-web.tar.gz $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/$CI_COMMIT_SHA-zhilian-cloud-syb-web.tar.gz
@@ -546,3 +611,49 @@ after_script:
# ------------------------------------------------------------------------------ 前端服务生产发布 end --------------------------------------------------------------------------
#------------------------------------------------------------------------------- 统一认证前端发布 start ------------------------------------------------------------------------
统一认证前端生产编译-卓正: # This job runs in the build stage, which runs first.
stage: build
when: manual
tags:
- b2c_local
rules:
- if: '$CI_COMMIT_BRANCH =~ /^V.*/'
when: manual
before_script:
- *ssh_syb_application
script:
- cd ./web/cloud-auth-web
- npm install
- npm run build-lyzz
- cd dist
- rm -rf *.tar.gz
# 找出创建时间超过七天包并删除
- tar -zcvf $B2C_LOCAL_SAVE_PATH/$CI_COMMIT_SHA-zhuozheng-cloud-syb-auth-web.tar.gz *
- cd $B2C_LOCAL_SAVE_PATH
- find ./ -mtime +1 -name "*.tar.gz" -exec rm -rf {} \;
# 推送包文件到B2C测试服务器
- scp $B2C_LOCAL_SAVE_PATH/$CI_COMMIT_SHA-zhuozheng-cloud-syb-auth-web.tar.gz $B2C_TEST_USER@$B2C_TEST_IP:$PUSH_PRO_PACKAGE_BASE_PATH/$CI_COMMIT_SHA-zhuozheng-cloud-syb-auth-web.tar.gz
统一认证发布生产-卓正:
stage: deploy
needs: [统一认证前端编译]
when: manual
tags:
- b2c
rules:
- if: '$CI_COMMIT_BRANCH =~ /^V.*/'
when: manual
before_script:
- *ssh_zhuozheng_pro_template
script:
- *opt_user_check
- cd $PUSH_PRO_PACKAGE_BASE_PATH
- scp $CI_COMMIT_SHA-zhuozheng-cloud-syb-auth-web.tar.gz $SSH_66_USER@$SSH_66_HOST:/mnt/lyzz-service/auth-web/dist.tar.gz
# 进入发布目录并解压压缩包
- ssh $SSH_66_USER@$SSH_66_HOST 'cd /mnt/lyzz-service/auth-web && tar -zxvf dist.tar.gz && rm -f dist.tar.gz'
#------------------------------------------------------------------------------- 统一认证前端发布 end --------------------------------------------------------------------------