Merge branch 'feature-jingfeng' into 'master'

holo配置修改

See merge request !1934

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/content/holo/HoloDataSource.java

@@ -107,10 +107,10 @@ public class HoloDataSource implements InitializingBean, DisposableBean {
     }
 
     private Pair<String, String> getHoloAuth() {
-        //{"appId":"ops_key","cluster":"default","namespaceName":"application","configurations":{"aliyun-key":"{\n\"LTAI5tGn2YicKmgcyTiJDV59\":\"iOp7cICESPZIvIjJRtTmLnCd4gT1Qy\"\n}"},"releaseKey":"20240412153514-b260f04ffbe11f4e"}
-        String result = HttpUtil.get("http://proapollo.gicdev.com:7080/configs/ops_key/default/application?key=aliyun-key",10000);
+        //{"appId":"ops_key","cluster":"default","namespaceName":"key_config","configurations":{"demo_aliyun_key":"{\n    \"LTAI5tMF2pZGShdULEYbyntc\": \"pC16FjCeklpXg18duNhJsEF91FvxpE\"\n}"},"releaseKey":"20240604165817-7632f04ffbe11f53"}
+        String result = HttpUtil.get("http://10.0.100.2:7080/configs/ops_key/default/key_config",10000);
         JSON json = JSONUtil.parse(result);
-        String authInfo = json.getByPath("configurations.aliyun-key", String.class);
+        String authInfo = json.getByPath("configurations.demo_aliyun_key", String.class);
         JSON authJson = JSONUtil.parseObj(authInfo);
         Map<String, String> map = authJson.toBean(new TypeReference<Map<String, String>>() {});
         for (Map.Entry<String, String> entry : map.entrySet()) {