⚡ 更新脚本

blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -15,7 +15,7 @@ public interface CommonConstant {
 	/**
 	 * nacos prod 地址
 	 */
-	String NACOS_PROD_ADDR = "192.168.186.129:8848";
+	String NACOS_PROD_ADDR = "192.168.0.157:8848";
 
 	/**
 	 * sentinel dev 地址
@@ -25,7 +25,7 @@ public interface CommonConstant {
 	/**
 	 * sentinel prod 地址
 	 */
-	String SENTINEL_PROD_ADDR = "192.168.186.129:8858";
+	String SENTINEL_PROD_ADDR = "192.168.0.157:8858";
 
 	/**
 	 * sword 系统名

doc/docker/README.md

@@ -4,7 +4,7 @@
 ```
 <servers>
   <server>
-    <id>192.168.186.129</id>
+    <id>192.168.0.157</id>
     <username>admin</username>
     <password>Harbor12345</password>
     <configuration>
@@ -20,7 +20,7 @@
 
 ###2. docker开启远程访问
 
-如果没有远程访问,会报 `Connect to 192.168.186.129:2375 [/192.168.186.129] failed: Connection refused: connect`
+如果没有远程访问,会报 `Connect to 192.168.0.157:2375 [/192.168.0.157] failed: Connection refused: connect`
 
 在`/usr/lib/systemd/system/docker.service`,配置远程访问。主要是在[Service]这个部分，加上下面两个参数：
 

doc/nacos/blade-prod.yaml

@@ -2,7 +2,7 @@
 spring:
   redis:
     ##redis 单机环境配置
-    host: 192.168.186.129
+    host: 192.168.0.157
     port: 3379
     password:
     database: 0
@@ -17,6 +17,6 @@ blade:
   #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
   datasource:
     prod:
-      url: jdbc:mysql://192.168.186.129:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8
+      url: jdbc:mysql://192.168.0.157:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8
       username: root
       password: root

doc/nacos/blade-test.yaml

@@ -2,7 +2,7 @@
 spring:
   redis:
     ##redis 单机环境配置
-    host: 192.168.186.129
+    host: 192.168.0.157
     port: 3379
     password:
     database: 0
@@ -17,6 +17,6 @@ blade:
   #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖)
   datasource:
     test:
-      url: jdbc:mysql://192.168.186.129:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8
+      url: jdbc:mysql://192.168.0.157:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8
       username: root
       password: root

pom.xml

@@ -15,7 +15,7 @@
         <java.version>1.8</java.version>
         <swagger.version>2.9.2</swagger.version>
         <swagger.models.version>1.5.21</swagger.models.version>
-        <swagger.bootstrapui.version>1.9.0</swagger.bootstrapui.version>
+        <swagger.bootstrapui.version>1.9.1</swagger.bootstrapui.version>
         <mybatis.plus.version>3.1.0</mybatis.plus.version>
         <curator.framework.version>4.0.1</curator.framework.version>
         <protostuff.version>1.6.0</protostuff.version>
@@ -27,7 +27,7 @@
         <spring.platform.version>Cairo-SR7</spring.platform.version>
 
         <!-- 推荐使用Harbor -->
-        <docker.registry.url>192.168.186.129</docker.registry.url>
+        <docker.registry.url>192.168.0.157</docker.registry.url>
         <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
         <docker.plugin.version>1.2.0</docker.plugin.version>
     </properties>

script/docker/.env

@@ -1,2 +1,2 @@
-REGISTER=192.168.186.129/blade
+REGISTER=192.168.0.157/blade
 TAG=2.0.0.RC6

script/docker/deploy.sh

@@ -27,7 +27,7 @@ base(){
 		cp /nginx/web/nginx.conf /docker/nginx/web/nginx.conf
 		cp /nginx/web/html /docker/nginx/web/html
 	fi
-	docker-compose up -d nacos prometheus grafana web-nginx blade-nginx blade-redis blade-gateway1 blade-gateway2 blade-gateway3
+	docker-compose up -d nacos prometheus grafana sentinel web-nginx blade-nginx blade-redis blade-gateway1 blade-gateway2 blade-gateway3
 }
 
 #启动程序模块

script/docker/docker-compose.yml

@@ -3,7 +3,7 @@ services:
 
   nacos:
     image: nacos/nacos-server:latest
-    container_name: nacos-standalone
+    container_name: nacos
     environment:
       - PREFER_HOST_MODE=hostname
       - MODE=standalone
@@ -11,14 +11,17 @@ services:
       - ./standalone-logs/:/home/nacos/logs
       - ./init.d/custom.properties:/home/nacos/init.d/custom.properties
     ports:
-      - "8848:8848"
+      - 8848:8848
+    networks:
+      blade_net:
+        ipv4_address: 172.30.0.48
   prometheus:
     container_name: prometheus
     image: prom/prometheus:latest
     volumes:
       - ./prometheus/prometheus-standalone.yaml:/etc/prometheus/prometheus.yml
     ports:
-      - "9090:9090"
+      - 9090:9090
     depends_on:
       - nacos
     restart: on-failure
@@ -29,6 +32,16 @@ services:
       - 3000:3000
     restart: on-failure
 
+  sentinel:
+    container_name: sentinel
+    image: bladex/sentinel-dashboard:1.4.2
+    ports:
+      - 8858:8858
+    restart: on-failure
+    networks:
+      blade_net:
+        ipv4_address: 172.30.0.58
+
   blade-nginx:
     image: nginx:stable-alpine-perl
     hostname: "blade-nginx"
@@ -58,7 +71,7 @@ services:
     image: redis:5.0.2-alpine
     hostname: "blade-redis"
     ports:
-    - "3379:6379"
+    - 3379:6379
     volumes:
     - /docker/redis/data:/data
     command: "redis-server --appendonly yes"