1.更换数据库连接池 c3p0 => durid

disconf-client/deploy/package-jar.xml

@@ -16,7 +16,6 @@
             <directory>target/classes</directory>
             <excludes>
                 <exclude>disconf.properties</exclude>
-                <exclude>logback.xml</exclude>
             </excludes>
             <outputDirectory>/</outputDirectory>
         </fileSet>

disconf-client/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.baidu.disconf</groupId>
         <artifactId>disconf-base</artifactId>
-        <version>2.6.36</version>
+        <version>2.6.41</version>
     </parent>
 
     <licenses>
@@ -67,6 +67,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -83,6 +84,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -93,21 +95,29 @@
         <!-- log dependencies -->
 
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.sun.jmx</groupId>
+                    <artifactId>jmxri</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jdmk</groupId>
+                    <artifactId>jmxtools</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.jms</groupId>
+                    <artifactId>jms</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- ================ test ================ -->

disconf-client/src/main/java/com/baidu/disconf/client/DisconfMgr.java

@@ -53,7 +53,7 @@ private DisconfMgr() {
     }
 
     /**
-     * 总入口
+     * 总入口 (Just for test ?)
      */
     public synchronized void start(List<String> scanPackageList) {
 
@@ -199,6 +199,38 @@ public synchronized void reloadableScan(String fileName) {
         }
     }
 
+    /**
+     * reloadable config file scan, for xml config
+     * Modify at 20170802 by felix.sung
+     */
+    public synchronized void reloadableScan(String fileName,String relativePath) {
+
+        if (!isFirstInit) {
+            return;
+        }
+
+        if (DisClientConfig.getInstance().ENABLE_DISCONF) {
+            try {
+
+                if (!DisClientConfig.getInstance().getIgnoreDisconfKeySet().contains(fileName)) {
+
+                    if (scanMgr != null) {
+                        scanMgr.reloadableScan(fileName,relativePath);
+                    }
+
+                    if (disconfCoreMgr != null) {
+                        disconfCoreMgr.processFile(fileName);
+                    }
+                    LOGGER.debug("disconf reloadable file: {} , relativeFilePath : {}", fileName , relativePath);
+                }
+
+            } catch (Exception e) {
+
+                LOGGER.error(e.toString(), e);
+            }
+        }
+    }
+
     /**
      * @Description: 总关闭
      */

disconf-client/src/main/java/com/baidu/disconf/client/DisconfMgrBean.java

@@ -30,7 +30,7 @@ public class DisconfMgrBean implements BeanDefinitionRegistryPostProcessor, Prio
 
     private ApplicationContext applicationContext;
 
