@@ -38,66 +38,100 @@ public class CoreConfigure {
3838
3939 private static final String KEY_UNSAFE_ENABLE = "unsafe.enable" ;
4040
41- // 受保护key数组，在保护key范围之内，如果前端已经传递过参数了，只能认前端，后端无法修改
41+ // 受保护key数组，在保护key范围之内，以用户传递的配置为准，系统配置不允许覆盖
4242 private static final String [] PROTECT_KEY_ARRAY = {KEY_NAMESPACE , KEY_SANDBOX_HOME , KEY_LAUNCH_MODE , KEY_SERVER_IP , KEY_SERVER_PORT , KEY_SERVER_CHARSET };
4343
4444 // 用户配置和系统默认配置都可以，需要进行合并的key，例如user_module
4545 private static final String [] MULTI_KEY_ARRAY = {KEY_USER_MODULE_LIB_PATH };
4646
4747 private static final FeatureCodec codec = new FeatureCodec (';' , '=' );
4848
49- private final Map <String , String > featureMap ;
49+ private final Map <String , String > featureMap = new LinkedHashMap < String , String >() ;
5050
51- private CoreConfigure (final String featureString ) {
52- this .featureMap = codec .toMap (featureString );
51+ private CoreConfigure (final String featureString ,
52+ final String propertiesFilePath ) {
53+ final Map <String , String > featureMap = toFeatureMap (featureString );
54+ final Map <String , String > propertiesMap = toPropertiesMap (propertiesFilePath );
55+ this .featureMap .putAll (merge (featureMap , propertiesMap ));
5356 }
5457
55- private static volatile CoreConfigure instance ;
56-
57- public static CoreConfigure toConfigure (final String featureString , final String propertiesFilePath ) {
58- return instance = mergePropertiesFile (new CoreConfigure (featureString ), propertiesFilePath );
58+ private Map <String , String > toFeatureMap (String featureString ) {
59+ return codec .toMap (featureString );
5960 }
6061
61- // 从配置文件中合并配置到CoreConfigure中
62- private static CoreConfigure mergePropertiesFile (final CoreConfigure cfg , final String propertiesFilePath ) {
63- Map <String , String > propertiesMap = propertiesToStringMap (cfg , fetchProperties (propertiesFilePath ));
64- for (String key : MULTI_KEY_ARRAY ) {
65- if (cfg .featureMap .containsKey (key ) && propertiesMap .containsKey (key )) {
66- propertiesMap .put (key , cfg .featureMap .get (key ) + ";" + propertiesMap .get (key ));
67- }
62+ private Map <String , String > toPropertiesMap (String propertiesFilePath ) {
63+ final Map <String , String > propertiesMap = new LinkedHashMap <String , String >();
64+
65+ if (null == propertiesFilePath ) {
66+ return propertiesMap ;
6867 }
69- cfg .featureMap .putAll (propertiesMap );
70- return cfg ;
71- }
7268
73- // 从指定配置文件路径中获取配置信息
74- private static Properties fetchProperties (final String propertiesFilePath ) {
69+ final File propertiesFile = new File (propertiesFilePath );
70+ if (!propertiesFile .exists ()
71+ || !propertiesFile .canRead ()) {
72+ return propertiesMap ;
73+ }
74+
75+
76+ // 从指定配置文件路径中获取配置信息
7577 final Properties properties = new Properties ();
7678 InputStream is = null ;
7779 try {
78- is = FileUtils .openInputStream (new File ( propertiesFilePath ) );
80+ is = FileUtils .openInputStream (propertiesFile );
7981 properties .load (is );
8082 } catch (Throwable cause ) {
8183 // cause.printStackTrace(System.err);
8284 } finally {
8385 IOUtils .closeQuietly (is );
8486 }
85- return properties ;
86- }
8787
88- // 配置转map
89- private static Map <String , String > propertiesToStringMap (CoreConfigure cfg , final Properties properties ) {
90- final Map <String , String > map = new HashMap <String , String >();
88+ // 转换为Map
9189 for (String key : properties .stringPropertyNames ()) {
90+ propertiesMap .put (key , properties .getProperty (key ));
91+ }
92+
93+ return propertiesMap ;
94+ }
95+
96+ private Map <String , String > merge (Map <String , String > featureMap , Map <String , String > propertiesMap ) {
9297
93- //如果受保护的key已经由入参指定，则过滤掉受保护的key,防止入参被覆盖
94- if (cfg .featureMap .containsKey (key ) && ArrayUtils .contains (PROTECT_KEY_ARRAY , key )) {
98+ // 以featureMap配置为准
99+ final Map <String , String > mergeMap = new LinkedHashMap <String , String >(featureMap );
100+
101+ // 合并propertiesMap
102+ for (final Map .Entry <String , String > propertiesEntry : propertiesMap .entrySet ()) {
103+
104+ // 如果是受保护的KEY，则以featureMap中的非空值为准
105+ if (mergeMap .containsKey (propertiesEntry .getKey ())
106+ && ArrayUtils .contains (PROTECT_KEY_ARRAY , propertiesEntry .getKey ())) {
95107 continue ;
96108 }
97109
98- map .put (key , properties .getProperty (key ));
110+ // 如果是多值合并的KEY，则不进行覆盖，转为合并
111+ else if (ArrayUtils .contains (MULTI_KEY_ARRAY , propertiesEntry .getKey ())
112+ && mergeMap .containsKey (propertiesEntry .getKey ())) {
113+ mergeMap .put (
114+ propertiesEntry .getKey (),
115+ mergeMap .get (propertiesEntry .getKey ()) + ";" + propertiesEntry .getValue ()
116+ );
117+ continue ;
118+ }
119+
120+ // 合并K,V
121+ else {
122+ mergeMap .put (propertiesEntry .getKey (), propertiesEntry .getValue ());
123+ }
124+
99125 }
100- return map ;
126+
127+ return mergeMap ;
128+
129+ }
130+
131+ private static volatile CoreConfigure instance ;
132+
133+ public static CoreConfigure toConfigure (final String featureString , final String propertiesFilePath ) {
134+ return instance = new CoreConfigure (featureString , propertiesFilePath );
101135 }
102136
103137 public static CoreConfigure getInstance () {
0 commit comments