diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..ebefefd --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/lepu-test-platform-service.iml b/.idea/lepu-test-platform-service.iml new file mode 100644 index 0000000..d0876a7 --- /dev/null +++ b/.idea/lepu-test-platform-service.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..d1e22ec --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..0ecb44b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index b00eca6..1ccc7b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -#FROM 192.168.16.17/library/jjdk:1.8.0 +#FROM 8.140.205.154/library/jjdk:1.8.0 FROM openjdk:8-jre-slim MAINTAINER zhangbo VOLUME /tmp diff --git a/compose/service/docker-compose.yml b/compose/service/docker-compose.yml index 9acfa9a..90ffe58 100644 --- a/compose/service/docker-compose.yml +++ b/compose/service/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: testplatform_service: # image: 192.168.31.11/library/lepu-test-platform-service:${branch} - image: 180.76.106.6:18081/library/lepu-test-platform-service:${branch} + image: 8.140.205.154:18081/library/lepu-test-platform-service:${branch} container_name: testplatform_service ports: - "19527:9527" diff --git a/compose/service/env.sh b/compose/service/env.sh index ea3b014..48d9370 100644 --- a/compose/service/env.sh +++ b/compose/service/env.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash export SERVICE_DIR=/application/app export SERVICE1_VERSION=${branch} -export HOST_IP_ADDR=180.76.106.6 \ No newline at end of file +export HOST_IP_ADDR=8.140.205.154 \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 4191631..7a1299a 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ server: - ipPort: 180.76.106.6:19527 + ipPort: 8.140.205.154:19527 port: 9527 servlet: session: