Merge pull request #18 from guoshiqiufeng/dev

1.6.3
guoshiqiufeng · Jan 19, 2022 · 0b4d35c · 0b4d35c
2 parents 155ff9f + 9bbb486
commit 0b4d35c
Show file tree

Hide file tree

Showing 63 changed files with 93 additions and 132 deletions.
diff --git a/kernel-all-spring-boot-starter/pom.xml b/kernel-all-spring-boot-starter/pom.xml
@@ -20,12 +20,12 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>kernel-all-spring-boot-starter</artifactId>
-    <version>1.6.2</version>
+    <version>1.6.3</version>
     <description>spring-boot 依赖引用</description>
     <inceptionYear>2021-Now</inceptionYear>
     <packaging>pom</packaging>
@@ -49,18 +49,22 @@
         <dependency>
             <groupId>com.gitee.fubluesky.kernel</groupId>
             <artifactId>security-spring-boot-starter</artifactId>
+            <version>${kernel.version}</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.fubluesky.kernel</groupId>
             <artifactId>auth-spring-boot-starter</artifactId>
+            <version>${kernel.version}</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.fubluesky.kernel</groupId>
             <artifactId>file-all-spring-boot-starter</artifactId>
+            <version>${kernel.version}</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.fubluesky.kernel</groupId>
             <artifactId>file-expand-apk</artifactId>
+            <version>${kernel.version}</version>
         </dependency>
         <dependency>
             <groupId>com.gitee.fubluesky.kernel</groupId>

diff --git a/kernel-auth/auth-api/pom.xml b/kernel-auth/auth-api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-auth</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...h/auth-api/src/main/java/com/gitee/fubluesky/kernel/auth/api/constants/AuthConstants.java b/...h/auth-api/src/main/java/com/gitee/fubluesky/kernel/auth/api/constants/AuthConstants.java
@@ -33,6 +33,11 @@ public interface AuthConstants {
 	 */
 	String EXCEPTION_STEP_CODE = "11";
 
+	/**
+	 * token header 默认参数名
+	 */
+	String DEFAULT_TOKEN_HEADER_NAME = "Authorization";
+
 	/**
 	 * 缓存前缀
 	 */

diff --git a/kernel-auth/auth-sdk/pom.xml b/kernel-auth/auth-sdk/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-auth</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-auth/auth-sdk/src/main/java/com/gitee/fubluesky/kernel/auth/LoginImpl.java b/kernel-auth/auth-sdk/src/main/java/com/gitee/fubluesky/kernel/auth/LoginImpl.java
@@ -19,6 +19,7 @@
 
 import com.gitee.fubluesky.kernel.auth.api.LoginApi;
 import com.gitee.fubluesky.kernel.auth.api.UserServiceApi;
+import com.gitee.fubluesky.kernel.auth.api.constants.AuthConstants;
 import com.gitee.fubluesky.kernel.auth.api.exception.AuthException;
 import com.gitee.fubluesky.kernel.auth.api.exception.enums.AuthExceptionEnum;
 import com.gitee.fubluesky.kernel.auth.api.pojo.AuthProperties;
@@ -85,6 +86,13 @@ public String getToken() {
 				}
 			}
 		}
+
+		token = request.getHeader(AuthConstants.DEFAULT_TOKEN_HEADER_NAME);
+		if (StringUtils.isNotBlank(token)) {
+			token = token.replace(authProperties.getTokenPrefix(), "");
+			return token;
+		}
+
 		return null;
 	}
 

diff --git a/kernel-auth/auth-spring-boot-starter/pom.xml b/kernel-auth/auth-spring-boot-starter/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-auth</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-auth/pom.xml b/kernel-auth/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-cache/cache-api/pom.xml b/kernel-cache/cache-api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-cache</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-cache/cache-redis-spring-boot-starter/pom.xml b/kernel-cache/cache-redis-spring-boot-starter/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-cache</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-cache/cache-sdk-redis/pom.xml b/kernel-cache/cache-sdk-redis/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-cache</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-cache/pom.xml b/kernel-cache/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-core/pom.xml b/kernel-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-core/src/main/java/com/gitee/fubluesky/kernel/core/constants/CoreConstants.java b/kernel-core/src/main/java/com/gitee/fubluesky/kernel/core/constants/CoreConstants.java
@@ -17,8 +17,6 @@
 
 package com.gitee.fubluesky.kernel.core.constants;
 
