From 6e173210a874ff7601aa68eab56e912f5619c79c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 21 五月 2026 15:32:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_英泽防锈' into dev_宁夏_英泽防锈

---
 src/store/modules/user.js |   80 +++++++++++++++++++++++++++++++---------
 1 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 2dd2797..ac97976 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,8 @@
-import {login, logout, getInfo, loginCheck, loginCheckFactory} from '@/api/login'
+import {login, logout, getInfo, loginCheck, loginCheckFactory,tideLogin} from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { isHttp, isEmpty } from "@/utils/validate"
 import defAva from '@/assets/images/profile.jpg'
+import { defineStore } from 'pinia'
 
 const useUserStore = defineStore(
   'user',
@@ -12,7 +13,8 @@
       name: '',
       avatar: '',
       roles: [],
-      permissions: []
+      permissions: [],
+      aiEnabled: 0
     }),
     actions: {
       // 鐧诲綍
@@ -23,36 +25,52 @@
         const uuid = userInfo.uuid
         return new Promise((resolve, reject) => {
           login(username, password, code, uuid).then(res => {
-            setToken(res.token)
-            this.token = res.token
+            const token = res?.token || res?.data?.token
+            if (!token) {
+              reject(new Error('鏈幏鍙栧埌鐧诲綍浠ょ墝'))
+              return
+            }
+            setToken(token)
+            this.token = token
             resolve()
           }).catch(error => {
             reject(error)
           })
         })
       },
+      getCurrentTime() {
+        const now = new Date();
+        const year = now.getFullYear();       // 鑾峰彇骞翠唤
+        const month = String(now.getMonth() + 1).padStart(2, '0');  // 鏈堜唤浠�0寮�濮嬶紝瑕�+1锛屽苟琛ラ浂
+        const day = String(now.getDate()).padStart(2, '0');         // 鏃ユ湡琛ラ浂
+        const hours = String(now.getHours()).padStart(2, '0');      // 灏忔椂琛ラ浂
+        const minutes = String(now.getMinutes()).padStart(2, '0');  // 鍒嗛挓琛ラ浂
+        const seconds = String(now.getSeconds()).padStart(2, '0');  // 绉掓暟琛ラ浂
+        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+      },
       // 鑾峰彇鐢ㄦ埛淇℃伅
       getInfo() {
         return new Promise((resolve, reject) => {
           getInfo().then(res => {
-            console.log('user',res)
-            const user = res.user
+            res  = res.data
+            const user = res.user || {}
             let avatar = user.avatar || ""
-            if (!isHttp(avatar)) {
-              avatar = (isEmpty(avatar)) ? defAva : import.meta.env.VITE_APP_BASE_API + avatar
-            }
+            avatar = import.meta.env.VITE_APP_BASE_API + '/profile/' + avatar
             if (res.roles && res.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
               this.roles = res.roles
               this.permissions = res.permissions
             } else {
               this.roles = ['ROLE_DEFAULT']
             }
-            this.id = user.userId
-            this.name = user.userName
+            this.id = user.userId || ''
+            this.name = user.userName || ''
             this.avatar = avatar
-            this.currentFactoryName = user.currentFactoryName
-            this.nickName = user.nickName
-            this.currentDeptId = user.currentDeptId
+            this.currentFactoryName = user.currentFactoryName || ''
+            this.nickName = user.nickName || ''
+            this.roleName = Array.isArray(user.roles) && user.roles.length > 0 ? (user.roles[0].roleName || '') : ''
+            this.currentDeptId = user.tenantId || ''
+            this.currentLoginTime = this.getCurrentTime()
+            this.aiEnabled = Number(res.aiEnabled) === 1 ? 1 : 0
             resolve(res)
           }).catch(error => {
             reject(error)
@@ -66,6 +84,7 @@
             this.token = ''
             this.roles = []
             this.permissions = []
+            this.aiEnabled = 0
             removeToken()
             resolve()
           }).catch(error => {
@@ -89,17 +108,42 @@
       loginCheckFactory(userInfo) {
         const username = userInfo.username.trim()
         const password = userInfo.password
-        const factoryId = userInfo.currentFatoryId
         return new Promise((resolve, reject) => {
-          loginCheckFactory(username, password, factoryId).then(res => {
-            setToken(res.token)
-            this.token = res.token
+          loginCheckFactory(username, password).then(res => {
+            const token = res?.token || res?.data?.token
+            if (!token) {
+              reject(new Error('鏈幏鍙栧埌鐧诲綍浠ょ墝'))
+              return
+            }
+            setToken(token)
+            this.token = token
             resolve()
           }).catch(error => {
             reject(error)
           })
         })
       },
+      TideLogin(code) {
+        return new Promise((resolve, reject) => {
+          tideLogin(code)
+              .then((res) => {
+                const token = res?.token || res?.data?.token
+                if (!token) {
+                  reject(new Error('鏈幏鍙栧埌鐧诲綍浠ょ墝'))
+                  return
+                }
+                setToken(token);
+                this.token = token
+                Vue.prototype.uploadHeader = {
+                  Authorization: "Bearer " + token,
+                };
+                resolve();
+              })
+              .catch((error) => {
+                reject(error);
+              });
+        });
+      },
     }
   })
 

--
Gitblit v1.9.3