From 8c7ee4136c67b7749d490718d9d511985679deaa Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Tue, 6 Jun 2017 08:20:47 +0800
Subject: [PATCH]

---
 bin/start.bat                         | 2 --
 lib/readme.txt                        | 2 +-
 libs/readme.txt                       | 1 +
 src/META-INF/application-template.xml | 8 +++-----
 src/org/redkale/boot/NodeServer.java  | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)
 create mode 100644 libs/readme.txt

diff --git a/bin/start.bat b/bin/start.bat
index 2d5618002..5982b2602 100644
--- a/bin/start.bat
+++ b/bin/start.bat
@@ -4,7 +4,5 @@ SET APP_HOME=%~dp0
 
 IF NOT EXIST "%APP_HOME%\conf\application.xml"  SET APP_HOME=%~dp0..
 
-#java -DAPP_HOME=%APP_HOME% -classpath %APP_HOME%\lib\* --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED  org.redkale.boot.Application
-
 java -DAPP_HOME=%APP_HOME% -classpath %APP_HOME%\lib\* org.redkale.boot.Application
 
diff --git a/lib/readme.txt b/lib/readme.txt
index 1e2fb2426..39089a77d 100644
--- a/lib/readme.txt
+++ b/lib/readme.txt
@@ -1 +1 @@
-所有进程运行所依赖的jar默认放在此处
\ No newline at end of file
+所有进程运行所依赖的第三方jar默认放在此处
\ No newline at end of file
diff --git a/libs/readme.txt b/libs/readme.txt
new file mode 100644
index 000000000..909b40ebd
--- /dev/null
+++ b/libs/readme.txt
@@ -0,0 +1 @@
+自己的业务jar默认放在此处
\ No newline at end of file
diff --git a/src/META-INF/application-template.xml b/src/META-INF/application-template.xml
index 9780a6996..a8b9de8a1 100644
--- a/src/META-INF/application-template.xml
+++ b/src/META-INF/application-template.xml
@@ -101,7 +101,7 @@
         host:  鏈嶅姟鎵�鍗燼ddress 锛� 榛樿: 0.0.0.0
         port:  required 鏈嶅姟鎵�鍗犵鍙� 
         root:  濡傛灉鏄痺eb绫诲瀷鏈嶅姟锛屽垯鍖呭惈椤甸潰  榛樿:{APP_HOME}/root
-        lib: server棰濆鐨刢lass鐩綍锛� 榛樿涓虹┖ 
+        lib: server棰濆鐨刢lass鐩綍锛� 榛樿涓�${APP_HOME}/libs/*; 
         excludelibs: 鎺掗櫎lib.path涓巈xcludes涓殑姝ｅ垯琛ㄨ揪寮忓尮閰嶇殑璺緞, 澶氫釜姝ｅ垯琛ㄨ揪寮忕敤鍒嗗彿;闅斿紑
         charset: 鏂囨湰缂栫爜锛� 榛樿: UTF-8
         backlog:  榛樿10K
@@ -119,8 +119,7 @@
         <!-- 
            鍔犺浇鎵�鏈夌殑Service鏈嶅姟;
            鍦ㄥ悓涓�涓繘绋嬩腑鍚屼竴涓猲ame鍚屼竴绫诲瀷鐨凷ervice灏嗗叡鐢ㄥ悓涓�涓疄渚�
-           autoload="true"  榛樿鍊�. 鑷姩鍔犺浇浠ヤ笅鐩綍锛堝鏋滃瓨鍦ㄧ殑璇濓級涓嬫墍鏈夌殑Service绫�:
-                                 server.lib;    server.lib/*;    server.classes;    
+           autoload="true"  榛樿鍊�. 鑷姩鍔犺浇classpath涓嬫墍鏈夌殑Service绫�  
            autoload="false" 闇�瑕佹樉钁楃殑鎸囧畾Service绫�
            includes锛� 褰揳utoload="true"锛� 鎷夊彇绫诲悕涓巌ncludes涓殑姝ｅ垯琛ㄨ揪寮忓尮閰嶇殑绫�, 澶氫釜姝ｅ垯琛ㄨ揪寮忕敤鍒嗗彿;闅斿紑
            excludes锛� 褰揳utoload="true"锛� 鎺掗櫎绫诲悕涓巈xcludes涓殑姝ｅ垯琛ㄨ揪寮忓尮閰嶇殑绫�, 澶氫釜姝ｅ垯琛ㄨ揪寮忕敤鍒嗗彿;闅斿紑           
@@ -246,8 +245,7 @@
         <!-- 
            鍔犺浇鎵�鏈夌殑Servlet鏈嶅姟;
            path:  servlet鐨凜ontextPath鍓嶇紑 榛樿涓虹┖
-           autoload="true"  榛樿鍊�. 鑷姩鍔犺浇浠ヤ笅鐩綍锛堝鏋滃瓨鍦ㄧ殑璇濓級涓嬫墍鏈夌殑Servlet绫�:
-                                 ${APP_HOME}/lib;    ${APP_HOME}/root/lib/*;    ${APP_HOME}/root/classes;   
+           autoload="true"  榛樿鍊�. 鑷姩鍔犺浇classpath涓嬫墍鏈夌殑Servlet绫� 
            autoload="false" 闇�瑕佹樉钁楃殑鎸囧畾Service绫�
            includes锛� 褰揳utoload="true"锛� 鎷夊彇绫诲悕涓巌ncludes涓殑姝ｅ垯琛ㄨ揪寮忓尮閰嶇殑绫�, 澶氫釜姝ｅ垯琛ㄨ揪寮忕敤鍒嗗彿;闅斿紑
            excludes锛� 褰揳utoload="true"锛� 鎺掗櫎绫诲悕涓巈xcludes涓殑姝ｅ垯琛ㄨ揪寮忓尮閰嶇殑绫�, 澶氫釜姝ｅ垯琛ㄨ揪寮忕敤鍒嗗彿;闅斿紑
diff --git a/src/org/redkale/boot/NodeServer.java b/src/org/redkale/boot/NodeServer.java
index 515453214..5deb8c914 100644
--- a/src/org/redkale/boot/NodeServer.java
+++ b/src/org/redkale/boot/NodeServer.java
@@ -132,7 +132,7 @@ public abstract class NodeServer {
 
             final String homepath = myroot.getCanonicalPath();
             //鍔犲叆鎸囧畾鐨刢lasspath
-            Server.loadLib(classLoader, logger, this.serverConf.getValue("lib", "").replace("${APP_HOME}", homepath) + ";" + homepath + "/lib/*;" + homepath + "/classes");
+            Server.loadLib(classLoader, logger, (isWATCH() ? "${APP_HOME}/lib/*;" : "") + this.serverConf.getValue("lib", "${APP_HOME}/libs/*").replace("${APP_HOME}", homepath));
         }
         //蹇呴』瑕佽繘琛屽垵濮嬪寲锛� 鏋勫缓Service鏃堕渶瑕佷娇鐢–ontext涓殑ExecutorService
         server.init(this.serverConf);