Merge branch 'fix/app-login' into 'main_dev'

perf: 优化小程序访问组态需要获取token

See merge request yunteng/thingskit-scada!165

@@ -8,6 +8,7 @@ enum Api {
   SHARE_LOGIN = '/auth/login/public',
   SHARE_LOGIN = '/auth/login/public',
   SHARE_MODE_CHECK = '/share/check/SCADA/',
   SHARE_MODE_CHECK = '/share/check/SCADA/',
   GET_SHARE_DATA = '/share/SCADA/share_data/',
   GET_SHARE_DATA = '/share/SCADA/share_data/',
+  APP_GET_TOKEN = '/third/login/id/',
 }
 }
 
 
 export const getConfigurationContent = (id: string = useParseParams().configurationId) => {
 export const getConfigurationContent = (id: string = useParseParams().configurationId) => {
@@ -49,3 +50,9 @@ export const getShareDataByAccessCredentials = (id: string, accessCredentials?:
     params: { accessCredentials },
     params: { accessCredentials },
   })
   })
 }
 }
+
+export const doAppLogin = (userId: string) => {
+  return defHttp.get<Record<'refreshToken' | 'token', string>>({
+    url: `${Api.APP_GET_TOKEN}${userId}`,
+  })
+}

 import { h, render } from 'vue'
 import { h, render } from 'vue'
 import { useParseParams, usePlatform } from '..'
 import { useParseParams, usePlatform } from '..'
-import { checkShareModeNeedPassword, getConfigurationContent as getContent, getShareDataByAccessCredentials, getShareToken, saveConfigurationContent as saveData } from '@/api/content'
+import { checkShareModeNeedPassword, doAppLogin, getConfigurationContent as getContent, getShareDataByAccessCredentials, getShareToken, saveConfigurationContent as saveData } from '@/api/content'
 import type { ConfigurationContentType } from '@/api/content/model'
 import type { ConfigurationContentType } from '@/api/content/model'
 import { ShareLoginModal } from '@/core/Share'
 import { ShareLoginModal } from '@/core/Share'
 import { PageModeEnum } from '@/enums/modeEnum'
 import { PageModeEnum } from '@/enums/modeEnum'
@@ -11,7 +11,7 @@ import { MessageEnum } from '@/enums/messageEnum'
 
 
 export function useContentData() {
 export function useContentData() {
   const contentDataStore = useContentDataStoreWithOut()
   const contentDataStore = useContentDataStoreWithOut()
-  const { mode, publicId, configurationId } = useParseParams()
+  const { mode, publicId, configurationId, userId } = useParseParams()
   const userStore = useUserStoreWithOut()
   const userStore = useUserStoreWithOut()
   const { createMessage } = useMessage()
   const { createMessage } = useMessage()
 
 
@@ -37,6 +37,11 @@ export function useContentData() {
   }
   }
 
 
   const doGetConfigurationContent = async () => {
   const doGetConfigurationContent = async () => {
+    if (userId) {
+      const { token, refreshToken } = await doAppLogin(userId)
+      userStore.storeToken(token, refreshToken)
+    }
+
     const result = mode === PageModeEnum.SHARE ? await shareModeBootstrap() : await getContent()
     const result = mode === PageModeEnum.SHARE ? await shareModeBootstrap() : await getContent()
 
 
     if (result) {
     if (result) {

@@ -7,6 +7,7 @@ interface HashParams {
   mode: PageModeEnum
   mode: PageModeEnum
   platform?: PlatformEnum
   platform?: PlatformEnum
   publicId?: string
   publicId?: string
+  userId?: string
 }
 }
 
 
 export function useParseParams(): HashParams {
 export function useParseParams(): HashParams {