Merge branch 'feature-2023-01-目标配置' into 'developer'

Feature 2023 01 目标配置

See merge request !878

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/exception/GlobalExceptionHandler.java

 package com.gic.haoban.manage.web.exception;
 
+import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.ShowFrontMessageException;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.web.controller.WebBaseController;
@@ -52,6 +53,25 @@ public class GlobalExceptionHandler extends WebBaseController {
         return res;
     }
 
+    @ResponseBody
+    @ExceptionHandler(RuntimeException.class)
+    public RestResponse controllerRunExceptionForRest(HttpServletResponse response, RuntimeException ex) {
+        logger.error("controllerRunException:{}", ex.getMessage(), ex);
+        RestResponse res = new RestResponse();
+        res.setCode(String.valueOf(HaoBanErrCode.ERR_3.getCode()));
+        String message = ex.getMessage();
+        if (message != null && message.indexOf(ShowFrontMessageException.class.getName()) > -1) {
+            Matcher matcher = pattern.matcher(message);
+            while (matcher.find()) {
+                message = (matcher.group(2));
+            }
+        } else {
+            message = HaoBanErrCode.ERR_3.getMsg();
+        }
+        res.setMessage(message);
+        return res;
+    }
+
     /**
      * 全局异常
      */

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/target/DataTargetHttpUtils.java

@@ -119,7 +119,7 @@ public class DataTargetHttpUtils {
         Config config = ConfigService.getConfig("COMMON.data-api-config");
         String value = config.getProperty(apolloKey, "");
         if (StringUtils.isBlank(value)) {
-            throw new RuntimeException("配置有误！");
+            throw new RuntimeException("数据接口配置有误！");
         }
         LOGGER.info("{}：Apollo查询的配置信息：{}", apolloKey, value);
         String[] split = value.split("\\+\\+\\+\\+");