Jinquan_Ou
2023-03-20 a51079ad8deab6a0a00e0e8729a778b19c357477
该接口返回参数
4个文件已修改
49 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
    }
}
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)
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -22,8 +22,5 @@
}
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);
    }
}