Browse Source

minor: 去掉微服务子应用功能

tuonian 3 months ago
parent
commit
aaf30c8b62

File diff suppressed because it is too large
+ 1 - 0
frontend/dist/assets/index-BmLnlYdg.js


File diff suppressed because it is too large
+ 0 - 1
frontend/dist/assets/index-C4bOgrFY.js


File diff suppressed because it is too large
+ 0 - 0
frontend/dist/assets/index-CPU_ifuQ.css


File diff suppressed because it is too large
+ 0 - 0
frontend/dist/assets/index-Du21pBjA.css


File diff suppressed because it is too large
+ 0 - 0
frontend/dist/assets/index-legacy-C9bzCwDK.js


File diff suppressed because it is too large
+ 0 - 0
frontend/dist/assets/polyfills-legacy-onNG-a16.js


File diff suppressed because it is too large
+ 0 - 0
frontend/dist/cdn/ace-builds-1.23.0-legacy.js


File diff suppressed because it is too large
+ 0 - 0
frontend/dist/cdn/ace-builds-1.23.0.js


File diff suppressed because it is too large
+ 0 - 0
frontend/dist/cdn/react-all-18.2.0-legacy.js


File diff suppressed because it is too large
+ 0 - 0
frontend/dist/cdn/react-all-18.2.0.js


File diff suppressed because it is too large
+ 0 - 0
frontend/dist/cdn/rich-legacy.js


File diff suppressed because it is too large
+ 0 - 0
frontend/dist/cdn/rich.js


+ 4 - 44
frontend/dist/index.html

@@ -1,57 +1,17 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-<script>
-(function (){
-const global = (0, eval)('window')
-const name = 'nginx-ui'
-
-    const proxy = global.proxy
-    let publicPath = (proxy && proxy.__INJECTED_PUBLIC_PATH_BY_QIANKUN__) || ''
-    publicPath = publicPath.slice(0, publicPath.length - 1)
-    global.legacyQiankun = global.legacyQiankun || {}
-    global.legacyQiankun[name] = global.legacyQiankun[name] || {}
-    Object.assign(global.legacyQiankun[name], {
-      proxy,
-      publicPath,
-      '__INJECTED_PUBLIC_PATH_BY_QIANKUN__': proxy && proxy.__INJECTED_PUBLIC_PATH_BY_QIANKUN__,
-      '__POWERED_BY_QIANKUN__': proxy && proxy.__INJECTED_PUBLIC_PATH_BY_QIANKUN__,
-    })})()
-</script>
+  <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/nginx-ui/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>NginxUI</title>
     <script type="application/javascript" src="/nginx-ui/config.js"></script>
-    <!-- replace by vite-plugin-legacy-qiankun <script type="module" crossorigin src="/nginx-ui/assets/index-C4bOgrFY.js"></script> -->
+    <script type="module" crossorigin src="/nginx-ui/assets/index-BmLnlYdg.js"></script>
     <link rel="modulepreload" crossorigin href="/nginx-ui/cdn/ace-builds-1.23.0.js">
     <link rel="modulepreload" crossorigin href="/nginx-ui/cdn/react-all-18.2.0.js">
-    <link rel="stylesheet" crossorigin href="/nginx-ui/assets/index-Du21pBjA.css">
-    <!-- replace by vite-plugin-legacy-qiankun <script type="module">import.meta.url;import("_").catch(()=>1);(async function*(){})().next();if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script> -->
-    <!-- replace by vite-plugin-legacy-qiankun <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script> -->
+    <link rel="stylesheet" crossorigin href="/nginx-ui/assets/index-CPU_ifuQ.css">
   </head>
   <body>
     <div id="nginx_ui_root"></div>

