跟随qmth-boot修改更新

api-demo/pom.xml

@@ -23,7 +23,11 @@
         </dependency>
         <dependency>
             <groupId>com.qmth.boot</groupId>
-            <artifactId>data-mysql-mp</artifactId>
+            <artifactId>data-mybatis-plus</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.qmth.boot</groupId>
+            <artifactId>core-schedule</artifactId>
         </dependency>
         <!--
         <dependency>

api-demo/src/main/java/com/qmth/demo/api/ApiDemoApplication.java

@@ -1,30 +1,35 @@
 package com.qmth.demo.api;
 
-import com.qmth.boot.core.security.service.CustomizeAuthorizationService;
-import com.qmth.demo.api.auth.DemoAuthorizationService;
+import com.qmth.boot.core.cache.service.CustomizeCacheConfiguration;
+import com.qmth.demo.api.service.DemoCacheService;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 
-import javax.annotation.Resource;
+import java.time.Duration;
 
 /**
  * api demo application
  */
 @SpringBootApplication(scanBasePackages = "com.qmth.*")
-@EnableCaching
 @MapperScan("com.qmth.demo.*")
 public class ApiDemoApplication {
 
-    @Resource
-    private DemoAuthorizationService demoAuthorizationService;
+    //    @Resource
+    //    private DemoAuthorizationService demoAuthorizationService;
+
+    //    @Bean
+    //    public CustomizeAuthorizationService customizeAuthorizationService() {
+    //        return registration -> {
+    //            registration.setDefault(demoAuthorizationService);
+    //        };
+    //    }
 
     @Bean
-    public CustomizeAuthorizationService customizeAuthorizationService() {
+    public CustomizeCacheConfiguration customizeCacheConfiguration() {
         return registration -> {
-            registration.setDefault(demoAuthorizationService);
+            registration.setCacheConfig(DemoCacheService.CACHE_NAME, Duration.ofSeconds(60));
         };
     }
 

api-demo/src/main/java/com/qmth/demo/api/auth/DemoAuthorizationService.java

@@ -1,10 +1,10 @@
 package com.qmth.demo.api.auth;
 
+import com.qmth.boot.core.security.annotation.AuthorizationComponent;
 import com.qmth.boot.core.security.service.AuthorizationService;
 import com.qmth.boot.tools.signature.SignatureType;
-import org.springframework.stereotype.Component;
 
-@Component
+@AuthorizationComponent
 public class DemoAuthorizationService implements AuthorizationService<DemoSession> {
 
     @Override

api-demo/src/main/java/com/qmth/demo/api/auth/DemoSession.java

@@ -2,8 +2,6 @@ package com.qmth.demo.api.auth;
 
 import com.qmth.boot.core.security.model.AccessEntity;
 
-import java.util.Collection;
-
 public class DemoSession implements AccessEntity {
 
     private String identity;
@@ -37,13 +35,4 @@ public class DemoSession implements AccessEntity {
         return token;
     }
 
-    @Override
-    public Collection<String> getAllowIP() {
-        return null;
-    }
-
-    @Override
-    public Collection<String> getDenyIP() {
-        return null;
-    }
 }

api-demo/src/main/java/com/qmth/demo/api/controller/AuthController.java

@@ -2,27 +2,17 @@ package com.qmth.demo.api.controller;
 
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
-import com.qmth.boot.api.config.ApiConfig;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.boot.core.security.config.SecurityConfig;
 import com.qmth.demo.api.auth.DemoSession;
 import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/auth")
 @Aac(strict = BOOL.FALSE, auth = BOOL.TRUE)
 public class AuthController {
 
-    @Resource
-    private ApiConfig apiConfig;
-
-    @Resource
-    private SecurityConfig securityConfig;
-
     @RequestMapping("/demo")
     public Object security(@RequestAttribute DemoSession accessEntity) {
         return accessEntity;

api-demo/src/main/java/com/qmth/demo/api/controller/CacheController.java

@@ -4,7 +4,7 @@ import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.core.cache.service.CacheService;
-import com.qmth.demo.api.cache.DemoCacheService;
+import com.qmth.demo.api.service.DemoCacheService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

api-demo/src/main/java/com/qmth/demo/api/controller/IndexController.java

@@ -2,10 +2,10 @@ package com.qmth.demo.api.controller;
 
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
-import com.qmth.boot.api.config.ApiConfig;
+import com.qmth.boot.api.config.ApiProperties;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.core.enums.Platform;
-import com.qmth.boot.core.security.config.SecurityConfig;
+import com.qmth.boot.core.security.config.SecurityProperties;
 import com.qmth.boot.core.uid.service.UidService;
 import org.apache.commons.lang3.RandomUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,13 +20,13 @@ import javax.servlet.http.HttpServletRequest;
 public class IndexController {
 
     @Resource
-    private ApiConfig apiConfig;
+    private ApiProperties apiProperties;
 
     @Resource
     private UidService uidService;
 
     @Resource
-    private SecurityConfig securityConfig;
+    private SecurityProperties securityProperties;
 
     @RequestMapping("/strict")
     @Aac(strict = BOOL.TRUE)
@@ -54,12 +54,12 @@ public class IndexController {
 
     @RequestMapping("/config")
     public Object config() {
-        return apiConfig;
+        return apiProperties;
     }
 
     @RequestMapping("/security")
     public Object security() {
-        return securityConfig;
+        return securityProperties;
     }
 
     @RequestMapping("/uid")

api-demo/src/main/java/com/qmth/demo/api/cache/DemoCacheService.java → api-demo/src/main/java/com/qmth/demo/api/service/DemoCacheService.java

@@ -1,4 +1,4 @@
-package com.qmth.demo.api.cache;
+package com.qmth.demo.api.service;
 
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;

api-demo/src/main/java/com/qmth/demo/api/service/DemoTaskService.java

@@ -0,0 +1,25 @@
+package com.qmth.demo.api.service;
+
+import com.qmth.boot.core.concurrent.annotation.Lockable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DemoTaskService {
+
+    private Logger log = LoggerFactory.getLogger(DemoTaskService.class);
+
+    @Scheduled(fixedDelay = 5000, initialDelay = 1000)
+    @Lockable(name = "fixDelayTask", timeout = 0)
+    public void fixDelayTask() {
+        log.info("fix delay task running");
+    }
+
+    @Scheduled(fixedRate = 1000, initialDelay = 1000)
+    public void fixRateTask() {
+        log.info("fix rate task running");
+    }
+
+}

api-demo/src/main/resources/application.properties

@@ -10,11 +10,11 @@ server.port=8080
 #com.qmth.logging.root-level=info
 #com.qmth.logging.file-path=/Users/luoshi/Downloads/demo.log
 
-com.qmth.mysql.url=jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=UTF-8
-com.qmth.mysql.username=root
-com.qmth.mysql.password=root
-com.qmth.mysql.log-level=debug
+com.qmth.datasource.url=jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=UTF-8
+com.qmth.datasource.username=root
+com.qmth.datasource.password=root
+com.qmth.mybatis.log-level=debug
 
-com.qmth.cache.expire-after-write=30s
+com.qmth.cache.expire-after-write=30m
 
 com.qmth.redis.host=127.0.0.1

pom.xml

@@ -16,7 +16,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <qmth.boot.version>1.0.0</qmth.boot.version>
+        <qmth.boot.version>1.0.1</qmth.boot.version>
     </properties>
 
     <dependencyManagement>
@@ -41,6 +41,11 @@
                 <artifactId>core-concurrent</artifactId>
                 <version>${qmth.boot.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.qmth.boot</groupId>
+                <artifactId>core-schedule</artifactId>
+                <version>${qmth.boot.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.qmth.boot</groupId>
                 <artifactId>data-redis</artifactId>
@@ -48,7 +53,7 @@
             </dependency>
             <dependency>
                 <groupId>com.qmth.boot</groupId>
-                <artifactId>data-mysql-mp</artifactId>
+                <artifactId>data-mybatis-plus</artifactId>
                 <version>${qmth.boot.version}</version>
             </dependency>
             <dependency>