Alawn/micro-fast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改ip

Browse Source
This commit is contained in:
lsy
2017-11-23 15:43:01 +08:00
parent d15cfe54fd
commit dcb5f495a2
34 changed files with 58 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
all/docker/mysql/docker-run-mysql.sh
+1 -1
View File
@@ -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
docker run --name mysql-master -d -p 3317:3306 -v /opt/mysql-master:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=studyj2e mysql:5.7
all/envBuildBash/echo-hosts.sh
+9 -10
View File
@@ -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
all/sql/cms.sql
+2 -2
View File
@@ -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
all/sql/ucenter.sql
+2 -2
View File
@@ -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
all/sql/upms.sql
+2 -2
View File
@@ -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
boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml
+2 -2
View File
@@ -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:
boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java
+2 -2
View File
@@ -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);
ms/cms/Dockerfile
+1 -1
View File
@@ -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"]
ms/cms/docker-run-cms.sh
+1 -1
View File
@@ -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
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
ms/cms/src/main/java/com/micro/fast/cms/CmsApplication.java
+1 -5
View File
@@ -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
ms/cms/src/main/resources/bootstrap.yml
+2 -2
View File
@@ -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:
ms/cms/src/main/resources/mybatisGenerator.properties
+1 -1
View File
@@ -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
ms/config-server/Dockerfile
+1 -1
View File
@@ -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"]
ms/config-server/docker-run-config-server.sh
+1 -1
View File
@@ -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
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
ms/config-server/src/main/resources/bootstrap.yml
+4 -2
View File
@@ -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
ms/gateway/Dockerfile
+1 -1
View File
@@ -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"]
ms/gateway/docker-run-gateway.sh
+1 -1
View File
@@ -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
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
ms/gateway/src/main/resources/bootstrap.yml
+2 -2
View File
@@ -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:
ms/register-center1/Dockerfile
+1 -1
View File
@@ -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"]
ms/register-center1/docker-run-register-center1.sh
+1 -1
View File
@@ -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
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
ms/register-center1/src/main/resources/bootstrap.yml
+3 -3
View File
@@ -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:
ms/register-center2/Dockerfile
+1 -1
View File
@@ -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"]
ms/register-center2/docker-run-register-center2.sh
+1 -1
View File
@@ -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
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
ms/register-center2/src/main/resources/bootstrap.yml
+3 -3
View File
@@ -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:
ms/ucenter/Dockerfile
+1 -1
View File
@@ -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"]
CMD ["java","-jar -Dregister.server.ip=172.17.0.1","/workhome/app.jar"]
ms/ucenter/docker-run-ucenter.sh
+1 -1
View File
@@ -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
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
ms/ucenter/src/main/resources/bootstrap.yml
+2 -2
View File
@@ -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:
ms/ucenter/src/main/resources/mybatisGenerator.properties
+1 -1
View File
@@ -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
ms/upms/Dockerfile
+1 -1
View File
@@ -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"]
ms/upms/docker-run-upms.sh
+1 -1
View File
@@ -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
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
ms/upms/src/main/resources/bootstrap.yml
+2 -2
View File
@@ -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:
ms/upms/src/main/resources/mybatisGenerator.properties
+1 -1
View File
@@ -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
ms/web-system-management/test/e2e/nightwatch.conf.js
+1 -1
View File
@@ -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
pa/src/main/resources/application-dev.yml
+1 -1
View File
@@ -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