diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java
index 2ffb8d133..45593a684 100644
--- a/src/main/java/org/redkale/boot/Application.java
+++ b/src/main/java/org/redkale/boot/Application.java
@@ -111,13 +111,6 @@ public final class Application {
      */
     public static final String RESNAME_APP_CLIENT_ASYNCGROUP = "APP_CLIENT_ASYNCGROUP";
 
-    /**
-     * 环境变量， 类型：Environment
-     *
-     * @since 2.7.0
-     */
-    public static final String RESNAME_APP_ENV = "APP_ENV";
-
     /**
      * 当前Service所属的SNCP Server的地址 类型: SocketAddress、InetSocketAddress、String <br>
      */
@@ -306,7 +299,7 @@ public final class Application {
             this.resourceFactory.register(RESNAME_APP_CONF_DIR, File.class, confFile);
             this.resourceFactory.register(RESNAME_APP_CONF_DIR, Path.class, confFile.toPath());
         }
-        this.resourceFactory.register(RESNAME_APP_ENV, Environment.class, appEnvironment);
+        this.resourceFactory.register(Environment.class, appEnvironment);
         {
             int nid = config.getIntValue("nodeid", 0);
             this.nodeid = nid;
@@ -749,23 +742,24 @@ public final class Application {
                     String key = prop.getValue("name");
                     String value = prop.getValue("value");
                     if (key == null || value == null) continue;
-                    appProperties.put(key, value);
-                    value = replaceValue(value);
-                    if (key.startsWith("redkale.datasource.") || key.startsWith("redkale.datasource[")
-                        || key.startsWith("redkale.cachesource.") || key.startsWith("redkale.cachesource[")) {
-                        sourceProperties.put(key, value);
-                    } else if (key.startsWith("system.property.")) {
-                        String propName = key.substring("system.property.".length());
-                        if (System.getProperty(propName) == null) { //命令行传参数优先级高
-                            System.setProperty(propName, value);
-                        }
-                    } else if (key.startsWith("mimetype.property.")) {
-                        MimeType.add(key.substring("mimetype.property.".length()), value);
-                    } else if (key.startsWith("property.")) {
-                        resourceFactory.register(key, value);
-                    } else {
-                        resourceFactory.register("property." + key, value);
-                    }
+                    putResourceProperties(key, value, null);
+//                    appProperties.put(key, value);
+//                    value = replaceValue(value);
+//                    if (key.startsWith("redkale.datasource.") || key.startsWith("redkale.datasource[")
+//                        || key.startsWith("redkale.cachesource.") || key.startsWith("redkale.cachesource[")) {
+//                        sourceProperties.put(key, value);
+//                    } else if (key.startsWith("system.property.")) {
+//                        String propName = key.substring("system.property.".length());
+//                        if (System.getProperty(propName) == null) { //命令行传参数优先级高
+//                            System.setProperty(propName, value);
+//                        }
+//                    } else if (key.startsWith("mimetype.property.")) {
+//                        MimeType.add(key.substring("mimetype.property.".length()), value);
+//                    } else if (key.startsWith("property.")) {
+//                        resourceFactory.register(key, value);
+//                    } else {
+//                        resourceFactory.register("property." + key, value);
+//                    }
                 }
                 String dfloads = propertiesConf.getValue("load");
                 if (dfloads != null) {
@@ -779,14 +773,8 @@ public final class Application {
                                 ps.load(in);
                                 in.close();
                                 if (logger.isLoggable(Level.FINEST)) logger.log(Level.FINEST, "load properties(" + dfload + ") size = " + ps.size());
-                                appProperties.putAll(ps);
                                 ps.forEach((x, y) -> {
-                                    if (x.toString().startsWith("redkale.datasource.") || x.toString().startsWith("redkale.datasource[")
-                                        || x.toString().startsWith("redkale.cachesource.") || x.toString().startsWith("redkale.cachesource[")) {
-                                        sourceProperties.put(x, replaceValue(y.toString()));
-                                    } else {
-                                        resourceFactory.register("property." + x, replaceValue(y.toString()));
-                                    }
+                                    putResourceProperties(x.toString(), y, null);
                                 });
                             } catch (Exception e) {
                                 logger.log(Level.WARNING, "load properties(" + dfload + ") error", e);
@@ -813,7 +801,7 @@ public final class Application {
                         if (compileMode) {
                             this.propertiesAgent.compile(propertiesConf);
                         } else {
-                            this.propertiesAgent.init(this, resourceFactory, propertiesConf);
+                            this.propertiesAgent.init(this, propertiesConf);
                         }
                         logger.info("PropertiesAgent (type = " + this.propertiesAgent.getClass().getSimpleName() + ") init in " + (System.currentTimeMillis() - s) + " ms");
                         break;
@@ -1700,6 +1688,35 @@ public final class Application {
         return value == null ? value : value.replace("${APP_HOME}", homePath).replace("${APP_NAME}", name);
     }
 
+    void putResourceProperties(String key, Object value, Properties cache) {
+        if (key == null || value == null) return;
+        appProperties.put(key, value);
+        value = replaceValue(value.toString());
+        if (key.startsWith("redkale.datasource.") || key.startsWith("redkale.datasource[")
+            || key.startsWith("redkale.cachesource.") || key.startsWith("redkale.cachesource[")) {
+            sourceProperties.put(key, value);
+        } else if (key.startsWith("system.property.")) {
+            String propName = key.substring("system.property.".length());
+            if (System.getProperty(propName) == null) { //命令行传参数优先级高
+                System.setProperty(propName, String.valueOf(value));
+            }
+        } else if (key.startsWith("mimetype.property.")) {
+            MimeType.add(key.substring("mimetype.property.".length()), String.valueOf(value));
+        } else if (key.startsWith("property.")) {
+            if (cache == null) {
+                resourceFactory.register(key, value);
+            } else {
+                cache.put(key, value);
+            }
+        } else {
+            if (cache == null) {
+                resourceFactory.register("property." + key, value);
+            } else {
+                cache.put("property." + key, value);
+            }
+        }
+    }
+
     private static String generateHelp() {
         return ""
             + "Usage: redkale [command] [arguments]\r\n"
diff --git a/src/main/java/org/redkale/boot/PropertiesAgent.java b/src/main/java/org/redkale/boot/PropertiesAgent.java
index da08f3721..957b06f20 100644
--- a/src/main/java/org/redkale/boot/PropertiesAgent.java
+++ b/src/main/java/org/redkale/boot/PropertiesAgent.java
@@ -41,10 +41,9 @@ public abstract class PropertiesAgent {
      * 初始化配置源，配置项需要写入appProperties，并监听配置项的变化
      *
      * @param application Application
-     * @param factory     依赖注入资源工厂
      * @param conf        节点配置
      */
-    public abstract void init(Application application, ResourceFactory factory, AnyValue conf);
+    public abstract void init(Application application, AnyValue conf);
 
     /**
      * 销毁动作
@@ -53,22 +52,13 @@ public abstract class PropertiesAgent {
      */
     public abstract void destroy(AnyValue conf);
 
-    protected String getKeyResourceName(String key) {
-        return key.startsWith("redkale.")
-            || key.startsWith("property.")
-            || key.startsWith("system.property.")
-            || key.startsWith("mimetype.property.") ? key : ("property." + key);
-    }
-
-    protected void putResourceProperties(Application application, Properties newProps) {
-        newProps.forEach((k, v) -> putResourceProperties(application, k.toString(), v));
+    protected void putResourceProperties(Application application, Properties props) {
+        Properties cache = new Properties();
+        props.forEach((k, v) -> application.putResourceProperties(k.toString(), v, cache));
+        application.resourceFactory.register(cache);
     }
 
     protected void putResourceProperties(Application application, String key, Object value) {
-        if (key.startsWith("redkale.datasource.") || key.startsWith("redkale.datasource[")
-            || key.startsWith("redkale.cachesource.") || key.startsWith("redkale.cachesource[")) {
-            application.sourceProperties.put(key, value);
-        }
-        application.appProperties.put(key, value);
+        application.putResourceProperties(key, value, null);
     }
 }