Merge pull request #9 from liy-cn/dev

解决扫描不到包的问题，以及数据库连接问题
liy-cn · Oct 31, 2021 · ad784a4 · ad784a4
2 parents 598f160 + 79a8db4
commit ad784a4
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 35 deletions.
diff --git a/...-offline-task-service/src/main/java/org/storm/commons/offlinetask/job/OfflineTaskJob.java b/...-offline-task-service/src/main/java/org/storm/commons/offlinetask/job/OfflineTaskJob.java
@@ -23,7 +23,7 @@ public void doScan() {
         long start=System.currentTimeMillis();
         offlineTaskScanService.scanTask();
         long end =System.currentTimeMillis();
-        log.info("OfflineTaskJob end. time:{}ms",end-start);
+        log.info("OfflineTaskJob end. time:{}ms\n",end-start);
 
     }
 }
diff --git a/common-offline-task-web/pom.xml b/common-offline-task-web/pom.xml
@@ -21,6 +21,12 @@
             <artifactId>common-offline-task-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.storm.commons</groupId>
+            <artifactId>common-offline-task-service</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/...web/src/main/java/org/storm/commons/commonofflinetaskweb/controllers/DemoControllers.java b/...web/src/main/java/org/storm/commons/commonofflinetaskweb/controllers/DemoControllers.java
diff --git a/...kweb/CommonOfflineTaskWebApplication.java → ...task/CommonOfflineTaskWebApplication.java b/...kweb/CommonOfflineTaskWebApplication.java → ...task/CommonOfflineTaskWebApplication.java
@@ -1,4 +1,4 @@
-package org.storm.commons.commonofflinetaskweb;
+package org.storm.commons.offlinetask;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...monofflinetaskweb/ServletInitializer.java → ...mmons/offlinetask/ServletInitializer.java b/...monofflinetaskweb/ServletInitializer.java → ...mmons/offlinetask/ServletInitializer.java
@@ -1,4 +1,4 @@
-package org.storm.commons.commonofflinetaskweb;
+package org.storm.commons.offlinetask;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;

diff --git a/...ine-task-web/src/main/java/org/storm/commons/offlinetask/controllers/DemoControllers.java b/...ine-task-web/src/main/java/org/storm/commons/offlinetask/controllers/DemoControllers.java
@@ -0,0 +1,48 @@
+package org.storm.commons.offlinetask.controllers;
+
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.storm.commons.offlinetask.MyApi;
+import org.storm.commons.offlinetask.api.OfflineTaskManageApi;
+import org.storm.commons.offlinetask.api.OfflineTaskScanApi;
+import org.storm.commons.offlinetask.domain.OfflineTaskDTO;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/demo")
+@Slf4j
+public class DemoControllers {
+
+    @Autowired
+    private MyApi myApi;
+
+    @Autowired
+    private OfflineTaskManageApi offlineTaskManageApi;
+
+    @Autowired
+    private OfflineTaskScanApi offlineTaskScanApi;
+
+    /**
+     * http://localhost:8080/demo/getMyApiName
+     * @return myApiImpl
+     */
+    @GetMapping("/getMyApiName")
+    String getMyApiName() {
+        String myApiName = myApi.getName();
+        log.info(myApiName);
+        if(offlineTaskManageApi != null){
+            OfflineTaskDTO offlineTaskDTO = offlineTaskManageApi.selectById(1L);
+            log.info("offlineTaskDTO:{}", JSON.toJSONString(offlineTaskDTO));
+        }
+        if(offlineTaskScanApi != null){
+            log.info("offlineTaskDTO:{}", JSON.toJSONString(offlineTaskScanApi));
+        }
+
+        return myApiName;
+    }
+}
diff --git a/...fflinetaskweb/service/impl/MyApiImpl.java → ...s/offlinetask/service/impl/MyApiImpl.java b/...fflinetaskweb/service/impl/MyApiImpl.java → ...s/offlinetask/service/impl/MyApiImpl.java
@@ -1,4 +1,4 @@
-package org.storm.commons.commonofflinetaskweb.service.impl;
+package org.storm.commons.offlinetask.service.impl;
 
 import org.springframework.stereotype.Service;
 import org.storm.commons.offlinetask.MyApi;

diff --git a/common-offline-task-web/src/main/resources/application.properties b/common-offline-task-web/src/main/resources/application.properties
@@ -2,7 +2,7 @@ server.port=8080
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost:3306/myDB?characterEncoding=UTF-8&useSSL=false
-spring.datasource.username=liy
+spring.datasource.username=liyue
 spring.datasource.password=123456
 
 spring.aop.proxy-target-class=true

diff --git a/...CommonOfflineTaskWebApplicationTests.java → ...CommonOfflineTaskWebApplicationTests.java b/...CommonOfflineTaskWebApplicationTests.java → ...CommonOfflineTaskWebApplicationTests.java
@@ -1,4 +1,4 @@
-package org.storm.commons.commonofflinetaskweb;
+package org.storm.commons.offlinetask;
 
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Assertions;
@@ -7,7 +7,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.storm.commons.offlinetask.MyApi;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest