From 9cd3abc7c96ff5be4411ff7910a5db557f59cb2b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 07 二月 2025 10:27:04 +0800
Subject: [PATCH] zjh20250207
---
ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java | 3 ++-
ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java | 2 ++
ltkj-admin/src/main/java/com/ltkj/web/db/DataSourceConfig.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java | 1 +
ltkj-admin/src/main/resources/application-dev.yml | 4 ++--
5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
index 21165b2..5a7e354 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
@@ -85,6 +85,7 @@
@ApiOperation("鐧诲綍鎺ュ彛")
@RepeatSubmit
public AjaxResult login(@RequestBody @ApiParam(value = "鐧诲綍瀵硅薄") LoginBody loginBody) {
+
AjaxResult ajax = success();
// 鐢熸垚浠ょ墝
String token;
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/db/DataSourceConfig.java b/ltkj-admin/src/main/java/com/ltkj/web/db/DataSourceConfig.java
index ebed200..8204871 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/db/DataSourceConfig.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/db/DataSourceConfig.java
@@ -9,7 +9,7 @@
import java.util.HashMap;
import java.util.Map;
-@Configuration
+//@Configuration
public class DataSourceConfig {
private static final String DEFAULT_DATA_SOURCE_KEY = "default"; // 涓诲簱鐨勬爣璇�
diff --git a/ltkj-admin/src/main/resources/application-dev.yml b/ltkj-admin/src/main/resources/application-dev.yml
index f58b1b2..ee295d4 100644
--- a/ltkj-admin/src/main/resources/application-dev.yml
+++ b/ltkj-admin/src/main/resources/application-dev.yml
@@ -147,7 +147,7 @@
# 鏄惁鍏佽璐︽埛澶氱粓绔悓鏃剁櫥褰曪紙true鍏佽 false涓嶅厑璁革級
soloLogin: true
#鏄惁寮�鍚櫥褰曟椂鍒ゆ柇鍟嗘埛绉橀挜鏄惁杩囨湡
- secret_key_login: true
+ secret_key_login: false
# MyBatis Plus閰嶇疆
mybatis-plus:
@@ -251,7 +251,7 @@
# username = root
# password = Root_ltkj123
config:
- properties: D:\ltkjprojectconf\config.properties
+ properties: D:\ltkjprojectconf\configregion.properties
path: D:\ltkjprojectconf
logging:
level:
diff --git a/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java b/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java
index 74b805f..8e56cdd 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/core/domain/model/LoginBody.java
@@ -34,6 +34,8 @@
*/
private String uuid;
+ private String hospId;
+
@ApiModelProperty(value = "鏄痶rue鍚alse")
private Boolean type = false;
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
index db229d3..c5d788c 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
@@ -95,6 +95,7 @@
*/
public String login(String username, String password, Boolean type,String code,String uuid) {
+
String aSwitch = configService.selectConfigByKey("captcha_switch");
if(null !=aSwitch && aSwitch.equalsIgnoreCase("Y")){
String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
@@ -138,8 +139,8 @@
}
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
- recordLoginInfo(Long.valueOf(loginUser.getUserId()));
+ recordLoginInfo(Long.valueOf(loginUser.getUserId()));
//鏍￠獙鍟嗗杩囨湡鍚�
if (secretKeyLogin)
{
--
Gitblit v1.8.0