From 9645ca1ea0ca880eff9bb0ba2138fad2b012f3e1 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期一, 18 十二月 2023 17:30:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 abdc922..643d8cc 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,12 +44,30 @@
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 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 final Integer THREE =3 ;
+
public static boolean DEALING_HK_IMG = false;
+ public static boolean DEALING_HK_ORG = false;
+ public static boolean DEALING_HK_USER = false;
+ public static boolean DEALING_HK_VISIT = false;
+ public static boolean DEALING_HK_EMPOWER = false;
// ERP鎺ュ彛閰嶇疆
public static final String ERP_CONFIG = "ERP_CONFIG";
// ERP ACCESS_KEY
@@ -58,7 +76,6 @@
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){
--
Gitblit v1.9.3