From 22e8a676ee42c0d78b3526bcd9a635abbe8dca03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 28 六月 2022 11:28:21 +0800
Subject: [PATCH] 优化databus bug
---
java110-core/src/main/java/com/java110/core/context/Environment.java | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/context/Environment.java b/java110-core/src/main/java/com/java110/core/context/Environment.java
index 6813075..04e2225 100644
--- a/java110-core/src/main/java/com/java110/core/context/Environment.java
+++ b/java110-core/src/main/java/com/java110/core/context/Environment.java
@@ -17,12 +17,11 @@
import com.java110.config.properties.code.Java110Properties;
-import com.java110.utils.factory.ApplicationContextFactory;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.util.StringUtil;
/**
* env
- *
*/
public class Environment {
@@ -31,46 +30,59 @@
public final static String ENV_ACTIVE = "ACTIVE";
- public final static String DEFAULT_ACTIVE="dev";
- public final static String DEFAULT_PHONE="cc_phone";
+ public final static String DEFAULT_ACTIVE = "dev";
+ public final static String DEFAULT_PHONE = "cc_phone";
/**
* 鐜鍙橀噺
+ *
* @param profile
* @return
*/
- public static String getEnv(String profile){
- return System.getenv(profile);
+ public static String getEnv(String profile) {
+ return System.getenv(profile);
}
- public static boolean testEnv(){
- String curEnv = getEnv(ENV_ACTIVE);
+ private static boolean testEnv() {
+ String curEnv = getEnv(ENV_ACTIVE);
- if(DEFAULT_ACTIVE.equals(curEnv) || StringUtil.isEmpty(curEnv)){
- return true;
- }
+ if (DEFAULT_ACTIVE.equals(curEnv) || StringUtil.isEmpty(curEnv)) {
+ return true;
+ }
- return false;
+ return false;
}
-
public static String getSecureCode() {
return secureCode;
}
+ /**
+ * 鍒ゆ柇鏄惁涓烘墜鏈哄紑鍙戞ā寮�
+ *
+ * @param java110Properties
+ * @return
+ */
public static boolean isOwnerPhone(Java110Properties java110Properties) {
-
- if(!testEnv()){
- return true;
- }
-
- if(StringUtil.isEmpty(java110Properties.getTestSwitch())
- || "0".equals(java110Properties.getTestSwitch())){
+ //寮�鍏虫槸鍚︽墦寮�涓烘祴璇曟ā寮�
+ if (StringUtil.isEmpty(java110Properties.getTestSwitch())
+ || "0".equals(java110Properties.getTestSwitch())) {
return false;
}
+ // 浜屾鍒ゆ柇鏄惁涓烘祴璇曟崲浠�
+ if (!testEnv()) {
+ return false;
+ }
return true;
}
+
+ public static void isDevEnv(){
+ String env = MappingCache.getValue("HC_ENV");
+ if ("DEV".equals(env) || "TEST".equals(env)) {
+ throw new IllegalArgumentException("涓轰簡淇濊瘉浣撻獙 姝ゅ姛鑳芥紨绀虹幆澧冧笉寮�鏀�");
+ }
+ }
}
--
Gitblit v1.8.0