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

版本升级

Browse Source
This commit is contained in:
lsy
2017-12-18 22:34:31 +08:00
parent 6e381307e7
commit 5109267e95
18 changed files with 42 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
all-in-one/src/main/resources/application-dev.yml
+1 -1
View File
@@ -31,7 +31,7 @@ jdbc:
master:
username: root
password: hfAhyoTu3UKAfmy27/RNKQ==
url: jdbc:mysql://127.0.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true
url: jdbc:mysql://www.microfast.com:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=true
driverClass: com.mysql.jdbc.Driver
mybatis:
typeAliasesPackage: com.lishouyu.pojo
all/envBuildBash/echo-hosts.sh
+9 -9
View File
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
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
echo "192.168.100.26 www.config.com" >> /etc/hosts
echo "192.168.100.26 www.register1.com" >> /etc/hosts
echo "192.168.100.26 www.register2.com" >> /etc/hosts
echo "192.168.100.26 www.upms.com" >> /etc/hosts
echo "192.168.100.26 www.cms.com" >> /etc/hosts
echo "192.168.100.26 www.ucenter.com" >> /etc/hosts
echo "192.168.100.26 www.gateway.com" >> /etc/hosts
echo "192.168.100.26 www.mall.com" >> /etc/hosts
echo "192.168.100.26 www.pay.com" >> /etc/hosts
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://127.0.0.1:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false
url: jdbc:mysql://www.microfast.com:3317/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false
username: root
password: studyj2e
driver-class-name: com.mysql.jdbc.Driver
redis:
host: 127.0.0.1
host: www.microfast.com
port: 6379
#security:
# basic:
boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class DataSourceMasterConfig {
//设置能否重置
initParams.put("resetEnable", "false");
//deny优先于allow
initParams.put("allow", "127.0.0.1,172.17.0.1");
initParams.put("allow", "127.0.0.1,172.17.0.1,www.microfast.com");
//initParams.put("deny","213.122.232.233");
if (logger.isInfoEnabled()) {
logger.info("micro-fast common druidServletParam使用默认的配置");
ms/cms/pom.xml
+1 -1
View File
@@ -35,7 +35,7 @@
<!--服务提供以及调用负载均衡-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
ms/cms/src/main/resources/bootstrap.yml
+2 -7
View File
@@ -1,7 +1,3 @@
#自定义参数,用于命令行替换，默认值是127.0.0.1
register:
server:
ip: 127.0.0.1
# 从配置中心加载文件
spring:
cloud:
@@ -17,7 +13,6 @@ spring:
eureka:
client:
serviceUrl:
defaultZone: http://micro:fast@${register.server.ip}:10002/eureka/,http://micro:fast@${register.server.ip}:10004/eureka/ #配置所有的注册中心
defaultZone: http://micro:fast@www.microfast.com:10002/eureka/,http://micro:fast@www.microfast.com:10004/eureka/ #配置所有的注册中心
instance:
prefer-ip-address: true
ip-address: 127.0.0.1
hostname: www.microfast.com
ms/config-server/pom.xml
+1 -1
View File
@@ -35,7 +35,7 @@
<!--服务提供以及调用负载均衡-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
<!--安全-->
<dependency>
ms/config-server/src/main/resources/bootstrap.yml
+3 -7
View File
@@ -1,7 +1,3 @@
#自定义参数,用于命令行替换，默认值是127.0.0.1
register:
server:
ip: 127.0.0.1
# 程序实例的配置，git仓库的配置
spring:
application:
@@ -16,8 +12,8 @@ spring:
eureka:
client:
service-url:
defaultZone: http://micro:fast@${register.server.ip}:10002/eureka/,http://micro:fast@${register.server.ip}:10004/eureka/ #配置所有的注册中心
defaultZone: http://micro:fast@www.microfast.com:10002/eureka/,http://micro:fast@www.microfast.com:10004/eureka/ #配置所有的注册中心
instance:
prefer-ip-address: true
ip-address: 127.0.0.1
hostname: www.microfast.com
appname: config-server
ms/gateway/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<!--服务提供以及调用负载均衡-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
ms/gateway/src/main/resources/bootstrap.yml
+3 -7
View File
@@ -1,7 +1,3 @@
#自定义参数,用于命令行替换，默认值是127.0.0.1
register:
server:
ip: 127.0.0.1
# 从配置中心加载文件
spring:
cloud:
@@ -17,7 +13,7 @@ spring:
eureka:
client:
serviceUrl:
defaultZone: http://micro:fast@${register.server.ip}:10002/eureka/,http://micro:fast@${register.server.ip}:10004/eureka/ #配置所有的注册中心
defaultZone: http://micro:fast@www.microfast.com:10002/eureka/,http://micro:fast@www.microfast.com:10004/eureka/ #配置所有的注册中心
instance:
prefer-ip-address: true
ip-address: 127.0.0.1
hostname: www.microfast.com
ms/register-center1/pom.xml
+5 -1
View File
@@ -22,9 +22,13 @@
<artifactId>spring-cloud-starter-config</artifactId>
</dependency>
<!--注册中心-->
<!--<dependency>-->
<!--<groupId>org.springframework.cloud</groupId>-->
<!--<artifactId>spring-cloud-starter-eureka-server</artifactId>-->
<!--</dependency>-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka-server</artifactId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
<!--web-->
<dependency>
ms/register-center1/src/main/resources/bootstrap.yml
+3 -11
View File
@@ -1,22 +1,14 @@
#自定义参数,用于命令行替换，默认值是127.0.0.1
register:
server:
ip: 127.0.0.1
config:
server:
ip: 127.0.0.1
#从配置中心加载配置文件,启动eureka-server服务
spring:
cloud:
config:
uri: http://config:server@${config.server.ip}:10000/
uri: http://config:server@www.microfast.com:10000/
profile: dev
label: master
name: eureka-server
eureka:
client:
service-url:
defaultZone: http://micro:fast@${register.server.ip}:10004/eureka #和其他注册中心连接
defaultZone: http://micro:fast@www.microfast.com:10004/eureka #和其他注册中心连接
instance:
prefer-ip-address: true
ip-address: 127.0.0.1
hostname: www.microfast.com
ms/register-center2/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<!--注册中心-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka-server</artifactId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
<!--web-->
<dependency>
ms/register-center2/src/main/resources/bootstrap.yml
+3 -11
View File
@@ -1,21 +1,13 @@
#自定义参数,用于命令行替换，默认值是127.0.0.1
register:
server:
ip: 127.0.0.1
config:
server:
ip: 127.0.0.1
spring:
cloud:
config:
name: eureka-server2
profile: dev
label: master
uri: http://config:server@${config.server.ip}:10000/
uri: http://config:server@www.microfast.com:10000/
eureka:
client:
service-url:
defaultZone: http://micro:fast@${register.server.ip}:10002/eureka #和其他注册中心连接
defaultZone: http://micro:fast@www.microfast.com:10002/eureka #和其他注册中心连接
instance:
prefer-ip-address: true
ip-address: 127.0.0.1
hostname: www.microfast.com
ms/ucenter/pom.xml
+1 -1
View File
@@ -45,7 +45,7 @@
<!--服务提供以及调用负载均衡-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
ms/ucenter/src/main/resources/bootstrap.yml
+2 -7
View File
@@ -1,7 +1,3 @@
#自定义参数,用于命令行替换，默认值是127.0.0.1
register:
server:
ip: 127.0.0.1
# 从配置中心加载文件
spring:
cloud:
@@ -17,7 +13,6 @@ spring:
eureka:
client:
serviceUrl:
defaultZone: http://micro:fast@${register.server.ip}:10002/eureka/,http://micro:fast@${register.server.ip}:10004/eureka/ #配置所有的注册中心
defaultZone: http://micro:fast@www.microfast.com:10002/eureka/,http://micro:fast@www.microfast.com:10004/eureka/ #配置所有的注册中心
instance:
prefer-ip-address: true
ip-address: 127.0.0.1
hostname: www.microfast.com
ms/upms/pom.xml
+1 -1
View File
@@ -40,7 +40,7 @@
<!--服务提供以及调用负载均衡-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
ms/upms/src/main/resources/bootstrap.yml
+2 -7
View File
@@ -1,7 +1,3 @@
#自定义参数,用于命令行替换，默认值是127.0.0.1
register:
server:
ip: 127.0.0.1
# 从配置中心加载文件
spring:
cloud:
@@ -17,7 +13,6 @@ spring:
eureka:
client:
serviceUrl:
defaultZone: http://micro:fast@${register.server.ip}:10002/eureka/,http://micro:fast@${register.server.ip}:10004/eureka/ #配置所有的注册中心
defaultZone: http://micro:fast@www.microfast.com:10002/eureka/,http://micro:fast@www.microfast.com:10004/eureka/ #配置所有的注册中心
instance:
prefer-ip-address: true
ip-address: 127.0.0.1
hostname: www.microfast.com