From a51079ad8deab6a0a00e0e8729a778b19c357477 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期一, 20 三月 2023 13:07:34 +0800
Subject: [PATCH] 该接口返回参数
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 14 ++++++++++----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 14 ++++++++------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 3 ---
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 18 ++++++++++--------
4 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
index 2846f9a..b28ca68 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@@ -2,6 +2,7 @@
import java.awt.image.BufferedImage;
import java.io.IOException;
+import java.util.HashMap;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import javax.imageio.ImageIO;
@@ -47,7 +48,6 @@
{
AjaxResult ajax = AjaxResult.success();
boolean captchaEnabled = configService.selectCaptchaEnabled();
- ajax.put("captchaEnabled", captchaEnabled);
if (!captchaEnabled)
{
return ajax;
@@ -87,11 +87,13 @@
return AjaxResult.error(e.getMessage());
}
- ajax.put("uuid", uuid);
- ajax.put("img", Base64.encode(os.toByteArray()));
- ajax.put("code",200);
- ajax.put("value",code);
- ajax.put("txt","77777");
+ HashMap<String, Object> data = new HashMap<>();
+ data.put("uuid",uuid);
+ data.put("img",Base64.encode(os.toByteArray()));
+ data.put("value",code);
+ data.put("txt","77777");
+ ajax.put("msg","鎿嶄綔鎴愬姛");
+ ajax.put("data",data);
return ajax;
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index b68b6f5..6c13276 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.common;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -93,10 +94,15 @@
String url = serverConfig.getUrl() + fileName;
AjaxResult ajax = AjaxResult.success();
- ajax.put("url", url);
- ajax.put("fileName", fileName);
- ajax.put("newFileName", FileUtils.getName(fileName));
- ajax.put("originalFilename", file.getOriginalFilename());
+
+ HashMap<String, Object> data = new HashMap<>();
+ data.put("url", url);
+ data.put("fileName", fileName);
+ data.put("newFileName", FileUtils.getName(fileName));
+ data.put("originalFilename", file.getOriginalFilename());
+
+ ajax.put("msg","鎿嶄綔鎴愬姛");
+ ajax.put("data",data);
return ajax;
}
catch (Exception e)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index c83c026..07f3998 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -22,8 +22,5 @@
-
-
-
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index fec82cd..4a881ba 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.service.IZfPropertyService;
import org.springframework.stereotype.Service;
+import java.util.HashMap;
import java.util.List;
@@ -47,15 +48,16 @@
Page<ZfProperty> zfPropertyPage = new Page<>(pageNum,pageSize);
Page<ZfProperty> pageResult = page(zfPropertyPage, lqw);
- AjaxResult success = AjaxResult.success();
- success.put("msg","鎿嶄綔鎴愬姛");
- success.put("code",200);
- success.put("data",pageResult.getRecords());
- success.put("total",pageResult.getTotal());
- success.put("pageNum",pageResult.getCurrent());
- success.put("pageSize",pageResult.getSize());
- return success;
+ HashMap<String, Object> data = new HashMap<>();
+
+ data.put("data",pageResult.getRecords());
+ data.put("total",pageResult.getTotal());
+ data.put("pageNum",pageResult.getCurrent());
+ data.put("pageSize",pageResult.getSize());
+
+
+ return AjaxResult.success(data);
}
}
--
Gitblit v1.9.1