micro 调整

plop-template/micro.hbs

@@ -1,12 +1,10 @@
 <script setup lang="ts">
-import WujieVue from 'wujie-vue3'
-import useMicro from '@fskj-admin/micro'
-import { plugins } from '@/utils/micro'
+import { micro, plugins } from '@/utils/micro'
 
 const microName = '{{name}}'
 
-const { getMicroByName, mainRouteWatch } = useMicro(WujieVue)
-const micro = getMicroByName(microName)
+const { getMicroByName, mainRouteWatch } = micro
+const microConfig = getMicroByName(microName)
 mainRouteWatch(microName)
 
 const route = useRoute()

src/utils/micro.ts

@@ -3,17 +3,6 @@ import useMicro from '@fskj-admin/micro'
 import { microList } from '@/config/mainMicro'
 import { useUserStore } from '@/stores/user'
 
-export const isMicro = window.__POWERED_BY_WUJIE__
-
-export const logout = () => {
-  if (isMicro) {
-    window.$wujie?.bus.$emit('logout')
-  } else {
-    const userStore = useUserStore()
-    userStore.logout()
-  }
-}
-
 export const plugins = [
   {
     cssBeforeLoaders: [
@@ -33,10 +22,11 @@ export const plugins = [
     }
   }
 ]
-// 主服务初始化微服务
-const { initMainMicro } = useMicro(WujieVue)
+
+// 主服务初始化
+export const micro = useMicro(WujieVue)
 export const initMicro = () => {
-  initMainMicro(microList, (bus: any) => {
+  micro.initMainMicro(microList, (bus: any) => {
     const userStore = useUserStore()
     // 监听退出登录
     bus.$on('logout', () => {
@@ -55,3 +45,14 @@ export const initMicro = () => {
     )
   })
 }
+
+export const isMicro = micro.isMicro
+
+export const logout = () => {
+  if (isMicro) {
+    window.$wujie?.bus.$emit('logout')
+  } else {
+    const userStore = useUserStore()
+    userStore.logout()
+  }
+}

src/views/micro/Micro.vue

@@ -1,12 +1,10 @@
 <script setup lang="ts">
-import WujieVue from 'wujie-vue3'
-import useMicro from '@fskj-admin/micro'
-import { plugins } from '@/utils/micro'
+import { micro, plugins } from '@/utils/micro'
 
 const microName = 'pictureAlbum'
 
-const { getMicroByName, mainRouteWatch } = useMicro(WujieVue)
-const micro = getMicroByName(microName)
+const { getMicroByName, mainRouteWatch } = micro
+const microConfig = getMicroByName(microName)
 mainRouteWatch(microName)
 
 const route = useRoute()
@@ -17,7 +15,7 @@ const route = useRoute()
     width="100%"
     height="100%"
     :name="microName"
-    :url="micro.url + route.path"
+    :url="microConfig.url + route.path"
     :sync="true"
     :plugins="plugins"
   ></WujieVue>