瀏覽代碼

抽离 db-utils

by su 3 年之前
父節點
當前提交
1cd9b3d2b1

+ 0 - 4
4dkankan-center-modeling/pom.xml

@@ -85,10 +85,6 @@
 			<artifactId>mysql-connector-java</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>druid</artifactId>
-		</dependency>
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>

+ 7 - 1
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/ModelingApplication.java

@@ -9,7 +9,13 @@ import org.springframework.context.annotation.ComponentScan;
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients("com.fdkankan.*.api.feign")
-@ComponentScan(basePackages = {"com.fdkankan.common", "com.fdkankan.modeling","com.fdkankan.oss","com.fdkankan.redis","com.fdkankan.mq"})
+@ComponentScan(basePackages = {
+		"com.fdkankan.common",
+		"com.fdkankan.modeling",
+		"com.fdkankan.oss",
+		"com.fdkankan.redis",
+		"com.fdkankan.mq",
+		"com.fdkankan.db"})
 public class ModelingApplication {
 
 	public static void main(String[] args) {

+ 4 - 0
4dkankan-center-modeling/src/main/resources/bootstrap.yml

@@ -12,6 +12,10 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
           - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true

+ 6 - 0
4dkankan-center-platform/pom.xml

@@ -78,6 +78,12 @@
           <version>2.0.0</version>
       </dependency>
 
+      <dependency>
+          <groupId>com.fdkankan</groupId>
+          <artifactId>4dkankan-utils-db</artifactId>
+          <version>2.0.0</version>
+      </dependency>
+
   </dependencies>
 
     <build>

+ 5 - 6
4dkankan-center-platform/src/main/resources/bootstrap.yml

@@ -12,6 +12,10 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
           - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true
@@ -33,9 +37,4 @@ spring:
             refresh: true
       discovery:
         server-addr: 192.168.0.47:8848
-        namespace: 4dkankan-dev
-
-
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志
+        namespace: 4dkankan-dev

+ 6 - 0
4dkankan-center-scene/pom.xml

@@ -45,6 +45,12 @@
             <version>2.0.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-db</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+
 <!--        <dependency>-->
 <!--            <groupId>com.alibaba.cloud</groupId>-->
 <!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->

+ 7 - 31
4dkankan-center-scene/src/main/java/com/fdkankan/scene/SceneApplication.java

@@ -12,40 +12,16 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableFeignClients("com.fdkankan.*.api.feign")
 @EnableDiscoveryClient
 @EnableScheduling
-@ComponentScan(basePackages = {"com.fdkankan.common", "com.fdkankan.scene","com.fdkankan.redis","com.fdkankan.mq"})
+@ComponentScan(basePackages = {
+        "com.fdkankan.common",
+        "com.fdkankan.scene",
+        "com.fdkankan.redis",
+        "com.fdkankan.mq",
+        "com.fdkankan.db",
+})
 @MapperScan("com.fdkankan.**.mapper")
 public class SceneApplication {
-
     public static void main(String[] args) {
         SpringApplication.run(SceneApplication.class, args);
     }
-
-    /**
-     * 注入全局异常处理器
-     */
-//    @Bean
-//    public GlobalExceptionHandler globalExceptionHandler(){
-//        return new GlobalExceptionHandler();
-//    }
-//
-//    @Bean
-//    public RedisUtil redisUtil(){
-//        return new RedisUtil();
-//    }
-//
-//    @Bean
-//    public FileRouteConfig fileRouteConfig(){
-//        return new FileRouteConfig();
-//    }
-//
-////    @Bean
-////    public PlatformClient platformClient(){
-////        return  new PlatformClient();
-////    }
-//
-//    @Bean
-//    public UploadToOssUtil uploadToOssUtil(){
-//        return new UploadToOssUtil();
-//    }
-
 }

+ 30 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/TestController.java

@@ -2,6 +2,7 @@ package com.fdkankan.scene.controller;
 
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ConstantFilePath;
@@ -15,6 +16,7 @@ import com.fdkankan.platform.api.feign.PlatformClient;
 import com.fdkankan.platform.api.vo.Camera;
 import com.fdkankan.platform.api.vo.User;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.scene.service.IFolderService;
 import com.fdkankan.scene.service.ISceneService;
 import com.fdkankan.scene.vo.SceneVO;
 import com.google.common.collect.Lists;
@@ -30,7 +32,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.sql.DataSource;
 import java.io.File;
+import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.*;
 
 @RefreshScope
@@ -44,6 +49,15 @@ public class TestController {
     @Autowired
     RedisUtil redisUtil;
 
+    @Autowired
+    IFolderService folderService;
+
+    @GetMapping("/testdb")
+    public List testdb(){
+        return folderService.list();
+    }
+
+
     @GetMapping("/test")
     public String test() throws Exception {
 
@@ -197,4 +211,20 @@ public class TestController {
 
     }
 
+    @Autowired
+    DataSource dataSource;
+
+    @GetMapping("/testDatasource")
+    public void testDatasource() throws SQLException {
+        Connection connection = dataSource.getConnection();
+        System.out.println(connection);
+
+        DruidDataSource druidDataSource = (DruidDataSource) dataSource;
+        System.out.println("druidDataSource 数据源最大连接数:" + druidDataSource.getMaxActive());
+        System.out.println("druidDataSource 数据源初始化连接数:" + druidDataSource.getInitialSize());
+
+        connection.close();
+
+    }
+
 }

+ 19 - 0
4dkankan-center-scene/src/main/resources/bootstrap.yml

@@ -1,4 +1,19 @@
 spring:
+  druid:
+    initialSize: 5 #初始化连接大小
+    minIdle: 5     #最小连接池数量
+    maxActive: 20  #最大连接池数量
+    maxWait: 60000 #获取连接时最大等待时间,单位毫秒
+    timeBetweenEvictionRunsMillis: 60000 #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+    minEvictableIdleTimeMillis: 300000   #配置一个连接在池中最小生存的时间,单位是毫秒
+    validationQuery: SELECT 1 from DUAL  #测试连接
+    testWhileIdle: true                  #申请连接的时候检测,建议配置为true,不影响性能,并且保证安全性
+    testOnBorrow: false                  #获取连接时执行检测,建议关闭,影响性能
+    testOnReturn: false                  #归还连接时执行检测,建议关闭,影响性能
+    poolPreparedStatements: false       #是否开启PSCache,PSCache对支持游标的数据库性能提升巨大,oracle建议开启,mysql下建议关闭
+    maxPoolPreparedStatementPerConnectionSize: 20 #开启poolPreparedStatements后生效
+    filters: stat,wall,slf4j   #配置扩展插件,常用的插件有=>stat:监控统计  slf4j:日志  wall:防御sql注入
+    connectionProperties: 'druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000'
   application:
     name: 4dkankan-center-scene
   cloud:
@@ -12,6 +27,10 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
           - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true

+ 5 - 5
4dkankan-common/pom.xml

@@ -109,11 +109,11 @@
 <!--        </dependency>-->
 
 
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.4.3.4</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-boot-starter</artifactId>-->
+<!--            <version>3.4.3.4</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>joda-time</groupId>

+ 0 - 5
4dkankan-pom/pom.xml

@@ -109,11 +109,6 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.alibaba/druid -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.plugin</groupId>

+ 0 - 7
pom.xml

@@ -48,7 +48,6 @@
         <fastjson-version>1.2.79</fastjson-version>
         <servlet-api-version>2.4</servlet-api-version>
         <spring.boot-mybatis-version>1.3.2</spring.boot-mybatis-version>
-        <druid-version>1.1.17</druid-version>
         <spring.plugin.metadata-version>1.2.0.RELEASE</spring.plugin.metadata-version>
         <jwt-version>3.10.3</jwt-version>
         <ant-version>1.8.2</ant-version>
@@ -112,12 +111,6 @@
             </dependency>
 
             <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>druid</artifactId>
-                <version>${druid-version}</version>
-            </dependency>
-
-            <dependency>
                 <groupId>org.springframework.plugin</groupId>
                 <artifactId>spring-plugin-metadata</artifactId>
                 <version>${spring.plugin.metadata-version}</version>