From b925d34442f821cb498fd36238fba4c402f78e77 Mon Sep 17 00:00:00 2001 From: fengyw Date: Sat, 30 Dec 2023 08:39:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=EF=BC=8C=E6=96=B9=E4=BE=BF=E8=AE=B0=E5=BF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOCKER.md | 8 ++++---- docker-compose.yml | 8 ++++---- .../com/roncoo/education/gateway/IndexController.java | 2 +- .../src/main/resources/bootstrap.properties | 2 +- .../src/main/resources/bootstrap.properties | 2 +- .../src/main/resources/bootstrap.properties | 2 +- .../src/main/resources/bootstrap.properties | 2 +- roncoo-job/distribution/conf/application.properties | 6 +++--- roncoo-job/src/main/resources/application.properties | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/DOCKER.md b/DOCKER.md index a4e01fc9..be0a56a1 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -1,10 +1,10 @@ #### 端口设置 | service | port | |----------------------------------|------| -| roncoo-education-gateway | 8180 | -| roncoo-education-system | 8184 | -| roncoo-education-user | 8186 | -| roncoo-education-course | 8188 | +| roncoo-education-gateway | 7700 | +| roncoo-education-system | 7710 | +| roncoo-education-user | 7720 | +| roncoo-education-course | 7730 | ------------------------------------------------------- #### 如何进行docker部署 diff --git a/docker-compose.yml b/docker-compose.yml index 9042dd40..1a74100a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: networks: - education ports: - - "8180:8180" + - "7700:7700" service-system: build: context: ./roncoo-education-service/roncoo-education-service-system @@ -29,7 +29,7 @@ services: networks: - education ports: - - "8184:8184" + - "7710:7710" service-user: build: context: ./roncoo-education-service/roncoo-education-service-user @@ -44,7 +44,7 @@ services: networks: - education ports: - - "8186:8186" + - "7720:7720" service-course: build: context: ./roncoo-education-service/roncoo-education-service-course @@ -59,7 +59,7 @@ services: networks: - education ports: - - "8188:8188" + - "7730:7730" networks: education: driver: host diff --git a/roncoo-education-gateway/src/main/java/com/roncoo/education/gateway/IndexController.java b/roncoo-education-gateway/src/main/java/com/roncoo/education/gateway/IndexController.java index 3e0734ff..56aab866 100644 --- a/roncoo-education-gateway/src/main/java/com/roncoo/education/gateway/IndexController.java +++ b/roncoo-education-gateway/src/main/java/com/roncoo/education/gateway/IndexController.java @@ -13,7 +13,7 @@ public class IndexController { @GetMapping("/") public Mono index() { String html = "
Gateway Run Success

"; - html = html + "
网关地址：http://localhost:8180
"; + html = html + "
网关地址：http://localhost:7700
"; return Mono.just(html); } } diff --git a/roncoo-education-gateway/src/main/resources/bootstrap.properties b/roncoo-education-gateway/src/main/resources/bootstrap.properties index c40b05d1..5e53f65a 100644 --- a/roncoo-education-gateway/src/main/resources/bootstrap.properties +++ b/roncoo-education-gateway/src/main/resources/bootstrap.properties @@ -3,7 +3,7 @@ spring.application.name=gateway # profile spring.profiles.active=dev # server -server.port=8180 +server.port=7700 # nacos spring.cloud.nacos.username=nacos spring.cloud.nacos.password=nacos diff --git a/roncoo-education-service/roncoo-education-service-course/src/main/resources/bootstrap.properties b/roncoo-education-service/roncoo-education-service-course/src/main/resources/bootstrap.properties index 216b25fe..91065bdd 100644 --- a/roncoo-education-service/roncoo-education-service-course/src/main/resources/bootstrap.properties +++ b/roncoo-education-service/roncoo-education-service-course/src/main/resources/bootstrap.properties @@ -5,7 +5,7 @@ spring.main.allow-bean-definition-overriding=true # profile spring.profiles.active=dev # server -server.port=8188 +server.port=7730 # nacos spring.cloud.nacos.username=nacos spring.cloud.nacos.password=nacos diff --git a/roncoo-education-service/roncoo-education-service-system/src/main/resources/bootstrap.properties b/roncoo-education-service/roncoo-education-service-system/src/main/resources/bootstrap.properties index 85926e61..4e5eb95e 100644 --- a/roncoo-education-service/roncoo-education-service-system/src/main/resources/bootstrap.properties +++ b/roncoo-education-service/roncoo-education-service-system/src/main/resources/bootstrap.properties @@ -5,7 +5,7 @@ spring.main.allow-bean-definition-overriding=true # profile spring.profiles.active=dev # server -server.port=8184 +server.port=7710 # nacos spring.cloud.nacos.username=nacos spring.cloud.nacos.password=nacos diff --git a/roncoo-education-service/roncoo-education-service-user/src/main/resources/bootstrap.properties b/roncoo-education-service/roncoo-education-service-user/src/main/resources/bootstrap.properties index 72d056f5..c92374b2 100644 --- a/roncoo-education-service/roncoo-education-service-user/src/main/resources/bootstrap.properties +++ b/roncoo-education-service/roncoo-education-service-user/src/main/resources/bootstrap.properties @@ -5,7 +5,7 @@ spring.main.allow-bean-definition-overriding=true # profile spring.profiles.active=dev # server -server.port=8186 +server.port=7720 # nacos spring.cloud.nacos.username=nacos spring.cloud.nacos.password=nacos diff --git a/roncoo-job/distribution/conf/application.properties b/roncoo-job/distribution/conf/application.properties index bef950ff..8d43b7d8 100644 --- a/roncoo-job/distribution/conf/application.properties +++ b/roncoo-job/distribution/conf/application.properties @@ -1,11 +1,11 @@ ### web -server.port=8181 +server.port=8080 server.servlet.context-path=/job ### xxl-job, datasource -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/education_job?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&autoReconnect=true&useSSL=true +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/os_job?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&autoReconnect=true&useSSL=true spring.datasource.username=root -spring.datasource.password=root +spring.datasource.password=123456 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver ### datasource-pool diff --git a/roncoo-job/src/main/resources/application.properties b/roncoo-job/src/main/resources/application.properties index b39bc99d..e6d233d5 100644 --- a/roncoo-job/src/main/resources/application.properties +++ b/roncoo-job/src/main/resources/application.properties @@ -1,5 +1,5 @@ ### web -server.port=8181 +server.port=8080 server.servlet.context-path=/job ### actuator @@ -23,9 +23,9 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml #mybatis.type-aliases-package=com.xxl.job.admin.core.model ### xxl-job, datasource -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/education_job?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&autoReconnect=true&useSSL=true +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/os_job?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&autoReconnect=true&useSSL=true spring.datasource.username=root -spring.datasource.password=root +spring.datasource.password=123456 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver ### datasource-pool -- GitLab