diff --git a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java
index 36c4d2a8d0..cf4471f6c6 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java
@@ -3,6 +3,7 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.RSASignature;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -15,6 +16,7 @@ import com.epmet.service.LoginService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.imageio.ImageIO;
@@ -36,6 +38,8 @@ import java.util.Arrays;
 @RestController
 @RequestMapping("login")
 public class LoginController {
+	@Value("${epmet.login.privateKey}")
+	private String privateKey;
 	@Autowired
 	private CaptchaService captchaService;
 
@@ -90,11 +94,15 @@ public class LoginController {
 	 * @Date 2020/3/14 19:46
 	 **/
 	@PostMapping("/operweb/loginbypassword")
-	public Result<UserTokenResultDTO> loginByPassword(@RequestBody LoginByPassWordFormDTO formDTO) {
+	public Result<UserTokenResultDTO> loginByPassword(@RequestBody LoginByPassWordFormDTO formDTO) throws Exception {
 		//效验数据
 		ValidatorUtils.validateEntity(formDTO);
-		Result<UserTokenResultDTO> result = loginService.loginByPassword(formDTO);
-		return result;
+		//解密密码
+		if (formDTO.getPassword().length() > 50) {
+			String confirmNewPassWord = RSASignature.decryptByPrivateKey(formDTO.getPassword(), privateKey);
+			formDTO.setPassword(confirmNewPassWord);
+		}
+		return loginService.loginByPassword(formDTO);
 	}
 
 	/**