🎨 独立Oauth客户端配置信息

Author: hengboy

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/ApiBootOauthProperties.java

@@ -27,7 +27,7 @@
 import static org.minbox.framework.api.boot.autoconfigure.oauth.ApiBootOauthProperties.API_BOOT_OAUTH_PREFIX;
 
 /**
- * 整合Oauth2 相关属性配置
+ * Configure Oauth2 properties class
  *
  * @author 恒宇少年
  */
@@ -36,11 +36,13 @@
 @ConfigurationProperties(prefix = API_BOOT_OAUTH_PREFIX)
 public class ApiBootOauthProperties {
     /**
-     * 安全配置前缀
+     * config prefix
      */
     public static final String API_BOOT_OAUTH_PREFIX = "api.boot.oauth";
     /**
-     * Oauth2认证存储方式，默认内存方式
+     * Configure oauth authentication information storage mode
+     * <p>
+     * The default use {@link OAuthAway#memory}
      *
      * @see OAuthAway
      */
@@ -59,89 +61,36 @@ public class ApiBootOauthProperties {
     @Deprecated
     private String clientSecret = "ApiBootSecret";
     /**
-     * 客户端授权类型集合
+     * Configure simple client grant types
      * 2.1.1. After the RELEASE version, the attribute is discarded and replaced by clients.
      */
     @Deprecated
     private String[] grantTypes = new String[]{"password", "refresh_token"};
     /**
-     * 客户端作用域集合
+     * Configure simple client scopes
      * 2.1.1. After the RELEASE version, the attribute is discarded and replaced by clients.
      */
     @Deprecated
     private String[] scopes = new String[]{"api"};
     /**
-     * 资源编号
+     * Configure simple client resource id
      * 2.1.1. After the RELEASE version, the attribute is discarded and replaced by clients.
      */
     @Deprecated
     private String resourceId = "api";
 
     /**
-     * 配置JWT格式化Oauth2返回的token
+     * Configure to use jwt to format oauth token
      */
     private Jwt jwt = new Jwt();
     /**
      * configure multiple clients
+     * <p>
+     * Add a client information by default and use the default configuration
      */
-    private List<Client> clients = new ArrayList() {{
-        add(new Client());
-    }};
-
-    /**
-     * Oauth2 Client
-     * Used to configure multiple clients
-     */
-    @Data
-    public static class Client {
-        /**
-         * oauth2 client id
-         */
-        private String clientId = "ApiBoot";
-        /**
-         * oauth2 client secret
-         */
-        private String clientSecret = "ApiBootSecret";
-        /**
-         * oauth2 client grant types
-         * default value is "password,refresh_token"
-         */
-        private String[] grantTypes = new String[]{"password", "refresh_token"};
-        /**
-         * oauth2 client scope
-         * default value is "api"
-         */
-        private String[] scopes = new String[]{"api"};
-        /**
-         * oauth2 application resource id
-         * default value is "api"
-         */
-        private String[] resourceId = new String[]{"api"};
-        /**
-         * oauth2 access token validity seconds
-         * default value is 2 hours (7200 second)
-         */
-        private int accessTokenValiditySeconds = 60 * 60 * 2;
-        /**
-         * oauth2 refresh token validity seconds
-         * <p>
-         * The default value is 30 days（2592000 seconds）
-         */
-        private int refreshTokenValiditySeconds = 60 * 60 * 24 * 30;
-    }
-
-    /**
-     * 自定义Jwt相关的配置
-     */
-    @Data
-    public static class Jwt {
-        /**
-         * 开启Jwt转换AccessToken
-         */
-        private boolean enable = false;
-        /**
-         * Jwt转换时使用的秘钥key
-         */
-        private String signKey = "ApiBoot";
-    }
+    private List<OAuthClient> clients = new ArrayList() {
+        {
+            add(new OAuthClient());
+        }
+    };
 }

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/Jwt.java

@@ -0,0 +1,20 @@
+package org.minbox.framework.api.boot.autoconfigure.oauth;
+
+import lombok.Data;
+
+/**
+ * The json web token config properties
+ *
+ * @author 恒宇少年
+ */
+@Data
+public class Jwt {
+    /**
+     * Enable the use of jwt formatting token
+     */
+    private boolean enable = false;
+    /**
+     * The secret key used during conversion
+     */
+    private String signKey = "ApiBoot";
+}

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/oauth/OAuthClient.java

@@ -0,0 +1,46 @@
+package org.minbox.framework.api.boot.autoconfigure.oauth;
+
+import lombok.Data;
+
+/**
+ * oauth client configuration class
+ *
+ * @author 恒宇少年
+ */
+@Data
+public class OAuthClient {
+    /**
+     * oauth2 client id
+     */
+    private String clientId = "ApiBoot";
+    /**
+     * oauth2 client secret
+     */
+    private String clientSecret = "ApiBootSecret";
+    /**
+     * oauth2 client grant types
+     * default value is "password,refresh_token"
+     */
+    private String[] grantTypes = new String[]{"password", "refresh_token"};
+    /**
+     * oauth2 client scope
+     * default value is "api"
+     */
+    private String[] scopes = new String[]{"api"};
+    /**
+     * oauth2 application resource id
+     * default value is "api"
+     */
+    private String[] resourceId = new String[]{"api"};
+    /**
+     * oauth2 access token validity seconds
+     * default value is 2 hours (7200 second)
+     */
+    private int accessTokenValiditySeconds = 60 * 60 * 2;
+    /**
+     * oauth2 refresh token validity seconds
+     * <p>
+     * The default value is 30 days（2592000 seconds）
+     */
+    private int refreshTokenValiditySeconds = 60 * 60 * 24 * 30;
+}