Merge pull request #10 from hiparker/development

Development
hiparker · Jan 6, 2022 · a04f65a · a04f65a
2 parents 56ed708 + 0d1d85d
commit a04f65a
Show file tree

Hide file tree

Showing 83 changed files with 1,282 additions and 4,239 deletions.
diff --git a/...ommon/annotation/ApiCryptoAsymmetric.java → .../opsli/common/annotation/LoginCrypto.java b/...ommon/annotation/ApiCryptoAsymmetric.java → .../opsli/common/annotation/LoginCrypto.java
@@ -19,23 +19,19 @@
 import java.lang.annotation.*;
 
 /**
- * Api非对称加解密
+ * 登录加解密
+ * 入参 非对称 公钥加密 私钥解密
+ * 出参 对称 公要加密 公要解密
  *
  * @author Parker
  * @date 2021年5月18日14:46:02
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface ApiCryptoAsymmetric {
+public @interface LoginCrypto {
 
     /** 加密启用状态 */
     boolean enable() default true;
 
-    /** 请求解密 */
-    boolean requestDecrypt() default true;
-
-    /** 返回加密 */
-    boolean responseEncrypt() default true;
-
 }
diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/CacheConstants.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/CacheConstants.java
@@ -21,14 +21,16 @@
  * @author Parker
  * @date 2020-09-22 17:07
  */
