From 3eca7b12190c381d40c24fb79f5fecf3088f6817 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 23 Apr 2025 20:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8Pinia=E4=BB=A3=E6=9B=BFVuex?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=95=B0=E6=8D=AE=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                      |  26 +++--
 config.js                    |   4 +-
 index.html                   |   4 +-
 manifest.json                |   4 +-
 pages/login.vue              |  12 +--
 pages/mine/about/index.vue   |   8 +-
 pages/mine/avatar/index.vue  |   6 +-
 pages/mine/index.vue         |   7 +-
 pages/mine/setting/index.vue |   4 +-
 plugins/auth.js              |   6 +-
 store/getters.js             |   8 --
 store/index.js               |  16 ++-
 store/modules/config.js      |  13 +++
 store/modules/user.js        | 198 +++++++++++++++++++----------------
 utils/constant.js            |   8 +-
 15 files changed, 169 insertions(+), 155 deletions(-)
 delete mode 100644 store/getters.js
 create mode 100644 store/modules/config.js
diff --git a/App.vue b/App.vue
index af0264b..ad67aa3 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,9 @@
 <script setup>
+  import config from './config'
+  import { getToken } from '@/utils/auth'
+  import { useConfigStore } from '@/store'
+  import { getCurrentInstance } from "vue"
   import { onLaunch } from '@dcloudio/uni-app'
-  import { getToken } from '@/utils/auth'
-  import { getCurrentInstance } from "vue"
 
   const { proxy } = getCurrentInstance()
 
@@ -10,29 +12,25 @@
   })
 
   // 初始化应用
-  function initApp() {
+  function initApp() {
+    // 初始化应用配置
+    initConfig()
     // 检查用户登录状态
     //#ifdef H5
     checkLogin()
     //#endif
+  }
+
+  function initConfig() {
+    useConfigStore().setConfig(config)
   }
 
   function checkLogin() {
     if (!getToken()) {
       proxy.$tab.reLaunch('/pages/login') 
     }
-  }
+  }
 </script>
-
-<script>
-  import config from './config'
-
-  export default {
-    onLaunch: function() {
-      this.globalData.config = config
-    }
-  }
-</script>
 
 <style lang="scss">
   @import '@/static/scss/index.scss'
diff --git a/config.js b/config.js
index 4a31f28..b690223 100644
--- a/config.js
+++ b/config.js
@@ -1,7 +1,7 @@
 // 应用全局配置
 export default {
-  baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  // baseUrl: 'http://localhost:8080',
+  // baseUrl: 'https://vue.ruoyi.vip/prod-api',
+  baseUrl: 'http://localhost:8080',
   // 应用信息
   appInfo: {
     // 应用名称
diff --git a/index.html b/index.html
index 3c1a975..2511ed7 100644
--- a/index.html
+++ b/index.html
@@ -4,9 +4,7 @@
 <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
-    <title></title>
-    <!--preload-links-->
-    <!--app-context-->
+    <title>RuoYi-App</title>
 </head>
 
 <body>
diff --git a/manifest.json b/manifest.json
index 21b8f4b..8a2113e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -35,7 +35,9 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             "sdkConfigs" : {}
         }
     },
diff --git a/pages/login.vue b/pages/login.vue
index 0be013d..02763f0 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -39,12 +39,12 @@
 </template>
 
 <script setup>
-  import { getCodeImg } from '@/api/login'
-  import store from '@/store'
-  import { ref, getCurrentInstance } from "vue"
+  import { getCodeImg } from '@/api/login'
+  import { useConfigStore, useUserStore } from '@/store'
+  import { ref, getCurrentInstance } from "vue"
 
   const { proxy } = getCurrentInstance()
-  const globalConfig = getApp().globalData.config
+  const globalConfig = useConfigStore().config
   const codeUrl = ref("")
   // 验证码开关
   const captchaEnabled = ref(true)
