From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 158 insertions(+), 6 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
index 56f106e..a97c9c4 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
@@ -2,11 +2,10 @@
/**
* 通用常量信息
- *
+ *
* @author ruoyi
*/
-public class Constants
-{
+public class Constants {
/**
* UTF-8 字符集
*/
@@ -51,11 +50,31 @@
* 成功标记
*/
public static final Integer SUCCESS = 200;
+ /**
+ * 仅会员查看
+ */
+ public static final Integer VIP_ERROR = 501;
/**
* 失败标记
*/
public static final Integer FAIL = 500;
+ /**
+ * 登录失效
+ */
+ public static final Integer TOKEN_ERROR = 600;
+ /**
+ * 账号冻结
+ */
+ public static final Integer FREEZE = 502;
+ /**
+ * 短信验证码无效
+ */
+ public static final Integer ERRORCODE = 503;
+ /**
+ * 积分商城兑换失败code
+ */
+ public static final Integer EXCHANGECODE = 506;
/**
* 登录成功状态
@@ -120,7 +139,7 @@
/**
* 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加）
*/
- public static final String[] JOB_WHITELIST_STR = { "com.ruoyi" };
+ public static final String[] JOB_WHITELIST_STR = {"com.ruoyi"};
/**
* 时间格式化
@@ -131,6 +150,139 @@
/**
* 定时任务违规的字符
*/
- public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
- "org.springframework", "org.apache", "com.ruoyi.common.core.utils.file" };
+ public static final String[] JOB_ERROR_STR = {"java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
+ "org.springframework", "org.apache", "com.ruoyi.common.core.utils.file"};
+
+ /**
+ * 60数字
+ */
+ public static final Integer SIXTY = 60;
+
+ /**
+ * 0数字
+ */
+ public static final Integer ZERO = 0;
+
+ /**
+ * 1数字
+ */
+ public static final Integer ONE = 1;
+ /**
+ * 字符串 1
+ */
+ public static final String ONE_STR = "1";
+ /**
+ * 字符串 2
+ */
+ public static final String TWO_STR = "2";
+ /**
+ * 数字 2
+ */
+ public static final Integer TWO = 2;
+ /**
+ * 字符串 3
+ */
+ public static final String THREE_STR = "3";
+ /**
+ * 数字 3
+ */
+ public static final Integer THREE = 3;
+ /**
+ * 字符串 4
+ */
+ public static final String FOUR_STR = "4";
+ /**
+ * 数字 4
+ */
+ public static final Integer FOUR = 4;
+ /**
+ * 字符串5
+ */
+ public static final String FIVE_STR = "5";
+ /**
+ * 数字 5
+ */
+ public static final Integer FIVE = 5;
+ /**
+ * 字符串6
+ */
+ public static final String SIX_STR = "6";
+ /**
+ * 数字6
+ */
+ public static final Integer SIX = 6;
+ /**
+ * 字符串7
+ */
+ public static final String SEVEN_STR = "7";
+ /**
+ * 数字7
+ */
+ public static final Integer SEVEN = 7;
+
+ /**
+ * 1数字
+ */
+ public static final Integer ONE_HUNDRED = 100;
+
+ /**
+ * 1000数字
+ */
+ public static final Integer ONE_THOUSAND = 1000;
+
+ /**
+ * 积分明细 符号 -
+ */
+ public static final String BURDEN = "-";
+
+ /**
+ * 积分明细 符号 -
+ */
+ public static final String INCREASE = "+";
+
+ /**
+ * 积分明细来源 商城消费
+ */
+ public static final String SHOPPING_CONSUME = "商城消费";
+
+ /**
+ * 手机号码正则
+ */
+ public static final String PHONE = ("^((13[0-9])|(14[0,1,4-9])|(15[0-3,5-9])|(16[2,5,6,7])|(17[0-8])|(18[0-9])|(19[0-3,5-9]))\\d{8}$");
+
+ /**
+ * 日
+ */
+ public static final String DAY = "day";
+
+ /**
+ * 周
+ */
+ public static final String WEEK = "week";
+
+ /**
+ * 月
+ */
+ public static final String MONTH = "month";
+
+ /**
+ * 错误码
+ */
+ public static final String ERR_CODE = "errcode";
+
+ /**
+ * 积分来源 - 完成学习
+ */
+ public static final String COMPLETE_LEARNING = "完成学习";
+
+ /**
+ * 积分来源 - 完成游戏
+ */
+ public static final String COMPLETE_GAME = "完成游戏";
+
+ /**
+ * 积分来源 - 完成听故事
+ */
+ public static final String COMPLETE_STORY= "完成听故事";
+
}
--
Gitblit v1.7.1