From c50686f775664c5a722f4b5ad7afde1e5214b14d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 05 十一月 2024 19:07:21 +0800 Subject: [PATCH] 最新版本541200007 --- server/system_service/src/main/java/com/doumee/api/system/SystemController.java | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemController.java index 8b7ba74..3d7543e 100644 --- a/server/system_service/src/main/java/com/doumee/api/system/SystemController.java +++ b/server/system_service/src/main/java/com/doumee/api/system/SystemController.java @@ -1,24 +1,45 @@ package com.doumee.api.system; import com.doumee.api.BaseController; +import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.biz.system.SystemUserBiz; import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.annotation.trace.Trace; import com.doumee.core.model.ApiResponse; import com.doumee.core.model.LoginUserInfo; +import com.doumee.core.utils.Constants; import com.doumee.dao.system.dto.LoginDTO; import com.doumee.dao.system.dto.UpdatePwdDto; import com.doumee.service.system.SystemLoginService; +import com.hikvision.artemis.sdk.ArtemisHttpUtil; +import com.hikvision.artemis.sdk.util.HttpUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.util.EntityUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.util.EntityUtils; +import javax.servlet.http.HttpServletRequest; + import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; /** * @author Eva.Caesar Liu @@ -37,10 +58,12 @@ @Autowired private SystemLoginService systemLoginService; + @PreventRepeat(limit = 10, lockTime = 10000) @ApiOperation("鐧诲綍") @PostMapping("/login") public ApiResponse<String> login (@Validated @RequestBody LoginDTO dto, HttpServletRequest request) { + dto.setCheckCode(true); return ApiResponse.success(systemLoginService.loginByPassword(dto, request)); } @@ -52,11 +75,13 @@ return ApiResponse.success(null); } + + @Trace(withRequestParameters = false) @ApiOperation("淇敼褰撳墠鐢ㄦ埛瀵嗙爜") @PostMapping("/updatePwd") public ApiResponse updatePwd (@Validated @RequestBody UpdatePwdDto dto) { - dto.setUserId(this.getLoginUser().getId()); + dto.setUserId(this.getLoginUser(null).getId()); systemUserBiz.updatePwd(dto); return ApiResponse.success(null); } @@ -64,6 +89,6 @@ @ApiOperation("鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�") @GetMapping("/getUserInfo") public ApiResponse<LoginUserInfo> getUserInfo () { - return ApiResponse.success(this.getLoginUser()); + return ApiResponse.success(this.getLoginUser(null)); } } -- Gitblit v1.9.3