-    <script >!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-    <script  crossorigin id="vite-legacy-polyfill" src="/nginx-ui/assets/polyfills-legacy-onNG-a16.js"></script>
-    <script>
-(function (){
-const global = (0, eval)('window')
-const name = 'nginx-ui'
-global.legacyQiankun[name].dynamicImport = System.import(!global.legacyQiankun[name].__POWERED_BY_QIANKUN__ ? '/nginx-ui/assets/index-legacy-C9bzCwDK.js' : new URL('/nginx-ui/assets/index-legacy-C9bzCwDK.js', global.legacyQiankun[name].__POWERED_BY_QIANKUN__).toString())})()
-</script>
-  <script>
-(function (){
-const global = (0, eval)('window')
-const name = 'nginx-ui'
-
-    const app = global.legacyQiankun[name]
-    if (!app.proxy) return
-    window[name] = {
-      bootstrap: (...args) => app.dynamicImport.then(() => app.lifecyle.bootstrap(...args)),
-      mount: (...args) => app.dynamicImport.then(() => app.lifecyle.mount(...args)),
-      unmount: (...args) => app.dynamicImport.then(() => app.lifecyle.unmount(...args)),
-      update: (...args) => app.dynamicImport.then(() => app.lifecyle.update(...args)),
-    }})()
-</script></body>
+  </body>
 </html>

+ 1 - 35
frontend/src/main.tsx

@@ -4,7 +4,6 @@ import './adapter/index.js'
 import App from './App.tsx'
 import './index.css'
 import './styles/index.less'
-import renderWithQiankun from "vite-plugin-qiankun/dist/helper";
 import './components/form/index.ts'
 
 let root: Root | null
@@ -21,37 +20,4 @@ const render = (props: any ={}) => {
   )
 }
 
-const initQianKun = ()=>{
-  renderWithQiankun({
-    bootstrap(){
-      console.log('bootstrap')
-    },
-    mount(props){
-      console.log('[nginx-ui] mount', props)
-      render(props)
-    },
-    unmount(){
-      console.log('unmount')
-      if (!root){
-        return
-      }
-      try {
-        root.unmount()
-        root = null
-      }catch (e) {
-        console.log('[nginx-ui] unmount fail', e)
-      }
-    },
-    update(props){
-      console.log('update', props)
-    }
-  })
-}
-
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-if (window.__POWERED_BY_QIANKUN__){
-  initQianKun()
-} else {
-  render()
-}
+render()

+ 75 - 82
frontend/vite.config.ts

@@ -1,103 +1,96 @@
-import { defineConfig, loadEnv } from 'vite'
+import {defineConfig, loadEnv} from 'vite'
 import react from '@vitejs/plugin-react'
 import {AntdResolve, createStyleImportPlugin} from "vite-plugin-style-import";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 import mdx from '@mdx-js/rollup'
 import * as path from 'path'
 import fse from 'fs-extra'
-import legacy from '@vitejs/plugin-legacy' // need this
-import { legacyQiankun } from 'vite-plugin-legacy-qiankun'
 
 
 const readDepInfo = (module: string) => {
-  const filePath = path.join(__dirname, 'node_modules', module, 'package.json')
-  if (fse.existsSync(filePath)){
-    return fse.readJSONSync(filePath)
-  }
-  return {
-    version: 'unknown'
-  }
+    const filePath = path.join(__dirname, 'node_modules', module, 'package.json')
+    if (fse.existsSync(filePath)) {
+        return fse.readJSONSync(filePath)
+    }
+    return {
+        version: 'unknown'
+    }
 }
 
 const acePackage = readDepInfo('ace-builds')
 const reactPackage = readDepInfo('react')
 