-    private String scanPackage = null;
+    private String  scanPackage = null;
 
     public void destroy() {
 

disconf-client/src/main/java/com/baidu/disconf/client/addons/properties/ReloadablePropertiesFactoryBean.java

@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,14 +60,16 @@ public void setLocations(List<String> fileNames) {
             filename = filename.trim();
 
             String realFileName = getFileName(filename);
+            String relativeFilePath = getFileRelativePath(filename);
 
             //
             // register to disconf
             //
-            DisconfMgr.getInstance().reloadableScan(realFileName);
+            DisconfMgr.getInstance().reloadableScan(realFileName,relativeFilePath);
 
             //
             // only properties will reload
+            // TODO 是否可以考虑支持多类型配置文件
             //
             String ext = FilenameUtils.getExtension(filename);
             if (ext.equals("properties")) {
@@ -118,6 +121,30 @@ private String getFileName(String fileName) {
         return null;
     }
 
+    private String getFileRelativePath(String fileName){
+        if (fileName != null) {
+            int index = fileName.indexOf(':');
+            if (index < 0) {
+                return fileName;
+            } else {
+                fileName = fileName.substring(index + 1);
+            }
+            //配置文件应该使用相对路径，此操作避免读取系统绝对路径
+            if(fileName.startsWith("/")){
+                fileName = fileName.substring(1);
+            }
+            //判断是否包含目录
+            if(fileName.indexOf("/") > 0){
+                fileName = fileName.substring(0,fileName.lastIndexOf("/"));
+            }else{
+                return "";
+            }
+
+            return fileName;
+        }
+        return null;
+    }
+
     protected Resource[] getLocations() {
         return locations;
     }

disconf-client/src/main/java/com/baidu/disconf/client/common/model/DisconfCenterFile.java

@@ -170,7 +170,7 @@ public String getFileDir() {
             if (targetDirPath.startsWith("/")) {
                 return OsUtil.pathJoin(targetDirPath);
             }
-
+            LOGGER.info("Download target file path : {}" , OsUtil.pathJoin(ClassLoaderUtil.getClassPath(), targetDirPath));
             return OsUtil.pathJoin(ClassLoaderUtil.getClassPath(), targetDirPath);
         }
 

disconf-client/src/main/java/com/baidu/disconf/client/core/filetype/impl/DisconfAnyFileProcessorImpl.java

@@ -14,6 +14,8 @@ public class DisconfAnyFileProcessorImpl implements DisconfFileTypeProcessor {
     @Override
     public Map<String, Object> getKvMap(String fileName) throws Exception {
         // TODO Auto-generated method stub
+
+
         return null;
     }
 

disconf-client/src/main/java/com/baidu/disconf/client/core/processor/impl/DisconfFileCoreProcessorImpl.java

@@ -129,7 +129,7 @@ private void updateOneConfFile(String fileName, DisconfCenterFile disconfCenterF
         }
 
         //
-        // 注入到仓库中
+        // 注入到仓库中，Reload非注解形式bean属性值
         //
         disconfStoreProcessor.inject2Store(fileName, new DisconfValue(null, dataMap));
         LOGGER.debug("inject ok.");

disconf-client/src/main/java/com/baidu/disconf/client/fetcher/impl/FetcherMgrImpl.java

@@ -49,9 +49,8 @@ public class FetcherMgrImpl implements FetcherMgr {
     // 创建对象
     //
     public FetcherMgrImpl(RestfulMgr restfulMgr, int retryTime, int retrySleepSeconds,
-                          boolean enableLocalDownloadDirInClassPath, String localDownloadDir, String
-                                  localDownloadDirTemp, List<String>
-                                  hostList) {
+                          boolean enableLocalDownloadDirInClassPath, String localDownloadDir,
+                          String localDownloadDirTemp, List<String> hostList) {
 
         this.restfulMgr = restfulMgr;
 

disconf-client/src/main/java/com/baidu/disconf/client/scan/ScanMgr.java

@@ -24,4 +24,12 @@ public interface ScanMgr {
      * @throws Exception
      */
     void reloadableScan(String fileName) throws Exception;
+
+    /**
+     * reloadable for non-annotation config file(eg: spring xml)
+     * @param fileName      config file name
+     * @param relativePath  relative path
+     * @throws Exception
+     */
+    void reloadableScan(String fileName , String relativePath) throws Exception;
 }

disconf-client/src/main/java/com/baidu/disconf/client/scan/impl/ScanMgrImpl.java

@@ -114,4 +114,9 @@ public void reloadableScan(String fileName) throws Exception {
         StaticScannerNonAnnotationFileMgrImpl.scanData2Store(fileName);
     }
 
+    @Override
+    public void reloadableScan(String fileName, String relativePath) throws Exception {
+        StaticScannerNonAnnotationFileMgrImpl.scanData2Store(fileName,relativePath);
+    }
+
 }

disconf-client/src/main/java/com/baidu/disconf/client/scan/inner/statically/impl/StaticScannerNonAnnotationFileMgrImpl.java

@@ -37,6 +37,7 @@ public void scanData2Store(ScanStaticModel scanModel) {
     /**
      *
      */
+    @Deprecated
     public static void scanData2Store(String fileName) {
 
         DisconfCenterBaseModel disconfCenterBaseModel =
@@ -45,6 +46,14 @@ public static void scanData2Store(String fileName) {
         DisconfStoreProcessorFactory.getDisconfStoreFileProcessor().transformScanData(disconfCenterBaseModel);
     }
 
+    public static void scanData2Store(String fileName, String relativePath) {
+
+        DisconfCenterBaseModel disconfCenterBaseModel =
+                StaticScannerNonAnnotationFileMgrImpl.getDisconfCenterFile(fileName,relativePath);
+
+        DisconfStoreProcessorFactory.getDisconfStoreFileProcessor().transformScanData(disconfCenterBaseModel);
+    }
+
     /**
      *
      */
@@ -104,4 +113,41 @@ public static DisconfCenterBaseModel getDisconfCenterFile(String fileName) {
         return disconfCenterFile;
     }
 
+    /**
+     *
+     */
+    public static DisconfCenterBaseModel getDisconfCenterFile(String fileName , String relativePath) {
+
+        DisconfCenterFile disconfCenterFile = new DisconfCenterFile();
+
+        fileName = fileName.trim();
+
+        //
+        // file name
+        disconfCenterFile.setFileName(fileName);
+
+        // 非注解式
+        disconfCenterFile.setIsTaggedWithNonAnnotationFile(true);
+
+        // file type
+        disconfCenterFile.setSupportFileTypeEnum(SupportFileTypeEnum.getByFileName(fileName));
+        disconfCenterFile.setTargetDirPath(relativePath);
+
+        //
+        // disConfCommonModel
+        DisConfCommonModel disConfCommonModel = makeDisConfCommonModel("", "", "");
+        disconfCenterFile.setDisConfCommonModel(disConfCommonModel);
+
+        // Remote URL
+        String url = DisconfWebPathMgr.getRemoteUrlParameter(DisClientSysConfig.getInstance().CONF_SERVER_STORE_ACTION,
+                disConfCommonModel.getApp(),
+                disConfCommonModel.getVersion(),
+                disConfCommonModel.getEnv(),
+                disconfCenterFile.getFileName(),
+                DisConfigTypeEnum.FILE);
+        disconfCenterFile.setRemoteServerUrl(url);
+
+        return disconfCenterFile;
+    }
+
 }

disconf-client/src/test/resources/log4j.properties

@@ -0,0 +1,19 @@
+
+log4j.rootLogger=INFO,dailyRolling,CONSOLE
+
+log4j.logger.org.apache.zookeeper=WARN
+log4j.logger.org.springframework=INFO
+log4j.logger.org.springframework.aop.framework.Cglib2AopProxy = INFO
+
+log4j.appender.dailyRolling=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.dailyRolling.File=../log/disconf-client.log
+log4j.appender.dailyRolling.layout=org.apache.log4j.PatternLayout
+log4j.appender.dailyRolling.layout.ConversionPattern=%d [%t] %-5p %-17c{2} (%13F:%L) %3x - %m%n
+
+log4j.appender.Threshold=WARN
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d [%t] %-5p %-17c{2} (%13F:%L) %3x - %m%n
+
+