兼容新配置中心

examcloud-web/src/main/java/cn/com/qmth/examcloud/web/bootstrap/PropertyHolder.java

@@ -1,11 +1,9 @@
 package cn.com.qmth.examcloud.web.bootstrap;
 
-import org.apache.commons.lang3.StringUtils;
+import cn.com.qmth.framework.config.center.client.core.EnvProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Properties;
-
 /**
  * 云配置
  *
@@ -17,103 +15,24 @@ public class PropertyHolder {
 
     private static final Logger LOG = LoggerFactory.getLogger(PropertyHolder.class);
 
-    private static final Properties PROPS = new Properties();
-
-    /**
-     * 设置属性
-     *
-     * @param key
-     * @param value
-     * @author WANGWEI
-     */
-    public static void setProperty(String key, String value) {
-        PROPS.setProperty(key, value);
-    }
-
-    /**
-     * @param key
-     * @return
-     */
     public static String getString(String key) {
-        String value = PROPS.getProperty(key);
-        if (StringUtils.isNotBlank(value)) {
-            return value.trim();
-        } else {
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("No property value, key = " + key);
-            }
-            return null;
-        }
+        return EnvProperty.getProperty(key);
     }
 
-    /**
-     * @param key
-     * @param defaultValue
-     * @return
-     */
     public static String getString(String key, String defaultValue) {
-        String value = getString(key);
-        if (null != value) {
-            return value;
-        }
-        return defaultValue;
+        return EnvProperty.getProperty(key, defaultValue);
     }
 
-    /**
-     * @param key
-     * @param defaultValue
-     * @return
-     */
     public static int getInt(String key, int defaultValue) {
-        String value = getString(key);
-        if (null != value) {
-            try {
-                return Integer.parseInt(value);
-            } catch (NumberFormatException e) {
-                PROPS.setProperty(key, String.valueOf(defaultValue));
-                return defaultValue;
-            }
-        }
-        return defaultValue;
+        return EnvProperty.getProperty(key, Integer.class, defaultValue);
     }
 
-    /**
-     * @param key
-     * @param defaultValue
-     * @return
-     */
     public static long getLong(String key, long defaultValue) {
-        String value = getString(key);
-        if (null != value) {
-            try {
-                return Long.parseLong(value);
-            } catch (NumberFormatException e) {
-                return defaultValue;
-            }
-        }
-        return defaultValue;
+        return EnvProperty.getProperty(key, Long.class, defaultValue);
     }
 
-    /**
-     * 获取boolean
-     *
-     * @param key
-     * @param defaultVale
-     * @return
-     * @author WANGWEI
-     */
-    public static boolean getBoolean(String key, boolean defaultVale) {
-        String value = getString(key);
-        if (null == value) {
-            return defaultVale;
-        }
-        if (value.equals("true")) {
-            return true;
-        } else if (value.equals("false")) {
-            return false;
-        } else {
-            return defaultVale;
-        }
+    public static boolean getBoolean(String key, boolean defaultValue) {
+        return EnvProperty.getProperty(key, Boolean.class, defaultValue);
     }
 
 }

examcloud-web/src/main/java/cn/com/qmth/examcloud/web/config/SystemProperties.java

@@ -56,7 +56,8 @@ public class SystemProperties {
         APP_SECRET_KEY = appSecretKey;
     }
 
-    @Value("${examcloud.startup.appCode:}")
+    /* @Value("${examcloud.startup.appCode:}") */
+    @Value("${sys.config.center.appCode:}")
     public void appCode(String appCode) {
         APP_CODE = appCode;
     }