MrBird 6 роки тому
батько
коміт
b57682b940

+ 10 - 10
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/EndpointConstant.java

@@ -5,23 +5,23 @@ package cc.mrbird.febs.common.core.entity.constant;
  *
  * @author MrBird
  */
-public class EndpointConstant {
+public interface EndpointConstant {
 
-    public static final String ALL = "/**";
+    String ALL = "/**";
 
-    public static final String OAUTH_ALL = "/oauth/**";
+    String OAUTH_ALL = "/oauth/**";
 
-    public static final String OAUTH_AUTHORIZE = "/oauth/authorize";
+    String OAUTH_AUTHORIZE = "/oauth/authorize";
 
-    public static final String OAUTH_CHECK_TOKEN = "/oauth/check_token";
+    String OAUTH_CHECK_TOKEN = "/oauth/check_token";
 
-    public static final String OAUTH_CONFIRM_ACCESS = "/oauth/confirm_access";
+    String OAUTH_CONFIRM_ACCESS = "/oauth/confirm_access";
 
-    public static final String OAUTH_TOKEN = "/oauth/token";
+    String OAUTH_TOKEN = "/oauth/token";
 
-    public static final String OAUTH_TOKEN_KEY = "/oauth/token_key";
+    String OAUTH_TOKEN_KEY = "/oauth/token_key";
 
-    public static final String OAUTH_ERROR = "/oauth/error";
+    String OAUTH_ERROR = "/oauth/error";
 
-    public static final String ACTUATOR_ALL = "/actuator/**";
+    String ACTUATOR_ALL = "/actuator/**";
 }

+ 14 - 18
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/FebsConstant.java

@@ -5,63 +5,59 @@ package cc.mrbird.febs.common.core.entity.constant;
  *
  * @author MrBird
  */
-public class FebsConstant {
+public interface FebsConstant {
 
     /**
      * 排序规则:降序
      */
-    public static final String ORDER_DESC = "descending";
+    String ORDER_DESC = "descending";
     /**
      * 排序规则:升序
      */
-    public static final String ORDER_ASC = "ascending";
+    String ORDER_ASC = "ascending";
 
     /**
      * Gateway请求头TOKEN名称(不要有空格)
      */
-    public static final String GATEWAY_TOKEN_HEADER = "GatewayToken";
+    String GATEWAY_TOKEN_HEADER = "GatewayToken";
     /**
      * Gateway请求头TOKEN值
      */
-    public static final String GATEWAY_TOKEN_VALUE = "febs:gateway:123456";
+    String GATEWAY_TOKEN_VALUE = "febs:gateway:123456";
 
     /**
      * 允许下载的文件类型,根据需求自己添加(小写)
      */
-    public static final String[] VALID_FILE_TYPE = {"xlsx", "zip"};
+    String[] VALID_FILE_TYPE = {"xlsx", "zip"};
 
     /**
      * 验证码 key前缀
      */
-    public static final String CODE_PREFIX = "febs.captcha.";
+    String CODE_PREFIX = "febs.captcha.";
 
     /**
      * 异步线程池名称
      */
-    public static final String ASYNC_POOL = "febsAsyncThreadPool";
+    String ASYNC_POOL = "febsAsyncThreadPool";
 
     /**
      * OAUTH2 令牌类型 https://oauth.net/2/bearer-tokens/
      */
-    public static final String OAUTH2_TOKEN_TYPE = "bearer";
+    String OAUTH2_TOKEN_TYPE = "bearer";
     /**
      * Java默认临时目录
      */
-    public static final String JAVA_TEMP_DIR = "java.io.tmpdir";
+    String JAVA_TEMP_DIR = "java.io.tmpdir";
     /**
      * utf-8
      */
-    public static final String UTF8 = "utf-8";
+    String UTF8 = "utf-8";
     /**
      * 注册用户角色ID
      */
-    public static final Long REGISTER_ROLE_ID = 2L;
+    Long REGISTER_ROLE_ID = 2L;
 
-    public static final String LOCALHOST = "localhost";
-    public static final String LOCALHOST_IP = "127.0.0.1";
-    /**
-     * 启动banner
-     */
-    public static final String COMPLETE_BANNER = "  _   _   _   _   _   _   _   _\n / \\ / \\ / \\ / \\ / \\ / \\ / \\ / \\\n( c | o | m | p | l | e | t | e )\n \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/ \\_/";
+    String LOCALHOST = "localhost";
+    String LOCALHOST_IP = "127.0.0.1";
 
 }

+ 17 - 17
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/FebsServerConstant.java

@@ -3,22 +3,22 @@ package cc.mrbird.febs.common.core.entity.constant;
 /**
  * @author MrBird
  */
-public class FebsServerConstant {
+public interface FebsServerConstant {
 
-    public static final String FEBS_AUTH = "FEBS-Auth";
-    public static final String FEBS_CLOUD = "FEBS-Cloud";
-    public static final String FEBS_COMMON = "FEBS-Common";
-    public static final String FEBS_COMMON_CORE = "FEBS-Common-Core";
-    public static final String FEBS_COMMON_DATASOURCE = "FEBS-Common-Datasource";
-    public static final String FEBS_COMMON_REDIS = "FEBS-Common-Redis";
-    public static final String FEBS_GATEWAY = "FEBS-Gateway";
-    public static final String FEBS_APM = "FEBS-APM";
-    public static final String FEBS_ADMIN = "FEBS-Admin";
-    public static final String FEBS_SERVER = "FEBS-Server";
-    public static final String FEBS_SERVER_SYSTEM = "FEBS-Server-System";
-    public static final String FEBS_SERVER_TEST = "FEBS-Server-Test";
-    public static final String FEBS_SERVER_JOB = "FEBS-Server-Job";
-    public static final String FEBS_SERVER_GENERATOR = "FEBS-Server-Generator";
-    public static final String FEBS_SERVER_SOCKET = "FEBS-Server-Socket";
-    public static final String FEBS_TX_MANAGER = "FEBS-TX-Manager";
+    String FEBS_AUTH = "FEBS-Auth";
+    String FEBS_CLOUD = "FEBS-Cloud";
+    String FEBS_COMMON = "FEBS-Common";
+    String FEBS_COMMON_CORE = "FEBS-Common-Core";
+    String FEBS_COMMON_DATASOURCE = "FEBS-Common-Datasource";
+    String FEBS_COMMON_REDIS = "FEBS-Common-Redis";
+    String FEBS_GATEWAY = "FEBS-Gateway";
+    String FEBS_APM = "FEBS-APM";
+    String FEBS_ADMIN = "FEBS-Admin";
+    String FEBS_SERVER = "FEBS-Server";
+    String FEBS_SERVER_SYSTEM = "FEBS-Server-System";
+    String FEBS_SERVER_TEST = "FEBS-Server-Test";
+    String FEBS_SERVER_JOB = "FEBS-Server-Job";
+    String FEBS_SERVER_GENERATOR = "FEBS-Server-Generator";
+    String FEBS_SERVER_SOCKET = "FEBS-Server-Socket";
+    String FEBS_TX_MANAGER = "FEBS-TX-Manager";
 }

+ 15 - 15
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/GeneratorConstant.java

@@ -5,64 +5,64 @@ package cc.mrbird.febs.common.core.entity.constant;
  *
  * @author MrBird
  */
-public class GeneratorConstant {
+public interface GeneratorConstant {
 
     /**
      * 数据库类型
      */
-    public static final String DATABASE_TYPE = "mysql";
+    String DATABASE_TYPE = "mysql";
 
     /**
      * 生成代码的临时目录
      */
-    public static final String TEMP_PATH = "febs_gen_temp/";
+    String TEMP_PATH = "febs_gen_temp/";
 
     /**
      * java类型文件后缀
      */
-    public static final String JAVA_FILE_SUFFIX = ".java";
+    String JAVA_FILE_SUFFIX = ".java";
     /**
      * mapper文件类型后缀
      */
-    public static final String MAPPER_FILE_SUFFIX = "Mapper.java";
+    String MAPPER_FILE_SUFFIX = "Mapper.java";
     /**
      * service文件类型后缀
      */
-    public static final String SERVICE_FILE_SUFFIX = "Service.java";
+    String SERVICE_FILE_SUFFIX = "Service.java";
     /**
      * service impl文件类型后缀
      */
-    public static final String SERVICEIMPL_FILE_SUFFIX = "ServiceImpl.java";
+    String SERVICEIMPL_FILE_SUFFIX = "ServiceImpl.java";
     /**
      * controller文件类型后缀
      */
-    public static final String CONTROLLER_FILE_SUFFIX = "Controller.java";
+    String CONTROLLER_FILE_SUFFIX = "Controller.java";
     /**
      * mapper xml文件类型后缀
      */
-    public static final String MAPPERXML_FILE_SUFFIX = "Mapper.xml";
+    String MAPPERXML_FILE_SUFFIX = "Mapper.xml";
     /**
      * entity模板
      */
-    public static final String ENTITY_TEMPLATE = "entity.ftl";
+    String ENTITY_TEMPLATE = "entity.ftl";
     /**
      * mapper模板
      */
-    public static final String MAPPER_TEMPLATE = "mapper.ftl";
+    String MAPPER_TEMPLATE = "mapper.ftl";
     /**
      * service接口模板
      */
-    public static final String SERVICE_TEMPLATE = "service.ftl";
+    String SERVICE_TEMPLATE = "service.ftl";
     /**
      * service impl接口模板
      */
-    public static final String SERVICEIMPL_TEMPLATE = "serviceImpl.ftl";
+    String SERVICEIMPL_TEMPLATE = "serviceImpl.ftl";
     /**
      * controller接口模板
      */
-    public static final String CONTROLLER_TEMPLATE = "controller.ftl";
+    String CONTROLLER_TEMPLATE = "controller.ftl";
     /**
      * mapper xml接口模板
      */
-    public static final String MAPPERXML_TEMPLATE = "mapperXml.ftl";
+    String MAPPERXML_TEMPLATE = "mapperXml.ftl";
 }

+ 6 - 6
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/GrantTypeConstant.java

@@ -5,26 +5,26 @@ package cc.mrbird.febs.common.core.entity.constant;
  *
  * @author MrBird
  */
-public class GrantTypeConstant {
+public interface GrantTypeConstant {
 
     /**
      * 刷新模式
      */
-    public static final String REFRESH_TOKEN = "refresh_token";
+    String REFRESH_TOKEN = "refresh_token";
     /**
      * 授权码模式
      */
-    public static final String AUTHORIZATION_CODE = "authorization_code";
+    String AUTHORIZATION_CODE = "authorization_code";
     /**
      * 客户端模式
      */
-    public static final String CLIENT_CREDENTIALS = "client_credentials";
+    String CLIENT_CREDENTIALS = "client_credentials";
     /**
      * 密码模式
      */
-    public static final String PASSWORD = "password";
+    String PASSWORD = "password";
     /**
      * 简化模式
      */
-    public static final String IMPLICIT = "implicit";
+    String IMPLICIT = "implicit";
 }

+ 3 - 3
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/ImageTypeConstant.java

@@ -5,14 +5,14 @@ package cc.mrbird.febs.common.core.entity.constant;
  *
  * @author MrBird
  */
-public class ImageTypeConstant {
+public interface ImageTypeConstant {
 
     /**
      * gif类型
      */
-    public static final String GIF = "gif";
+    String GIF = "gif";
     /**
      * png类型
      */
-    public static final String PNG = "png";
+    String PNG = "png";
 }

+ 3 - 3
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/PageConstant.java

@@ -5,8 +5,8 @@ package cc.mrbird.febs.common.core.entity.constant;
  *
  * @author MrBird
  */
-public class PageConstant {
+public interface PageConstant {
 
-    public static final String ROWS = "rows";
-    public static final String TOTAL = "total";
+    String ROWS = "rows";
+    String TOTAL = "total";
 }

+ 5 - 5
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/ParamsConstant.java

@@ -5,23 +5,23 @@ package cc.mrbird.febs.common.core.entity.constant;
  *
  * @author MrBird
  */
-public class ParamsConstant {
+public interface ParamsConstant {
 
     /**
      * 验证码 key
      */
-    public static final String VALIDATE_CODE_KEY = "key";
+    String VALIDATE_CODE_KEY = "key";
     /**
      * 验证码 code
      */
-    public static final String VALIDATE_CODE_CODE = "code";
+    String VALIDATE_CODE_CODE = "code";
     /**
      * 认证类型参数 key
      */
-    public static final String GRANT_TYPE = "grant_type";
+    String GRANT_TYPE = "grant_type";
     /**
      * 登录类型
      */
-    public static final String LOGIN_TYPE = "login_type";
+    String LOGIN_TYPE = "login_type";
 
 }

+ 5 - 3
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/RegexpConstant.java

@@ -5,9 +5,11 @@ package cc.mrbird.febs.common.core.entity.constant;
  *
  * @author MrBird
  */
-public class RegexpConstant {
+public interface RegexpConstant {
 
-    // 简单手机号正则(这里只是简单校验是否为 11位,实际规则更复杂)
-    public static final String MOBILE_REG = "[1]\\d{10}";
+    /**
+     * 简单手机号正则(这里只是简单校验是否为 11位,实际规则更复杂)
+     */
+    String MOBILE_REG = "[1]\\d{10}";
 
 }

+ 3 - 3
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/SocialConstant.java

@@ -3,8 +3,8 @@ package cc.mrbird.febs.common.core.entity.constant;
 /**
  * @author MrBird
  */
-public class SocialConstant {
+public interface SocialConstant {
 
-    public static final String SOCIAL_LOGIN = "social_login";
-    public static final String SOCIAL_LOGIN_PASSWORD = "febs_social_login_password";
+    String SOCIAL_LOGIN = "social_login";
+    String SOCIAL_LOGIN_PASSWORD = "febs_social_login_password";
 }