JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix-bug-202303' into fix-bug-202303

Browse Source
This commit is contained in:
梁琦涛
2023-03-03 17:52:58 +08:00
parent f37c0e79f4 71ca26cc00
commit 220182e072
6 changed files with 104 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
+16 -34
View File
@@ -1,39 +1,21 @@
package com.jero.modules.system.controller;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.crypto.asymmetric.RSA;
import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.exceptions.ClientException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jero.modules.system.service.*;
import com.jero.common.api.vo.Result;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.model.SysLoginModel;
import com.jero.modules.system.service.ILoginService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CacheConstant;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.modules.base.service.BaseCommonService;
import com.jero.common.system.util.JwtUtil;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.*;
import com.jero.common.util.encryption.EncryptedString;
import com.jero.modules.system.entity.SysDepart;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.model.SysLoginModel;
import com.jero.modules.system.util.RandImageUtil;
import org.springframework.beans.BeanUtils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.security.KeyPair;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.util.*;
import java.util.List;
import java.util.Map;
/**
* @Author scott
@@ -52,7 +34,7 @@ public class LoginController {
public Result<JSONObject> login(@RequestBody SysLoginModel sysLoginModel){
return loginService.login(sysLoginModel);
}
/**
* 退出登录
* @param request
@@ -63,7 +45,7 @@ public class LoginController {
public Result<Object> logout(HttpServletRequest request,HttpServletResponse response) {
return loginService.logout(request,response);
}
/**
* 获取访问量
* @return
@@ -72,7 +54,7 @@ public class LoginController {
public Result<JSONObject> loginfo() {
return loginService.loginfo();
}
/**
* 获取访问量
* @return
@@ -94,7 +76,7 @@ public class LoginController {
/**
* 短信登录接口
*
*
* @param jsonObject
* @return
*/
@@ -102,10 +84,10 @@ public class LoginController {
public Result<String> sms(@RequestBody JSONObject jsonObject) {
return loginService.sms(jsonObject);
}
/**
* 手机号登录接口
*
*
* @param jsonObject
* @return
*/
@@ -135,7 +117,7 @@ public class LoginController {
public Result<String> randomImage(HttpServletResponse response,@PathVariable String key){
return loginService.randomImage(response,key);
}
/**
* app登录
* @param sysLoginModel
@@ -153,7 +135,7 @@ public class LoginController {
* @return
*/
@RequestMapping(value = "/checkCaptcha", method = RequestMethod.POST)
public Result<?> checkCaptcha(@RequestBody SysLoginModel sysLoginModel){
public Result<T> checkCaptcha(@RequestBody SysLoginModel sysLoginModel){
return loginService.checkCaptcha(sysLoginModel);
}
@@ -169,4 +151,4 @@ public class LoginController {
public Result<String> getRSAPublicKey(){
return loginService.getRSAPublicKey();
}
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java
+63 -56
View File
@@ -1,34 +1,30 @@
package com.jero.modules.system.controller;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.util.RedisUtil;
import com.jero.common.util.TokenUtils;
import com.jero.modules.system.util.XSSUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.CommonSendStatus;
import com.jero.common.constant.WebsocketConst;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.util.JwtUtil;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.RedisUtil;
import com.jero.common.util.TokenUtils;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.message.websocket.WebSocket;
import com.jero.modules.system.entity.SysAnnouncement;
import com.jero.modules.system.entity.SysAnnouncementSend;
import com.jero.modules.system.service.ISysAnnouncementSendService;
import com.jero.modules.system.service.ISysAnnouncementService;
import com.jero.modules.system.util.XSSUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -42,13 +38,14 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.jero.common.constant.CommonConstant.ANNOUNCEMENT_SEND_STATUS_1;
@@ -75,6 +72,8 @@ public class SysAnnouncementController {
@Lazy
private RedisUtil redisUtil;
private String ERROR_TEXT = "未找到对应实体";
/**
* 分页列表查询
* @param sysAnnouncement
@@ -83,15 +82,16 @@ public class SysAnnouncementController {
* @param req
* @return
*/
@RequestMapping(value = "/page", method = RequestMethod.GET)
// @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page")
public Result<IPage<SysAnnouncement>> queryPageList(SysAnnouncement sysAnnouncement,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<SysAnnouncement>> result = new Result<IPage<SysAnnouncement>>();
Result<IPage<SysAnnouncement>> result = new Result<>();
sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
QueryWrapper<SysAnnouncement> queryWrapper = new QueryWrapper<SysAnnouncement>(sysAnnouncement);
Page<SysAnnouncement> page = new Page<SysAnnouncement>(pageNo,pageSize);
QueryWrapper<SysAnnouncement> queryWrapper = new QueryWrapper<>(sysAnnouncement);
Page<SysAnnouncement> page = new Page<>(pageNo,pageSize);
//排序逻辑 处理
String column = req.getParameter("column");
String order = req.getParameter("order");
@@ -113,7 +113,8 @@ public class SysAnnouncementController {
* @param sysAnnouncement
* @return
*/
@RequestMapping(value = "/add", method = RequestMethod.POST)
// @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add")
public Result<Object> add(@RequestBody SysAnnouncement sysAnnouncement) {
try {
// update-begin-author:liusq date:20210804 for:标题处理xss攻击的问题
@@ -135,11 +136,12 @@ public class SysAnnouncementController {
* @param sysAnnouncement
* @return
*/
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
// @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PutMapping("/edit")
public Result<Object> eidt(@RequestBody SysAnnouncement sysAnnouncement) {
SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId());
if(sysAnnouncementEntity==null) {
return Result.error("未找到对应实体");
return Result.error(ERROR_TEXT);
}else {
// update-begin-author:liusq date:20210804 for:标题处理xss攻击的问题
String title = XSSUtils.striptXSS(sysAnnouncement.getTitile());
@@ -159,11 +161,12 @@ public class SysAnnouncementController {
* @param id
* @return
*/
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
// @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@DeleteMapping("/delete")
public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
if(sysAnnouncement==null) {
return Result.error("未找到对应实体");
return Result.error(ERROR_TEXT);
}else {
sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
boolean ok = sysAnnouncementService.updateById(sysAnnouncement);
@@ -180,7 +183,8 @@ public class SysAnnouncementController {
* @param ids
* @return
*/
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteBatch")
public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(ids==null || "".equals(ids.trim())) {
return Result.error("参数不识别！");
@@ -200,12 +204,12 @@ public class SysAnnouncementController {
* @param id
* @return
*/
@RequestMapping(value = "/queryById", method = RequestMethod.GET)
// @RequestMapping(value = "/queryById", method = RequestMethod.GET)
@GetMapping("/queryById")
public Result<SysAnnouncement> queryById(@RequestParam(name="id",required=true) String id) {
Result<SysAnnouncement> result = new Result<SysAnnouncement>();
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
if(sysAnnouncement==null) {
return Result.error("未找到对应实体");
return Result.error(ERROR_TEXT);
}else {
return Result.OK(sysAnnouncement);
}
@@ -216,11 +220,12 @@ public class SysAnnouncementController {
* @param id
* @return
*/
@RequestMapping(value = "/doReleaseData", method = RequestMethod.GET)
// @RequestMapping(value = "/doReleaseData", method = RequestMethod.GET)
@GetMapping("/doReleaseData")
public Result<SysAnnouncement> doReleaseData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) {
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
if(sysAnnouncement==null) {
return Result.error("未找到对应实体");
return Result.error(ERROR_TEXT);
}else {
sysAnnouncement.setSendStatus(CommonSendStatus.PUBLISHED_STATUS_1);//发布中
sysAnnouncement.setSendTime(new Date());
@@ -238,8 +243,6 @@ public class SysAnnouncementController {
// 2.插入用户通告阅读标记表记录
String userId = sysAnnouncement.getUserIds();
String[] userIds = userId.substring(0, (userId.length()-1)).split(",");
String anntId = sysAnnouncement.getId();
Date refDate = new Date();
JSONObject obj = new JSONObject();
obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
obj.put(WebsocketConst.MSG_ID, sysAnnouncement.getId());
@@ -258,11 +261,12 @@ public class SysAnnouncementController {
* @param id
* @return
*/
@RequestMapping(value = "/doReovkeData", method = RequestMethod.GET)
// @RequestMapping(value = "/doReovkeData", method = RequestMethod.GET)
@GetMapping("/doReovkeData")
public Result<Object> doReovkeData(@RequestParam(name="id",required=true) String id, HttpServletRequest request) {
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
if(sysAnnouncement==null) {
return Result.error("未找到对应实体");
return Result.error(ERROR_TEXT);
}else {
sysAnnouncement.setSendStatus(CommonSendStatus.REVOKE_STATUS_2);//撤销发布
sysAnnouncement.setCancelTime(new Date());
@@ -279,13 +283,14 @@ public class SysAnnouncementController {
* @功能：补充用户数据，并返回系统消息
* @return
*/
@RequestMapping(value = "/listByUser", method = RequestMethod.GET)
// @RequestMapping(value = "/listByUser", method = RequestMethod.GET)
@GetMapping("/listByUser")
public Result<Map<String,Object>> listByUser() {
Result<Map<String,Object>> result = new Result<Map<String,Object>>();
Result<Map<String,Object>> result = new Result<>();
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
// 1.将系统消息补充到用户通告阅读标记表中
LambdaQueryWrapper<SysAnnouncement> querySaWrapper = new LambdaQueryWrapper<SysAnnouncement>();
LambdaQueryWrapper<SysAnnouncement> querySaWrapper = new LambdaQueryWrapper<>();
querySaWrapper.eq(SysAnnouncement::getMsgType,CommonConstant.MSG_TYPE_ALL); // 全部人员
querySaWrapper.eq(SysAnnouncement::getDelFlag,CommonConstant.DEL_FLAG_0.toString()); // 未删除
querySaWrapper.eq(SysAnnouncement::getSendStatus, CommonConstant.HAS_SEND); //已发布
@@ -294,7 +299,7 @@ public class SysAnnouncementController {
querySaWrapper.notInSql(SysAnnouncement::getId,"select annt_id from sys_announcement_send where user_id='"+userId+"'");
//update-begin--Author:liusq Date:20210108 for： [JT-424] 【开源issue】bug处理--------------------
List<SysAnnouncement> announcements = sysAnnouncementService.list(querySaWrapper);
if(announcements.size()>0) {
if(announcements.isEmpty()) {
for(int i=0;i<announcements.size();i++) {
//update-begin--Author:wangshuai Date:20200803 for： 通知公告消息重复LOWCOD-759--------------------
//因为websocket没有判断是否存在这个用户，要是判断会出现问题，故在此判断逻辑
@@ -313,11 +318,11 @@ public class SysAnnouncementController {
}
}
// 2.查询用户未读的系统消息
Page<SysAnnouncement> anntMsgList = new Page<SysAnnouncement>(0,5);
Page<SysAnnouncement> anntMsgList = new Page<>(0,5);
anntMsgList = sysAnnouncementService.querySysCementPageByUserId(anntMsgList,userId,"1");//通知公告消息
Page<SysAnnouncement> sysMsgList = new Page<SysAnnouncement>(0,5);
Page<SysAnnouncement> sysMsgList = new Page<>(0,5);
sysMsgList = sysAnnouncementService.querySysCementPageByUserId(sysMsgList,userId,"2");//系统消息
Map<String,Object> sysMsgMap = new HashMap<String, Object>();
Map<String,Object> sysMsgMap = new HashMap<>();
sysMsgMap.put("sysMsgList", sysMsgList.getRecords());
sysMsgMap.put("sysMsgTotal", sysMsgList.getTotal());
sysMsgMap.put("anntMsgList", anntMsgList.getRecords());
@@ -336,7 +341,7 @@ public class SysAnnouncementController {
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(SysAnnouncement sysAnnouncement,HttpServletRequest request) {
// Step.1 组装查询条件
LambdaQueryWrapper<SysAnnouncement> queryWrapper = new LambdaQueryWrapper<SysAnnouncement>(sysAnnouncement);
LambdaQueryWrapper<SysAnnouncement> queryWrapper = new LambdaQueryWrapper<>(sysAnnouncement);
//Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
queryWrapper.eq(SysAnnouncement::getDelFlag,CommonConstant.DEL_FLAG_0);
@@ -357,8 +362,9 @@ public class SysAnnouncementController {
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
// @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
@PostMapping("/importExcel")
public Result<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -394,14 +400,15 @@ public class SysAnnouncementController {
* @param anntId
* @return
*/
@RequestMapping(value = "/syncNotic", method = RequestMethod.GET)
// @RequestMapping(value = "/syncNotic", method = RequestMethod.GET)
@GetMapping("/syncNotic")
public Result<SysAnnouncement> syncNotic(@RequestParam(name="anntId",required=false) String anntId, HttpServletRequest request) {
Result<SysAnnouncement> result = new Result<SysAnnouncement>();
Result<SysAnnouncement> result = new Result<>();
JSONObject obj = new JSONObject();
if(StringUtils.isNotBlank(anntId)){
SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(anntId);
if(sysAnnouncement==null) {
return Result.error("未找到对应实体");
return Result.error(ERROR_TEXT);
}else {
if(sysAnnouncement.getMsgType().equals(CommonConstant.MSG_TYPE_ALL)) {
obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_TOPIC);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java
+19 -19
View File
@@ -45,7 +45,8 @@ import lombok.extern.slf4j.Slf4j;
public class SysAnnouncementSendController {
@Autowired
private ISysAnnouncementSendService sysAnnouncementSendService;
private String ERROE_MSG = "未找到对应实体";
/**
* 分页列表查询
* @param sysAnnouncementSend
@@ -59,9 +60,9 @@ public class SysAnnouncementSendController {
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<SysAnnouncementSend>> result = new Result<IPage<SysAnnouncementSend>>();
QueryWrapper<SysAnnouncementSend> queryWrapper = new QueryWrapper<SysAnnouncementSend>(sysAnnouncementSend);
Page<SysAnnouncementSend> page = new Page<SysAnnouncementSend>(pageNo,pageSize);
Result<IPage<SysAnnouncementSend>> result = new Result<>();
QueryWrapper<SysAnnouncementSend> queryWrapper = new QueryWrapper<>(sysAnnouncementSend);
Page<SysAnnouncementSend> page = new Page<>(pageNo,pageSize);
//排序逻辑 处理
String column = req.getParameter("column");
String order = req.getParameter("order");
@@ -81,7 +82,7 @@ public class SysAnnouncementSendController {
result.setResult(pageList);
return result;
}
/**
* 添加
* @param sysAnnouncementSend
@@ -97,7 +98,7 @@ public class SysAnnouncementSendController {
return Result.error("操作失败");
}
}
/**
* 编辑
* @param sysAnnouncementSend
@@ -107,17 +108,17 @@ public class SysAnnouncementSendController {
public Result<Object> edit(@RequestBody SysAnnouncementSend sysAnnouncementSend) {
SysAnnouncementSend sysAnnouncementSendEntity = sysAnnouncementSendService.getById(sysAnnouncementSend.getId());
if(sysAnnouncementSendEntity==null) {
return Result.error("未找到对应实体");
return Result.error(ERROE_MSG);
}else {
boolean ok = sysAnnouncementSendService.updateById(sysAnnouncementSend);
if(ok) {
return Result.OK("操作成功!");
}
}
return Result.OK();
}
/**
* 通过id删除
* @param id
@@ -127,7 +128,7 @@ public class SysAnnouncementSendController {
public Result<Object> delete(@RequestParam(name="id",required=true) String id) {
SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
if(sysAnnouncementSend==null) {
return Result.error("未找到对应实体");
return Result.error(ERROE_MSG);
}else {
boolean ok = sysAnnouncementSendService.removeById(id);
if(ok) {
@@ -137,7 +138,7 @@ public class SysAnnouncementSendController {
return Result.OK();
}
/**
* 批量删除
* @param ids
@@ -152,7 +153,7 @@ public class SysAnnouncementSendController {
return Result.OK("删除成功!");
}
}
/**
* 通过id查询
* @param id
@@ -160,15 +161,14 @@ public class SysAnnouncementSendController {
*/
@GetMapping(value = "/queryById")
public Result<SysAnnouncementSend> queryById(@RequestParam(name="id",required=true) String id) {
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id);
if(sysAnnouncementSend==null) {
return Result.error("未找到对应实体");
return Result.error(ERROE_MSG);
}else {
return Result.OK(sysAnnouncementSend);
}
}
/**
* @功能：更新用户系统消息阅读状态
* @param json
@@ -176,7 +176,7 @@ public class SysAnnouncementSendController {
*/
@PutMapping(value = "/editByAnntIdAndUserId")
public Result<SysAnnouncementSend> editById(@RequestBody JSONObject json) {
Result<SysAnnouncementSend> result = new Result<SysAnnouncementSend>();
Result<SysAnnouncementSend> result = new Result<>();
String anntId = json.getString("anntId");
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
@@ -189,7 +189,7 @@ public class SysAnnouncementSendController {
result.setSuccess(true);
return result;
}
/**
* @功能：获取我的消息
* @return
@@ -198,13 +198,13 @@ public class SysAnnouncementSendController {
public Result<IPage<AnnouncementSendModel>> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
Result<IPage<AnnouncementSendModel>> result = new Result<IPage<AnnouncementSendModel>>();
Result<IPage<AnnouncementSendModel>> result = new Result<>();
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
announcementSendModel.setUserId(userId);
announcementSendModel.setPageNo((pageNo-1)*pageSize);
announcementSendModel.setPageSize(pageSize);
Page<AnnouncementSendModel> pageList = new Page<AnnouncementSendModel>(pageNo,pageSize);
Page<AnnouncementSendModel> pageList = new Page<>(pageNo,pageSize);
pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel);
result.setResult(pageList);
result.setSuccess(true);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ILoginService.java
+3 -7
View File
@@ -1,15 +1,11 @@
package com.jero.modules.system.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.model.SysLoginModel;
import com.jero.modules.system.model.TreeSelectModel;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.RequestBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -99,7 +95,7 @@ public interface ILoginService{
* @param sysLoginModel
* @return
*/
public Result<?> checkCaptcha(@RequestBody SysLoginModel sysLoginModel);
public Result<T> checkCaptcha(@RequestBody SysLoginModel sysLoginModel);
/**
* 返回一个RSA公钥
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java
+2 -1
View File
@@ -24,6 +24,7 @@ import com.jero.modules.system.model.TreeSelectModel;
import com.jero.modules.system.service.*;
import com.jero.modules.system.util.RandImageUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.jeecgframework.poi.excel.imports.base.ImportFileServiceI;
import org.springframework.beans.BeanUtils;
@@ -421,7 +422,7 @@ public class LoginServiceImpl implements ILoginService {
}
@Override
public Result<?> checkCaptcha(SysLoginModel sysLoginModel) {
public Result<T> checkCaptcha(SysLoginModel sysLoginModel) {
String captcha = sysLoginModel.getCaptcha();
String checkKey = sysLoginModel.getCheckKey();
if(captcha==null){
jero-web/src/components/menu/index.js
+1 -1
View File
@@ -134,7 +134,7 @@ export default {
},
renderMenuItem (menu) {
const target = menu.meta.target || null
const tag = target && 'a' || 'router-link'
const tag = (target && 'a') || 'router-link'
let props = { to: { name: menu.name } }
if (menu.route && menu.route === '0') {
props = { to: { path: menu.path } }