Kaynağa Gözat

fix 修复 升级带来的兼容性问题

疯狂的狮子li 4 yıl önce
ebeveyn
işleme
4bc137d113

+ 1 - 1
config/dev/application.yml

@@ -185,7 +185,7 @@ knife4j:
   # 是否开启Knife4j增强模式
   enable: true
   # 是否开启生产环境保护策略
-  production: true
+  production: false
   # 登录认证
   basic:
     enable: true

+ 2 - 7
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
+            rule-type: flow

+ 6 - 6
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:

+ 0 - 4
ruoyi-gateway/pom.xml

@@ -63,10 +63,6 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common-redis</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-dubbo</artifactId>
-        </dependency>
 
         <!-- 自定义负载均衡(多团队开发使用) -->
 <!--        <dependency>-->

+ 18 - 20
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("(♥◠‿◠)ノ゙  若依网关启动成功   ლ(´ڡ`ლ)゙  ");
+    }
+}

+ 5 - 0
ruoyi-modules/ruoyi-gen/pom.xml

@@ -87,6 +87,11 @@
             <artifactId>ruoyi-common-dubbo</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common-seata</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

+ 0 - 3
ruoyi-visual/ruoyi-doc/src/main/resources/application.yml

@@ -1,6 +1,3 @@
-server:
-  port: 18000
-
 # knife4j聚合配置
 knife4j:
   enableAggregation: true

+ 1 - 1
ruoyi-visual/ruoyi-doc/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9300
+  port: 18000
 
 # Spring
 spring: