root/material-manage-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 变更服务器配置

Browse Source
This commit is contained in:
han0
2024-11-25 14:56:50 +08:00
parent 869cfc9e3b
commit dba48dfcff
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
.gitlab-ci.yml
View File

@@ -49,17 +49,17 @@ deploy:
- scp ./docker-compose.yml "root@$DEPLOY_DEV_HOST_IP:$DEPLOY_PATH/" - scp ./docker-compose.yml "root@$DEPLOY_DEV_HOST_IP:$DEPLOY_PATH/"
- ssh root@$DEPLOY_DEV_HOST_IP "cd $DEPLOY_PATH && su xxs && docker-compose up -d --force-recreate" - ssh root@$DEPLOY_DEV_HOST_IP "cd $DEPLOY_PATH && su xxs && docker-compose up -d --force-recreate"
deploy_huawei: #deploy_huawei:
<<: *import_ssh_key # <<: *import_ssh_key
image: kroniak/ssh-client:3.9 # image: kroniak/ssh-client:3.9
stage: deploy # stage: deploy
dependencies: # dependencies:
- build # - build
when: on_success # when: on_success
script: # script:
- ssh root@$DEPLOY_TEST_HOST_IP -p $DEPLOY_TEST_HOST_PORT "mkdir -p $DEPLOY_TEST_PATH" # - ssh root@$DEPLOY_TEST_HOST_IP -p $DEPLOY_TEST_HOST_PORT "mkdir -p $DEPLOY_TEST_PATH"
- ssh root@$DEPLOY_TEST_HOST_IP -p $DEPLOY_TEST_HOST_PORT "rm -rf $DEPLOY_TEST_PATH/*.jar" # - ssh root@$DEPLOY_TEST_HOST_IP -p $DEPLOY_TEST_HOST_PORT "rm -rf $DEPLOY_TEST_PATH/*.jar"
- scp -P $DEPLOY_TEST_HOST_PORT ./target/*-SNAPSHOT.jar "root@$DEPLOY_TEST_HOST_IP:$DEPLOY_TEST_PATH/" # - scp -P $DEPLOY_TEST_HOST_PORT ./target/*-SNAPSHOT.jar "root@$DEPLOY_TEST_HOST_IP:$DEPLOY_TEST_PATH/"
- ssh root@$DEPLOY_TEST_HOST_IP -p $DEPLOY_TEST_HOST_PORT "mv $DEPLOY_TEST_PATH/*-SNAPSHOT.jar $DEPLOY_TEST_PATH/app.jar" # - ssh root@$DEPLOY_TEST_HOST_IP -p $DEPLOY_TEST_HOST_PORT "mv $DEPLOY_TEST_PATH/*-SNAPSHOT.jar $DEPLOY_TEST_PATH/app.jar"
- scp -P $DEPLOY_TEST_HOST_PORT ./docker-compose.yml "root@$DEPLOY_TEST_HOST_IP:$DEPLOY_TEST_PATH/" # - scp -P $DEPLOY_TEST_HOST_PORT ./docker-compose.yml "root@$DEPLOY_TEST_HOST_IP:$DEPLOY_TEST_PATH/"
- ssh root@$DEPLOY_TEST_HOST_IP -p $DEPLOY_TEST_HOST_PORT "cd $DEPLOY_TEST_PATH && su && docker-compose -f docker-compose.huawei.yml up -d --force-recreate" # - ssh root@$DEPLOY_TEST_HOST_IP -p $DEPLOY_TEST_HOST_PORT "cd $DEPLOY_TEST_PATH && su && docker-compose -f docker-compose.huawei.yml up -d --force-recreate"

6
docker-compose.yml
View File

@@ -5,9 +5,9 @@ services:
restart: always restart: always
image: openjdk:11.0.12 image: openjdk:11.0.12
volumes: volumes:
- /opt/app/material-manage-service/app.jar:/app.jar - ./app.jar:/app.jar
- /opt/app/material-manage-service/logs:/logs - ./logs:/logs
- /opt/files/material-manage-service:/files - ./files:/files
- /etc/localtime:/etc/localtime - /etc/localtime:/etc/localtime
ports: ports:
- "19882:9882" - "19882:9882"

3
src/main/resources/application-dev.yml
View File

@@ -7,6 +7,9 @@ spring:
password: Xxs123456 password: Xxs123456
url: jdbc:mysql://192.168.1.3:4306/material_manage?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true url: jdbc:mysql://192.168.1.3:4306/material_manage?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
username: root username: root
# password: XKKFB123456!
# url: jdbc:mysql://60.204.172.162:9306/material_manage?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
# username: root
redis: redis:
database: 4 database: 4
host: 127.0.0.1 host: 127.0.0.1

4
src/main/resources/application-huawei.yml
View File

@@ -5,11 +5,11 @@ spring:
master: master:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
password: XKKFB123456! password: XKKFB123456!
url: jdbc:mysql://192.168.0.63:3306/material_manage?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true url: jdbc:mysql://mysql:3306/material_manage?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useInformationSchema=true
username: root username: root
redis: redis:
database: 4 database: 4
host: 192.168.0.230 host: redis
password: 'Xxs123456' password: 'Xxs123456'
port: 6379 port: 6379