fix 修复 升级带来的兼容性问题
parent
0c2efd36cf
commit
4bc137d113
|
|
@ -185,7 +185,7 @@ knife4j:
|
||||||
# 是否开启Knife4j增强模式
|
# 是否开启Knife4j增强模式
|
||||||
enable: true
|
enable: true
|
||||||
# 是否开启生产环境保护策略
|
# 是否开启生产环境保护策略
|
||||||
production: true
|
production: false
|
||||||
# 登录认证
|
# 登录认证
|
||||||
basic:
|
basic:
|
||||||
enable: true
|
enable: true
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,3 @@
|
||||||
# dubbo 订阅配置
|
|
||||||
dubbo:
|
|
||||||
cloud:
|
|
||||||
# 需要远程调用的服务 多个用逗号分割
|
|
||||||
subscribed-services: ruoyi-auth,ruoyi-system
|
|
||||||
|
|
||||||
# 安全配置
|
# 安全配置
|
||||||
security:
|
security:
|
||||||
# 验证码
|
# 验证码
|
||||||
|
|
@ -89,5 +83,6 @@ spring:
|
||||||
server-addr: ${spring.cloud.nacos.server-addr}
|
server-addr: ${spring.cloud.nacos.server-addr}
|
||||||
dataId: sentinel-${spring.application.name}
|
dataId: sentinel-${spring.application.name}
|
||||||
groupId: ${spring.cloud.nacos.config.group}
|
groupId: ${spring.cloud.nacos.config.group}
|
||||||
|
namespace: ${spring.profiles.active}
|
||||||
data-type: json
|
data-type: json
|
||||||
rule-type: flow
|
rule-type: flow
|
||||||
|
|
@ -17,12 +17,12 @@ spring:
|
||||||
username: ${datasource.system-master.username}
|
username: ${datasource.system-master.username}
|
||||||
password: ${datasource.system-master.password}
|
password: ${datasource.system-master.password}
|
||||||
# 从库数据源
|
# 从库数据源
|
||||||
slave:
|
#slave:
|
||||||
lazy: true
|
# lazy: true
|
||||||
driver-class-name:
|
# driver-class-name:
|
||||||
url:
|
# url:
|
||||||
username:
|
# username:
|
||||||
password:
|
# password:
|
||||||
|
|
||||||
# 代码生成
|
# 代码生成
|
||||||
gen:
|
gen:
|
||||||
|
|
|
||||||
|
|
@ -63,10 +63,6 @@
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>com.ruoyi</groupId>
|
||||||
<artifactId>ruoyi-common-redis</artifactId>
|
<artifactId>ruoyi-common-redis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>com.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-dubbo</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 自定义负载均衡(多团队开发使用) -->
|
<!-- 自定义负载均衡(多团队开发使用) -->
|
||||||
<!-- <dependency>-->
|
<!-- <dependency>-->
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
package com.ruoyi.gateway;
|
package com.ruoyi.gateway;
|
||||||
|
|
||||||
import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
|
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
||||||
|
|
@ -10,7 +9,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
@EnableDubbo
|
|
||||||
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
|
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
|
||||||
public class RuoYiGatewayApplication {
|
public class RuoYiGatewayApplication {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
|
|
||||||
|
|
@ -87,6 +87,11 @@
|
||||||
<artifactId>ruoyi-common-dubbo</artifactId>
|
<artifactId>ruoyi-common-dubbo</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-common-seata</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,3 @@
|
||||||
server:
|
|
||||||
port: 18000
|
|
||||||
|
|
||||||
# knife4j聚合配置
|
# knife4j聚合配置
|
||||||
knife4j:
|
knife4j:
|
||||||
enableAggregation: true
|
enableAggregation: true
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Tomcat
|
# Tomcat
|
||||||
server:
|
server:
|
||||||
port: 9300
|
port: 18000
|
||||||
|
|
||||||
# Spring
|
# Spring
|
||||||
spring:
|
spring:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue