From a4e9550ac1f85466799b370aa6ce1a70eb873d4f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 15 七月 2024 12:10:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 98 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 85 insertions(+), 13 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index aaf7e4e..f9eebca 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -16,6 +16,10 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.Date;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -33,6 +37,10 @@
public static final String HK_PUSH_URL = "HK_PUSH_URL";
public static final String HK_ROOTORG_CODE ="HK_ROOTORG_CODE" ;
public static final String HK_ROOTORG_NAME ="HK_ROOTORG_NAME" ;
+ public static final String REDIS_TOKEN_KEY = "token_";
+ public static final String CUSTOMER = "CUSTOMER";
+ public static final String BUSINESS = "BUSINESS";
+
//琚嫓璁夸汉淇℃伅鏍￠獙鏂瑰紡锛�0鎵嬫満鍙峰崟鐙牎楠� 1鎵嬫満鍙峰拰濮撳悕缁勫悎鏍￠獙锛�
public static final String BEVISITED_USER_VALID = "BEVISITED_USER_VALID";
@@ -48,6 +56,7 @@
public static final String FILE_DIR = "";
public static final String INITIAL_PASSWORD = "INITIAL_PASSWORD";
public static final String VALIDATE_VISIT = "VALIDATE_VISIT";
+ public static final String PLATFORM = "mp-weixin";
// 璁垮鏉ヨ閰嶇疆
public static final String VISIT_CONFIG = "VISIT_CONFIG";
@@ -304,6 +313,7 @@
//鍙戦�佷細璁紑濮� 瀹氭椂鎻愬墠澶氬皯鍒嗛挓鍙戦��
public static final String SYSTEM ="SYSTEM";
+ public static final String MEMBER ="MEMBER";
public static final String COFFEE_BEAN_TASK ="COFFEE_BEAN_TASK";
@@ -314,31 +324,49 @@
public static final String WX_PLATFORM = "WX_PLATFORM";
+ public static final String ZBOM_ZHONGTAI_API_URL = "ZBOM_ZHONGTAI_API_URL";
public static final String WX_PLATFORM_ACCESS_TOKEN = "WX_PLATFORM_ACCESS_TOKEN";
+ public static final String ZBOM_ENCODE_URL = "ZBOM_ENCODE_URL";
public static final String WX_PLATFORM_APPID = "WX_PLATFORM_APPID";
public static final String WX_PLATFORM_SECRET = "WX_PLATFORM_SECRET";
public static final String WX_PLATFORM_AUDIT_VISIT = "WX_PLATFORM_AUDIT_VISIT";
+ public static final String ZBOM_CRM_API_URL = "ZBOM_CRM_API_URL";
+ public static final String ZBOM_CRM_API_KEY = "ZBOM_CRM_API_KEY";
+ public static final String ZBOM_SMS_API_KEY = "ZBOM_SMS_API_KEY";
+ public static final String ZBOM_IAM_API_URL = "ZBOM_IAM_API_URL";
+ public static final String ZBOM_SMS_API_URL = "ZBOM_SMS_API_URL";
public static final String WX_PLATFORM_PREFIX = "WX_PLATFORM_PREFIX";
-
+ public static final String WX_MINI_CONFIG = "WX_MINI_CONFIG";
+ public static final String WX_APPID_CUSTOMER = "WX_APPID_CUSTOMER";
+ public static final String WX_SECRET_CUSTOMER = "WX_SECRET_CUSTOMER";
+ public static final String WX_APPID_PERSONNEL = "WX_APPID_PERSONNEL";
+ public static final String WX_SECRET_PERSONNEL = "WX_SECRET_PERSONNEL";
public interface RedisKeys {
- public static final String IMPORTING_MEMBER ="IMPORTING_MEMBER";
- public static final String IMPORTING_SHOP ="IMPORTING_SHOP";
- public static final String IAM_APPID ="IAM_APPID";
- public static final String IAM_APPKEY ="IAM_APPKEY";
- public static final String SHOP_TREE ="SHOP_TREE";
- public static final String ERP_TOKEN ="ERP_TOKEN";
- public static final long EXPIRE_TIME = 7200;
+ String IMPORTING_MEMBER ="IMPORTING_MEMBER";
+ String IMPORTING_SHOP ="IMPORTING_SHOP";
+ String IMPORTING_USERS ="IMPORTING_USERS";
+ String IAM_APPID ="IAM_APPID";
+ String ZBOM_CRM_API_KEY ="ZBOM_CRM_API_KEY";
+ String ZBOM_CRM_API_URL ="ZBOM_CRM_API_URL";
+ String ZBOM_ENCODE_URL ="ZBOM_ENCODE_URL";
+ String ZBOM_SMS_API_KEY ="ZBOM_SMS_API_KEY";
+ String ZBOM_ZHONGTAI_API_URL ="ZBOM_ZHONGTAI_API_URL";
+ String ZBOM_SMS_API_URL ="ZBOM_SMS_API_URL";
+ String IAM_APPKEY ="IAM_APPKEY";
+ String SHOP_TREE ="SHOP_TREE";
+ String ERP_TOKEN ="ERP_TOKEN";
+ long EXPIRE_TIME = 7200;
- public static final String INTERNAL_TOKEN ="INTERNAL_TOKEN";
+ String INTERNAL_TOKEN ="INTERNAL_TOKEN";
- public static final String GOODSORDER_KEY = "ordercode_";
- public static final String ACTIVITY_SIGN_KEY = "actcode_";
- public static final String AFTERSALE_KEY = "salecode_";
+ String GOODSORDER_KEY = "ordercode_";
+ String ACTIVITY_SIGN_KEY = "actcode_";
+ String AFTERSALE_KEY = "salecode_";
}
@@ -413,6 +441,39 @@
int unPass = 3;//瀹℃壒鏈�氳繃
int otherDeal = 4;//浠栦汉宸插鐞�
}
+
+
+ /**
+ * 鏍规嵁閰嶇疆澶勭悊鎴垮眿鎴峰瀷淇℃伅
+ * @param layout
+ * @return
+ */
+ public static String getHouseLayout(String layout){
+ if(StringUtils.isBlank(layout)){
+ return null;
+ }
+ String [] arr = layout.split("-");
+ StringBuffer stringBuffer = new StringBuffer();
+ for (int i = 0; i < arr.length; i++) {
+ if(i==0){
+ stringBuffer.append( i + "瀹�");
+ }else if(i==1){
+ stringBuffer.append( i + "鍘�");
+ }else if(i==2){
+ stringBuffer.append( i + "鍘�");
+ }else if(i==3){
+ stringBuffer.append( i + "鍗�");
+ }else if(i==4){
+ stringBuffer.append( i + "闃�");
+ }else {
+ break;
+ }
+
+ }
+ return stringBuffer.toString();
+}
+
+
/**
* 鑾峰彇杞︾墝绫诲瀷淇℃伅
@@ -511,7 +572,7 @@
list.add(m);
}
System.out.println(JSONObject.toJSONString(list));
-
+
}
@@ -584,4 +645,15 @@
return reqJson;
}
+ public static String getRandom6Num( ) {
+ Random random = new Random();
+ StringBuilder sb = new StringBuilder();
+
+ for (int i = 0; i < 6; i++) {
+ int digit = random.nextInt(10);
+ sb.append(digit);
+ }
+
+ return sb.toString();
+ }
}
--
Gitblit v1.9.3