Merge branch 'ww' into 'main'

feat: 实现同源登录验证,增加命令行启动不同开发环境

See merge request yunteng/thingskit-view!2

@@ -12,3 +12,6 @@ VITE_GLOB_APP_TITLE = GoView
 
 
 # spa shortname
 # spa shortname
 VITE_GLOB_APP_SHORT_NAME = GoView
 VITE_GLOB_APP_SHORT_NAME = GoView
+
+# iot platform proxy prefix
+VITE_IOT_PLATFORM_PROXY_PREFIX = /large-designer/

@@ -9,3 +9,6 @@ VITE_GLOB_API_URL_PREFIX = /yt
 
 
 # 内容安全协议
 # 内容安全协议
 VITE_GLOB_CONTENT_SECURITY_POLICY = false
 VITE_GLOB_CONTENT_SECURITY_POLICY = false
+
+# 公共路径
+VITE_GLOB_PUBLIC_PATH = /

+# Proxy
+VITE_GLOB_PROXY = [["/api", "http://222.180.200.114:48080/api"]]
+
+# Api prefix
+VITE_GLOB_API_URL = /api
+
+# 
+VITE_GLOB_API_URL_PREFIX = /yt
+
+# 内容安全协议
+VITE_GLOB_CONTENT_SECURITY_POLICY = false

@@ -8,3 +8,6 @@ VITE_GLOB_API_URL_PREFIX = /yt
 
 
 # 内容安全协议
 # 内容安全协议
 VITE_GLOB_CONTENT_SECURITY_POLICY = true
 VITE_GLOB_CONTENT_SECURITY_POLICY = true
+
+#
+VITE_GLOB_PUBLIC_PATH = /

 import { resolve } from "path"
 import { resolve } from "path"
+import { ConfigEnv } from "vite"
 
 
 export function parseEnv(env: ImportMetaEnv) {
 export function parseEnv(env: ImportMetaEnv) {
   const res: Record<string, any> = {}
   const res: Record<string, any> = {}
@@ -26,7 +27,7 @@ export function parseEnv(env: ImportMetaEnv) {
     }
     }
 
 
   }
   }
-  
+
   return res
   return res
 }
 }
 
 
