24282 1 year ago
parent
commit
b278e8111e

+ 4 - 0
base-starter/src/main/java/org/dromara/base/config/ResponseAdvice.java

@@ -1,5 +1,6 @@
 package org.dromara.base.config;
 
+import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.base.annotation.FormatIgnore;
 import org.dromara.common.core.domain.R;
@@ -38,6 +39,9 @@ public class ResponseAdvice implements ResponseBodyAdvice<Object>, ErrorControll
         if (body instanceof R || body instanceof TableDataInfo) {
             return body;
         }
+        if (body instanceof String) {
+            return JSONObject.toJSONString(R.ok("操作成功", body));
+        }
         return R.ok("操作成功", body);
     }
 

+ 2 - 0
base-starter/src/main/java/org/dromara/web/controller/IndexController.java

@@ -2,6 +2,7 @@ package org.dromara.web.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
+import org.dromara.base.annotation.FormatIgnore;
 import org.dromara.common.core.config.RuoYiConfig;
 import org.dromara.common.core.utils.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,6 +26,7 @@ public class IndexController {
     /**
      * 访问首页,提示语
      */
+    @FormatIgnore
     @GetMapping("/")
     public String index() {
         return StringUtils.format("欢迎使用{}后台管理框架,当前版本:v{},请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());