From 3432ded7171043d49858c09759a3e5cb5b4a57be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92SAKURA=E9=85=B1?= Date: Sat, 24 Nov 2018 17:46:29 +0800 Subject: [PATCH] :wrench: Changing configuration files.use default eureka port and default config server port --- doc/md/modules.md | 6 ++++-- docker-compose.yml | 2 +- pigx-auth/src/main/resources/bootstrap.yml | 2 +- pigx-config/Dockerfile | 2 +- pigx-config/src/main/resources/bootstrap.yml | 4 ++-- pigx-eureka/Dockerfile | 2 +- pigx-eureka/src/main/resources/bootstrap.yml | 2 +- pigx-gateway/src/main/resources/bootstrap.yml | 2 +- pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml | 2 +- pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml | 2 +- pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml | 2 +- pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml | 2 +- pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml | 2 +- .../pigx-sso-client-demo/src/main/resources/bootstrap.yml | 2 +- .../pigx-tx-manager/src/main/resources/bootstrap.yml | 2 +- 15 files changed, 19 insertions(+), 17 deletions(-) diff --git a/doc/md/modules.md b/doc/md/modules.md index d0df7dae0..f6383a648 100644 --- a/doc/md/modules.md +++ b/doc/md/modules.md @@ -5,13 +5,14 @@ pigx ├── pigx-auth -- 授权服务提供[3000] ├── pigx-common -- 系统公共模块 ├ ├── pigx-common-core -- 公共工具类核心包 +├ ├── pigx-common-cache -- 缓存 ├ ├── pigx-common-job -- 定时任务 ├ ├── pigx-common-log -- 日志服务 ├ └── pigx-common-security -- 安全工具类 ├ └── pigx-common-swagger -- Swagger Api文档生成 ├ └── pigx-common-transaction -- 分布式事务工具包 -├── pigx-config -- 配置中心[4001] -├── pigx-eureka -- 服务注册与发现[1025] +├── pigx-config -- 配置中心[8888] +├── pigx-eureka -- 服务注册与发现[8761] ├── pigx-gateway -- Spring Cloud Gateway网关[9999] ├── pigx-upms -- 通用用户权限管理模块 ├ └── pigx-upms-api -- 通用用户权限管理系统公共api模块 @@ -21,5 +22,6 @@ pigx ├ ├── pigx-daemon -- 分布式调度中心[5002] ├ └── pigx-code-gen -- 图形化代码生成[5003] ├ └── pigx-tx-manager -- pigx分布式事务解决方案[5004] +├ └── pigx-activiti -- 工作流模块[5005] ``` diff --git a/docker-compose.yml b/docker-compose.yml index ea432c59b..9a5745ccc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: dockerfile: ./pigx-eureka/Dockerfile restart: always ports: - - 1025:1025 + - 8761:8761 pigx-config: build: diff --git a/pigx-auth/src/main/resources/bootstrap.yml b/pigx-auth/src/main/resources/bootstrap.yml index d1ad7b973..d3e1e4ffd 100644 --- a/pigx-auth/src/main/resources/bootstrap.yml +++ b/pigx-auth/src/main/resources/bootstrap.yml @@ -20,4 +20,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-config/Dockerfile b/pigx-config/Dockerfile index fead92d09..59cffdb98 100644 --- a/pigx-config/Dockerfile +++ b/pigx-config/Dockerfile @@ -6,7 +6,7 @@ RUN mkdir -p /pigx/bin/com.pig4cloud/pigx-config WORKDIR /pigx/bin/com.pig4cloud/pigx-config -EXPOSE 4001 +EXPOSE 8888 ADD ./pigx-config/target/pigx-config.jar ./ diff --git a/pigx-config/src/main/resources/bootstrap.yml b/pigx-config/src/main/resources/bootstrap.yml index 66b989783..02a8af2c5 100644 --- a/pigx-config/src/main/resources/bootstrap.yml +++ b/pigx-config/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: 4001 + port: 8888 spring: application: @@ -19,7 +19,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ # 暴露监控端点 management: diff --git a/pigx-eureka/Dockerfile b/pigx-eureka/Dockerfile index e05fb249b..5d75a4129 100644 --- a/pigx-eureka/Dockerfile +++ b/pigx-eureka/Dockerfile @@ -6,7 +6,7 @@ RUN mkdir -p /pigx/bin/com.pig4cloud/pigx-eureka WORKDIR /pigx/bin/com.pig4cloud/pigx-eureka -EXPOSE 1025 +EXPOSE 8761 ADD ./pigx-eureka/target/pigx-eureka.jar ./ diff --git a/pigx-eureka/src/main/resources/bootstrap.yml b/pigx-eureka/src/main/resources/bootstrap.yml index 582202b2a..a7a7b60bd 100644 --- a/pigx-eureka/src/main/resources/bootstrap.yml +++ b/pigx-eureka/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: 1025 + port: 8761 spring: security: diff --git a/pigx-gateway/src/main/resources/bootstrap.yml b/pigx-gateway/src/main/resources/bootstrap.yml index a3191ee0d..af561c083 100644 --- a/pigx-gateway/src/main/resources/bootstrap.yml +++ b/pigx-gateway/src/main/resources/bootstrap.yml @@ -22,6 +22,6 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml index de3c57d38..d9752c7ba 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml @@ -25,4 +25,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml index 059f6bdc9..881d420d0 100644 --- a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml @@ -22,5 +22,5 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@lengleng:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml index 7455228c7..4f9b128a8 100644 --- a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml @@ -20,4 +20,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml index 7e03bd6dd..57012f4a4 100644 --- a/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml @@ -20,4 +20,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml index 938fd81d1..293c48e9e 100644 --- a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml @@ -20,7 +20,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ turbine: app-config: pigx-upms,pigx-auth cluster-name-expression: new String("default") diff --git a/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml b/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml index 44ffe7402..b604fa388 100644 --- a/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-sso-client-demo/src/main/resources/bootstrap.yml @@ -24,4 +24,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/ diff --git a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml index 1bea72f6b..763d12f9c 100644 --- a/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-tx-manager/src/main/resources/bootstrap.yml @@ -20,5 +20,5 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:8761/eureka/