From 259532c07cfda09f64267d6307e59a85a3c411a0 Mon Sep 17 00:00:00 2001 From: administrator <2316696377@qq.com> Date: Fri, 22 May 2020 12:06:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A9=E9=A1=B9=E7=9B=AE=E8=B7=91=E8=B5=B7?= =?UTF-8?q?=E6=9D=A5=EF=BC=9B=20auth=E6=A8=A1=E5=9D=97=E8=BF=98=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=8A=A0jwt=E5=AE=9E=E7=8E=B0=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=99=BB=E5=BD=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 + .../src/main/resources/application.yml | 6 +- .../src/main/resources/application-dev.yml | 1 + ruoyi-auth/src/main/resources/application.yml | 8 - ruoyi-auth/src/main/resources/bootstrap.yml | 48 +++--- ruoyi-gateway/pom.xml | 148 ++++++++++-------- .../src/main/resources/application-dev.yml | 13 ++ .../src/main/resources/bootstrap.yml | 49 +++--- .../src/main/resources/bootstrap.yml | 48 +++--- 9 files changed, 173 insertions(+), 154 deletions(-) create mode 100644 ruoyi-auth/src/main/resources/application-dev.yml delete mode 100644 ruoyi-auth/src/main/resources/application.yml create mode 100644 ruoyi-gateway/src/main/resources/application-dev.yml diff --git a/pom.xml b/pom.xml index b895b401..b782ec3e 100644 --- a/pom.xml +++ b/pom.xml @@ -208,6 +208,12 @@ druid-spring-boot-starter 1.1.14 + + + org.projectlombok + lombok + 1.18.10 + diff --git a/ruoyi-api/ruoyi-api-system/src/main/resources/application.yml b/ruoyi-api/ruoyi-api-system/src/main/resources/application.yml index ebbee5ff..68245e6b 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/resources/application.yml +++ b/ruoyi-api/ruoyi-api-system/src/main/resources/application.yml @@ -1,5 +1,3 @@ -server: - port: 80 spring: datasource: type: com.alibaba.druid.pool.DruidDataSource @@ -7,6 +5,4 @@ spring: username: root password: root url: jdbc:mysql://localhost:3306/ry-cloud?serverTimezone=Asia/Shanghai - driver-class-name: com.mysql.cj.jdbc.Driver - application: - name: ruoyi-system \ No newline at end of file + driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/ruoyi-auth/src/main/resources/application-dev.yml b/ruoyi-auth/src/main/resources/application-dev.yml new file mode 100644 index 00000000..a3e7b727 --- /dev/null +++ b/ruoyi-auth/src/main/resources/application-dev.yml @@ -0,0 +1 @@ +debug: true \ No newline at end of file diff --git a/ruoyi-auth/src/main/resources/application.yml b/ruoyi-auth/src/main/resources/application.yml deleted file mode 100644 index 68245e6b..00000000 --- a/ruoyi-auth/src/main/resources/application.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - druid: - username: root - password: root - url: jdbc:mysql://localhost:3306/ry-cloud?serverTimezone=Asia/Shanghai - driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index 037cd7a7..c6d470a1 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -1,24 +1,24 @@ -# Tomcat -server: - port: 9200 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-auth - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +# Tomcat +server: + port: 9200 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-auth + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 127.0.0.1:8848 + config: + # 配置中心地址 + server-addr: 127.0.0.1:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index fdd8d39b..add44d95 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -1,69 +1,79 @@ - - - com.ruoyi - ruoyi - 1.0.0 - - 4.0.0 - - ruoyi-gateway - - - ruoyi-gateway网关模块 - - - - - - - org.springframework.cloud - spring-cloud-starter-gateway - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.github.penggle - kaptcha - - - - - com.ruoyi - ruoyi-common-redis - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - io.springfox - springfox-swagger2 - ${swagger.fox.version} - - - - - + + + com.ruoyi + ruoyi + 1.0.0 + + 4.0.0 + + ruoyi-gateway + + + ruoyi-gateway网关模块 + + + + + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.springframework.boot + spring-boot-starter-webflux + + + + + com.github.penggle + kaptcha + + + + + com.ruoyi + ruoyi-common-redis + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + io.springfox + springfox-swagger2 + ${swagger.fox.version} + + + + org.projectlombok + lombok + + + + + diff --git a/ruoyi-gateway/src/main/resources/application-dev.yml b/ruoyi-gateway/src/main/resources/application-dev.yml new file mode 100644 index 00000000..bebe20c1 --- /dev/null +++ b/ruoyi-gateway/src/main/resources/application-dev.yml @@ -0,0 +1,13 @@ +spring: + cloud: + gateway: + routes: + - id: authRoute + uri: lb://ruoyi-auth + order: 10000 + predicates: + - Path=/auth/** + filters: + - StripPrefix=1 + +debug: true \ No newline at end of file diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index a8c53707..7c10e2dc 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -1,24 +1,25 @@ -# Tomcat -server: - port: 8080 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-gateway - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +# Tomcat +server: + port: 8080 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-gateway + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 127.0.0.1:8848 + config: + # 配置中心地址 + server-addr: 127.0.0.1:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index 554d7979..71d1ecb3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -1,24 +1,24 @@ -# Tomcat -server: - port: 9201 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-system - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +# Tomcat +server: + port: 80 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-system + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 127.0.0.1:8848 + config: + # 配置中心地址 + server-addr: 127.0.0.1:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}