Jelajahi Sumber

项目初始化 启动正常

louhr 5 tahun lalu
induk
melakukan
176ea39adc

+ 0 - 6
kernel/pom.xml

@@ -50,12 +50,6 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.mybatis.spring.boot</groupId>
-			<artifactId>mybatis-spring-boot-starter</artifactId>
-			<version>1.3.2</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-logging</artifactId>

+ 4 - 1
kernel/src/main/java/com/lantone/qc/kernel/KernelApplication.java

@@ -2,8 +2,11 @@ package com.lantone.qc.kernel;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@ComponentScan("com.lantone.qc")
 public class KernelApplication {
 
 	public static void main(String[] args) {

+ 0 - 19
kernel/src/main/resources/application.yml

@@ -11,25 +11,6 @@ spring:
       force: true
       charset: UTF-8
       enabled: true
-  datasource:       # mybatis 配置,使用druid数据源
-      url: jdbc:mysql://1.1.1.1:3306/bigdata-web?useUnicode=true&characterEncoding=UTF-8
-      username: root
-      password: diagbot@20180822
-      type: com.alibaba.druid.pool.DruidDataSource
-      driver-class-name: com.mysql.jdbc.Driver
-      filters: stat
-      maxActive: 20
-      initialSize: 1
-      maxWait: 60000
-      minIdle: 1
-      timeBetweenEvictionRunsMillis: 60000
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: select 'x'
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      poolPreparedStatements: true
-      maxOpenPreparedStatements: 20
 
 logging:          # 日志
   config: classpath:logback-spring.xml

+ 0 - 6
public/pom.xml

@@ -28,12 +28,6 @@
             <version>2.8.6</version>
             <!--<scope>provided</scope>-->
         </dependency>
-
-        <dependency>
-            <groupId>com.google.collections</groupId>
-            <artifactId>google-collections</artifactId>
-            <version>1.0</version>
-        </dependency>
     </dependencies>
 
     <build>

+ 5 - 6
public/src/main/java/com/lantone/qc/pub/util/StringUtil.java

@@ -1,6 +1,5 @@
 package com.lantone.qc.pub.util;
 
-import com.google.common.collect.Sets;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
@@ -129,10 +128,10 @@ public class StringUtil {
      * @param target
      * @return
      */
-    public static boolean isSameContent(List<String> source, List<String> target) {
-        Set<String> sourceSet = Sets.newHashSet(source);
-        Set<String> targetSet = Sets.newHashSet(target);
-        return Sets.difference(sourceSet, targetSet).isEmpty() && Sets.difference(targetSet, sourceSet).isEmpty();
-    }
+//    public static boolean isSameContent(List<String> source, List<String> target) {
+//        Set<String> sourceSet = Sets.newHashSet(source);
+//        Set<String> targetSet = Sets.newHashSet(target);
+//        return Sets.difference(sourceSet, targetSet).isEmpty() && Sets.difference(targetSet, sourceSet).isEmpty();
+//    }
 
 }