update

angel/docker/standalone/middleware/docker-compose.yml

@@ -126,22 +126,22 @@ services:
 
 
   #微服务-配置中心
-  # msconfig:
-    # image: lianshufeng/springboot:jdk17
-    # ports:
-      # - "8080:8080"
-    # volumes:
-      # - "./config:/opt/jar/"
-    # working_dir: /opt/jar
-    # container_name: msconfig
-    # restart: always
-    # environment:
-      # - UpdateResources=${ResourcesUrl}/resources/app/Config-1.0.0-SNAPSHOT.jar
-    # command: nohup java -Dfile.encoding=UTF-8 -Xmx300m -Xms200m -Duser.timezone=GMT+8 -Dspring.profiles.active=dev -jar Config-1.0.0-SNAPSHOT.jar
-    # depends_on:
-      # - consul_node
-    # networks:
-      # - ms_net      
+  msconfig:
+    image: lianshufeng/springboot:jdk17
+    ports:
+      - "8080:8080"
+    volumes:
+      - "./config:/opt/jar/"
+    working_dir: /opt/jar
+    container_name: msconfig
+    restart: always
+    environment:
+      - UpdateResources=${ResourcesUrl}/resources/app/Config-1.0.0-SNAPSHOT.jar
+    command: nohup java -Dfile.encoding=UTF-8 -Xmx300m -Xms200m -Duser.timezone=GMT+8 -Dspring.profiles.active=dev -jar Config-1.0.0-SNAPSHOT.jar
+    depends_on:
+      - consul_node
+    networks:
+      - ms_net
       
       
 

angel/docker/standalone/middleware/setup.sh

@@ -1,11 +1,19 @@
 #!/bin/bash
 
 
-#  (consul)
-mkdir -p ./data/consul
-chmod -R 777 ./data/consul
+# 创建子网
+docker network create --subnet=10.172.0.0/16 --gateway=10.172.0.1 ms_net
 
+# mongodb
+sh mongo/tools/dos2unix.sh
 
 
-# restart
-docker-compose down ; docker-compose up -d
+# 重启
+docker-compose down && docker-compose up -d
+
+
+echo -----------
+echo mongo 提示
+echo 初始化mongo集群: docker exec -it mongo-shard1-1 bash /opt/mongo/cmd/setup.sh
+echo 客户端连接: docker exec -it mongo-shard1-1 bash /opt/mongo/cmd/client.sh
+echo -----------

components/ApplicationClient/src/main/java/com/github/microservice/app/helper/ConsulHelper.java

@@ -100,6 +100,11 @@ public class ConsulHelper {
         String hosts = consulProperties.getHost();
         Assert.hasText(hosts, "注册不能为空");
         if (hosts.indexOf(",") == -1) {
+            String host = consulProperties.getHost();
+            if (host.indexOf(":") > -1) {
+                String[] items = host.split(":");
+                return HostItem.builder().host(items[0]).port(Integer.parseInt(items[1])).build();
+            }
             return HostItem.builder().host(hosts).build();
         }
         final Set<HostItem> hostItems = hostItems(consulProperties);