diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c12386..7a8512d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,17 +49,17 @@ deploy: - 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" -deploy_huawei: - <<: *import_ssh_key - image: kroniak/ssh-client:3.9 - stage: deploy - dependencies: - - build - when: on_success - 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 "rm -rf $DEPLOY_TEST_PATH/*.jar" - - 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" - - 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" +#deploy_huawei: +# <<: *import_ssh_key +# image: kroniak/ssh-client:3.9 +# stage: deploy +# dependencies: +# - build +# when: on_success +# 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 "rm -rf $DEPLOY_TEST_PATH/*.jar" +# - 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" +# - 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" diff --git a/docker-compose.yml b/docker-compose.yml index 17c3b21..59aab80 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,9 +5,9 @@ services: restart: always image: openjdk:11.0.12 volumes: - - /opt/app/material-manage-service/app.jar:/app.jar - - /opt/app/material-manage-service/logs:/logs - - /opt/files/material-manage-service:/files + - ./app.jar:/app.jar + - ./logs:/logs + - ./files:/files - /etc/localtime:/etc/localtime ports: - "19882:9882" diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9462af6..50172c0 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,6 +7,9 @@ spring: 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 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: database: 4 host: 127.0.0.1 diff --git a/src/main/resources/application-huawei.yml b/src/main/resources/application-huawei.yml index f7b5d65..6567626 100644 --- a/src/main/resources/application-huawei.yml +++ b/src/main/resources/application-huawei.yml @@ -5,11 +5,11 @@ spring: master: driver-class-name: com.mysql.cj.jdbc.Driver 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 redis: database: 4 - host: 192.168.0.230 + host: redis password: 'Xxs123456' port: 6379