From 1147614053efae0314a36c15293a6a5ed4e6d737 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 二月 2025 11:28:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 8589721..fdca607 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -34,6 +34,7 @@
public static final String MINI_PROGRAMME ="MINI_PROGRAMME" ;
public static final String FREE_RENT_TIME ="FREE_RENT_TIME" ;
+ public static final String LOW_VOLTAGE ="LOW_VOLTAGE" ;
public static final String ACCESS_TOKEN ="ACCESS_TOKEN" ;
public static final String IMG_DIR = "IMG_DIR";
public static final String FILE_DIR ="FILE_DIR" ;
@@ -41,12 +42,20 @@
public static final String PROJECT_FILE = "PROJECT_FILE";
public static final String PROJECTS = "PROJECTS";
public static final String DISCOUNT = "DISCOUNT";
+ public static final String ELEC_BIKE_CONTRIL_API_URL = "ELEC_BIKE_CONTRIL_API_URL";
public static final String FORCE_BACK_LOCK = "FORCE_BACK_LOCK";
public static final String FORCE_BACK_SITE = "FORCE_BACK_SITE";
//杞﹁締绫诲瀷鏁版嵁
public static final String BIKE_TYPE ="0,1,2,3,4,5,6,7,8" ;
public static final String MINI_PROGRAMME_REALEASE ="MINI_PROGRAMME_REALEASE" ;
+ public static final String TIME_OUT_TEMPID ="TIME_OUT_TEMPID" ;
+
public static final int FOUR =4 ;
+ public static final String PAUSE_BIKE_TYPE ="PAUSE_BIKE_TYPE" ;
+ public static final String HEART_TIME_EXPIRE_TIME ="HEART_TIME_EXPIRE_TIME" ;
+ public static final String PARK_LAT_LNG_LIST = "PARK_LAT_LNG_LIST";
+ public static final String LOW_BIKE_VOLTAGE ="LOW_BIKE_VOLTAGE" ;
+ public static final String EBIKE_PREFIX ="ebike-" ;
public static String REDIS_DEBUG_STR="test_";
public static final String AD = "AD";
public static String REPAIR = "REPAIR";
@@ -115,7 +124,9 @@
REFUND(2,"缁撶畻閫�鎶奸噾", "缁撶畻閫�鎶奸噾"),
- PLATFORMREFUND(3,"骞冲彴閫�鎶奸噾", "骞冲彴閫�鎶奸噾")
+ PLATFORM_REFUND(3,"骞冲彴閫�娆�", "骞冲彴閫�娆�"),
+
+ DISCOUNT(4,"骞冲彴濂楅", "骞冲彴濂楅")
;
String name;
@@ -170,6 +181,7 @@
}
public interface RedisKeys {
public static final String submission_period_key = "sp_";
+ public static final String import_bikes = "import_bikes";
}
public static final String ACCESS_ID = "ACCESS_ID";
@@ -211,6 +223,8 @@
public static final String BUSINESS_STARTTIME = "BUSINESS_STARTTIME";
//灏忕▼搴忔瘡鏃ユ湇鍔＄粨鏉熸椂闂�
public static final String BUSINESS_ENDTIME = "BUSINESS_ENDTIME";
+ //鐢佃溅浜岀淮鐮佸墠缂�
+ public static final String ELECTRICITY_PREFIX = "ELECTRICITY_PREFIX";
//閽夐拤閫氱煡鍦板潃
public static final String DINGDING_URL = "DINGDING_URL";
@@ -420,7 +434,8 @@
BACK_CYCLING("宸茶繕杞�", 2,"宸茶繕杞�"),
- LOCKING_DEFEAT("寮�閿佸け璐�", 3,"寮�閿佸け璐�")
+ LOCKING_DEFEAT("寮�閿佸け璐�", 3,"寮�閿佸け璐�"),
+ RIDES_PAUSING("涓村仠涓�", 4,"涓村仠涓�")
;
String name;
--
Gitblit v1.9.3