Merge pull request #209 from chenjianghua666/master

修复bug
TarsCloud · Jan 18, 2024 · 53ea279 · 53ea279
2 parents 84f36d9 + 7b2e919
commit 53ea279
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/client/src/pages/server/manage.vue b/client/src/pages/server/manage.vue
@@ -1790,10 +1790,10 @@ export default {
           if (regHost && regHost.test(tmp[i])) {
             flag++; // eslint-disable-line
             // 提取参数
-            var ip = tmp[i].split(/\s/)[1];
-            if (regIP.test(ip)) {
-              this.servantDetailModal.model.node_name = ip;
-            }
+            // var ip = tmp[i].split(/\s/)[1];
+            // if (regIP.test(ip)) {
+            //   this.servantDetailModal.model.node_name = ip;
+            // }
             regHost = null;
           }
 

diff --git a/sso/dao/UserDao.js b/sso/dao/UserDao.js
@@ -16,7 +16,7 @@ UserDao.getUserIdList = async() => {
 
 UserDao.getUserAuthList = async() => {
 
-    return await sequelize.query('select u.uid as uid, a.`role`, a.`flag` from  t_user_info as u left join t_auth as a on u.`uid` = a.`uid` order by uid', { type: QueryTypes.SELECT });
+    return await sequelize.query('select u.uid as uid, u.update_time as update_time, a.`role`, a.`flag` from  t_user_info as u left join t_auth as a on u.`uid` = a.`uid` order by uid', { type: QueryTypes.SELECT });
 };
 
 UserDao.modifyPass = async (uid, password) => {

diff --git a/sso/db-service/user/UserService.js b/sso/db-service/user/UserService.js
@@ -37,6 +37,7 @@ UserService.getUserAuthList = async() => {
             items.push({
                 uid: item.uid,
                 name: item.uid,
+                update_time: item.update_time,
                 authorization: []
             });