-import com.gitee.fubluesky.kernel.core.enums.ErrorType;
-
 /**
  * 常量
  *
@@ -28,24 +26,6 @@
  */
 public interface CoreConstants {
 
-	/**
-	 * 用户端操作异常的错误码分类编号 建议使用 ErrorType {@link ErrorType}
-	 */
-	@Deprecated
-	String USER_OPERATION_ERROR_TYPE_CODE = "1";
-
-	/**
-	 * 业务执行异常的错误码分类编号 建议使用 ErrorType {@link ErrorType}
-	 */
-	@Deprecated
-	String BUSINESS_ERROR_TYPE_CODE = "2";
-
-	/**
-	 * 第三方调用异常的错误码分类编号 建议使用 ErrorType {@link ErrorType}
-	 */
-	@Deprecated
-	String THIRD_ERROR_TYPE_CODE = "3";
-
 	/**
 	 * 一级宏观码标识，宏观码标识代表一类错误码的统称
 	 */

diff --git a/kernel-core/src/main/java/com/gitee/fubluesky/kernel/core/util/IdUtils.java b/kernel-core/src/main/java/com/gitee/fubluesky/kernel/core/util/IdUtils.java
@@ -26,11 +26,10 @@
  * @version 1.0
  * @since 2021-07-23 17:13
  */
-@SuppressWarnings("all")
 @UtilityClass
 public class IdUtils {
 
-	public String generateUUID() {
+	public String generateUuid() {
 		return UUID.randomUUID().toString().replaceAll("-", "");
 	}
 

diff --git a/kernel-db/db-api/pom.xml b/kernel-db/db-api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-db</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-db/db-sdk-mybatis-plus/pom.xml b/kernel-db/db-sdk-mybatis-plus/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-db</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-db/db-spring-boot-starter/pom.xml b/kernel-db/db-spring-boot-starter/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-db</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-db/pom.xml b/kernel-db/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-dependencies/pom.xml b/kernel-dependencies/pom.xml
@@ -22,7 +22,7 @@
     <groupId>com.gitee.fubluesky.kernel</groupId>
     <artifactId>kernel-dependencies</artifactId>
     <name>kernel-dependencies</name>
-    <version>1.6.2</version>
+    <version>1.6.3</version>
     <description>依赖版本统一配置</description>
     <inceptionYear>2021-Now</inceptionYear>
     <packaging>pom</packaging>
@@ -54,10 +54,6 @@
         <!-- 极光推送 -->
         <jpush.version>3.4.7</jpush.version>
 
-        <kernel-file.version>1.6.2</kernel-file.version>
-        <kernel-security.version>1.6.2</kernel-security.version>
-        <kernel-auth.version>1.6.2</kernel-auth.version>
-
         <!--插件-->
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
         <maven-install-plugin.version>3.0.0-M1</maven-install-plugin.version>
@@ -195,44 +191,6 @@
                 <artifactId>commons-compress</artifactId>
                 <version>${commons-compress.version}</version>
             </dependency>
-            <!--kernel-auth-->
-            <dependency>
-                <groupId>com.gitee.fubluesky.kernel</groupId>
-                <artifactId>auth-api</artifactId>
-                <version>${kernel-auth.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.gitee.fubluesky.kernel</groupId>
-                <artifactId>auth-spring-boot-starter</artifactId>
-                <version>${kernel-auth.version}</version>
-            </dependency>
-            <!--kernel-security-->
-            <dependency>
-                <groupId>com.gitee.fubluesky.kernel</groupId>
-                <artifactId>security-api</artifactId>
-                <version>${kernel-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.gitee.fubluesky.kernel</groupId>
-                <artifactId>security-spring-boot-starter</artifactId>
-                <version>${kernel-security.version}</version>
-            </dependency>
-            <!--kernel-file-->
-            <dependency>
-                <groupId>com.gitee.fubluesky.kernel</groupId>
-                <artifactId>file-api</artifactId>
-                <version>${kernel-file.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.gitee.fubluesky.kernel</groupId>
-                <artifactId>file-all-spring-boot-starter</artifactId>
-                <version>${kernel-file.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.gitee.fubluesky.kernel</groupId>
-                <artifactId>file-expand-apk</artifactId>
-                <version>${kernel-file.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/kernel-email/email-api/pom.xml b/kernel-email/email-api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-email</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-email/email-sdk-java/pom.xml b/kernel-email/email-sdk-java/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-email</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-email/email-spring-boot-starter/pom.xml b/kernel-email/email-spring-boot-starter/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-email</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-email/pom.xml b/kernel-email/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-excel/excel-api/pom.xml b/kernel-excel/excel-api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-excel</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-excel/excel-sdk-easy/pom.xml b/kernel-excel/excel-sdk-easy/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-excel</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-excel/excel-spring-boot-starter/pom.xml b/kernel-excel/excel-spring-boot-starter/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-excel</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-excel/pom.xml b/kernel-excel/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-file/file-ali-spring-boot-starter/pom.xml b/kernel-file/file-ali-spring-boot-starter/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-file</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-file/file-all-spring-boot-starter/pom.xml b/kernel-file/file-all-spring-boot-starter/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-file</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/kernel-file/file-api/pom.xml b/kernel-file/file-api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.gitee.fubluesky.kernel</groupId>
         <artifactId>kernel-file</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>