测试

lmxdawn · lmxdawn · commit f6bcda56dddc · 2018-11-05T18:57:12.000+08:00
diff --git a/dao/pom.xml b/dao/pom.xml
@@ -39,4 +39,14 @@
 
     </dependencies>
 
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/dao/src/main/resources/application.properties b/dao/src/main/resources/application.properties
@@ -2,29 +2,3 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 mybatis.config-location=classpath:mybatis/mybatis-config.xml
 mybatis.mapper-locations=classpath:mybatis/mapper/*.xml
-
-
-#连接池的配置信息
-## 初始化大小，最小，最大
-spring.datasource.initialSize=5
-spring.datasource.minIdle=5
-spring.datasource.maxActive=20
-## 配置获取连接等待超时的时间
-spring.datasource.maxWait=60000
-# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-spring.datasource.timeBetweenEvictionRunsMillis=60000
-# 配置一个连接在池中最小生存的时间，单位是毫秒
-spring.datasource.minEvictableIdleTimeMillis=300000
-spring.datasource.validationQuery=SELECT 1 FROM DUAL
-spring.datasource.testWhileIdle=true
-spring.datasource.testOnBorrow=false
-spring.datasource.testOnReturn=false
-# 打开PSCache，并且指定每个连接上PSCache的大小
-spring.datasource.poolPreparedStatements=true
-spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
-# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-spring.datasource.filters=stat,wall,log4j
-# 通过connectProperties属性来打开mergeSql功能；慢SQL记录
-spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-# 合并多个DruidDataSource的监控数据
-#spring.datasource.useGlobalDataSourceStat=true
diff --git a/dao/src/test/java/com/lmxdawn/admin/dao/AuthAdminDaoTest.java b/dao/src/test/java/com/lmxdawn/admin/dao/AuthAdminDaoTest.java
@@ -4,19 +4,24 @@
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 import static org.junit.Assert.*;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
+@SpringBootConfiguration
+@MapperScan("com.lmxdawn.admin.dao")
 public class AuthAdminDaoTest {
     
-    @Autowired
+    @Resource
     private AuthAdminDao authAdminDao;
     
     @Test
diff --git a/service/src/main/java/com/lmxdawn/admin/service/AuthAdminService.java b/service/src/main/java/com/lmxdawn/admin/service/AuthAdminService.java
@@ -0,0 +1,12 @@
+package com.lmxdawn.admin.service;
+
+
+import com.lmxdawn.admin.entity.AuthAdmin;
+
+import java.util.List;
+
+public interface AuthAdminService {
+
+    List<AuthAdmin> queryList();
+
+}
diff --git a/service/src/main/java/com/lmxdawn/admin/service/impl/AuthAdminServiceImpl.java b/service/src/main/java/com/lmxdawn/admin/service/impl/AuthAdminServiceImpl.java
@@ -0,0 +1,15 @@
+package com.lmxdawn.admin.service.impl;
+
+import com.lmxdawn.admin.entity.AuthAdmin;
+import com.lmxdawn.admin.service.AuthAdminService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AuthAdminServiceImpl implements AuthAdminService {
+    @Override
+    public List<AuthAdmin> queryList() {
+        return null;
+    }
+}
diff --git a/web/pom.xml b/web/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>com.lmxdawn</groupId>
-            <artifactId>dao</artifactId>
+            <artifactId>service</artifactId>
             <version>${parent.version}</version>
         </dependency>
     </dependencies>
diff --git a/web/src/main/java/com/lmxdawn/admin/AdminApplication.java b/web/src/main/java/com/lmxdawn/admin/AdminApplication.java
@@ -1,11 +1,13 @@
 package com.lmxdawn.admin;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 
 @SpringBootApplication
 @ServletComponentScan
+@MapperScan("com.lmxdawn.admin.dao")
 public class AdminApplication {
 
     public static void main(String[] args) {
diff --git a/web/src/main/java/com/lmxdawn/admin/controller/HelloController.java b/web/src/main/java/com/lmxdawn/admin/controller/HelloController.java
@@ -0,0 +1,25 @@
+package com.lmxdawn.admin.controller;
+
+import com.lmxdawn.admin.entity.AuthAdmin;
+import com.lmxdawn.admin.service.AuthAdminService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+public class HelloController {
+
+    @Autowired
+    private AuthAdminService authAdminService;
+
+    @GetMapping("/hello")
+    public List<AuthAdmin> hello() {
+        List<AuthAdmin> authAdminList = authAdminService.queryList();
+//        System.out.println(authAdminList.size());
+       // log.log(authAdminList.size());
+        return authAdminList;
+    }
+
+}
diff --git a/web/src/main/resources/application.properties b/web/src/main/resources/application.properties
@@ -1,3 +1,5 @@
-spring.datasource.url=jdbc:mysql://localhost/vue-admin
+server.port=9998
+spring.datasource.url=jdbc:mysql://localhost/vue-admin?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=root
+
