From 6bd02d963b7e4be8e46301ce216009b32893668a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 4 Jun 2021 00:02:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B3=A8=E9=87=8A=E6=8E=89=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-jwtLogin/pom.xml | 13 +++ .../da/login/rest/LoginRestController.java | 79 ++++++++++--------- .../com/adc/da/main/config/ShiroConfig.java | 2 +- .../SarStandardsInfoController.java | 28 +++++++ 4 files changed, 82 insertions(+), 40 deletions(-) diff --git a/adc-da-jwtLogin/pom.xml b/adc-da-jwtLogin/pom.xml index 930ab3c1..6d199da8 100644 --- a/adc-da-jwtLogin/pom.xml +++ b/adc-da-jwtLogin/pom.xml @@ -21,6 +21,7 @@ 1.8 UTF-8 UTF-8 + 2.6.6 @@ -29,6 +30,18 @@ adc-da-sys 3.0.0 + + + net.sf.ehcache + ehcache-core + ${ehcache.version} + + + net.sf.ehcache + ehcache-web + 2.0.4 + + diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java index 9ab1480c..4472fcfe 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java @@ -31,7 +31,7 @@ import java.util.Map; @Validated @Controller -@RequestMapping(value = "/auth") +@RequestMapping(value = "/api") @Api(description = "登录接口") @Slf4j public class LoginRestController { @@ -79,47 +79,48 @@ public class LoginRestController { private int verifyCodeMode; +// @ApiOperation(value = "登录") +// @PostMapping(value = "/login") +// @ResponseBody +// public ResponseMessage loginWithVerifyCode(HttpServletResponse response, @RequestBody LoginVO loginVO) { +// String username = loginVO.getUsername(); +// String password = loginVO.getPassword(); +// String key = loginVO.getKey(); +// +// if (StringUtils.isBlank(username)) { +// return Result.error("r0014", "登录名不能为空"); +// } +// if (StringUtils.isBlank(password)) { +// return Result.error("r0016", "密码不能为空"); +// } +// if (StringUtils.isBlank(key)) { +// return Result.error("key不能为空"); +// } +// +// +// +// UserEO userEO = userService.getUserByLoginNameNotDeleted(username); +// if (null == userEO) { +// log.info("用户[{}]身份验证失败", username); +// return Result.error("r0011", "您输入的帐号或密码有误"); +// } +// if (PasswordUtils.validatePassword(password, userEO.getPassword())) { +// String token = JWTUtil.sign(username, userEO.getPassword(), userEO.getUsid()); +// response.setHeader("Authorization", token); +// response.addHeader("Access-Control-Allow-Headers", "Authorization"); +// return Result.success(token); +// } else { +// log.info("用户[{}]密码验证失败", username); +// return Result.error("r0011", "您输入的帐号或密码有误"); +// } +// } + + + @ApiOperation(value = "登录") +// @GetMapping(value = "/login") @PostMapping(value = "/login") @ResponseBody - public ResponseMessage loginWithVerifyCode(HttpServletResponse response, @RequestBody LoginVO loginVO) { - String username = loginVO.getUsername(); - String password = loginVO.getPassword(); - String key = loginVO.getKey(); - - if (StringUtils.isBlank(username)) { - return Result.error("r0014", "登录名不能为空"); - } - if (StringUtils.isBlank(password)) { - return Result.error("r0016", "密码不能为空"); - } - if (StringUtils.isBlank(key)) { - return Result.error("key不能为空"); - } - - - - UserEO userEO = userService.getUserByLoginNameNotDeleted(username); - if (null == userEO) { - log.info("用户[{}]身份验证失败", username); - return Result.error("r0011", "您输入的帐号或密码有误"); - } - if (PasswordUtils.validatePassword(password, userEO.getPassword())) { - String token = JWTUtil.sign(username, userEO.getPassword(), userEO.getUsid()); - response.setHeader("Authorization", token); - response.addHeader("Access-Control-Allow-Headers", "Authorization"); - return Result.success(token); - } else { - log.info("用户[{}]密码验证失败", username); - return Result.error("r0011", "您输入的帐号或密码有误"); - } - } - - - - @ApiOperation(value = "登录") - @GetMapping(value = "/login") - @ResponseBody public ResponseMessage loginRest(HttpServletRequest request, HttpServletResponse response, @RequestParam @NotNull(message = "请输入用户名") String username, @RequestParam @NotNull(message = "请输入密码") String password, diff --git a/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfig.java b/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfig.java index 3ab198c6..b1268fa1 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfig.java +++ b/adc-da-main/src/main/java/com/adc/da/main/config/ShiroConfig.java @@ -22,7 +22,7 @@ import javax.servlet.Filter; import java.util.HashMap; import java.util.Map; -@Configuration +//@Configuration @Order(value=1) public class ShiroConfig { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index c3e56761..8df49c74 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -180,5 +180,33 @@ public class SarStandardsInfoController extends BaseController } } +// @ApiOperation(value = "|SysCorpEO|导出excel") +// @GetMapping(value = "/exportStandardsInfoExcel") +// public void exportStandardsInfoExcel(StandardsInfoExcelVO standardsInfoExcelVO,HttpServletResponse response, +// HttpServletRequest request) throws Exception { +// OutputStream os = null; +// Workbook workbook = null; +// try { +// if(StringUtils.isEmpty(standardsInfoExcelVO.getExportName())||standardsInfoExcelVO.getExportName().equals("null")){ +// standardsInfoExcelVO.setExportName("标准法规信息"); +// } +// response.setHeader("Content-Disposition", +// "attachment; filename=" + ReadExcel.encodeFileName(standardsInfoExcelVO.getExportName()+".xlsx", +// request)); +// response.setContentType("application/force-download"); +// // 导出所有数据 +// List datas = sarStandardsInfoEOService.getExportDatas(standardsInfoExcelVO); +// workbook = StandExportUtil.exportDatas(datas,standardsInfoExcelVO.getStandType()); +// os = response.getOutputStream(); +// workbook.write(os); +// os.flush(); +// } catch (IOException e) { +// logger.error(e.getMessage(), e); +// throw new AdcDaBaseException("下载文件失败，请重试"); +// } finally { +// IOUtils.closeQuietly(os); +// } +// } + }