Эх сурвалжийг харах

架构调整:关闭数据库连接和nacos依赖

wanger 8 сар өмнө
parent
commit
c3b54a5f33

+ 3 - 42
onemap-modules/onemap-overlap/pom.xml

@@ -18,29 +18,6 @@
 
 
     <dependencies>
     <dependencies>
 
 
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
 
 
         <!-- Swagger UI -->
         <!-- Swagger UI -->
         <dependency>
         <dependency>
@@ -49,22 +26,10 @@
             <version>${swagger.fox.version}</version>
             <version>${swagger.fox.version}</version>
         </dependency>
         </dependency>
 
 
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- RuoYi Common DataSource -->
-        <dependency>
-            <groupId>com.onemap</groupId>
-            <artifactId>onemap-common-datasource</artifactId>
-        </dependency>
-
-        <!-- RuoYi Common DataScope -->
+        <!-- SpringBoot Actuator -->
         <dependency>
         <dependency>
-            <groupId>com.onemap</groupId>
-            <artifactId>onemap-common-datascope</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
         </dependency>
 
 
         <!-- RuoYi Common Log -->
         <!-- RuoYi Common Log -->
@@ -128,10 +93,6 @@
             <artifactId>zip4j</artifactId>
             <artifactId>zip4j</artifactId>
             <version>1.3.2</version>
             <version>1.3.2</version>
         </dependency>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
 
 
         <!--geotools-->
         <!--geotools-->
         <dependency>
         <dependency>

+ 7 - 2
onemap-modules/onemap-overlap/src/main/java/com/onemap/overlap/OneMapOverlapApplication.java

@@ -1,10 +1,14 @@
 package com.onemap.overlap;
 package com.onemap.overlap;
 
 
+import com.onemap.common.redis.configure.RedisConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import com.onemap.common.security.annotation.EnableCustomConfig;
 import com.onemap.common.security.annotation.EnableCustomConfig;
 import com.onemap.common.security.annotation.EnableRyFeignClients;
 import com.onemap.common.security.annotation.EnableRyFeignClients;
 import com.onemap.common.swagger.annotation.EnableCustomSwagger2;
 import com.onemap.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 
 /**
 /**
@@ -12,11 +16,12 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  *
  *
  * @author siwei
  * @author siwei
  */
  */
-@EnableScheduling
-@EnableCustomConfig
+//@EnableScheduling
+//@EnableCustomConfig
 @EnableCustomSwagger2
 @EnableCustomSwagger2
 @EnableRyFeignClients
 @EnableRyFeignClients
 @SpringBootApplication
 @SpringBootApplication
+@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
 public class OneMapOverlapApplication
 public class OneMapOverlapApplication
 {
 {
     public static void main(String[] args)
     public static void main(String[] args)

+ 27 - 0
onemap-modules/onemap-overlap/src/main/java/com/onemap/overlap/controller/TestController.java

@@ -0,0 +1,27 @@
+package com.onemap.overlap.controller;
+
+import com.onemap.common.core.utils.StringUtils;
+import com.onemap.common.core.web.domain.RequestResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/test")
+public class TestController
+{
+
+    @GetMapping("/test")
+    public RequestResult test(String bsm)
+    {
+        try
+        {
+            return  RequestResult.success("成功");
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            return RequestResult.error("失败", null);
+        }
+    }
+}

+ 13 - 0
onemap-modules/onemap-overlap/src/main/resources/application.yml

@@ -0,0 +1,13 @@
+# spring配置
+spring:
+  redis:
+    host: localhost
+    port: 6379
+    password:
+server:
+  port: 9206
+# swagger配置
+swagger:
+  title: 系统模块接口文档
+  license: Powered By ruoyi
+  licenseUrl: https://ruoyi.vip