From 6cd222d13f03901362f9a4c36a204e1e0b93a6e4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 08 九月 2022 00:31:22 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-core/src/main/java/com/java110/core/context/Environment.java |   78 +++++++++++++++++++++++++++++----------
 1 files changed, 58 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..f82f407 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,85 @@
 
     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";
+
+    public final static String SPRING_CLOUD = "CLOUD"; // 鐜鏄痵pring boot cloud
+    public final static String SPRING_BOOT = "BOOT"; // 鐜鏄痵pring boot cloud
+
+    private static String systemStartWay = "CLOUD"; // 鐜鏄痵pring boot cloud
 
     /**
      * 鐜鍙橀噺
+     *
      * @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("涓轰簡淇濊瘉浣撻獙 姝ゅ姛鑳芥紨绀虹幆澧冧笉寮�鏀�");
+        }
+    }
+
+
+    /**
+     * boot 鏂瑰紡鍚姩
+     * @return
+     */
+    public static boolean isStartBootWay(){
+        if(Environment.SPRING_BOOT.equals(systemStartWay)){
+            return true;
+        }
+
+        return false;
+    }
+
+    public static String getSystemStartWay() {
+        return systemStartWay;
+    }
+
+    public static void setSystemStartWay(String systemStartWay) {
+        Environment.systemStartWay = systemStartWay;
+    }
 }

--
Gitblit v1.8.0