From e0965debdfc7149b9490d66d45c8737ca574ed21 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 15 十二月 2023 14:47:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
index 47a1f0e..69242b4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -44,13 +44,34 @@
public static final String FILE_DIR = "";
// 璁垮鏉ヨ閰嶇疆
public static final String VISIT_CONFIG = "VISIT_CONFIG";
+ public static final String MEMBER_IMG = "MEMBER_IMG";
// 鍔冲姟鏉ヨ閰嶇疆
public static final String LABOR_CONFIG = "LABOR_CONFIG";
public static final String VISIT_EVENT_IMG = "VISIT_EVENT_IMG";
public static final String CAR_EVENT_IMG = "CAR_EVENT_IMG";
public static final String DEVICE_EVENT_IMG = "DEVICE_EVENT_IMG";
- public static boolean DEALING_HK_IMG = false;
+ public static final String FTP ="FTP" ;
+ public static final String FTP_HOST ="FTP_HOST" ;
+ public static final String FTP_PORT ="FTP_PORT" ;
+ public static final String FTP_USERNAME ="FTP_USERNAME" ;
+ public static final String FTP_PWD ="FTP_PWD" ;
+ public static final String FTP_RESOURCE_PATH ="FTP_RESOURCE_PATH" ;
+ public static final String ERP_ORGLIST_URL ="ERP_ORGLIST_URL" ;
+ public static final String ERP_USERLIST_URL ="ERP_USERLIST_URL" ;
+ public static final String ERP_APPROVE_URL ="ERP_APPROVE_URL" ;
+ public static final String ERP_USERSTATUS_RL ="ERP_USERSTATUS_RL" ;
+ public static final String ERP ="ERP" ;
+ public static boolean DEALING_HK_IMG = false;
+ // ERP鎺ュ彛閰嶇疆
+ public static final String ERP_CONFIG = "ERP_CONFIG";
+ // ERP ACCESS_KEY
+ public static final String ERP_ACCESS_KEY = "ERP_ACCESS_KEY";
+ // ERP ACCESS_SECRET
+ public static final String ERP_ACCESS_SECRET = "ERP_ACCESS_SECRET";
+
+ // FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧�
+ public static final String FTP_RESOURCE_PATH = "FTP_RESOURCE_PATH";
public static Date getBirthdyByCardNo(String idCard){
if(idCard ==null || idCard.length()<14){
@@ -153,6 +174,7 @@
+
public static final String WX_PLATFORM = "WX_PLATFORM";
public static final String WX_PLATFORM_ACCESS_TOKEN = "WX_PLATFORM_ACCESS_TOKEN";
public static final String WX_PLATFORM_APPID = "WX_PLATFORM_APPID";
@@ -164,6 +186,9 @@
public interface RedisKeys {
+ public static final String ERP_TOKEN ="ERP_TOKEN";
+ public static final long EXPIRE_TIME = 7200;
+
public static final String GOODSORDER_KEY = "ordercode_";
public static final String ACTIVITY_SIGN_KEY = "actcode_";
public static final String AFTERSALE_KEY = "salecode_";
@@ -240,7 +265,8 @@
/** 鐢ㄦ埛鍚敤绂佺敤鏋氫妇鍊�*/
ENABLE(0,"姝ｅ父"),
- DISABLE(1,"绂佺敤");
+ DISABLE(1,"绂佺敤"),
+ FREEZE(2,"鎷夐粦/鍐荤粨");
private Integer value;
private String des;
--
Gitblit v1.9.3