feature(配置修改): 配置修改

配置修改

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/business/impl/ResourceBusiness.java

@@ -345,10 +345,11 @@ public class ResourceBusiness implements IResourceBusiness {
      * @throws IOException
      */
     private String getAppRemoteDetailById(String appId) throws IOException {
-        String busSraId = resourceConfig.getMenuResource().getBusSraId();
+        String busSraId = resourceConfig.getBusSraId();
+        String busSreIdcard = resourceConfig.getBusSreIdcard();
         String busServiceId = resourceConfig.getMenuResource().getBusServiceId();
         String busServiceFunc = resourceConfig.getMenuResource().getBusServiceFunc();
-        List<Header> heards = getHeaders(busSraId, busServiceId, busServiceFunc);
+        List<Header> heards = getHeaders(busSraId, busSreIdcard, busServiceId, busServiceFunc);
         String url = resourceConfig.getResourceUrl() + "/" + appId;
         CloseableHttpResponse response = HttpUtil.get(url, null, heards);
         return EntityUtils.toString(response.getEntity());
@@ -361,10 +362,11 @@ public class ResourceBusiness implements IResourceBusiness {
      * @return
      */
     private String getAppRemoteDetailByCode(String appCode) throws IOException {
-        String busSraId = resourceConfig.getAppModifyResource().getBusSraId();
+        String busSraId = resourceConfig.getBusSraId();
+        String busSreIdcard = resourceConfig.getBusSreIdcard();
         String busServiceId = resourceConfig.getAppModifyResource().getBusServiceId();
         String busServiceFunc = resourceConfig.getAppModifyResource().getBusServiceFunc();
-        List<Header> heards = getHeaders(busSraId, busServiceId, busServiceFunc);
+        List<Header> heards = getHeaders(busSraId, busSreIdcard, busServiceId, busServiceFunc);
         String url = resourceConfig.getResourceUrl();
         Map<String, String> param = new HashMap<>();
         param.put("yyxtbh", appCode);
@@ -389,10 +391,11 @@ public class ResourceBusiness implements IResourceBusiness {
         String param = JSON.toJSONString(map);
         //获取服务资源
         //服务资源提供方一次查询所有服务资源,未采用分页获取方式
-        String busSraId = resourceConfig.getServiceResource().getBusSraId();
+        String busSraId = resourceConfig.getBusSraId();
+        String busSreIdcard = resourceConfig.getBusSreIdcard();
         String busServiceId = resourceConfig.getServiceResource().getBusServiceId();
         String busServiceFunc = resourceConfig.getServiceResource().getBusServiceFunc();
-        List<Header> headerList = getHeaders(busSraId, busServiceId, busServiceFunc);
+        List<Header> headerList = getHeaders(busSraId, busSreIdcard, busServiceId, busServiceFunc);
         String response = HttpUtil.postJSON(url, param, headerList, null);
         if (null == response) {
             httpResult.setCode(ResponseStatus.FAIL_CODE);
@@ -491,10 +494,11 @@ public class ResourceBusiness implements IResourceBusiness {
         map.put("page",pageNo-1);
         map.put("size",pageSize);
         String param = JSON.toJSONString(map);
-        String busSraId = resourceConfig.getAppResource().getBusSraId();
+        String busSraId = resourceConfig.getBusSraId();
+        String busSreIdcard = resourceConfig.getBusSreIdcard();
         String busServiceId = resourceConfig.getAppResource().getBusServiceId();
         String busServiceFunc = resourceConfig.getAppResource().getBusServiceFunc();
-        List<Header> headerList = getHeaders(busSraId,busServiceId,busServiceFunc);
+        List<Header> headerList = getHeaders(busSraId, busSreIdcard, busServiceId, busServiceFunc);
         String response = HttpUtil.postForm(url, param, headerList, null);
         if(null == response){
             httpResult.setCode(ResponseStatus.FAIL_CODE);
@@ -510,17 +514,21 @@ public class ResourceBusiness implements IResourceBusiness {
 
     /**
      * 总线调用设置请求头
+     *
      * @param busSraId
+     * @param busSreIdcard
      * @param busServiceId
      * @param busServiceFunc
      * @return
      */
-    private List<Header> getHeaders(String busSraId, String busServiceId, String busServiceFunc) {
+    private List<Header> getHeaders(String busSraId, String busSreIdcard, String busServiceId, String busServiceFunc) {
         List<Header> heardList = new ArrayList<>();
         Header busSraIdHeader = new BasicHeader("bus_sra_id",busSraId);
+        Header busSreIdHeader = new BasicHeader("bus_sre_idcard", busSreIdcard);
         Header serviceIdHeader = new BasicHeader("bus_service_id",busServiceId);
         Header busServiceFuncHeader = new BasicHeader("bus_service_func",busServiceFunc);
         heardList.add(busSraIdHeader);
+        heardList.add(busSreIdHeader);
         heardList.add(serviceIdHeader);
         heardList.add(busServiceFuncHeader);
         return heardList;

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/config/DcucResourceConfig.java

@@ -34,6 +34,16 @@ public class DcucResourceConfig {
      */
     private String appTopic;
 
+    /**
+     * 总线请求头参数
+     */
+    private String busSraId;
+
+    /**
+     * 总线请求头参数
+     */
+    private String busSreIdcard;
+
     /**
      * 服务资源配置
      */
@@ -57,10 +67,6 @@ public class DcucResourceConfig {
     @Data
     public static class MenuResourceConfig {
 
-        /**
-         * 总线请求头参数
-         */
-        private String busSraId;
         /**
          * 总线请求头参数
          */
@@ -71,13 +77,6 @@ public class DcucResourceConfig {
          */
         private String busServiceFunc;
 
-        /**
-         * 总线请求头参数
-         * 根据应用编码获取应用详情
-         * 用于应用新增或更改推送查询接口
-         */
-        private String busServiceFuncAppUpdate;
-
         /**
          * 是否需要获取菜单数据
          */
@@ -86,27 +85,25 @@ public class DcucResourceConfig {
 
     @Data
     public static class AppResourceConfig {
+
         /**
          * 总线请求头参数
          */
-        private String busSraId;
+        private String busServiceId;
         /**
          * 总线请求头参数
          */
-        private String busServiceId;
+        private String busServiceFunc;
+
         /**
          * 总线请求头参数
          */
-        private String busServiceFunc;
+        private String busSreIdcard;
     }
 
     @Data
     public static class ServiceResourceConfig {
 
-        /**
-         * 总线请求头参数
-         */
-        private String busSraId;
         /**
          * 总线请求头参数
          */
@@ -119,10 +116,7 @@ public class DcucResourceConfig {
 
     @Data
     public static class AppModifyResourceConfig {
-        /**
-         * 总线请求头参数
-         */
-        private String busSraId;
+
         /**
          * 总线请求头参数
          */

dcuc-app-service/src/main/resources/application-app.yml

@@ -11,26 +11,24 @@ dcuc:
       #是否开启kafka
       kafka: false
       app-topic: 10000028
+      bus-sra-id: B1200000001
+      bus-sre-idcard:
       #应用资源请求参数
       page-size: 50
       app-resource:
-        bus-sra-id: B1200000001
         bus-service-id: S-120000000000-0700-00006
         bus-service-func: searchApp
       #服务资源请求参数
       service-resource:
-        bus-sra-id: B1200000001
         bus-service-id: S-120000000000-0700-00070
         bus-service-func: findAll
       #菜单资源请求参数
       menu-resource:
-        bus-sra-id: B0100000001
         bus-service-id: S-120000000000-0700-00006
         bus-service-func: findApp
         menu-enabled: true
       #应用增量同步接口参数
       app-modify-resource:
-        bus-sra-id: B0100000001
         bus-service-id: S-120000000000-0200-00029
         bus-service-func: findAppByYyxtbh
       resource-url: http://10.201.7.31:8585/bus/send