Merge pull request #64 from hengboy/2.3.x

hengboy · web-flow · commit 3aa6aacd5cf7 · 2020-09-02T14:43:44.000+08:00
调整sample适配新版本
diff --git a/api-boot-samples/api-boot-sample-integration/pom.xml b/api-boot-samples/api-boot-sample-integration/pom.xml
@@ -27,7 +27,6 @@
     <modelVersion>4.0.0</modelVersion>
     <properties>
         <java.version>1.8</java.version>
-        <api.boot.version>2.2.2.RELEASE</api.boot.version>
     </properties>
     <artifactId>api-boot-sample-integration</artifactId>
     <description>
@@ -135,12 +134,12 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.2.2.RELEASE</version>
+                <version>${spring-boot.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-mybatis-enhance-maven-codegen</artifactId>
-                <version>2.1.5.RELEASE</version>
+                <version>${api-boot.version}</version>
                 <dependencies>
                     <!--数据驱动依赖-->
                     <dependency>
@@ -175,7 +174,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>${api.boot.version}</version>
+                <version>${api-boot.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/article/mapper/ArticleInfoMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/article/mapper/ArticleInfoMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface ArticleInfoMapper
-     extends EnhanceMapper<ArticleInfoEntity, String> {
+     extends EnhanceMapper<ArticleInfoEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/article/mapper/ArticleTopicInfoMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/article/mapper/ArticleTopicInfoMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface ArticleTopicInfoMapper
-     extends EnhanceMapper<ArticleTopicInfoEntity, String> {
+     extends EnhanceMapper<ArticleTopicInfoEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/article/mapper/ArticleTopicUniMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/article/mapper/ArticleTopicUniMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface ArticleTopicUniMapper
-     extends EnhanceMapper<ArticleTopicUniEntity, Integer> {
+     extends EnhanceMapper<ArticleTopicUniEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/article/service/ArticleInfoService.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/article/service/ArticleInfoService.java
@@ -5,9 +5,6 @@
 import com.gitee.hengboy.mybatis.enhance.sort.SortEnum;
 import com.gitee.hengboy.mybatis.pageable.Page;
 import com.gitee.hengboy.mybatis.pageable.request.PageableRequest;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceField;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceLoad;
-import org.minbox.framework.api.boot.plugin.resource.load.enums.ResourceStoreEvent;
 import org.minbox.framework.knowledge.library.common.base.BaseService;
 import org.minbox.framework.knowledge.library.common.constants.Constant;
 import org.minbox.framework.knowledge.library.common.dsl.DArticleInfoEntity;
@@ -21,6 +18,9 @@
 import org.minbox.framework.knowledge.library.service.comment.service.CommentService;
 import org.minbox.framework.knowledge.library.service.constants.ResourceType;
 import org.minbox.framework.knowledge.library.service.user.service.UserLikeRecordService;
+import org.minbox.framework.resource.annotation.ResourceField;
+import org.minbox.framework.resource.annotation.ResourceLoad;
+import org.minbox.framework.resource.enums.ResourceStoreEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/article/service/ArticleTopicInfoService.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/article/service/ArticleTopicInfoService.java
@@ -1,8 +1,6 @@
 package org.minbox.framework.knowledge.library.service.article.service;
 
 import com.gitee.hengboy.mybatis.enhance.sort.SortEnum;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceField;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceLoad;
 import org.minbox.framework.knowledge.library.common.base.BaseService;
 import org.minbox.framework.knowledge.library.common.constants.Constant;
 import org.minbox.framework.knowledge.library.common.dsl.DArticleTopicInfoEntity;
@@ -11,6 +9,8 @@
 import org.minbox.framework.knowledge.library.common.exception.KnowledgeException;
 import org.minbox.framework.knowledge.library.service.article.dto.ArticleTopicInfoDTO;
 import org.minbox.framework.knowledge.library.service.constants.ResourceType;
+import org.minbox.framework.resource.annotation.ResourceField;
+import org.minbox.framework.resource.annotation.ResourceLoad;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/balance/mapper/UserBalanceInfoMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/balance/mapper/UserBalanceInfoMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface UserBalanceInfoMapper
-     extends EnhanceMapper<UserBalanceInfoEntity, String> {
+     extends EnhanceMapper<UserBalanceInfoEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/balance/mapper/UserBalanceRecordMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/balance/mapper/UserBalanceRecordMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface UserBalanceRecordMapper
-     extends EnhanceMapper<UserBalanceRecordEntity, Integer> {
+     extends EnhanceMapper<UserBalanceRecordEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/balance/mapper/UserBalanceTypeMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/balance/mapper/UserBalanceTypeMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface UserBalanceTypeMapper
-     extends EnhanceMapper<UserBalanceTypeEntity, String> {
+     extends EnhanceMapper<UserBalanceTypeEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/banner/mapper/BannerInfoMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/banner/mapper/BannerInfoMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface BannerInfoMapper
-     extends EnhanceMapper<BannerInfoEntity, Integer> {
+     extends EnhanceMapper<BannerInfoEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/banner/service/BannerInfoService.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/banner/service/BannerInfoService.java
@@ -1,13 +1,13 @@
 package org.minbox.framework.knowledge.library.service.banner.service;
 
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceField;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceLoad;
 import org.minbox.framework.knowledge.library.common.base.BaseService;
 import org.minbox.framework.knowledge.library.common.constants.Constant;
 import org.minbox.framework.knowledge.library.common.dsl.DBannerInfoEntity;
 import org.minbox.framework.knowledge.library.common.exception.KnowledgeException;
 import org.minbox.framework.knowledge.library.service.banner.dto.BannerInfoDTO;
 import org.minbox.framework.knowledge.library.service.constants.ResourceType;
+import org.minbox.framework.resource.annotation.ResourceField;
+import org.minbox.framework.resource.annotation.ResourceLoad;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/comment/mapper/CommentInfoMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/comment/mapper/CommentInfoMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface CommentInfoMapper
-     extends EnhanceMapper<CommentInfoEntity, String> {
+     extends EnhanceMapper<CommentInfoEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/freedback/mapper/FeedbackMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/freedback/mapper/FeedbackMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface FeedbackMapper
-     extends EnhanceMapper<FeedbackEntity, Integer> {
+     extends EnhanceMapper<FeedbackEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/resource/mapper/CommonResourceMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/resource/mapper/CommonResourceMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface CommonResourceMapper
-     extends EnhanceMapper<CommonResourceEntity, Integer> {
+     extends EnhanceMapper<CommonResourceEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/resource/mapper/CommonResourceTypeMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/resource/mapper/CommonResourceTypeMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface CommonResourceTypeMapper
-     extends EnhanceMapper<CommonResourceTypeEntity, String> {
+     extends EnhanceMapper<CommonResourceTypeEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/resource/store/KnowledgeResourceService.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/resource/store/KnowledgeResourceService.java
@@ -1,8 +1,8 @@
 package org.minbox.framework.knowledge.library.service.resource.store;
 
 import org.minbox.framework.api.boot.common.exception.ApiBootException;
-import org.minbox.framework.api.boot.plugin.resource.load.ApiBootResourceStoreDelegate;
 import org.minbox.framework.knowledge.library.service.resource.service.CommonResourceService;
+import org.minbox.framework.resource.ResourceStoreDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,7 +20,7 @@
  * GitHub：https://github.com/hengboy
  */
 @Service
-public class KnowledgeResourceService implements ApiBootResourceStoreDelegate {
+public class KnowledgeResourceService implements ResourceStoreDelegate {
     /**
      * 资源加载
      */
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/security/KnowledgeLibraryUserDelegate.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/security/KnowledgeLibraryUserDelegate.java
@@ -1,8 +1,8 @@
 package org.minbox.framework.knowledge.library.service.security;
 
-import org.minbox.framework.api.boot.plugin.security.delegate.ApiBootStoreDelegate;
 import org.minbox.framework.knowledge.library.common.entity.UserInfoEntity;
 import org.minbox.framework.knowledge.library.service.user.service.UserInfoService;
+import org.minbox.framework.security.delegate.SecurityStoreDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -22,7 +22,7 @@
  * GitHub：https://github.com/hengboy
  */
 @Service
-public class KnowledgeLibraryUserDelegate implements ApiBootStoreDelegate {
+public class KnowledgeLibraryUserDelegate implements SecurityStoreDelegate {
     /**
      * 用户业务逻辑注入
      */
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/user/mapper/UserInfoMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/user/mapper/UserInfoMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface UserInfoMapper
-     extends EnhanceMapper<UserInfoEntity, String> {
+     extends EnhanceMapper<UserInfoEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/user/mapper/UserLikeRecordMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/user/mapper/UserLikeRecordMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface UserLikeRecordMapper
-     extends EnhanceMapper<UserLikeRecordEntity, Integer> {
+     extends EnhanceMapper<UserLikeRecordEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/user/mapper/UserReadRecordMapper.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/user/mapper/UserReadRecordMapper.java
@@ -19,6 +19,6 @@
  * ================================
  */
 public interface UserReadRecordMapper
-     extends EnhanceMapper<UserReadRecordEntity, Integer> {
+     extends EnhanceMapper<UserReadRecordEntity> {
 
 }
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/user/service/UserLikeRecordService.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/user/service/UserLikeRecordService.java
@@ -1,8 +1,6 @@
 package org.minbox.framework.knowledge.library.service.user.service;
 
 import com.gitee.hengboy.mybatis.enhance.sort.SortEnum;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceField;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceLoad;
 import org.minbox.framework.knowledge.library.common.base.BaseService;
 import org.minbox.framework.knowledge.library.common.dsl.DArticleInfoEntity;
 import org.minbox.framework.knowledge.library.common.dsl.DUserLikeRecordEntity;
@@ -11,6 +9,8 @@
 import org.minbox.framework.knowledge.library.service.article.dto.ArticleInfoDTO;
 import org.minbox.framework.knowledge.library.service.constants.ResourceType;
 import org.minbox.framework.knowledge.library.service.user.mapper.UserLikeRecordMapper;
+import org.minbox.framework.resource.annotation.ResourceField;
+import org.minbox.framework.resource.annotation.ResourceLoad;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/user/service/UserReadRecordService.java b/api-boot-samples/api-boot-sample-integration/src/main/java/org/minbox/framework/knowledge/library/service/user/service/UserReadRecordService.java
@@ -1,8 +1,6 @@
 package org.minbox.framework.knowledge.library.service.user.service;
 
 import com.gitee.hengboy.mybatis.enhance.sort.SortEnum;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceField;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceLoad;
 import org.minbox.framework.knowledge.library.common.base.BaseService;
 import org.minbox.framework.knowledge.library.common.dsl.DArticleInfoEntity;
 import org.minbox.framework.knowledge.library.common.dsl.DUserReadRecordEntity;
@@ -12,6 +10,8 @@
 import org.minbox.framework.knowledge.library.service.constants.ResourceType;
 import org.minbox.framework.knowledge.library.service.user.mapper.UserReadRecordMapper;
 import org.minbox.framework.knowledge.library.service.user.struct.UserReadRecordStruct;
+import org.minbox.framework.resource.annotation.ResourceField;
+import org.minbox.framework.resource.annotation.ResourceLoad;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/api-boot-samples/api-boot-sample-mybatis-enhance-codegen/pom.xml b/api-boot-samples/api-boot-sample-mybatis-enhance-codegen/pom.xml
@@ -54,7 +54,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.2.2.RELEASE</version>
+                <version>${api-boot.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -65,12 +65,12 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.1.7.RELEASE</version>
+                <version>${spring-boot.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-mybatis-enhance-maven-codegen</artifactId>
-                <version>2.1.5.RELEASE</version>
+                <version>${api-boot.version}</version>
                 <dependencies>
                     <!--数据驱动依赖-->
                     <dependency>
diff --git a/api-boot-samples/api-boot-sample-mybatis-pageable/pom.xml b/api-boot-samples/api-boot-sample-mybatis-pageable/pom.xml
@@ -62,7 +62,7 @@
                 <artifactId>api-boot-dependencies</artifactId>
                 <scope>import</scope>
                 <type>pom</type>
-                <version>2.2.2.RELEASE</version>
+                <version>${api-boot.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -71,7 +71,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.1.7.RELEASE</version>
+                <version>${spring-boot.version}</version>
             </plugin>
         </plugins>
     </build>
diff --git a/api-boot-samples/api-boot-sample-mybatis-pageable/src/main/java/org/minbox/framework/api/boot/sample/UserMapper.java b/api-boot-samples/api-boot-sample-mybatis-pageable/src/main/java/org/minbox/framework/api/boot/sample/UserMapper.java
@@ -30,5 +30,5 @@
  * Gitee：https://gitee.com/hengboy
  * GitHub：https://github.com/hengboy
  */
-public interface UserMapper extends EnhanceMapper<UserEntity, String> {
+public interface UserMapper extends EnhanceMapper<UserEntity> {
 }
diff --git a/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/resources/application.yml b/api-boot-samples/api-boot-sample-security-oauth-jwt/src/main/resources/application.yml
@@ -8,4 +8,7 @@ spring:
     username: root
     password: 123456
   profiles:
-    active: memory
+    active: memory
+
+server:
+    port: 9091
diff --git a/api-boot-samples/api-boot-sample-swagger/pom.xml b/api-boot-samples/api-boot-sample-swagger/pom.xml
@@ -39,7 +39,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.2.2.RELEASE</version>
+                <version>${api-boot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@`
`19`	`19`	`* ================================`
`20`	`20`	`*/`
`21`	`21`	`public interface ArticleInfoMapper`
`22`		`- extends EnhanceMapper<ArticleInfoEntity, String> {`
	`22`	`+ extends EnhanceMapper<ArticleInfoEntity> {`
`23`	`23`
`24`	`24`	`}`