-public interface CacheConstants {
+public final class CacheConstants {
 
-    String PREFIX_NAME = "opsli";
+    public static final String PREFIX_NAME = "opsli";
 
     /** Ehcache 缓存存放空间 */
-    String EHCACHE_SPACE = "timed";
+    public static final String EHCACHE_SPACE = "timed";
 
     /** 热数据前缀 */
-    String HOT_DATA_PREFIX = "hot_data";
+    public static final String HOT_DATA_PREFIX = "hot_data";
 
+
+    private CacheConstants(){}
 }
diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/DictConstants.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/DictConstants.java
diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/MenuConstants.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/MenuConstants.java
@@ -21,18 +21,20 @@
  * @author Parker
  * @date 2021年3月10日15:50:16
  */
-public interface MenuConstants {
+public final class MenuConstants {
 
     /** 菜单根节点ID */
-    String GEN_ID = "0";
+    public static final String GEN_ID = "0";
 
     /** 菜单类型 */
-    String MENU = "1";
+    public static final String MENU = "1";
 
     /** 按钮类型 */
-    String BUTTON = "2";
+    public static final String BUTTON = "2";
 
     /** 外链类型 */
-    String EXTERNAL = "3";
+    public static final String EXTERNAL = "3";
+
+    private MenuConstants(){}
 
 }
diff --git a/...-base-support/opsli-common/src/main/java/org/opsli/common/constants/MyBatisConstants.java b/...-base-support/opsli-common/src/main/java/org/opsli/common/constants/MyBatisConstants.java
@@ -23,35 +23,37 @@
  * @author Parker
  * @date 2020-09-16 17:42
  */
-public interface MyBatisConstants {
+public final class MyBatisConstants {
 
 
     /** 逻辑删除值 */
-    String  LOGIC_DELETE_VALUE = "1";
+    public static final String  LOGIC_DELETE_VALUE = "1";
     /** 逻辑不删除值 */
-    String  LOGIC_NOT_DELETE_VALUE = "0";
+    public static final String  LOGIC_NOT_DELETE_VALUE = "0";
 
 
     /** ID */
-    String FIELD_ID = "id";
+    public static final String FIELD_ID = "id";
     /** PID */
-    String FIELD_PARENT_ID = "parentId";
+    public static final String FIELD_PARENT_ID = "parentId";
     /** PIDs */
-    String FIELD_PARENT_IDS = "parentIds";
+    public static final String FIELD_PARENT_IDS = "parentIds";
     /** 创建人 */
-    String FIELD_CREATE_BY = "createBy";
+    public static final String FIELD_CREATE_BY = "createBy";
     /** 更新时间 */
-    String FIELD_CREATE_TIME = "createTime";
+    public static final String FIELD_CREATE_TIME = "createTime";
     /** 更新人 */
-    String FIELD_UPDATE_BY = "updateBy";
+    public static final String FIELD_UPDATE_BY = "updateBy";
     /** 更新时间 */
-    String FIELD_UPDATE_TIME = "updateTime";
+    public static final String FIELD_UPDATE_TIME = "updateTime";
     /** 逻辑删除 */
-    String FIELD_DELETE_LOGIC = "deleted";
+    public static final String FIELD_DELETE_LOGIC = "deleted";
     /** 乐观锁 */
-    String FIELD_OPTIMISTIC_LOCK = "version";
+    public static final String FIELD_OPTIMISTIC_LOCK = "version";
     /** 多租户字段 */
-    String FIELD_TENANT = "tenantId";
+    public static final String FIELD_TENANT = "tenantId";
     /** 组织字段 */
-    String FIELD_ORG_GROUP = "orgIds";
+    public static final String FIELD_ORG_GROUP = "orgIds";
+
+    private MyBatisConstants(){}
 }
diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/OrderConstants.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/OrderConstants.java
@@ -21,36 +21,38 @@
  * @author Parker
  * @date 2020-09-16 17:42
  */
-public interface OrderConstants {
+public final class OrderConstants {
 
     /** Util 加载顺序 */
-    int UTIL_ORDER = 140;
+    public static final int UTIL_ORDER = 140;
 
     /** 限流器 */
-    int LIMITER_AOP_SORT = 149;
+    public static final int LIMITER_AOP_SORT = 149;
 
     /** token */
-    int TOKEN_AOP_SORT = 150;
+    public static final int TOKEN_AOP_SORT = 150;
 
     /** 请求加解密 */
-    int ENCRYPT_ADN_DECRYPT_AOP_SORT = 160;
+    public static final int ENCRYPT_ADN_DECRYPT_AOP_SORT = 160;
 
     /** 热点数据加载顺序 */
-    int HOT_DATA_ORDER = 180;
+    public static final int HOT_DATA_ORDER = 180;
 
     /** 参数非法验证顺序 */
-    int VERIFY_ARGS_AOP_SORT = 185;
+    public static final int VERIFY_ARGS_AOP_SORT = 185;
 
     /** 搜索历史 */
-    int SEARCH_HIS_AOP_SORT = 186;
+    public static final int SEARCH_HIS_AOP_SORT = 186;
 
     /** SQL 切面执行顺序 */
-    int SQL_ORDER = 190;
+    public static final int SQL_ORDER = 190;
 
     /** 参数非法验证顺序 */
-    int LOG_ORDER = 200;
+    public static final int LOG_ORDER = 200;
 
     /** Controller异常拦截顺序 */
-    int EXCEPTION_HANDLER_ORDER = 260;
+    public static final int EXCEPTION_HANDLER_ORDER = 260;
+
+    private OrderConstants(){}
 
 }
diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/RedisConstants.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/RedisConstants.java
@@ -0,0 +1,68 @@
+package org.opsli.common.constants;
+
+/**
+ * Redis 常量
+ * {} 为项目名称
+ * @author 周鹏程
+ * @date 2021/12/10 19:52
+ */
+public final class RedisConstants {
+
+
+	/** 字典名称 */
+	public static final String PREFIX_DICT_NAME = "hash#{}:dict:name:";
+
+	/** 字典值 VALUE */
+	public static final String PREFIX_DICT_VALUE = "hash#{}:dict:value:";
+
+	/** 菜单编号 */
+	public static final String PREFIX_MENU_CODE = "kv#{}:menu:code:";
+
+	/** 参数编号 */
+	public static final String PREFIX_OPTIONS_CODE = "hash#{}:options";
+
+	/** 用户搜索记录 */
+	public static final String PREFIX_HIS_USERNAME = "zset#{}:his:username:";
+
+
+
+	/** 用户ID */
+	public static final String PREFIX_USER_ID = "kv#{}:user_id:";
+
+	/** 用户ID 和 角色 */
+	public static final String PREFIX_USER_ID_AND_ROLES = "kv#{}:user_id:roles:";
+
+	/** 用户ID 和 默认角色 */
+	public static final String PREFIX_USER_ID_DEF_ROLE = "kv#{}:user_id:def_role_id:";
+
+	/** 用户ID 和 组织 */
+	public static final String PREFIX_USER_ID_ORGS = "kv#{}:user_id:orgs:";
+
+	/** 用户ID 和 默认组织 */
+	public static final String PREFIX_USER_ID_DEF_ORG = "kv#{}:user_id:def_org:";
+
+	/** 用户ID 和 权限 */
+	public static final String PREFIX_USER_ID_PERMISSIONS = "kv#{}:user_id:permissions:";
+
+	/** 用户ID 和 菜单 */
+	public static final String PREFIX_USER_ID_MENUS = "kv#{}:user_id:menus:";
+
+	/** 用户名 */
+	public static final String PREFIX_USERNAME = "kv#{}:username:";
+
+
+
+	/** 票据 */
+	public static final String PREFIX_TICKET = "set#{}:ticket:";
+
+	/** 账号失败次数 */
+	public static final String PREFIX_ACCOUNT_SLIP_COUNT = "kv#{}:account:slip:count:";
+
+	/** 账号失败锁定KEY */
+	public static final String PREFIX_ACCOUNT_SLIP_LOCK = "kv#{}:account:slip:lock:";
+
+
+
+
+	private RedisConstants(){}
+}
diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/SignConstants.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/SignConstants.java
@@ -6,24 +6,26 @@
  * @author Parker
  * @date 2020-09-16 17:42
  */
-public interface SignConstants {
+public final class SignConstants {
 
     /** 用户账号 */
-    String ACCOUNT = "account";
+    public static final String ACCOUNT = "account";
 
     /** 用户ID */
-    String USER_ID = "userId";
+    public static final String USER_ID = "userId";
 
     /** 租户ID */
-    String TENANT_ID = "tenantId";
+    public static final String TENANT_ID = "tenantId";
 
     /** 时间戳 */
-    String TIMESTAMP  = "timestamp";
+    public static final String TIMESTAMP  = "timestamp";
 
     /** 其他信息 */
-    String OTHER = "other";
+    public static final String OTHER = "other";
 
     /** 签名 类型 */
-    String TYPE = "type";
+    public static final String TYPE = "type";
+
+    private SignConstants(){}
 
 }
diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/TokenConstants.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/TokenConstants.java
@@ -21,9 +21,11 @@
  * @author Parker
  * @date 2020-09-16 17:42
  */
-public interface TokenConstants {
+public final class TokenConstants {
 
     /** ACCESS_TOKEN */
-    String ACCESS_TOKEN = "X-Token";
+    public static final String ACCESS_TOKEN = "X-Token";
 
+
+    private TokenConstants(){}
 }
diff --git a/...ase-support/opsli-common/src/main/java/org/opsli/common/constants/TokenTypeConstants.java b/...ase-support/opsli-common/src/main/java/org/opsli/common/constants/TokenTypeConstants.java
@@ -6,12 +6,13 @@
  * @author Parker
  * @date 2020-09-16 17:42
  */
-public interface TokenTypeConstants {
+public final class TokenTypeConstants {
 
     /** 系统内部TOKEN */
-    String TYPE_SYSTEM = "system";
+    public static final String TYPE_SYSTEM = "system";
 
     /** 外部TOKEN */
-    String TYPE_EXTERNAL = "external";
+    public static final String TYPE_EXTERNAL = "external";
 
+    private TokenTypeConstants(){}
 }
diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/TreeConstants.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/constants/TreeConstants.java
@@ -21,13 +21,15 @@
  * @author Parker
  * @date 2021年3月10日15:50:16
  */
-public interface TreeConstants {
+public final class TreeConstants {
 
     /** 是否包含子集 */
-    String HAS_CHILDREN = "hasChildren";
+    public static final String HAS_CHILDREN = "hasChildren";
 
 
     /** 是否是叶子节点 */
-    String IS_LEAF = "isLeaf";
+    public static final String IS_LEAF = "isLeaf";
 
+
+    private TreeConstants(){}
 }