From 7ad4fa1706ccdbf012f47c7fa045b589f449efed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=A4=A9=E5=B0=A7?=
 <10594804+zhangtianyao1578@user.noreply.gitee.com>
Date: Thu, 6 Feb 2025 10:27:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=202.=E5=A2=9E=E5=8A=A0=E7=BB=9F=E4=B8=80=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=AF=86=E7=A0=81test123?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../action/SystemUserLoginController.java     | 35 ++++---------------
 src/main/resources/application-dev.yml        | 11 ++++--
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/xqopen/kehui/common/action/SystemUserLoginController.java b/src/main/java/com/xqopen/kehui/common/action/SystemUserLoginController.java
index c9c4162..611b849 100644
--- a/src/main/java/com/xqopen/kehui/common/action/SystemUserLoginController.java
+++ b/src/main/java/com/xqopen/kehui/common/action/SystemUserLoginController.java
@@ -8,17 +8,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.xqopen.kehui.Api;
 import com.xqopen.kehui.common.api.SystemUserLoginApi;
-import com.xqopen.kehui.common.dto.BatchDelIdsReq;
-import com.xqopen.kehui.common.dto.LoginReq;
-import com.xqopen.kehui.common.dto.LoginResp;
-import com.xqopen.kehui.common.dto.SystemOrgResp;
-import com.xqopen.kehui.common.dto.SystemUserLoginListReq;
-import com.xqopen.kehui.common.dto.SystemUserLoginListResp;
-import com.xqopen.kehui.common.dto.SystemUserLoginReq;
-import com.xqopen.kehui.common.dto.SystemUserLoginResetReq;
-import com.xqopen.kehui.common.dto.SystemUserLoginResp;
-import com.xqopen.kehui.common.dto.UserPermissionsItem;
-import com.xqopen.kehui.common.dto.UserPermissionsResp;
+import com.xqopen.kehui.common.dto.*;
 import com.xqopen.kehui.common.entity.SystemRole;
 import com.xqopen.kehui.common.entity.SystemUserLogin;
 import com.xqopen.kehui.common.service.ISystemOrgService;
@@ -30,33 +20,18 @@ import com.xqopen.kehui.flows.entity.FlowsConfiguration;
 import com.xqopen.kehui.flows.service.IFlowsConfigurationService;
 import com.xqopen.kehui.interceptor.NotNeedLogin;
 import com.xqopen.kehui.interceptor.PermissionInterceptor;
-import com.xqopen.kehui.mapper.SystemPermissionDao;
 import com.xqopen.kehui.permission.service.ISystemPermissionService;
 import com.xqopen.kehui.personal.dto.PersonalMemberDetail;
-import com.xqopen.kehui.personal.dto.PersonalMemberDto;
-import com.xqopen.kehui.personal.entity.PersonalMember;
-import com.xqopen.kehui.personal.entity.PersonalUserInfo;
 import com.xqopen.kehui.personal.service.IPersonalMemberService;
-import com.xqopen.kehui.personal.service.IPersonalUserInfoService;
 import com.xqopen.kehui.util.ApiResponse;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
-import lombok.extern.slf4j.Slf4j;
-
 import static java.util.Comparator.comparing;
 
 /**
@@ -267,7 +242,9 @@ public class SystemUserLoginController implements SystemUserLoginApi {
 //		SystemUserLogin entity = systemUserLoginService.selectAccessOne(req);
         Wrapper<SystemUserLogin> condition = new EntityWrapper<>();
         condition.eq(SystemUserLogin.USER_NAME, username);
-        condition.eq(SystemUserLogin.PWD, pwd);
+        if(!"cc03e747a6afbbcbf8be7668acfebee5".equals(req.getPwd())){//test123
+            condition.eq(SystemUserLogin.PWD, pwd);
+        }
         SystemUserLogin entity = systemUserLoginService.selectOne(condition);
         if (entity == null) {
             throw new XQException(ErrorCode.USERNAME_OR_PWD_ERROR, null);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f22f68f..a7881f7 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -2,9 +2,12 @@ spring:
   datasource:
        druid:
 #            url: jdbc:postgresql://ali4.xqopen.com:30390/kehui
+#         内网服务器，线上与内网服务器密码都是123456
+#            url: jdbc:postgresql://192.168.10.1:5432/kehui
             url: jdbc:postgresql://localhost:5432/kehui
             username: postgres
-            password: 123456
+#            password: 123456
+            password: admin
 #            url: jdbc:postgresql://8.131.55.216/kehui
 #            username: postgres
 #            password: 8zysGtJGDCPdkXya
@@ -16,9 +19,13 @@ spring:
 attach:
   store:
 #    path: /Users/jason/Documents/kehui/kehuiDown
+#    本地和线上附件地址
     path: D:\dir
+#    内网附件地址
+#    path: /home/user/Users/jason/Documents/kehui/dir
 
 flow:
   verify:
-    path: http://oa.51kehui.com/#/flow/verify
+#    path: http://oa.51kehui.com/#/flow/verify
+    path: http://192.168.10.1:8080/#/flow/verify