diff --git a/all-in-one/src/main/resources/application-dev.yml b/all-in-one/src/main/resources/application-dev.yml index ca8d1d2..c50a6ba 100644 --- a/all-in-one/src/main/resources/application-dev.yml +++ b/all-in-one/src/main/resources/application-dev.yml @@ -31,7 +31,7 @@ jdbc: master: username: root password: hfAhyoTu3UKAfmy27/RNKQ== - url: jdbc:mysql://172.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true + url: jdbc:mysql://127.0.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true driverClass: com.mysql.jdbc.Driver mybatis: typeAliasesPackage: com.lishouyu.pojo diff --git a/all/envBuildBash/echo-hosts.sh b/all/envBuildBash/echo-hosts.sh index f5004e0..fd85380 100644 --- a/all/envBuildBash/echo-hosts.sh +++ b/all/envBuildBash/echo-hosts.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash -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 +echo "127.0.0.1 www.config.server.com" >> /etc/hosts +echo "127.0.0.1 www.eureka.server.com" >> /etc/hosts +echo "127.0.0.1 www.eureka.server2.com" >> /etc/hosts +echo "127.0.0.1 www.upms.com" >> /etc/hosts +echo "127.0.0.1 www.cms.com" >> /etc/hosts +echo "127.0.0.1 www.ucenter.com" >> /etc/hosts +echo "127.0.0.1 www.gateway.com" >> /etc/hosts +echo "127.0.0.1 www.mall.com" >> /etc/hosts +echo "127.0.0.1 www.pay.com" >> /etc/hosts diff --git a/all/sql/cms.sql b/all/sql/cms.sql index ef35350..09a5b56 100644 --- a/all/sql/cms.sql +++ b/all/sql/cms.sql @@ -1,5 +1,5 @@ /* - Source Server : 172.17.0.1 + Source Server : 127.0.0.1 Source Host : localhost:3317 Source Database : micro diff --git a/all/sql/ucenter.sql b/all/sql/ucenter.sql index 6e0e6c8..d3496d5 100644 --- a/all/sql/ucenter.sql +++ b/all/sql/ucenter.sql @@ -1,5 +1,5 @@ /* - Source Server : 172.17.0.1 + Source Server : 127.0.0.1 Source Host : localhost:3317 Source Database : micro diff --git a/all/sql/upms.sql b/all/sql/upms.sql index c265062..9dbe23a 100644 --- a/all/sql/upms.sql +++ b/all/sql/upms.sql @@ -1,5 +1,5 @@ /* - Source Server : 172.17.0.1 + Source Server : 127.0.0.1 Source Host : localhost:3317 Source Database : micro diff --git a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/mybatisStart.properties b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/mybatisStart.properties index 9a513c7..a1b9b5f 100644 --- a/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/mybatisStart.properties +++ b/boot-starter/boot-starter-maven-plugin/mybatis-generator-extend-maven-plugin/src/main/resources/mybatisStart.properties @@ -1,7 +1,7 @@ -#mybatisGeneratorExtend 所需要的必要的配置文件 +#mybatisGeneratorExtend \u6240\u9700\u8981\u7684\u5FC5\u8981\u7684\u914D\u7F6E\u6587\u4EF6 db.driverLocation=/root/mysql-connector-java-5.1.40-bin.jar db.driverClassName=com.mysql.jdbc.Driver -db.url=jdbc:mysql://172.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false +db.url=jdbc:mysql://127.0.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false db.username=root db.password=studyj2e mybatisGenerator.pojoPackage=pojoPackage 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 bc98658..19115f8 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.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false + url: jdbc:mysql://127.0.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false username: root password: studyj2e driver-class-name: com.mysql.jdbc.Driver redis: - host: 172.17.0.1 + host: 127.0.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 620eeb1..6b24829 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.17.0.1,127.0.0.1"); + initParams.put("allow", "127.0.0.1,172.17.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.17.0.1"); + logger.info("micro-fast common 添加druidServletParam allow:127.0.0.1"); } } servletRegistrationBean.setInitParameters(initParams); diff --git a/ms/cms/Dockerfile b/ms/cms/Dockerfile index 67b0c6c..40d26a1 100644 --- a/ms/cms/Dockerfile +++ b/ms/cms/Dockerfile @@ -5,5 +5,4 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10012 EXPOSE 10013 -CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/cms/src/main/resources/bootstrap.yml b/ms/cms/src/main/resources/bootstrap.yml index d984f1a..112e77a 100644 --- a/ms/cms/src/main/resources/bootstrap.yml +++ b/ms/cms/src/main/resources/bootstrap.yml @@ -1,7 +1,7 @@ -#自定义参数,用于命令行替换，默认值是172.17.0.1 +#自定义参数,用于命令行替换，默认值是127.0.0.1 register: server: - ip: 172.17.0.1 + ip: 127.0.0.1 # 从配置中心加载文件 spring: cloud: @@ -20,4 +20,4 @@ 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 \ No newline at end of file + ip-address: 127.0.0.1 \ No newline at end of file diff --git a/ms/cms/src/main/resources/mybatisGenerator.properties b/ms/cms/src/main/resources/mybatisGenerator.properties index b6818cf..634f3b9 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.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false +db.url=jdbc:mysql://127.0.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false 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 a32eeb9..638cb7d 100644 --- a/ms/config-server/Dockerfile +++ b/ms/config-server/Dockerfile @@ -5,4 +5,3 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10000 EXPOSE 10001 -CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/config-server/src/main/resources/bootstrap.yml b/ms/config-server/src/main/resources/bootstrap.yml index 8f96b24..db6aaee 100644 --- a/ms/config-server/src/main/resources/bootstrap.yml +++ b/ms/config-server/src/main/resources/bootstrap.yml @@ -1,7 +1,7 @@ -#自定义参数,用于命令行替换，默认值是172.17.0.1 +#自定义参数,用于命令行替换，默认值是127.0.0.1 register: server: - ip: 172.17.0.1 + ip: 127.0.0.1 # 程序实例的配置，git仓库的配置 spring: application: @@ -19,5 +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 + ip-address: 127.0.0.1 diff --git a/ms/gateway/Dockerfile b/ms/gateway/Dockerfile index 68548df..0378b51 100644 --- a/ms/gateway/Dockerfile +++ b/ms/gateway/Dockerfile @@ -5,4 +5,3 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10006 EXPOSE 10007 -CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/gateway/src/main/resources/bootstrap.yml b/ms/gateway/src/main/resources/bootstrap.yml index e147f9e..cb90ed8 100644 --- a/ms/gateway/src/main/resources/bootstrap.yml +++ b/ms/gateway/src/main/resources/bootstrap.yml @@ -1,7 +1,7 @@ -#自定义参数,用于命令行替换，默认值是172.17.0.1 +#自定义参数,用于命令行替换，默认值是127.0.0.1 register: server: - ip: 172.17.0.1 + ip: 127.0.0.1 # 从配置中心加载文件 spring: cloud: @@ -20,4 +20,4 @@ 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 + ip-address: 127.0.0.1 diff --git a/ms/register-center1/Dockerfile b/ms/register-center1/Dockerfile index b01cd69..b0002f6 100644 --- a/ms/register-center1/Dockerfile +++ b/ms/register-center1/Dockerfile @@ -5,4 +5,3 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10002 EXPOSE 10003 -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/src/main/resources/bootstrap.yml b/ms/register-center1/src/main/resources/bootstrap.yml index 3b28e42..92a7d24 100644 --- a/ms/register-center1/src/main/resources/bootstrap.yml +++ b/ms/register-center1/src/main/resources/bootstrap.yml @@ -1,10 +1,10 @@ -#自定义参数,用于命令行替换，默认值是172.17.0.1 +#自定义参数,用于命令行替换，默认值是127.0.0.1 register: server: - ip: 172.17.0.1 + ip: 127.0.0.1 config: server: - ip: 172.17.0.1 + ip: 127.0.0.1 #从配置中心加载配置文件,启动eureka-server服务 spring: cloud: @@ -19,4 +19,4 @@ eureka: defaultZone: http://micro:fast@${register.server.ip}:10004/eureka #和其他注册中心连接 instance: prefer-ip-address: true - ip-address: 172.17.0.1 \ No newline at end of file + ip-address: 127.0.0.1 \ No newline at end of file diff --git a/ms/register-center2/Dockerfile b/ms/register-center2/Dockerfile index a598e9d..ff9e7af 100644 --- a/ms/register-center2/Dockerfile +++ b/ms/register-center2/Dockerfile @@ -5,4 +5,3 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10004 EXPOSE 10005 -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/src/main/resources/bootstrap.yml b/ms/register-center2/src/main/resources/bootstrap.yml index d02ccef..86db6ab 100644 --- a/ms/register-center2/src/main/resources/bootstrap.yml +++ b/ms/register-center2/src/main/resources/bootstrap.yml @@ -1,10 +1,10 @@ -#自定义参数,用于命令行替换，默认值是172.17.0.1 +#自定义参数,用于命令行替换，默认值是127.0.0.1 register: server: - ip: 172.17.0.1 + ip: 127.0.0.1 config: server: - ip: 172.17.0.1 + ip: 127.0.0.1 spring: cloud: config: @@ -18,4 +18,4 @@ eureka: defaultZone: http://micro:fast@${register.server.ip}:10002/eureka #和其他注册中心连接 instance: prefer-ip-address: true - ip-address: 172.17.0.1 \ No newline at end of file + ip-address: 127.0.0.1 \ No newline at end of file diff --git a/ms/ucenter/Dockerfile b/ms/ucenter/Dockerfile index 4008cc7..e61122d 100644 --- a/ms/ucenter/Dockerfile +++ b/ms/ucenter/Dockerfile @@ -5,4 +5,3 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10010 EXPOSE 10011 -CMD ["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 e0b0305..b756fc4 100644 --- a/ms/ucenter/src/main/resources/bootstrap.yml +++ b/ms/ucenter/src/main/resources/bootstrap.yml @@ -1,7 +1,7 @@ -#自定义参数,用于命令行替换，默认值是172.17.0.1 +#自定义参数,用于命令行替换，默认值是127.0.0.1 register: server: - ip: 172.17.0.1 + ip: 127.0.0.1 # 从配置中心加载文件 spring: cloud: @@ -20,4 +20,4 @@ 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 \ No newline at end of file + ip-address: 127.0.0.1 \ No newline at end of file diff --git a/ms/ucenter/src/main/resources/mybatisGenerator.properties b/ms/ucenter/src/main/resources/mybatisGenerator.properties index b6818cf..634f3b9 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.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false +db.url=jdbc:mysql://127.0.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false db.username=root db.password=studyj2e \ No newline at end of file diff --git a/ms/upms/Dockerfile b/ms/upms/Dockerfile index 0c0b8cd..14a383e 100644 --- a/ms/upms/Dockerfile +++ b/ms/upms/Dockerfile @@ -5,4 +5,3 @@ ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10008 EXPOSE 10009 -CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"] diff --git a/ms/upms/src/main/resources/bootstrap.yml b/ms/upms/src/main/resources/bootstrap.yml index 848f35f..2cf28c5 100644 --- a/ms/upms/src/main/resources/bootstrap.yml +++ b/ms/upms/src/main/resources/bootstrap.yml @@ -1,7 +1,7 @@ -#自定义参数,用于命令行替换，默认值是172.17.0.1 +#自定义参数,用于命令行替换，默认值是127.0.0.1 register: server: - ip: 172.17.0.1 + ip: 127.0.0.1 # 从配置中心加载文件 spring: cloud: @@ -20,4 +20,4 @@ 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 \ No newline at end of file + ip-address: 127.0.0.1 \ No newline at end of file diff --git a/ms/upms/src/main/resources/generatorConfig.xml b/ms/upms/src/main/resources/generatorConfig.xml index bc53172..1deea27 100644 --- a/ms/upms/src/main/resources/generatorConfig.xml +++ b/ms/upms/src/main/resources/generatorConfig.xml @@ -25,7 +25,7 @@ diff --git a/ms/upms/src/main/resources/mybatisGenerator.properties b/ms/upms/src/main/resources/mybatisGenerator.properties index 93e5c90..4c629d3 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.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false +db.url=jdbc:mysql://127.0.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false db.username=root db.password=studyj2e \ No newline at end of file diff --git a/ms/upms/src/main/resources/mybatisStart.properties b/ms/upms/src/main/resources/mybatisStart.properties index fa40400..3b5e884 100644 --- a/ms/upms/src/main/resources/mybatisStart.properties +++ b/ms/upms/src/main/resources/mybatisStart.properties @@ -1,7 +1,7 @@ -#mybatisGeneratorExtend配置文件 +#mybatisGeneratorExtend\u914D\u7F6E\u6587\u4EF6 db.driverLocation=/root/mysql-connector-java-5.1.40-bin.jar db.driverClassName=com.mysql.jdbc.Driver -db.url=jdbc:mysql://172.17.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false +db.url=jdbc:mysql://127.0.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false db.username=root db.password=studyj2e mybatisGenerator.pojoPackage=com.micro.fast.upms.pojo