From 2dc56b3fa4ed03ee7ca7b907cc633bd5d5004fb1 Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Mon, 4 Sep 2023 10:50:24 +0800
Subject: [PATCH] abc

---
 yxt-portal-ui/src/api/User/login.js               |  3 ++-
 .../src/main/resources/application.yml            | 15 +++++++++++++++
 .../supervise/system/sysuser/SysUserMapper.xml    |  3 +--
 .../supervise/system/sysuser/SysUserService.java  |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/yxt-portal-ui/src/api/User/login.js b/yxt-portal-ui/src/api/User/login.js
index e4472168..80149639 100644
--- a/yxt-portal-ui/src/api/User/login.js
+++ b/yxt-portal-ui/src/api/User/login.js
@@ -22,7 +22,8 @@ class user {
     return request({
       url: '/portal/v1/sysuser/updatePassword',
       method: 'post',
-      data: qs.stringify(data)
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
     })
   }
 
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application.yml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application.yml
index b371ab4d..79a6c4b8 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application.yml
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application.yml
@@ -45,6 +45,21 @@ mybatis-plus:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 
+#hystrix的超时时间
+hystrix:
+  command:
+    default:
+      execution:
+        timeout:
+          enabled: true
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000
+#ribbon的超时时间
+ribbon:
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
+
 
 
 
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml
index 9eb97681..9f4a62e7 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserMapper.xml
@@ -122,9 +122,8 @@
                  left join sys_staffinfo si on si.sid = su.staffSid
         where su.userName = #{param1}
           and su.isDelete = 0
-          and su.userType = 1
-          and si.personTypeKey != '01'
     </select>
+    <!--    and su.userType = 1      and si.personTypeKey != '01'-->
     <select id="selectByUserNameApp" resultType="com.yxt.supervise.system.sysuser.SysUser">
         SELECT su.*
         FROM sys_user su
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java
index e8f2091e..e1575fba 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java
@@ -140,7 +140,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         if (StringUtils.isNotBlank(query.getName())) {
             qw.like("staff.name", query.getName());
         }
-        qw.ne("staff.personTypeKey","01");
+//        qw.ne("staff.personTypeKey","01");
         return qw;
     }