@@ -101,7 +101,7 @@
 
   // 密码登录
   async function pwdLogin() {
-    store.dispatch('Login', loginForm.value).then(() => {
+    useUserStore().login(loginForm.value).then(() => {
       proxy.$modal.closeLoading()
       loginSuccess()
     }).catch(() => {
@@ -114,7 +114,7 @@
   // 登录成功后，处理函数
   function loginSuccess(result) {
     // 设置用户信息
-    store.dispatch('GetInfo').then(res => {
+    useUserStore().getInfo().then(res => {
       proxy.$tab.reLaunch('/pages/index')
     })
   }
diff --git a/pages/mine/about/index.vue b/pages/mine/about/index.vue
index 85eb5be..7a53944 100644
--- a/pages/mine/about/index.vue
+++ b/pages/mine/about/index.vue
@@ -43,9 +43,11 @@
   </view>
 </template>
 
-<script setup>
-  const url = getApp().globalData.config.appInfo.site_url
-  const version = getApp().globalData.config.appInfo.version
+<script setup>
+  import { useConfigStore } from '@/store'
+
+  const url = useConfigStore().config.appInfo.site_url
+  const version = useConfigStore().config.appInfo.version
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/mine/avatar/index.vue b/pages/mine/avatar/index.vue
index 75848b0..5169a62 100644
--- a/pages/mine/avatar/index.vue
+++ b/pages/mine/avatar/index.vue
@@ -38,7 +38,7 @@
 
 <script>
   import config from '@/config'
-  import store from "@/store"
+  import { useUserStore } from '@/store'
   import { uploadAvatar } from "@/api/system/user"
   
   const baseUrl = config.baseUrl
@@ -68,7 +68,7 @@
 		 */
 		data() {
 			return {
-				imageSrc: store.getters.avatar,
+				imageSrc: useUserStore().avatar,
 				isShowImg: false,
 				// 初始化的宽高
 				cropperInitW: SCREEN_WIDTH,
@@ -257,7 +257,7 @@
 							uni.hideLoading()
 							let data = {name: 'avatarfile', filePath: res.tempFilePath}
 							uploadAvatar(data).then(response => {
-								store.commit('SET_AVATAR', baseUrl + response.imgUrl)
+								useUserStore().SET_AVATAR(baseUrl + response.imgUrl)
 								uni.showToast({ title: "修改成功", icon: 'success' })
 								uni.navigateBack()
 							})
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index af972fd..cb13646 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -77,13 +77,12 @@
 </template>
 
 <script setup>
-  import store from '@/store'
+  import { useUserStore } from '@/store'
   import { computed , getCurrentInstance } from "vue"
 
   const { proxy } = getCurrentInstance()
-  const name = store.state.user.name
-  const version= getApp().globalData.config.appInfo.version
-  const avatar = computed(() => store.state.user.avatar)
+  const name = useUserStore().name
+  const avatar = computed(() => useUserStore().avatar)
   const windowHeight = computed(() => uni.getSystemInfoSync().windowHeight - 50)
 
   function handleToInfo() {
diff --git a/pages/mine/setting/index.vue b/pages/mine/setting/index.vue
index 58af34c..fdf9d8b 100644
--- a/pages/mine/setting/index.vue
+++ b/pages/mine/setting/index.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script setup>
-  import store from '@/store'
+  import { useUserStore } from '@/store'
   import { ref, computed , getCurrentInstance } from "vue"
 
   const { proxy } = getCurrentInstance()
@@ -51,7 +51,7 @@
 
   function handleLogout() {
     proxy.$modal.confirm('确定注销并退出系统吗？').then(() => {
-      store.dispatch('LogOut').then(() => {}).finally(()=>{
+      useUserStore().logOut().then(() => {}).finally(()=>{
         proxy.$tab.reLaunch('/pages/index')
       })
     })
diff --git a/plugins/auth.js b/plugins/auth.js
index 6bcce3f..b47b9df 100644
--- a/plugins/auth.js
+++ b/plugins/auth.js
@@ -1,8 +1,8 @@
-import store from '@/store'
+import { useUserStore } from '@/store'
 
 function authPermission(permission) {
   const all_permission = "*:*:*"
-  const permissions = store.getters && store.getters.permissions
+  const permissions = useUserStore().permissions
   if (permission && permission.length > 0) {
     return permissions.some(v => {
       return all_permission === v || v === permission
@@ -14,7 +14,7 @@ function authPermission(permission) {
 
 function authRole(role) {
   const super_admin = "admin"
-  const roles = store.getters && store.getters.roles
+  const roles = useUserStore().roles
   if (role && role.length > 0) {
     return roles.some(v => {
       return super_admin === v || v === role
diff --git a/store/getters.js b/store/getters.js
deleted file mode 100644
index f0eece3..0000000
--- a/store/getters.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const getters = {
-  token: state => state.user.token,
-  avatar: state => state.user.avatar,
-  name: state => state.user.name,
-  roles: state => state.user.roles,
-  permissions: state => state.user.permissions
-}
-export default getters
diff --git a/store/index.js b/store/index.js
index d787e08..e1adc20 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,11 +1,7 @@
-import { createStore } from "vuex"
-import user from '@/store/modules/user'
-import getters from './getters'
+import { createPinia } from 'pinia'
 
-const store = createStore({
-  modules: {
-    user
-  },
-  getters
-})
-export default store
+const pinia = createPinia()
+
+export default pinia
+export { useUserStore } from './modules/user'
+export { useConfigStore } from './modules/config'
diff --git a/store/modules/config.js b/store/modules/config.js
new file mode 100644
index 0000000..cb3a361
--- /dev/null
+++ b/store/modules/config.js
@@ -0,0 +1,13 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+export const useConfigStore = defineStore('config', () => {
+  const config = ref()
+  const setConfig = (val) => {
+    config.value = val
+  }
+  return {
+    config,
+    setConfig
+  }
+})
\ No newline at end of file
diff --git a/store/modules/user.js b/store/modules/user.js
index 36e6ee3..4bc324f 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -2,102 +2,116 @@ import config from '@/config'
 import storage from '@/utils/storage'
 import constant from '@/utils/constant'
 import { isHttp, isEmpty } from "@/utils/validate"
-import { login, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import { getInfo, login, logout } from '@/api/login'
+import { getToken, removeToken, setToken } from '@/utils/auth'
 import defAva from '@/static/images/profile.jpg'
+import { ref } from 'vue'
+import { defineStore } from 'pinia'
 
 const baseUrl = config.baseUrl
 
-const user = {
-  state: {
-    token: getToken(),
-    name: storage.get(constant.name),
-    avatar: storage.get(constant.avatar),
-    roles: storage.get(constant.roles),
-    permissions: storage.get(constant.permissions)
-  },
+export const useUserStore = defineStore('user', () => {
+  const token = ref(getToken())
+  const id = ref(storage.get(constant.id))
+  const name = ref(storage.get(constant.name))
+  const avatar = ref(storage.get(constant.avatar))
+  const roles = ref(storage.get(constant.roles))
+  const permissions = ref(storage.get(constant.permissions))
 
-  mutations: {
-    SET_TOKEN: (state, token) => {
-      state.token = token
-    },
-    SET_NAME: (state, name) => {
-      state.name = name
-      storage.set(constant.name, name)
-    },
-    SET_AVATAR: (state, avatar) => {
-      state.avatar = avatar
-      storage.set(constant.avatar, avatar)
-    },
-    SET_ROLES: (state, roles) => {
-      state.roles = roles
-      storage.set(constant.roles, roles)
-    },
-    SET_PERMISSIONS: (state, permissions) => {
-      state.permissions = permissions
-      storage.set(constant.permissions, permissions)
-    }
-  },
-
-  actions: {
-    // 登录
-    Login({ commit }, userInfo) {
-      const username = userInfo.username.trim()
-      const password = userInfo.password
-      const code = userInfo.code
-      const uuid = userInfo.uuid
-      return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
-          setToken(res.token)
-          commit('SET_TOKEN', res.token)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 获取用户信息
-    GetInfo({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        getInfo().then(res => {
-          const user = res.user
-		  let avatar = user.avatar || ""
-		  if (!isHttp(avatar)) {
-            avatar = (isEmpty(avatar)) ? defAva : baseUrl + avatar
-          }
-          const username = (isEmpty(user) || isEmpty(user.userName)) ? "" : user.userName
-		  if (res.roles && res.roles.length > 0) {
-            commit('SET_ROLES', res.roles)
-            commit('SET_PERMISSIONS', res.permissions)
-          } else {
-            commit('SET_ROLES', ['ROLE_DEFAULT'])
-          }
-          commit('SET_NAME', username)
-          commit('SET_AVATAR', avatar)
-          resolve(res)
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 退出系统
-    LogOut({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        logout(state.token).then(() => {
-          commit('SET_TOKEN', '')
-          commit('SET_ROLES', [])
-          commit('SET_PERMISSIONS', [])
-          removeToken()
-          storage.clean()
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    }
+  const SET_TOKEN = (val) => {
+    token.value = val
+  }
+  const SET_ID = (val) => {
+    id.value = val
+    storage.set(constant.id, val)
+  }
+  const SET_NAME = (val) => {
+    name.value = val
+    storage.set(constant.name, val)
+  }
+  const SET_AVATAR = (val) => {
+    avatar.value = val
+    storage.set(constant.avatar, val)
+  }
+  const SET_ROLES = (val) => {
+    roles.value = val
+    storage.set(constant.roles, val)
+  }
+  const SET_PERMISSIONS = (val) => {
+    permissions.value = val
+    storage.set(constant.permissions, val)
   }
-}
 
-export default user
+  // 登录
+  const loginAction = (userInfo) => {
+    const username = userInfo.username.trim()
+    const password = userInfo.password
+    const code = userInfo.code
+    const uuid = userInfo.uuid
+    return new Promise((resolve, reject) => {
+      login(username, password, code, uuid).then(res => {
+        setToken(res.token)
+        SET_TOKEN(res.token)
+        resolve()
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  }
+
+  // 获取用户信息
+  const getInfoAction = () => {
+    return new Promise((resolve, reject) => {
+      getInfo().then(res => {
+        const user = res.user
+        let avatar = user.avatar || ""
+        if (!isHttp(avatar)) {
+          avatar = (isEmpty(avatar)) ? defAva : baseUrl + avatar
+        }
+        const userid = (isEmpty(user) || isEmpty(user.userId)) ? "" : user.userId
+        const username = (isEmpty(user) || isEmpty(user.userName)) ? "" : user.userName
+        if (res.roles && res.roles.length > 0) {
+          SET_ROLES(res.roles)
+          SET_PERMISSIONS(res.permissions)
+        } else {
+          SET_ROLES(['ROLE_DEFAULT'])
+        }
+		SET_ID(userid)
+        SET_NAME(username)
+        SET_AVATAR(avatar)
+        resolve(res)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  }
+
+  // 退出系统
+  const logOutAction = () => {
+    return new Promise((resolve, reject) => {
+      logout(token.value).then(() => {
+        SET_TOKEN('')
+        SET_ROLES([])
+        SET_PERMISSIONS([])
+        removeToken()
+        storage.clean()
+        resolve()
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  }
+
+  return {
+    token,
+    id,
+    name,
+    avatar,
+    roles,
+    permissions,
+    SET_AVATAR,
+    login: loginAction,
+    getInfo: getInfoAction,
+    logOut: logOutAction
+  }
+})
diff --git a/utils/constant.js b/utils/constant.js
index 891d5b8..bf98860 100644
--- a/utils/constant.js
+++ b/utils/constant.js
@@ -1,8 +1,8 @@
 const constant = {
-   avatar: 'vuex_avatar',
-   name: 'vuex_name',
-   roles: 'vuex_roles',
-   permissions: 'vuex_permissions'
+   avatar: 'user_avatar',
+   name: 'user_name',
+   roles: 'user_roles',
+   permissions: 'user_permissions'
  }
 
  export default constant