-export default defineConfig(({command, mode})=>{
-  console.log('command,mode', command,mode)
-  const env = loadEnv(mode, process.cwd(),'')
-  console.log('env', env.VITE_BASE_API)
+export default defineConfig(({command, mode}) => {
+    console.log('command,mode', command, mode)
+    const env = loadEnv(mode, process.cwd(), '')
+    console.log('env', env.VITE_BASE_API)
 
-  return {
-    plugins: [
-      mdx({
-        format: 'detect',
-        include: ["**/*.md",'**/*.mdx']
-      }),
-      react(),
-      createStyleImportPlugin({
-        resolves: [AntdResolve()]
-      }),
-        legacy(),
-        legacyQiankun({
-          name: 'nginx-ui',
-          devSandbox: true,
-        })
-    ],
-    css: {
-      preprocessorOptions: {
-        less: {
-          javascriptEnabled: true
-        }
-      }
-    },
-    resolve:{
-      alias: {
-        '@': path.resolve(__dirname,'./src'),
-        'docs': path.resolve(__dirname,'./docs')
-      }
-    },
-    assetsInclude: ["**/*.md"],
-    server:{
-      proxy: {
-        ...(mode === 'desktop')? {
-          "/api":{
-            target: 'http://127.0.0.1:38080',
-            rewrite: path => path.replace(/^\/api/,"")
-          }
-        } : {
-          "/api/rdm/":{
-            // target: 'http://10.10.0.1:8080',
-            // target: 'http://10.10.0.1:38085',
-            target: 'http://127.0.0.1:38085',
-            rewrite: path => path.replace(/^\/api/,""),
-            ws: true
-          },
-          "/api":{
-            // target: 'http://10.10.0.1:8080',
-            target: 'http://127.0.0.1:8080',
-            rewrite: path => path.replace(/^\/api/,"")
-          },
-        }
-      }
-    },
-    build: {
-      sourcemap: false,
-      minify: true,
-      rollupOptions: {
-        output: {
-          // 通过正则或者其他逻辑来确定哪些依赖应该被打包到vendor chunk中
-          manualChunks(filename){
-            if (filename.includes('/node_modules/ace-builds')) {
-              return `ace-builds-${acePackage.version}`;
+    return {
+        plugins: [
+            mdx({
+                format: 'detect',
+                include: ["**/*.md", '**/*.mdx']
+            }),
+            react(),
+            createStyleImportPlugin({
+                resolves: [AntdResolve()]
+            }),
+        ],
+        css: {
+            preprocessorOptions: {
+                less: {
+                    javascriptEnabled: true
+                }
+            }
+        },
+        resolve: {
+            alias: {
+                '@': path.resolve(__dirname, './src'),
+                'docs': path.resolve(__dirname, './docs')
+            }
+        },
+        assetsInclude: ["**/*.md"],
+        server: {
+            proxy: {
+                ...(mode === 'desktop') ? {
+                    "/api": {
+                        target: 'http://127.0.0.1:38080',
+                        rewrite: path => path.replace(/^\/api/, "")
+                    }
+                } : {
+                    "/api/rdm/": {
+                        // target: 'http://10.10.0.1:8080',
+                        // target: 'http://10.10.0.1:38085',
+                        target: 'http://127.0.0.1:38085',
+                        rewrite: path => path.replace(/^\/api/, ""),
+                        ws: true
+                    },
+                    "/api": {
+                        // target: 'http://10.10.0.1:8080',
+                        target: 'http://127.0.0.1:8080',
+                        rewrite: path => path.replace(/^\/api/, "")
+                    },
+                }
             }
-            if (filename.includes('/node_modules/react')) {
-              return `react-all-${reactPackage.version}`;
+        },
+        build: {
+            sourcemap: false,
+            minify: true,
+            rollupOptions: {
+                output: {
+                    // 通过正则或者其他逻辑来确定哪些依赖应该被打包到vendor chunk中
+                    manualChunks(filename) {
+                        if (filename.includes('/node_modules/ace-builds')) {
+                            return `ace-builds-${acePackage.version}`;
+                        }
+                        if (filename.includes('/node_modules/react')) {
+                            return `react-all-${reactPackage.version}`;
+                        }
+                    },
+                    chunkFileNames: `cdn/[name].js`
+                }
             }
-          },
-          chunkFileNames: `cdn/[name].js`
         }
-      }
     }
-  }
 
 })

+ 1 - 1
server/models/user.go

@@ -19,7 +19,7 @@ type User struct {
 	Remark    string         `json:"remark"`
 	Source    string         `json:"source"`   // 账号来源,默认或者自有账号
 	TempCode  string         `json:"tempCode"` // 临时授权码,重置密码
-	CreatedAt time.Time      `orm:"auto_now_add;type(datetime);default(0001-01-01 00:00:00)" json:"createdAt"`
+	CreatedAt time.Time      `orm:"auto_now_add;type(datetime);default('0001-01-01 00:00:00')" json:"createdAt"`
 	Routes    []SettingRoute `orm:"-" json:"routes"`
 }
 

Some files were not shown because too many files changed in this diff