diff --git a/config/dev/application.yml b/config/dev/application.yml index 1aa2ef7b..4ee0e861 100644 --- a/config/dev/application.yml +++ b/config/dev/application.yml @@ -185,7 +185,7 @@ knife4j: # 是否开启Knife4j增强模式 enable: true # 是否开启生产环境保护策略 - production: true + production: false # 登录认证 basic: enable: true diff --git a/config/dev/ruoyi-gateway.yml b/config/dev/ruoyi-gateway.yml index 64e507da..b9db8388 100644 --- a/config/dev/ruoyi-gateway.yml +++ b/config/dev/ruoyi-gateway.yml @@ -1,9 +1,3 @@ -# dubbo 订阅配置 -dubbo: - cloud: - # 需要远程调用的服务 多个用逗号分割 - subscribed-services: ruoyi-auth,ruoyi-system - # 安全配置 security: # 验证码 @@ -89,5 +83,6 @@ spring: server-addr: ${spring.cloud.nacos.server-addr} dataId: sentinel-${spring.application.name} groupId: ${spring.cloud.nacos.config.group} + namespace: ${spring.profiles.active} data-type: json - rule-type: flow \ No newline at end of file + rule-type: flow diff --git a/config/dev/ruoyi-gen.yml b/config/dev/ruoyi-gen.yml index eeca6d0e..533ac4c3 100644 --- a/config/dev/ruoyi-gen.yml +++ b/config/dev/ruoyi-gen.yml @@ -17,12 +17,12 @@ spring: username: ${datasource.system-master.username} password: ${datasource.system-master.password} # 从库数据源 - slave: - lazy: true - driver-class-name: - url: - username: - password: + #slave: + # lazy: true + # driver-class-name: + # url: + # username: + # password: # 代码生成 gen: diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index ce1e5520..d3038a01 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -63,10 +63,6 @@ com.ruoyi ruoyi-common-redis - - com.ruoyi - ruoyi-common-dubbo - diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java index 056cea86..a4c33318 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java @@ -1,20 +1,18 @@ -package com.ruoyi.gateway; - -import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; - -/** - * 网关启动程序 - * - * @author ruoyi - */ -@EnableDubbo -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) -public class RuoYiGatewayApplication { - public static void main(String[] args) { - SpringApplication.run(RuoYiGatewayApplication.class, args); - System.out.println("(♥◠‿◠)ノ゙ 若依网关启动成功 ლ(´ڡ`ლ)゙ "); - } -} +package com.ruoyi.gateway; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; + +/** + * 网关启动程序 + * + * @author ruoyi + */ +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +public class RuoYiGatewayApplication { + public static void main(String[] args) { + SpringApplication.run(RuoYiGatewayApplication.class, args); + System.out.println("(♥◠‿◠)ノ゙ 若依网关启动成功 ლ(´ڡ`ლ)゙ "); + } +} diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 05c59674..ab8e33ac 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -87,6 +87,11 @@ ruoyi-common-dubbo + + com.ruoyi + ruoyi-common-seata + + diff --git a/ruoyi-visual/ruoyi-doc/src/main/resources/application.yml b/ruoyi-visual/ruoyi-doc/src/main/resources/application.yml index a54f9101..c084566c 100644 --- a/ruoyi-visual/ruoyi-doc/src/main/resources/application.yml +++ b/ruoyi-visual/ruoyi-doc/src/main/resources/application.yml @@ -1,6 +1,3 @@ -server: - port: 18000 - # knife4j聚合配置 knife4j: enableAggregation: true diff --git a/ruoyi-visual/ruoyi-doc/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-doc/src/main/resources/bootstrap.yml index ce6cdb71..3df0dd4b 100644 --- a/ruoyi-visual/ruoyi-doc/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-doc/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9300 + port: 18000 # Spring spring: