diff --git a/.env.build b/.env.build index d49ad8e..43a43c7 100644 --- a/.env.build +++ b/.env.build @@ -1,8 +1,6 @@ VITE_APP_ENV = 'prod' #自动获取地址推荐 -#VITE_APP_BASE_URL = '/micro-service-api' -VITE_APP_BASE_URL = 'http://8.135.1.141/micro-service-api' -VITE_APP_BASE_WS_URL = '' +VITE_APP_BASE_URL = 'https://github.jzfai.top/micro-service-api' #image or oss address -VITE_APP_IMAGE_URL = 'http://8.135.1.141:8080' +VITE_APP_IMAGE_URL = 'https://github.jzfai.top/gofast-image' diff --git a/.env.build-test b/.env.build-test index 46b5a9d..d454976 100644 --- a/.env.build-test +++ b/.env.build-test @@ -1,8 +1,8 @@ VITE_APP_ENV = 'test' #自动获取地址推荐 #VITE_APP_BASE_URL = '/micro-service-api' -VITE_APP_BASE_URL = 'http://8.135.1.141/micro-service-api' +VITE_APP_BASE_URL = 'https://github.jzfai.top/micro-service-api' VITE_APP_BASE_WS_URL = '' #image or oss address -VITE_APP_IMAGE_URL = 'http://8.135.1.141:8080' +VITE_APP_IMAGE_URL = 'https://github.jzfai.top/gofast-image' diff --git a/.env.serve-dev b/.env.serve-dev index e127538..a38d289 100644 --- a/.env.serve-dev +++ b/.env.serve-dev @@ -1,10 +1,10 @@ #The defined variable must start with VITE_APP_ VITE_APP_ENV = 'dev' -VITE_APP_BASE_URL = 'http://8.135.1.141/micro-service-api' +VITE_APP_BASE_URL = 'https://github.jzfai.top/micro-service-api' #image or oss address -VITE_APP_IMAGE_URL = 'http://8.135.1.141:8080' +VITE_APP_IMAGE_URL = 'https://github.jzfai.top/gofast-image' #proxy, use this to test proxy #VITE_APP_BASE_URL = '/api' -#VITE_APP_PROXY_URL = 'http://8.135.1.141/micro-service-api' +#VITE_APP_PROXY_URL = 'https://github.jzfai.top/micro-service-api' diff --git a/.env.serve-test b/.env.serve-test index d853b9f..ed14544 100644 --- a/.env.serve-test +++ b/.env.serve-test @@ -1,10 +1,10 @@ #The defined variable must start with VITE_APP_ VITE_APP_ENV = 'test' -VITE_APP_BASE_URL = 'http://8.135.1.141/micro-service-api' +VITE_APP_BASE_URL = 'https://github.jzfai.top/micro-service-api' #image or oss address -VITE_APP_IMAGE_URL = 'http://8.135.1.141:8080' +VITE_APP_IMAGE_URL = 'https://github.jzfai.top/gofast-image' #proxy, use this to test proxy #VITE_APP_BASE_URL = '/api' -#VITE_APP_PROXY_URL = 'http://8.135.1.141/micro-service-api' +#VITE_APP_PROXY_URL = 'https://github.jzfai.top/micro-service-api' diff --git a/README-zh_CN.md b/README-zh_CN.md index b34ee87..2eee0f8 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -19,9 +19,9 @@ update element-plus vite2 vue3 version ,add func of element-svg icon for side me add domo of 'import export download template' in CRUD //11-26 update vue3 version and so on; -add keep-alive use demo and router using demo ，look for "http://8.135.1.141/vue3-admin-template/#/writing-demo/keep-alive" +add keep-alive use demo and router using demo ，look for "https://github.jzfai.top/vue3-admin-template/#/writing-demo/keep-alive" add the param cachePage and leaveRmCachePage to route for keep-alive,look for https://github.com/jzfai/vue3-admin-template/blob/master/src/router/index.js -add collection the error log of img loading fail,look for "http://8.135.1.141/vue3-admin-template/#/error-log/log" +add collection the error log of img loading fail,look for "https://github.jzfai.top/vue3-admin-template/#/error-log/log" in router page you need add root element,such as div, but is not necessary for children component fix some issue ``` @@ -30,20 +30,20 @@ fix some issue [github address](https://github.com/jzfai/vue3-admin-ts.git) -[Access address](http://8.135.1.141/vue3-admin-ts) +[Access address](https://github.jzfai.top/vue3-admin-ts) github 地址： https://github.com/jzfai/vue3-admin-ts.git -国内体验地址：http://8.135.1.141/vue3-admin-ts +国内体验地址：https://github.jzfai.top/vue3-admin-ts ## 例子 ---- 我们先看看加载速度和构建后的包大小： -![template-speed-analysis](http://8.135.1.141/file/images/template-speed-analysis.png) +![template-speed-analysis](https://github.jzfai.top/file/images/template-speed-analysis.png) -![template-demo](http://8.135.1.141/file/images/plus-demo.png) +![template-demo](https://github.jzfai.top/file/images/plus-demo.png) ## 相关项目 @@ -92,7 +92,7 @@ git clone https://github.com/jzfai/vue3-admin-ts.git cd vue3-admin-ts # 安装依赖(建议用pnpm) -# 你可以运行npm i -g pnpm 去安装pnpm +# 你可以运行npm i -g pnpm@6.32.3 去安装pnpm pnpm # 启动服务 @@ -207,7 +207,7 @@ Modern browsers and Internet Explorer 11+. |Edge| last 2 versions| last 2 versions| last 2 versions ## 讨论和交流(含vue3+ts视频教程) -[WeChat group](http://8.135.1.141/file/images/wx-groud.png) +[WeChat group](https://github.jzfai.top/file/images/wx-groud.png) ## 版本 diff --git a/README.md b/README.md index 3394e9c..9ca1872 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ Use eslint+prettier+gitHooks format and verification code to improve code standa [github address](https://github.com/jzfai/vue3-admin-ts.git) -[Access address](http://8.135.1.141/vue3-admin-ts) +[Access address](https://github.jzfai.top/vue3-admin-ts) -国内体验地址：http://8.135.1.141/vue3-admin-ts +国内体验地址：https://github.jzfai.top/vue3-admin-ts github 地址： https://github.com/jzfai/vue3-admin-ts.git @@ -30,9 +30,9 @@ github 地址： https://github.com/jzfai/vue3-admin-ts.git ---- Let's look at the loading speed and the size of the built package first.： -![template-speed-analysis](http://8.135.1.141/file/images/template-speed-analysis.png) +![template-speed-analysis](https://github.jzfai.top/file/images/template-speed-analysis.png) -![template-demo](http://8.135.1.141/file/images/plus-demo.png) +![template-demo](https://github.jzfai.top/file/images/plus-demo.png) ## Related items @@ -71,7 +71,7 @@ git clone https://github.com/jzfai/vue3-admin-ts.git cd vue3-admin-ts # install dependency(Recommend use pnpm) -#you can run npm i -g pnpm to install it +#you can run npm i -g pnpm@6.32.3 to install it pnpm # develop @@ -117,7 +117,7 @@ Modern browsers and Internet Explorer 11+. |Edge| last 2 versions| last 2 versions| last 2 versions ## Discussion and Communication -[WeChat group](http://8.135.1.141/file/images/wx-groud.png) +[WeChat group](https://github.jzfai.top/file/images/wx-groud.png) ## License diff --git a/package.json b/package.json index de48f7e..9e4318f 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,11 @@ { "name": "vue3-admin-ts", - "version": "1.5.5", + "version": "1.6.1", "license": "ISC", "author": "kuanghua(869653722@qq.com)", + "packageManager": "pnpm@6.32.3", "scripts": { + "preinstall": "npx only-allow pnpm", "dev": "vite --mode serve-dev --host", "test": "vite --mode serve-test --host", "build:test": "vite build --mode build-test", @@ -21,11 +23,11 @@ "vue": "^3.2.26" }, "dependencies": { - "@element-plus/icons-vue": "1.1.4", + "@element-plus/icons-vue": "2.0.4", "axios": "0.21.3", "echarts": "5.3.2", - "element-plus": "2.1.9", - "js-errorlog-collection": "^1.0.5", + "element-plus": "2.2.5", + "js-error-collection": "^1.0.7", "mitt": "3.0.0", "moment-mini": "^2.22.1", "nprogress": "0.2.0", @@ -33,7 +35,7 @@ "path-to-regexp": "^6.2.0", "pinia": "2.0.13", "tinymce": "6.0.1", - "vue": "3.2.33", + "vue": "3.2.37", "vue-router": "4.0.14" }, "devDependencies": { @@ -61,7 +63,7 @@ "typescript": "4.5.4", "unplugin-auto-import": "^0.5.11", "unplugin-vue-components": "^0.17.14", - "vite": "2.9.7", + "vite": "2.9.12", "vite-plugin-html": "^3.2.0", "vite-plugin-mock": "^2.9.6", "vite-plugin-style-import": "1.2.1", @@ -90,6 +92,6 @@ "not op_mini all" ], "engines": { - "node": ">= 14" + "node": ">= 14<18" } } diff --git a/src/hooks/useErrorLog.ts b/src/hooks/useErrorLog.ts index 39c8530..4bed7c3 100644 --- a/src/hooks/useErrorLog.ts +++ b/src/hooks/useErrorLog.ts @@ -4,7 +4,7 @@ import setting from '@/settings' import bus from '@/utils/bus' import pack from '../../package.json' import { ObjTy } from '~/common' -import { jsErrorCollection } from 'js-errorlog-collection' +import { jsErrorCollection } from 'js-error-collection' const errorLogReq = (errLog: string) => { request({ url: '/integration-front/errorCollection/insert', diff --git a/src/settings.ts b/src/settings.ts index f7dcad6..9d897e9 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -107,7 +107,7 @@ const setting: SettingTy = { * vite.config.js base config * such as * */ - viteBasePath: '/vue3-admin-ts/' + viteBasePath: './' } export default setting diff --git a/src/views/error-log/ErrorLog.vue b/src/views/error-log/ErrorLog.vue index bfe4cf5..3870130 100644 --- a/src/views/error-log/ErrorLog.vue +++ b/src/views/error-log/ErrorLog.vue @@ -137,7 +137,7 @@ let usertableData = ref([]) import packages from '/package.json' let searchForm: ObjTy = reactive({ errorLog: '', - pageUrl: `8.135.1.141/${packages.name}`, + pageUrl: `https://github.jzfai.top/${packages.name}`, createTime: '', id: '' }) diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue index 2a97bde..e0e8175 100644 --- a/src/views/login/Login.vue +++ b/src/views/login/Login.vue @@ -192,6 +192,10 @@ $light_gray: #eee;