diff --git a/admin/pom.xml b/admin/pom.xml
index fbcc4cf..003bea7 100644
--- a/admin/pom.xml
+++ b/admin/pom.xml
@@ -55,6 +55,16 @@
pdfbox
3.0.5
+
+ org.apache.poi
+ poi
+ 5.2.3
+
+
+ org.apache.poi
+ poi-ooxml
+ 5.2.3
+
diff --git a/admin/src/main/java/com/jinrui/reference/admin/mapper/AdminUserMapper.java b/admin/src/main/java/com/jinrui/reference/admin/mapper/AdminUserMapper.java
index b129625..a83f77e 100644
--- a/admin/src/main/java/com/jinrui/reference/admin/mapper/AdminUserMapper.java
+++ b/admin/src/main/java/com/jinrui/reference/admin/mapper/AdminUserMapper.java
@@ -21,6 +21,7 @@ public interface AdminUserMapper {
@Result(column = "name", property = "name"),
@Result(column = "active", property = "active"),
@Result(column = "user_type", property = "userType"),
+ @Result(column = "password", property = "password"),
@Result(column = "create_time", property = "createTime", javaType = Date.class, jdbcType = JdbcType.TIMESTAMP),
@Result(column = "update_time", property = "updateTime", javaType = Date.class, jdbcType = JdbcType.TIMESTAMP)
})
diff --git a/admin/src/main/java/com/jinrui/reference/admin/model/entity/AdminUser.java b/admin/src/main/java/com/jinrui/reference/admin/model/entity/AdminUser.java
index e9bb4bc..65319e1 100644
--- a/admin/src/main/java/com/jinrui/reference/admin/model/entity/AdminUser.java
+++ b/admin/src/main/java/com/jinrui/reference/admin/model/entity/AdminUser.java
@@ -48,6 +48,16 @@ public class AdminUser {
* 用户修改时间
*/
private Date updateTime;
+
+ private String password;
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
public AdminUser() {}
diff --git a/admin/src/main/java/com/jinrui/reference/admin/service/AdminUserService.java b/admin/src/main/java/com/jinrui/reference/admin/service/AdminUserService.java
index b4cd58e..4e87ba3 100644
--- a/admin/src/main/java/com/jinrui/reference/admin/service/AdminUserService.java
+++ b/admin/src/main/java/com/jinrui/reference/admin/service/AdminUserService.java
@@ -1,6 +1,7 @@
package com.jinrui.reference.admin.service;
import java.util.List;
+import java.util.Objects;
import java.util.Random;
import java.util.stream.Collectors;
@@ -155,6 +156,9 @@ public class AdminUserService {
if (!adminUser.isActive()) {
return ResultObject.failed("用户已被禁用,请联系系统管理员!");
}
+ if (!Objects.equals(captcha, adminUser.getPassword())) {
+ return ResultObject.failed("用户密码错误!");
+ }
LoginVO loginVO = new LoginVO(adminUser);
jedis.del(redisLockKey, redisCaptchaListKey);
return ResultObject.success(loginVO);
diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml
index abdb533..99f4b56 100644
--- a/admin/src/main/resources/application.yml
+++ b/admin/src/main/resources/application.yml
@@ -1,6 +1,3 @@
-logging:
- level:
- root: DEBUG
server:
port: 13579
compression:
@@ -25,21 +22,21 @@ spring:
# url: jdbc:mysql://192.168.0.142:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
# username: financial_prod
# password: mmTFncqmDal5HLRGY0BV
- url: jdbc:mysql://121.37.185.246:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
- username: root
- password: Xgf_8000
+ url: jdbc:mysql://10.127.2.207:3306/reference?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ username: financial_prod
+ password: mmTFncqmDal5HLRGY0BV
redis:
# host: 192.168.0.172
# port: 6379
# password: Xgf_redis
- host: 123.60.153.169
+ host: 10.127.2.209
port: 6379
- password: Xgf_redis
+ password: dMrt4kmwiW6LDJXy
elasticsearch:
scheme: http
# 111.13.176.3 部署地址
# 10.127.2.194 本地测试地址
- host: 111.13.176.3
+ host: 10.127.2.194
port: 9200
enable: true
username: elastic