配置和配置项可支持自定义app #147

knightliao · Sep 5, 2016 · 9122064 · 9122064
1 parent e553fab
commit 9122064
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
diff --git a/disconf-client/src/main/java/com/baidu/disconf/client/common/annotations/DisconfFile.java b/disconf-client/src/main/java/com/baidu/disconf/client/common/annotations/DisconfFile.java
@@ -32,6 +32,11 @@
      */
     String version() default "";
 
+    /**
+     * 版本,默认为用户指定的app
+     */
+    String app() default "";
+
     /**
      * 以"/"开头则是系统的全路径，否则则是相对于classpath的路径，默认是classpath根路径
      * 注意：根路径要注意是否有权限，否则会出现找不到路径，推荐采用相对路径

diff --git a/disconf-client/src/main/java/com/baidu/disconf/client/common/annotations/DisconfItem.java b/disconf-client/src/main/java/com/baidu/disconf/client/common/annotations/DisconfItem.java
@@ -32,6 +32,11 @@
      */
     String env() default "";
 
+    /**
+     * 版本,默认为用户指定的app
+     */
+    String app() default "";
+
     /**
      * 版本,默认为用户指定的版本
      */

diff --git a/...in/java/com/baidu/disconf/client/scan/inner/statically/impl/StaticScannerFileMgrImpl.java b/...in/java/com/baidu/disconf/client/scan/inner/statically/impl/StaticScannerFileMgrImpl.java
@@ -105,7 +105,8 @@ private static DisconfCenterFile transformScanFile(Class<?> disconfFileClass, Se
         //
         // disConfCommonModel
         DisConfCommonModel disConfCommonModel =
-                makeDisConfCommonModel(disconfFileAnnotation.env(), disconfFileAnnotation.version());
+                makeDisConfCommonModel(disconfFileAnnotation.app(), disconfFileAnnotation.env(), disconfFileAnnotation
+                        .version());
         disconfCenterFile.setDisConfCommonModel(disConfCommonModel);
 
         // Remote URL

diff --git a/...in/java/com/baidu/disconf/client/scan/inner/statically/impl/StaticScannerItemMgrImpl.java b/...in/java/com/baidu/disconf/client/scan/inner/statically/impl/StaticScannerItemMgrImpl.java
@@ -122,7 +122,8 @@ private static DisconfCenterItem transformScanItem(Method method) {
 
         //
         // disConfCommonModel
-        DisConfCommonModel disConfCommonModel = makeDisConfCommonModel(disconfItem.env(), disconfItem.version());
+        DisConfCommonModel disConfCommonModel = makeDisConfCommonModel(disconfItem.app(), disconfItem.env(),
+                disconfItem.version());
         disconfCenterItem.setDisConfCommonModel(disConfCommonModel);
 
         // Disconf-web url

diff --git a/...in/java/com/baidu/disconf/client/scan/inner/statically/impl/StaticScannerMgrImplBase.java b/...in/java/com/baidu/disconf/client/scan/inner/statically/impl/StaticScannerMgrImplBase.java
@@ -12,12 +12,16 @@ public class StaticScannerMgrImplBase {
     /**
      * env/version 默认是应用整合设置的，但用户可以在配置中更改它
      */
-    protected static DisConfCommonModel makeDisConfCommonModel(String env, String version) {
+    protected static DisConfCommonModel makeDisConfCommonModel(String app, String env, String version) {
 
         DisConfCommonModel disConfCommonModel = new DisConfCommonModel();
 
         // app
-        disConfCommonModel.setApp(DisClientConfig.getInstance().APP);
+        if (!app.isEmpty()) {
+            disConfCommonModel.setApp(app);
+        } else {
+            disConfCommonModel.setApp(DisClientConfig.getInstance().APP);
+        }
 
         // env
         if (!env.isEmpty()) {

diff --git a/...aidu/disconf/client/scan/inner/statically/impl/StaticScannerNonAnnotationFileMgrImpl.java b/...aidu/disconf/client/scan/inner/statically/impl/StaticScannerNonAnnotationFileMgrImpl.java
@@ -89,7 +89,7 @@ public static DisconfCenterBaseModel getDisconfCenterFile(String fileName) {
 
         //
         // disConfCommonModel
-        DisConfCommonModel disConfCommonModel = makeDisConfCommonModel("", "");
+        DisConfCommonModel disConfCommonModel = makeDisConfCommonModel("", "", "");
         disconfCenterFile.setDisConfCommonModel(disConfCommonModel);
 
         // Remote URL