From dcb5f495a253179c74bb133310d91f2adf312ea6 Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Thu, 23 Nov 2017 15:43:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/docker/mysql/docker-run-mysql.sh | 2 +- all/envBuildBash/echo-hosts.sh | 19 +++++++++---------- all/sql/cms.sql | 4 ++-- all/sql/ucenter.sql | 4 ++-- all/sql/upms.sql | 4 ++-- .../src/main/resources/application.yml | 4 ++-- .../common/config/DataSourceMasterConfig.java | 4 ++-- ms/cms/Dockerfile | 2 +- ms/cms/docker-run-cms.sh | 2 +- .../com/micro/fast/cms/CmsApplication.java | 6 +----- ms/cms/src/main/resources/bootstrap.yml | 4 ++-- .../resources/mybatisGenerator.properties | 2 +- ms/config-server/Dockerfile | 2 +- ms/config-server/docker-run-config-server.sh | 2 +- .../src/main/resources/bootstrap.yml | 6 ++++-- ms/gateway/Dockerfile | 2 +- ms/gateway/docker-run-gateway.sh | 2 +- ms/gateway/src/main/resources/bootstrap.yml | 4 ++-- ms/register-center1/Dockerfile | 2 +- .../docker-run-register-center1.sh | 2 +- .../src/main/resources/bootstrap.yml | 6 +++--- ms/register-center2/Dockerfile | 2 +- .../docker-run-register-center2.sh | 2 +- .../src/main/resources/bootstrap.yml | 6 +++--- ms/ucenter/Dockerfile | 2 +- ms/ucenter/docker-run-ucenter.sh | 2 +- ms/ucenter/src/main/resources/bootstrap.yml | 4 ++-- .../resources/mybatisGenerator.properties | 2 +- ms/upms/Dockerfile | 2 +- ms/upms/docker-run-upms.sh | 2 +- ms/upms/src/main/resources/bootstrap.yml | 4 ++-- .../resources/mybatisGenerator.properties | 2 +- .../test/e2e/nightwatch.conf.js | 2 +- pa/src/main/resources/application-dev.yml | 2 +- 34 files changed, 58 insertions(+), 61 deletions(-) diff --git a/all/docker/mysql/docker-run-mysql.sh b/all/docker/mysql/docker-run-mysql.sh index 7def183..3e53031 100644 --- a/all/docker/mysql/docker-run-mysql.sh +++ b/all/docker/mysql/docker-run-mysql.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run --name mysql-master -d --net ms-net --ip 172.18.0.200 -p 3317:3306 -v /opt/mysql-master:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=studyj2e mysql:latest \ No newline at end of file +docker run --name mysql-master -d -p 3317:3306 -v /opt/mysql-master:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=studyj2e mysql:5.7 \ No newline at end of file diff --git a/all/envBuildBash/echo-hosts.sh b/all/envBuildBash/echo-hosts.sh index f5f44c3..f5004e0 100644 --- a/all/envBuildBash/echo-hosts.sh +++ b/all/envBuildBash/echo-hosts.sh @@ -1,11 +1,10 @@ #!/usr/bin/env bash - -echo "172.18.0.1 www.config.server.com" >> /etc/hosts -echo "172.18.0.1 www.eureka.server.com" >> /etc/hosts -echo "172.18.0.1 www.eureka.server2.com" >> /etc/hosts -echo "172.18.0.1 www.upms.com" >> /etc/hosts -echo "172.18.0.1 www.cms.com" >> /etc/hosts -echo "172.18.0.1 www.ucenter.com" >> /etc/hosts -echo "172.18.0.1 www.gateway.com" >> /etc/hosts -echo "172.18.0.1 www.mall.com" >> /etc/hosts -echo "172.18.0.1 www.pay.com" >> /etc/hosts +echo "172.17.0.1 www.config.server.com" >> /etc/hosts +echo "172.17.0.1 www.eureka.server.com" >> /etc/hosts +echo "172.17.0.1 www.eureka.server2.com" >> /etc/hosts +echo "172.17.0.1 www.upms.com" >> /etc/hosts +echo "172.17.0.1 www.cms.com" >> /etc/hosts +echo "172.17.0.1 www.ucenter.com" >> /etc/hosts +echo "172.17.0.1 www.gateway.com" >> /etc/hosts +echo "172.17.0.1 www.mall.com" >> /etc/hosts +echo "172.17.0.1 www.pay.com" >> /etc/hosts diff --git a/all/sql/cms.sql b/all/sql/cms.sql index 7162c4f..ef35350 100644 --- a/all/sql/cms.sql +++ b/all/sql/cms.sql @@ -1,6 +1,6 @@ /* - Source Server : 172.18.0.1 - Source Host : localhost:3306 + Source Server : 172.17.0.1 + Source Host : localhost:3317 Source Database : micro Target Server Type : MYSQL diff --git a/all/sql/ucenter.sql b/all/sql/ucenter.sql index 1fde3e6..6e0e6c8 100644 --- a/all/sql/ucenter.sql +++ b/all/sql/ucenter.sql @@ -1,6 +1,6 @@ /* - Source Server : 172.18.0.1 - Source Host : localhost:3306 + Source Server : 172.17.0.1 + Source Host : localhost:3317 Source Database : micro Target Server Type : MYSQL diff --git a/all/sql/upms.sql b/all/sql/upms.sql index b43552d..c265062 100644 --- a/all/sql/upms.sql +++ b/all/sql/upms.sql @@ -1,6 +1,6 @@ /* - Source Server : 172.18.0.1 - Source Host : localhost:3306 + Source Server : 172.17.0.1 + Source Host : localhost:3317 Source Database : micro Target Server Type : MYSQL diff --git a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml index 12c427d..e79d1cc 100644 --- a/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml +++ b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml @@ -2,12 +2,12 @@ spring: session: store-type: none # 暂时不开启session存储 datasource: - url: jdbc:mysql://172.18.0.1:3306/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true + url: jdbc:mysql://172.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true username: root password: studyj2e driver-class-name: com.mysql.jdbc.Driver redis: - host: 172.18.0.1 + host: 172.17.0.1 port: 6379 security: basic: diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java index 333dcf7..620eeb1 100644 --- a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java +++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java @@ -80,14 +80,14 @@ public class DataSourceMasterConfig { //设置能否重置 initParams.put("resetEnable", "false"); //deny优先于allow - initParams.put("allow", "172.18.0.1"); + initParams.put("allow", "172.17.0.1,127.0.0.1"); //initParams.put("deny","213.122.232.233"); if (logger.isInfoEnabled()) { logger.info("micro-fast common druidServletParam使用默认的配置"); logger.info("micro-fast common 添加druidServletParam loginUsername:micro"); logger.info("micro-fast common 添加druidServletParam loginPassword:fast"); logger.info("micro-fast common 添加druidServletParam resetEnable:false"); - logger.info("micro-fast common 添加druidServletParam allow:172.18.0.1"); + logger.info("micro-fast common 添加druidServletParam allow:172.17.0.1"); } } servletRegistrationBean.setInitParameters(initParams); diff --git a/ms/cms/Dockerfile b/ms/cms/Dockerfile index cf155c3..67b0c6c 100644 --- a/ms/cms/Dockerfile +++ b/ms/cms/Dockerfile @@ -5,5 +5,5 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10012 EXPOSE 10013 -CMD ["java","-jar -Dregister.server.ip=172.18.0.1","/workhome/app.jar"] +CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/cms/docker-run-cms.sh b/ms/cms/docker-run-cms.sh index e9d9e1e..aceb250 100755 --- a/ms/cms/docker-run-cms.sh +++ b/ms/cms/docker-run-cms.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d --net ms-net -p 10012:10012 -p 10013:10013 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-cmsV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.18.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 10012:10012 -p 10013:10013 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-cmsV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/ms/cms/src/main/java/com/micro/fast/cms/CmsApplication.java b/ms/cms/src/main/java/com/micro/fast/cms/CmsApplication.java index e3d1dc4..633f184 100644 --- a/ms/cms/src/main/java/com/micro/fast/cms/CmsApplication.java +++ b/ms/cms/src/main/java/com/micro/fast/cms/CmsApplication.java @@ -3,14 +3,10 @@ package com.micro.fast.cms; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.cloud.client.SpringCloudApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.netflix.feign.EnableFeignClients; -import org.springframework.cloud.netflix.feign.FeignClient; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; + @SpringCloudApplication @EnableFeignClients diff --git a/ms/cms/src/main/resources/bootstrap.yml b/ms/cms/src/main/resources/bootstrap.yml index 82232e9..3211f51 100644 --- a/ms/cms/src/main/resources/bootstrap.yml +++ b/ms/cms/src/main/resources/bootstrap.yml @@ -1,7 +1,7 @@ -#自定义参数,用于命令行替换，默认值是172.18.0.1 +#自定义参数,用于命令行替换，默认值是172.17.0.1 register: server: - ip: 172.18.0.1 + ip: 172.17.0.1 # 从配置中心加载文件 spring: cloud: diff --git a/ms/cms/src/main/resources/mybatisGenerator.properties b/ms/cms/src/main/resources/mybatisGenerator.properties index a3c4a5d..8a770a2 100644 --- a/ms/cms/src/main/resources/mybatisGenerator.properties +++ b/ms/cms/src/main/resources/mybatisGenerator.properties @@ -1,5 +1,5 @@ db.driverLocation=/root/mysql-connector-java-5.1.40-bin.jar db.driverClassName=com.mysql.jdbc.Driver -db.url=jdbc:mysql://172.18.0.1:3306/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true +db.url=jdbc:mysql://172.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true db.username=root db.password=studyj2e \ No newline at end of file diff --git a/ms/config-server/Dockerfile b/ms/config-server/Dockerfile index ad879c8..a32eeb9 100644 --- a/ms/config-server/Dockerfile +++ b/ms/config-server/Dockerfile @@ -5,4 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10000 EXPOSE 10001 -CMD ["java","-jar -Dregister.server.ip=172.18.0.1","/workhome/app.jar"] +CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/config-server/docker-run-config-server.sh b/ms/config-server/docker-run-config-server.sh index 86fc3d7..b201f9f 100755 --- a/ms/config-server/docker-run-config-server.sh +++ b/ms/config-server/docker-run-config-server.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d --net ms-net -p 10000:10000 -p 10001:10001 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-config-serverV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.18.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 10000:10000 -p 10001:10001 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-config-serverV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/ms/config-server/src/main/resources/bootstrap.yml b/ms/config-server/src/main/resources/bootstrap.yml index 441130b..8f96b24 100644 --- a/ms/config-server/src/main/resources/bootstrap.yml +++ b/ms/config-server/src/main/resources/bootstrap.yml @@ -1,7 +1,7 @@ -#自定义参数,用于命令行替换，默认值是172.18.0.1 +#自定义参数,用于命令行替换，默认值是172.17.0.1 register: server: - ip: 172.18.0.1 + ip: 172.17.0.1 # 程序实例的配置，git仓库的配置 spring: application: @@ -19,3 +19,5 @@ eureka: defaultZone: http://micro:fast@${register.server.ip}:10002/eureka/,http://micro:fast@${register.server.ip}:10004/eureka/ #配置所有的注册中心 instance: prefer-ip-address: true + ip-address: 172.17.0.1 + diff --git a/ms/gateway/Dockerfile b/ms/gateway/Dockerfile index 8e9142e..68548df 100644 --- a/ms/gateway/Dockerfile +++ b/ms/gateway/Dockerfile @@ -5,4 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10006 EXPOSE 10007 -CMD ["java","-jar -Dregister.server.ip=172.18.0.1","/workhome/app.jar"] +CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/gateway/docker-run-gateway.sh b/ms/gateway/docker-run-gateway.sh index 89c03e5..38c7c40 100755 --- a/ms/gateway/docker-run-gateway.sh +++ b/ms/gateway/docker-run-gateway.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d --net ms-net -p 10006:10006 -p 10007:10007 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-gatewayV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.18.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 10006:10006 -p 10007:10007 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-gatewayV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/ms/gateway/src/main/resources/bootstrap.yml b/ms/gateway/src/main/resources/bootstrap.yml index 23e070f..a6b936f 100644 --- a/ms/gateway/src/main/resources/bootstrap.yml +++ b/ms/gateway/src/main/resources/bootstrap.yml @@ -1,7 +1,7 @@ -#自定义参数,用于命令行替换，默认值是172.18.0.1 +#自定义参数,用于命令行替换，默认值是172.17.0.1 register: server: - ip: 172.18.0.1 + ip: 172.17.0.1 # 从配置中心加载文件 spring: cloud: diff --git a/ms/register-center1/Dockerfile b/ms/register-center1/Dockerfile index 8666249..b01cd69 100644 --- a/ms/register-center1/Dockerfile +++ b/ms/register-center1/Dockerfile @@ -5,4 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10002 EXPOSE 10003 -CMD ["java","-jar -Dregister.server.ip=172.18.0.1 -Dconfig.server.ip=172.18.0.1"," /workhome/app.jar"] +CMD ["java","-jar -Dregister.server.ip=172.17.0.1 -Dconfig.server.ip=172.17.0.1"," /workhome/app.jar"] diff --git a/ms/register-center1/docker-run-register-center1.sh b/ms/register-center1/docker-run-register-center1.sh index ef61feb..6dd80a7 100755 --- a/ms/register-center1/docker-run-register-center1.sh +++ b/ms/register-center1/docker-run-register-center1.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d --net ms-net -p 10002:10002 -p 10003:10003 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center1V0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.18.0.1 -Dconfig.server.ip=172.18.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 10002:10002 -p 10003:10003 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center1V0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 -Dconfig.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/ms/register-center1/src/main/resources/bootstrap.yml b/ms/register-center1/src/main/resources/bootstrap.yml index 42c5412..b88cb43 100644 --- a/ms/register-center1/src/main/resources/bootstrap.yml +++ b/ms/register-center1/src/main/resources/bootstrap.yml @@ -1,10 +1,10 @@ -#自定义参数,用于命令行替换，默认值是172.18.0.1 +#自定义参数,用于命令行替换，默认值是172.17.0.1 register: server: - ip: 172.18.0.1 + ip: 172.17.0.1 config: server: - ip: 172.18.0.1 + ip: 172.17.0.1 #从配置中心加载配置文件,启动eureka-server服务 spring: cloud: diff --git a/ms/register-center2/Dockerfile b/ms/register-center2/Dockerfile index 2768bdd..a598e9d 100644 --- a/ms/register-center2/Dockerfile +++ b/ms/register-center2/Dockerfile @@ -5,4 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10004 EXPOSE 10005 -CMD ["java","-jar -Dregister.server.ip=172.18.0.1 -Dconfig.server.ip=172.18.0.1","/workhome/app.jar"] +CMD ["java","-jar -Dregister.server.ip=172.17.0.1 -Dconfig.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/register-center2/docker-run-register-center2.sh b/ms/register-center2/docker-run-register-center2.sh index c47e9ad..c929824 100755 --- a/ms/register-center2/docker-run-register-center2.sh +++ b/ms/register-center2/docker-run-register-center2.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d --net ms-net -p 10004:10004 -p 10005:10005 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center2V0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.18.0.1 -Dconfig.server.ip=172.18.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 10004:10004 -p 10005:10005 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center2V0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 -Dconfig.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/ms/register-center2/src/main/resources/bootstrap.yml b/ms/register-center2/src/main/resources/bootstrap.yml index 8a11fea..ac4cf63 100644 --- a/ms/register-center2/src/main/resources/bootstrap.yml +++ b/ms/register-center2/src/main/resources/bootstrap.yml @@ -1,10 +1,10 @@ -#自定义参数,用于命令行替换，默认值是172.18.0.1 +#自定义参数,用于命令行替换，默认值是172.17.0.1 register: server: - ip: 172.18.0.1 + ip: 172.17.0.1 config: server: - ip: 172.18.0.1 + ip: 172.17.0.1 spring: cloud: config: diff --git a/ms/ucenter/Dockerfile b/ms/ucenter/Dockerfile index 769d149..4008cc7 100644 --- a/ms/ucenter/Dockerfile +++ b/ms/ucenter/Dockerfile @@ -5,4 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10010 EXPOSE 10011 -CMD ["java","-jar -Dregister.server.ip=172.18.0.1","/workhome/app.jar"] \ No newline at end of file +CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] \ No newline at end of file diff --git a/ms/ucenter/docker-run-ucenter.sh b/ms/ucenter/docker-run-ucenter.sh index 1b82f2f..a51dcd4 100755 --- a/ms/ucenter/docker-run-ucenter.sh +++ b/ms/ucenter/docker-run-ucenter.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d --net ms-net -p 10010:10010 -p 10011:10011 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-ucenterV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.18.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 10010:10010 -p 10011:10011 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-ucenterV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/ms/ucenter/src/main/resources/bootstrap.yml b/ms/ucenter/src/main/resources/bootstrap.yml index eb5c311..4973567 100644 --- a/ms/ucenter/src/main/resources/bootstrap.yml +++ b/ms/ucenter/src/main/resources/bootstrap.yml @@ -1,7 +1,7 @@ -#自定义参数,用于命令行替换，默认值是172.18.0.1 +#自定义参数,用于命令行替换，默认值是172.17.0.1 register: server: - ip: 172.18.0.1 + ip: 172.17.0.1 # 从配置中心加载文件 spring: cloud: diff --git a/ms/ucenter/src/main/resources/mybatisGenerator.properties b/ms/ucenter/src/main/resources/mybatisGenerator.properties index a3c4a5d..8a770a2 100644 --- a/ms/ucenter/src/main/resources/mybatisGenerator.properties +++ b/ms/ucenter/src/main/resources/mybatisGenerator.properties @@ -1,5 +1,5 @@ db.driverLocation=/root/mysql-connector-java-5.1.40-bin.jar db.driverClassName=com.mysql.jdbc.Driver -db.url=jdbc:mysql://172.18.0.1:3306/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true +db.url=jdbc:mysql://172.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true db.username=root db.password=studyj2e \ No newline at end of file diff --git a/ms/upms/Dockerfile b/ms/upms/Dockerfile index 7ff67fb..0c0b8cd 100644 --- a/ms/upms/Dockerfile +++ b/ms/upms/Dockerfile @@ -5,4 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10008 EXPOSE 10009 -CMD ["java","-jar -Dregister.server.ip=172.18.0.1","/workhome/app.jar"] +CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/upms/docker-run-upms.sh b/ms/upms/docker-run-upms.sh index 6de04cc..cd8041f 100755 --- a/ms/upms/docker-run-upms.sh +++ b/ms/upms/docker-run-upms.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker run -d --net ms-net -p 10008:10008 -p 10009:10009 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-upmsV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.18.0.1 /workhome/app.jar \ No newline at end of file +docker run -d -p 10008:10008 -p 10009:10009 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-upmsV0.0.1-SNAPSHOT java -jar -Dregister.server.ip=172.17.0.1 /workhome/app.jar \ No newline at end of file diff --git a/ms/upms/src/main/resources/bootstrap.yml b/ms/upms/src/main/resources/bootstrap.yml index c0c2969..6b3bc42 100644 --- a/ms/upms/src/main/resources/bootstrap.yml +++ b/ms/upms/src/main/resources/bootstrap.yml @@ -1,7 +1,7 @@ -#自定义参数,用于命令行替换，默认值是172.18.0.1 +#自定义参数,用于命令行替换，默认值是172.17.0.1 register: server: - ip: 172.18.0.1 + ip: 172.17.0.1 # 从配置中心加载文件 spring: cloud: diff --git a/ms/upms/src/main/resources/mybatisGenerator.properties b/ms/upms/src/main/resources/mybatisGenerator.properties index a3c4a5d..8a770a2 100644 --- a/ms/upms/src/main/resources/mybatisGenerator.properties +++ b/ms/upms/src/main/resources/mybatisGenerator.properties @@ -1,5 +1,5 @@ db.driverLocation=/root/mysql-connector-java-5.1.40-bin.jar db.driverClassName=com.mysql.jdbc.Driver -db.url=jdbc:mysql://172.18.0.1:3306/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true +db.url=jdbc:mysql://172.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true db.username=root db.password=studyj2e \ No newline at end of file diff --git a/ms/web-system-management/test/e2e/nightwatch.conf.js b/ms/web-system-management/test/e2e/nightwatch.conf.js index 7c7370b..f019c0a 100644 --- a/ms/web-system-management/test/e2e/nightwatch.conf.js +++ b/ms/web-system-management/test/e2e/nightwatch.conf.js @@ -10,7 +10,7 @@ module.exports = { selenium: { start_process: true, server_path: require('selenium-server').path, - host: '172.18.0.1', + host: '127.0.0.1', port: 4444, cli_args: { 'webdriver.chrome.driver': require('chromedriver').path diff --git a/pa/src/main/resources/application-dev.yml b/pa/src/main/resources/application-dev.yml index 44d617d..64afcc5 100644 --- a/pa/src/main/resources/application-dev.yml +++ b/pa/src/main/resources/application-dev.yml @@ -31,7 +31,7 @@ jdbc: master: username: root password: hfAhyoTu3UKAfmy27/RNKQ== - url: jdbc:mysql://172.18.0.1:3306/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true + url: jdbc:mysql://172.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true driverClass: com.mysql.jdbc.Driver mybatis: typeAliasesPackage: com.micro.fast.pa.pojo