@@ -37,3 +38,8 @@ export function getEnvConfig(match = 'VITE_GLOB_',) {
 export function getRootPath(...dir: string[]) {
 export function getRootPath(...dir: string[]) {
   return resolve(process.cwd(), ...dir);
   return resolve(process.cwd(), ...dir);
 }
 }
+
+
+export function getPublicPath({ command, mode }: ConfigEnv, viteEnv: ViteEnv) { 
+  return command === 'build' ? '/' : mode === 'independence' ? viteEnv.VITE_IOT_PLATFORM_PROXY_PREFIX: '/'
+}

-import { getRootPath } from "../utils";
+import { getRootPath } from "../../../utils";
 import { writeFileSync } from "fs";
 import { writeFileSync } from "fs";
 import { Plugin } from "vite";
 import { Plugin } from "vite";
 import { GLOB_CONFIG_FILE_NAME } from "./const";
 import { GLOB_CONFIG_FILE_NAME } from "./const";
@@ -10,7 +10,7 @@ export function GenerateBuildConfig(viteEnv: Record<string, any>) {
     apply: 'build',
     apply: 'build',
     enforce: 'post',
     enforce: 'post',
     closeBundle() {
     closeBundle() {
-      
+
       function createConfig({ config, configName, configFileName }: { configName: string, config: Record<string, any>, configFileName?: string } = { configName: '', config: {} }) {
       function createConfig({ config, configName, configFileName }: { configName: string, config: Record<string, any>, configFileName?: string } = { configName: '', config: {} }) {
         try {
         try {
           const windowConf = `window.${configName}`;
           const windowConf = `window.${configName}`;

@@ -2,10 +2,10 @@ import { createHtmlPlugin } from 'vite-plugin-html'
 
 
 const GLOB_CONFIG_FILE_NAME = '_app.config.js'
 const GLOB_CONFIG_FILE_NAME = '_app.config.js'
 
 
-export function configHtmlPlugin(env: ImportMetaEnv, isBuild: boolean) {
+export function configHtmlPlugin(env: ViteEnv, isBuild: boolean) {
   const { VITE_GLOB_APP_TITLE, VITE_GLOB_CONTENT_SECURITY_POLICY, VITE_GLOB_PUBLIC_PATH } = env
   const { VITE_GLOB_APP_TITLE, VITE_GLOB_CONTENT_SECURITY_POLICY, VITE_GLOB_PUBLIC_PATH } = env
   const getAppConfigSrc = () => {
   const getAppConfigSrc = () => {
-    const path = VITE_GLOB_PUBLIC_PATH.endsWith('/') ? VITE_GLOB_PUBLIC_PATH : `${VITE_GLOB_PUBLIC_PATH}`
+    const path = VITE_GLOB_PUBLIC_PATH?.endsWith('/') ? VITE_GLOB_PUBLIC_PATH : `${VITE_GLOB_PUBLIC_PATH}`
     return `${path || '/'}${GLOB_CONFIG_FILE_NAME}?v=${Date.now()}`
     return `${path || '/'}${GLOB_CONFIG_FILE_NAME}?v=${Date.now()}`
   }
   }
 
 

+import { Plugin, PluginOption } from "vite";
+import { GenerateBuildConfig } from "./globConfig";
+import { configHtmlPlugin } from "./html";
+
+export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
+  const vitePlugins: (Plugin | PluginOption[])[] = []
+
+  vitePlugins.push(configHtmlPlugin(viteEnv, isBuild))
+  vitePlugins.push(GenerateBuildConfig(viteEnv))
+
+  return vitePlugins
+}

 <!DOCTYPE html>
 <!DOCTYPE html>
 <html lang="zh-cmn-Hans">
 <html lang="zh-cmn-Hans">
-  <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <meta name="renderer" content="webkit" />
-    <meta name="description" content="GoView 是高效、高性能的拖拽式低代码数据可视化开发平台，将页面元素封装为基础组件，无需编写代码即可完成业务需求。">
-    <meta name="keywords" content="GoView，goview，低代码，可视化">
-    <meta name="author" content="奔跑的面条，面条">
-    <meta
-      name="viewport"
-      content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
-    />
-    <link rel="icon" href="./favicon.ico" />
-    <title>GoView</title>
-    <link rel="stylesheet" href="./index.css" />
-  </head>
-  <body>
-    <div id="appProvider" style="display: none;"></div>
-    <div id="app">
-      <div class="first-loading-wrp">
-        <div class="loading-wrp">
-          <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
-        </div>
+
+<head>
+  <%- contentSecurityPolicy %>
+  <meta charset="UTF-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+  <meta name="renderer" content="webkit" />
+  <meta name="description" content="GoView 是高效、高性能的拖拽式低代码数据可视化开发平台，将页面元素封装为基础组件，无需编写代码即可完成业务需求。">
+  <meta name="keywords" content="GoView，goview，低代码，可视化">
+  <meta name="author" content="奔跑的面条，面条">
+  <meta name="viewport"
+    content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0" />
+  <link rel="icon" href="./favicon.ico" />
+  <title>
+    <%= title %>>
+  </title>
+  <link rel="stylesheet" href="./index.css" />
+</head>
+
+<body>
+  <div id="appProvider" style="display: none;"></div>
+  <div id="app">
+    <div class="first-loading-wrp">
+      <div class="loading-wrp">
+        <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
       </div>
       </div>
     </div>
     </div>
-    <script type="module" src="/src/main.ts"></script>
-  </body>
+  </div>
+  <script type="module" src="/src/main.ts"></script>
+</body>
+
 </html>
 </html>

@@ -6,6 +6,7 @@
   },
   },
   "scripts": {
   "scripts": {
     "dev": "vite --host",
     "dev": "vite --host",
+    "dev:proxy": "vite --host --mode independence",
     "build": "vue-tsc --noEmit && vite build",
     "build": "vue-tsc --noEmit && vite build",
     "preview": "vite preview",
     "preview": "vite preview",
     "new": "plop --plopfile ./plop/plopfile.js",
     "new": "plop --plopfile ./plop/plopfile.js",

@@ -51,6 +51,7 @@ export interface UserInfoModel {
   tenantName: string;
   tenantName: string;
   roles: string[];
   roles: string[];
   plainRoles?: PlainRoleInfo[];
   plainRoles?: PlainRoleInfo[];
+  homePath?: string
 }
 }
 
 
 export interface PlainRoleInfo {
 export interface PlainRoleInfo {

+export enum RuntimeEnvironment {
+  DEVELOPMENT = 'development',
+  PRODUCTION = 'production',
+  INDEPENDENCE = 'independence'
+}

@@ -2,8 +2,7 @@ export const PageEnum = {
   SYSTEM_PASSWORD: '/system/changePassword',
   SYSTEM_PASSWORD: '/system/changePassword',
   // basic login path
   // basic login path
   BASE_LOGIN: '/login',
   BASE_LOGIN: '/login',
-  // basic home path
-  // BASE_HOME: isDolang.value == '/dashboard/workbench' ? '/dashboard/workbench' : isDolang.value,
+  // basic home path 
   BASE_HOME: '/dashboard/workbench',
   BASE_HOME: '/dashboard/workbench',
   // error page path
   // error page path
   ERROR_PAGE: '/exception',
   ERROR_PAGE: '/exception',

+import { PageEnum } from "@/enums/pageEnum";
+import { Router } from "vue-router"
+
+export const createErrorGuard = (router: Router) => {
+  router.beforeEach((to, from, next) => {
+    const isErrorPage = router.getRoutes().findIndex((item) => item.name === to.name);
+    if (isErrorPage === -1) {
+      next({ name: PageEnum.ERROR_PAGE_NAME_404 })
+    }
+    next()
+  })
+
+  // 错误
+  router.onError((error) => {
+    console.log(error, '路由错误');
+  });
+} 

+import { Router } from "vue-router"
+import { createErrorGuard } from "./errorGuard"
+import { createLoadingGuard } from "./loadingGuard"
+import { createPermissionGuard } from "./permissionGuard"
+
+export const setupRouterGuard = (router: Router) => {
+  createPermissionGuard(router)
+  createErrorGuard(router)
+  createLoadingGuard(router)
+}

+import { Router } from "vue-router";
+
+export const createLoadingGuard = (router: Router) => {
+    router.beforeEach(async (to, from, next) => {
+      const Loading = window['$loading'];
+      Loading && Loading.start();
+      next()
+    })
+  
+    router.afterEach((to, _, failure) => {
+      const Loading = window['$loading'];
+      document.title = (to?.meta?.title as string) || document.title;
+      Loading && Loading.finish();
+    })
+
+}

+import { RuntimeEnvironment } from "@/enums/external/envEnum";
+import { PageEnum } from "@/enums/pageEnum";
+import { useUserStoreWithOut } from "@/store/external/module/user";
+import { RouteLocationRaw, Router } from "vue-router";
+
+
+const whitePathList: string[] = [PageEnum.BASE_LOGIN];
+
+const isIndependenceMode = import.meta.env.MODE === RuntimeEnvironment.INDEPENDENCE
+
+const toIotPlatformLogin = () => {
+  const { origin } = window.location
+  window.location.replace(`${origin}/login?redirect=${import.meta.env.VITE_IOT_PLATFORM_PROXY_PREFIX}`)
+}
+
+export function createPermissionGuard(router: Router) {
+  const userStore = useUserStoreWithOut()
+
+  router.beforeEach((to, from, next) => {
+    if (from.path === '/' &&
+      to.path === PageEnum.BASE_HOME &&
+      userStore.getUserInfo.homePath &&
+      userStore.getUserInfo.homePath !== PageEnum.BASE_HOME
+    ) {
+      console.log(userStore.getUserInfo.homePath)
+      next(userStore.getUserInfo.homePath)
+      return
+    }
+
+    const token = userStore.getJwtToken
+
+    if (whitePathList.includes(to.path)) {
+      if (to.path === PageEnum.BASE_LOGIN && token) {
+        const isSessionTimeout = userStore.getSessionTimeout
+        try {
+          if (!isSessionTimeout) {
+            next('/')
+          }
+        } catch (error) {
+          console.error(error)
+        }
+      }
+      else {
+        if (isIndependenceMode) {
+          toIotPlatformLogin()
+          return
+        }
+        next()
+        return
+      }
+    }
+
+    if (!token) {
+      const redirectData = {
+        path: PageEnum.BASE_LOGIN,
+        redirect: true
+      } as RouteLocationRaw
+      if (isIndependenceMode) {
+        toIotPlatformLogin()
+        return
+      }
+      next(redirectData)
+    } else {
+      next()
+    }
+
+  })
+}

@@ -7,6 +7,7 @@ import { HttpErrorPage, LoginRoute, ReloadRoute } from '@/router/base'
 import { Layout } from '@/router/constant'
 import { Layout } from '@/router/constant'
 
 
 import modules from '@/router/modules'
 import modules from '@/router/modules'
+import { setupRouterGuard } from './external/guard'
 
 
 const RootRoute: Array<RouteRecordRaw> = [
 const RootRoute: Array<RouteRecordRaw> = [
   {
   {
@@ -39,6 +40,9 @@ const router = createRouter({
 export function setupRouter(app: App) {
 export function setupRouter(app: App) {
   app.use(router);
   app.use(router);
   // 创建路由守卫
   // 创建路由守卫
-  createRouterGuards(router)
+  // THINGS_KIT 修改路由拦截
+  // createRouterGuards(router)
+  setupRouterGuard(router)
+
 }
 }
 export default router
 export default router

@@ -53,6 +53,8 @@ const setting: Partial<ProjectConfig> = {
   // Whether to cancel the http request that has been sent but not responded when switching the interface.
   // Whether to cancel the http request that has been sent but not responded when switching the interface.
   // If it is enabled, I want to overwrite a single interface. Can be set in a separate interface
   // If it is enabled, I want to overwrite a single interface. Can be set in a separate interface
   removeAllHttpPending: false,
   removeAllHttpPending: false,
+
+  permissionCacheType: CacheTypeEnum.LOCAL
 };
 };
 
 
 export default setting;
 export default setting;

@@ -2,8 +2,7 @@ import type { UserInfo, UserUpdateInfo } from '/#/external/store';
 import type { ErrorMessageMode } from '/#/external/axios';
 import type { ErrorMessageMode } from '/#/external/axios';
 import { defineStore } from 'pinia';
 import { defineStore } from 'pinia';
 import { pinia as store } from '@/store';
 import { pinia as store } from '@/store';
-import { RoleEnum } from '@/enums/external/roleEnum';
-import { PageEnum } from '@/enums/external/pageEnum';
+import { RoleEnum } from '@/enums/external/roleEnum'; 
 import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY, ROLES_KEY, USER_INFO_KEY } from '@/enums/external/cacheEnum';
 import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY, ROLES_KEY, USER_INFO_KEY } from '@/enums/external/cacheEnum';
 import { getAuthCache, setAuthCache } from '@/utils/external/auth';
 import { getAuthCache, setAuthCache } from '@/utils/external/auth';
 import {
 import {
@@ -17,6 +16,7 @@ import router from '@/router';
 import { createLocalStorage } from '@/utils/external/cache';
 import { createLocalStorage } from '@/utils/external/cache';
 import { useI18n } from 'vue-i18n';
 import { useI18n } from 'vue-i18n';
 import { useDialog } from 'naive-ui';
 import { useDialog } from 'naive-ui';
+import { PageEnum } from '@/enums/pageEnum';
 
 
 interface UserState {
 interface UserState {
   platInfo: any;
   platInfo: any;

 import type { GlobEnvConfig } from '/#/external/config';
 import type { GlobEnvConfig } from '/#/external/config';
 
 
-import pkg from '../../../../package.json';
-import { getGlobalConfigName } from '../../../../build/external/globConfig/getGlobConfigName';
+// import pkg from '../../../../package.json';
+import { getGlobalConfigName } from '../../../../build/external/vite/plugins/globConfig/getGlobConfigName';
+import { RuntimeEnvironment } from '@/enums/external/envEnum';
 
 
 export function getCommonStoragePrefix() {
 export function getCommonStoragePrefix() {
-  const { VITE_GLOB_APP_SHORT_NAME } = getAppEnvConfig();
-  return `${VITE_GLOB_APP_SHORT_NAME}__${getEnv()}`.toUpperCase();
+  // const { VITE_GLOB_APP_SHORT_NAME } = getAppEnvConfig();
+  const VITE_GLOB_APP_SHORT_NAME = 'undefined'
+  const ENV = [RuntimeEnvironment.DEVELOPMENT, RuntimeEnvironment.INDEPENDENCE].includes(import.meta.env.MODE as RuntimeEnvironment) ? RuntimeEnvironment.DEVELOPMENT : RuntimeEnvironment.PRODUCTION
+  return `${VITE_GLOB_APP_SHORT_NAME}__${ENV.toUpperCase()}`.toUpperCase();
 }
 }
 
 
 // Generate cache key according to version
 // Generate cache key according to version
 export function getStorageShortName() {
 export function getStorageShortName() {
+  const pkg = { version: '2.7.1' }
   return `${getCommonStoragePrefix()}${`__${pkg.version}`}__`.toUpperCase();
   return `${getCommonStoragePrefix()}${`__${pkg.version}`}__`.toUpperCase();
 }
 }
 
 
@@ -20,18 +24,16 @@ export function getAppEnvConfig() {
     ? // Get the global configuration (the configuration will be extracted independently when packaging)
     ? // Get the global configuration (the configuration will be extracted independently when packaging)
     (import.meta.env as unknown as GlobEnvConfig)
     (import.meta.env as unknown as GlobEnvConfig)
     : window[ENV_NAME as any]) as unknown as GlobEnvConfig;
     : window[ENV_NAME as any]) as unknown as GlobEnvConfig;
- 
+
   const {
   const {
     VITE_GLOB_APP_TITLE,
     VITE_GLOB_APP_TITLE,
     VITE_GLOB_API_URL,
     VITE_GLOB_API_URL,
     VITE_GLOB_APP_SHORT_NAME,
     VITE_GLOB_APP_SHORT_NAME,
     VITE_GLOB_API_URL_PREFIX,
     VITE_GLOB_API_URL_PREFIX,
     VITE_GLOB_UPLOAD_URL,
     VITE_GLOB_UPLOAD_URL,
-    VITE_GLOB_CONFIGURATION,
     VITE_GLOB_WEB_SOCKET,
     VITE_GLOB_WEB_SOCKET,
-    VITE_GLOB_CONTENT_SECURITY_POLICY,
-    VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME,
     VITE_GLOB_ALARM_NOTIFY_DURATION,
     VITE_GLOB_ALARM_NOTIFY_DURATION,
+    VITE_GLOB_CONTENT_SECURITY_POLICY
   } = ENV;
   } = ENV;
 
 
   if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) {
   if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) {
@@ -46,11 +48,9 @@ export function getAppEnvConfig() {
     VITE_GLOB_APP_SHORT_NAME,
     VITE_GLOB_APP_SHORT_NAME,
     VITE_GLOB_API_URL_PREFIX,
     VITE_GLOB_API_URL_PREFIX,
     VITE_GLOB_UPLOAD_URL,
     VITE_GLOB_UPLOAD_URL,
-    VITE_GLOB_CONFIGURATION,
     VITE_GLOB_WEB_SOCKET,
     VITE_GLOB_WEB_SOCKET,
-    VITE_GLOB_CONTENT_SECURITY_POLICY,
-    VITE_GLOB_ALARM_NOTIFY_POLLING_INTERVAL_TIME,
     VITE_GLOB_ALARM_NOTIFY_DURATION,
     VITE_GLOB_ALARM_NOTIFY_DURATION,
+    VITE_GLOB_CONTENT_SECURITY_POLICY
   };
   };
 }
 }
 
 

@@ -66,7 +66,7 @@
                   </div>
                   </div>
                 </n-form-item>
                 </n-form-item>
                 <n-form-item>
                 <n-form-item>
-                  <!-- YUN_TENG loading修改  -->
+                  <!-- THINGS_KIT loading修改  -->
                   <n-button type="primary" @click="handleSubmit" size="large" :loading="loginLoading" block>{{
                   <n-button type="primary" @click="handleSubmit" size="large" :loading="loginLoading" block>{{
                     $t('login.form_button') }}</n-button>
                     $t('login.form_button') }}</n-button>
                 </n-form-item>
                 </n-form-item>
@@ -173,7 +173,7 @@ const shuffleHandle = () => {
   }, carouselInterval)
   }, carouselInterval)
 }
 }
 
 
-// YUN_TENG 登录钩子
+// THINGS_KIT 登录钩子
 const { login, loading: loginLoading } = useLogin()
 const { login, loading: loginLoading } = useLogin()
 
 
 // 点击事件
 // 点击事件
@@ -183,19 +183,8 @@ const handleSubmit = (e: Event) => {
     if (!errors) {
     if (!errors) {
       const { username, password } = formInline
       const { username, password } = formInline
       loading.value = true
       loading.value = true
-      // YUN_TENG 登录接口
+      // THINGS_KIT 登录接口
       await login({ username, password })
       await login({ username, password })
-      // setLocalStorage(
-      //   GO_LOGIN_INFO_STORE,
-      //   cryptoEncode(
-      //     JSON.stringify({
-      //       username,
-      //       password,
-      //     })
-      //   )
-      // )
-      // window['$message'].success(`${t('login.login_success')}!`)
-      // routerTurnByName(PageEnum.BASE_HOME_NAME, true)
 
 
     } else {
     } else {
       window['$message'].error(`${t('login.login_message')}!`)
       window['$message'].error(`${t('login.login_message')}!`)

@@ -166,4 +166,6 @@ export interface GlobEnvConfig {
   VITE_GLOB_WEB_SOCKET: string;
   VITE_GLOB_WEB_SOCKET: string;
   // notify duration
   // notify duration
   VITE_GLOB_ALARM_NOTIFY_DURATION: string;
   VITE_GLOB_ALARM_NOTIFY_DURATION: string;
+  // content security policy
+  VITE_GLOB_CONTENT_SECURITY_POLICY: string
 }
 }

 /// <reference types="vite/client" />
 /// <reference types="vite/client" />
 
 
-
 declare interface GlobEnvConfig {
 declare interface GlobEnvConfig {
   // 标题
   // 标题
   VITE_GLOB_APP_TITLE: string;
   VITE_GLOB_APP_TITLE: string;
@@ -26,8 +25,11 @@ declare interface ViteEnv extends GlobEnvConfig {
   VITE_DEV_PATH: string
   VITE_DEV_PATH: string
   // 生产地址
   // 生产地址
   VITE_PRO_PATH: string
   VITE_PRO_PATH: string
+  // iot platform proxy prefix
+  VITE_IOT_PLATFORM_PROXY_PREFIX: string
 }
 }
 
 
 interface ImportMetaEnv extends ViteEnv {
 interface ImportMetaEnv extends ViteEnv {
+  MODE: 'development' | 'production' | 'independence'
 }
 }
 
 

@@ -6,25 +6,26 @@ import viteCompression from 'vite-plugin-compression'
 import { viteMockServe } from 'vite-plugin-mock'
 import { viteMockServe } from 'vite-plugin-mock'
 import monacoEditorPlugin from 'vite-plugin-monaco-editor'
 import monacoEditorPlugin from 'vite-plugin-monaco-editor'
 import { createProxy } from './build/external/vite/proxy'
 import { createProxy } from './build/external/vite/proxy'
-import { parseEnv } from './build/external/utils'
-import { GenerateBuildConfig } from './build/external/globConfig'
+import { getPublicPath, parseEnv } from './build/external/utils'
+import { createVitePlugins } from './build/external/vite/plugins'
 
 
 function pathResolve(dir: string) {
 function pathResolve(dir: string) {
   return resolve(process.cwd(), '.', dir)
   return resolve(process.cwd(), '.', dir)
 }
 }
-
+// THINGS_KIT 构建方法变更
 export default defineConfig(({ mode, command }) => {
 export default defineConfig(({ mode, command }) => {
 
 
   const root = process.cwd()
   const root = process.cwd()
-  
-  const env = loadEnv(mode, root) 
+
+  const env = loadEnv(mode, root)
 
 
   const viteEnv = parseEnv(env)
   const viteEnv = parseEnv(env)
 
 
   const isBuild = command === 'build'
   const isBuild = command === 'build'
 
 
   return {
   return {
-    base: '/',
+    // THINGS_KIT 修改public path
+    base: getPublicPath({ command, mode }, viteEnv),
     // 路径重定向
     // 路径重定向
     resolve: {
     resolve: {
       alias: [
       alias: [
@@ -76,7 +77,7 @@ export default defineConfig(({ mode, command }) => {
         algorithm: 'gzip',
         algorithm: 'gzip',
         ext: '.gz'
         ext: '.gz'
       }),
       }),
-      GenerateBuildConfig(viteEnv)
+      ...createVitePlugins(viteEnv, isBuild)
     ],
     ],
     build: {
     build: {
       target: 'es2015',
       target: 'es2015',
@@ -88,8 +89,8 @@ export default defineConfig(({ mode, command }) => {
       chunkSizeWarningLimit: chunkSizeWarningLimit
       chunkSizeWarningLimit: chunkSizeWarningLimit
     },
     },
     server: {
     server: {
-      proxy: createProxy(viteEnv)
-    }
+      port: 5555,
+      proxy: createProxy(viteEnv),
+    },
   }
   }
-}
-)
+})