From 0fc2eff399e89e4baad24e88904ff8a965414504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com> Date: Tue, 20 Jun 2023 14:21:35 +0800 Subject: [PATCH 01/14] =?UTF-8?q?test:=20:white=5Fcheck=5Fmark:=20?= =?UTF-8?q?=E6=B5=8B=E8=AF=95commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 3449d0331c38e2ce99381b77441eb900bdf2e086 --- vite.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vite.config.ts b/vite.config.ts index 6f208d78..80d0cc26 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -45,7 +45,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => { [env.VITE_APP_BASE_API]: { target: "http://vapi.youlai.tech", // 线上接口地址 // target: 'http://localhost:8989', // 本地接口地址 , 后端工程仓库地址：https://gitee.com/youlaiorg/youlai-boot - changeOrigin: true, + changeOrigin: false, rewrite: (path) => path.replace(new RegExp("^" + env.VITE_APP_BASE_API), ""), // 替换 /dev-api 为 target 接口地址 }, From 4d7dc3a400b3396a4d44478bd436bc13855ef9b1 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Thu, 22 Jun 2023 05:36:23 +0800 Subject: [PATCH 02/14] =?UTF-8?q?docs:=20:memo:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=A4=E6=B5=81=E7=BE=A4=E5=8A=A0=E5=85=A5=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 153f9587dd59bf02f4369fac553ac310037ddc90 --- README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d10bd5e6..c4f23b88 100644 --- a/README.md +++ b/README.md @@ -148,15 +148,13 @@ server { ![](https://oss.youlai.tech/youlai-boot/2023/05/21/d9863c6ded9e4363824b0d8c4c1f0642.png) -## 公众号🎉 +## 交流群🚀 > 无广告，佛系公众号，随缘更新开源组织成员技术分享，期待您的关注！ -![](https://s2.loli.net/2023/05/28/JaG4L8ZHmkIgRQC.png) +如果交流群的二维码过期，请加我微信，备注「前端」、「后端」或「全栈」即可，我将邀请您加入对应的微信群。 -## 交流群🚀 - -> 如果交流群的二维码过期，请加我微信，备注「前端」、「后端」或「全栈」即可，我将邀请您加入对应的微信群。 - -![](https://s2.loli.net/2023/05/28/7vNjHTotb2h9zBD.png) +|公众号|交流群| +|-|-| +||| From fc9dae4d859c22f33fc42d111485282cea2283a2 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Thu, 22 Jun 2023 05:36:51 +0800 Subject: [PATCH 03/14] =?UTF-8?q?docs:=20:memo:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=A4=E6=B5=81=E7=BE=A4=E5=8A=A0=E5=85=A5=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: db69d6e749e1b64d7f94069229426d52aa51fa90 --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c4f23b88..19fb7631 100644 --- a/README.md +++ b/README.md @@ -150,11 +150,13 @@ server { ## 交流群🚀 -> 无广告，佛系公众号，随缘更新开源组织成员技术分享，期待您的关注！ - -如果交流群的二维码过期，请加我微信，备注「前端」、「后端」或「全栈」即可，我将邀请您加入对应的微信群。 +> 关注「有来技术」公众号，获取交流群二维码。 +> +> 如果交流群的二维码过期，加我微信，备注「前端」、「后端」或「全栈」即可。 +> +> 为了避免营销广告人群混入，此举无奈，望理解！ |公众号|交流群| |-|-| -||| +||| From ccdbaf7ce658fd967384450e6610714d5c0bcfb4 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Sat, 24 Jun 2023 23:50:23 +0800 Subject: [PATCH 04/14] =?UTF-8?q?refactor:=20=E7=99=BB=E5=BD=95=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=8F=82=E6=95=B0=E4=BB=8EURL=E7=A7=BB=E5=85=A5?= =?UTF-8?q?=E5=88=B0=E8=AF=B7=E6=B1=82=E4=BD=93=E7=9A=84FormData?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 474e69601fc257661fe8bed68f45c62990613cd0 --- src/api/auth/index.ts | 30 ++++++++++++++++++------------ src/api/auth/types.ts | 5 ++--- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts index d75d67b1..92663750 100644 --- a/src/api/auth/index.ts +++ b/src/api/auth/index.ts @@ -1,6 +1,6 @@ -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; -import { CaptchaResult, LoginData, LoginResult } from './types'; +import request from "@/utils/request"; +import { AxiosPromise } from "axios"; +import { CaptchaResult, LoginData, LoginResult } from "./types"; /** * 登录API @@ -9,10 +9,18 @@ import { CaptchaResult, LoginData, LoginResult } from './types'; * @returns */ export function loginApi(data: LoginData): AxiosPromise { + const formData = new FormData(); + formData.append("username", data.username); + formData.append("password", data.password); + formData.append("verifyCodeKey", data.verifyCodeKey || ""); + formData.append("verifyCode", data.verifyCode || ""); return request({ - url: '/api/v1/auth/login', - method: 'post', - params: data + url: "/api/v1/auth/login", + method: "post", + data: formData, + headers: { + "Content-Type": "multipart/form-data", + }, }); } @@ -21,19 +29,17 @@ export function loginApi(data: LoginData): AxiosPromise { */ export function logoutApi() { return request({ - url: '/api/v1/auth/logout', - method: 'delete' + url: "/api/v1/auth/logout", + method: "delete", }); } - - /** * 获取验证码 */ export function getCaptchaApi(): AxiosPromise { return request({ - url: '/api/v1/auth/captcha', - method: 'get' + url: "/api/v1/auth/captcha", + method: "get", }); } diff --git a/src/api/auth/types.ts b/src/api/auth/types.ts index dcc47d09..858f1d9e 100644 --- a/src/api/auth/types.ts +++ b/src/api/auth/types.ts @@ -5,11 +5,11 @@ export interface LoginData { /** * 用户名 */ - username?: string; + username: string; /** * 密码 */ - password?: string; + password: string; /** * 验证码缓存key @@ -57,4 +57,3 @@ export interface CaptchaResult { */ verifyCodeBase64: string; } - From 3305f07cbfca12918792f134b22f1caff5942561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com> Date: Sun, 25 Jun 2023 18:31:39 +0800 Subject: [PATCH 05/14] =?UTF-8?q?docs:=20:memo:=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: fdd47031653fed24bf60707cb0227479b3e009d3 --- README.md | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 19fb7631..27eb444b 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@

+ ## 项目介绍 [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) 是基于 Vue3 + Vite4+ TypeScript5 + Element-Plus + Pinia 等最新主流技术栈构建的后台管理前端模板（配套后端源码）。 @@ -22,39 +23,40 @@ - 提供了配套的 Java 后端接口，真实的接口数据，而非使用 Mock 数据。您可以访问在[线接口文档](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5)查看接口详情。 - 权限系统功能齐全，包括用户管理、角色管理、菜单管理、字典管理和部门管理等，以满足您对权限管理的需求。 - 项目还提供了基础设施支持，包括动态路由、按钮级别的权限控制、国际化支持、代码规范、Git 提交规范以及常用组件的封装，以便开发人员更高效地开发和维护项目。 + ## 项目预览 - **在线预览**： [https://vue3.youlai.tech/](https://vue3.youlai.tech/) - **控制台** - ![暗黑模式](https://s2.loli.net/2023/03/13/QvjY4zf3VCGteNF.png) + ![暗黑模式](https://oss.youlai.tech/blog/vue-dark-mode.png) - **接口文档** - ![接口文档](https://s2.loli.net/2023/03/13/bH4J3O6WRgCUpwt.png) + ![接口文档](https://oss.youlai.tech/blog/vue-api-doc.png) - **权限管理系统** - | ![用户管理](https://s2.loli.net/2023/03/13/L9xgT5sSMVZukQj.png) | ![image-20230313003008012](https://s2.loli.net/2023/03/13/nQg6HmrtFUkPDYv.png) | - | --- | --- | - | ![image-20230313003028425](https://s2.loli.net/2023/03/13/C4fDRJeTuUO7gPI.png) | ![字典管理](https://s2.loli.net/2023/03/13/BzqjHpa64wfeWhE.png) | + | ![用户管理](https://oss.youlai.tech/blog/vue-user.png) | ![角色管理](https://oss.youlai.tech/blog/vue-role.png) | + | ------------------------------------------------------ | ------------------------------------------------------ | + | ![菜单管理](https://oss.youlai.tech/blog/vue-menu.png) | ![字典管理](https://oss.youlai.tech/blog/vue-dict.png) | ## 项目地址 -| 项目 | Gitee | Github |GitCode | -| --- | --- | --- | --- | -| 前端 | [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin) |[vue3-element-admin](https://gitcode.net/youlai/vue3-element-admin)| -| 后端 | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) |[youlai-boot](https://gitcode.net/youlai/youlai-boot)| +| 项目 | Gitee | Github | GitCode | +| ---- | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ | +| 前端 | [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin) | [vue3-element-admin](https://gitcode.net/youlai/vue3-element-admin) | +| 后端 | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) | [youlai-boot](https://gitcode.net/youlai/youlai-boot) | ## 环境准备 -| 环境 | 名称版本 | 备注 | -| ----------- | :-------- | --------------| -| **开发工具** | VSCode | [下载地址](https://code.visualstudio.com/Download) | -| **运行环境** | Node 16+ | [下载地址](http://nodejs.cn/download) | -| **VSCode插件(必装)** | 1. `Vue Language Features (Volar) `
2. `TypeScript Vue Plugin (Volar) `
3. 禁用 Vetur | ![image-20230224222541797](https://s2.loli.net/2023/02/24/Qt4XDGHFOWqfsyB.png) | +| 环境 | 名称版本 | 备注 | +| -------------------- | :----------------------------------------------------------- | ------------------------------------------------------------ | +| **开发工具** | VSCode | [下载地址](https://code.visualstudio.com/Download) | +| **运行环境** | Node 16+ | [下载地址](http://nodejs.cn/download) | +| **VSCode插件(必装)** | 1. `Vue Language Features (Volar) `
2. `TypeScript Vue Plugin (Volar) `
3. 禁用 Vetur | ![vscode-plugin](https://oss.youlai.tech/blog/vscode-plugin.png) | ## 项目启动 @@ -105,7 +107,7 @@ server { 模板项目的组件类型声明已自动生成。如果添加和使用新的组件，请按照图示方法开启自动生成。在自动生成完成后，记得将其设置为 `false`，避免重复执行引发冲突。 - ![](https://s2.loli.net/2023/06/03/lrcsHzInYV6wWqo.png) + ![](https://oss.youlai.tech/blog/vue-unplugin.png) - **项目启动浏览器访问空白** @@ -114,7 +116,7 @@ server { - **项目同步仓库更新升级** 项目同步仓库更新升级之后，建议 `pnpm install` 安装更新依赖之后启动 。 - + - **其他问题** 如果有其他问题或者建议，建议 [ISSUE](https://gitee.com/youlaiorg/vue3-element-admin/issues/new) @@ -122,13 +124,16 @@ server { ## 接口支持 - **接口调用地址**：[https://vapi.youlai.tech](https://vapi.youlai.tech) + - **接口文档地址**：[在线接口文档](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5) + - **OpenAPI文档地址**：[http://vapi.youlai.tech/v3/api-docs](http://vapi.youlai.tech/v3/api-docs) + - **本地接口**：默认使用线上接口，你可以通过以下步骤完成本地接口环境搭建： - > 1. 获取基于 `Java 、SpringBoot` 开发的后端 [youlai-boot](https://gitee.com/youlaiorg/youlai-boot.git) 源码 ; - >2. 根据后端工程说明文档 [README.md](https://gitee.com/youlaiorg/youlai-boot#%E9%A1%B9%E7%9B%AE%E8%BF%90%E8%A1%8C) 完成本地启动; - > 3. 替换 [vite.config.ts](vite.config.ts) 的代理目标地址 `vapi.youlai.tech` 为本地的 `localhost:8989` + > 1. 获取基于 `Java 、SpringBoot` 开发的后端 [youlai-boot](https://gitee.com/youlaiorg/youlai-boot.git) 源码 ; + > 2. 根据后端工程说明文档 [README.md](https://gitee.com/youlaiorg/youlai-boot#%E9%A1%B9%E7%9B%AE%E8%BF%90%E8%A1%8C) 完成本地启动; + > 3. 替换 [vite.config.ts](vite.config.ts) 的代理目标地址 `vapi.youlai.tech` 为本地的 `localhost:8989` @@ -157,6 +162,7 @@ server { > 为了避免营销广告人群混入，此举无奈，望理解！ -|公众号|交流群| -|-|-| -||| +| 公众号 | 交流群 | +| ------------------------------------------------------------ | ------------------------------------------------------------ | +| | | + From b5ac410128dfdceb48b33a220ada1079a3565234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com> Date: Mon, 26 Jun 2023 05:00:57 +0000 Subject: [PATCH 06/14] =?UTF-8?q?docs:=20=E9=A1=B9=E7=9B=AE=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9=20Former-commit-i?= =?UTF-8?q?d:=20a63207c58e821fd3f33bdc4d1c5d8b2351018a8d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 27eb444b..059d7c1b 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@

- ## 项目介绍 [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) 是基于 Vue3 + Vite4+ TypeScript5 + Element-Plus + Pinia 等最新主流技术栈构建的后台管理前端模板（配套后端源码）。 @@ -30,18 +29,19 @@ - **控制台** - ![暗黑模式](https://oss.youlai.tech/blog/vue-dark-mode.png) + ![暗黑模式](https://img-blog.csdnimg.cn/img_convert/91d571bf1b7a7d64357030a8b29d76b6.png) - **接口文档** - ![接口文档](https://oss.youlai.tech/blog/vue-api-doc.png) + ![接口文档](https://img-blog.csdnimg.cn/02e77660017e4444a711cb4b639e1f00.png#pic_center) + - **权限管理系统** - | ![用户管理](https://oss.youlai.tech/blog/vue-user.png) | ![角色管理](https://oss.youlai.tech/blog/vue-role.png) | + |![在这里插入图片描述](https://img-blog.csdnimg.cn/0d82e1e1feee4b648994fe5977e796a0.png#pic_center) | ![角色管理](https://img-blog.csdnimg.cn/img_convert/50af023406ff3d7402589bc2679d6251.png) | | ------------------------------------------------------ | ------------------------------------------------------ | - | ![菜单管理](https://oss.youlai.tech/blog/vue-menu.png) | ![字典管理](https://oss.youlai.tech/blog/vue-dict.png) | + | ![菜单管理](https://img-blog.csdnimg.cn/img_convert/27b2cd312a828c7843abd94249686ef5.png) | ![在这里插入图片描述](https://img-blog.csdnimg.cn/3863aaaa92e1443e84d91fa49b6fa933.png#pic_center) ## 项目地址 @@ -56,7 +56,7 @@ | -------------------- | :----------------------------------------------------------- | ------------------------------------------------------------ | | **开发工具** | VSCode | [下载地址](https://code.visualstudio.com/Download) | | **运行环境** | Node 16+ | [下载地址](http://nodejs.cn/download) | -| **VSCode插件(必装)** | 1. `Vue Language Features (Volar) `
2. `TypeScript Vue Plugin (Volar) `
3. 禁用 Vetur | ![vscode-plugin](https://oss.youlai.tech/blog/vscode-plugin.png) | +| **VSCode插件(必装)** | 1. `Vue Language Features (Volar) `
2. `TypeScript Vue Plugin (Volar) `
3. 禁用 Vetur | ![vscode-plugin](https://img-blog.csdnimg.cn/img_convert/e1e3d289f6117ba0639fc5d0c188568d.png) | ## 项目启动 @@ -107,7 +107,7 @@ server { 模板项目的组件类型声明已自动生成。如果添加和使用新的组件，请按照图示方法开启自动生成。在自动生成完成后，记得将其设置为 `false`，避免重复执行引发冲突。 - ![](https://oss.youlai.tech/blog/vue-unplugin.png) + ![](https://img-blog.csdnimg.cn/img_convert/6484b14dc4f11a52c33a828a1df998fa.png) - **项目启动浏览器访问空白** @@ -151,7 +151,9 @@ server { 执行 `pnpm run commit` 唤起 git commit 交互，根据提示完成信息的输入和选择。 -![](https://oss.youlai.tech/youlai-boot/2023/05/21/d9863c6ded9e4363824b0d8c4c1f0642.png) +![](https://img-blog.csdnimg.cn/img_convert/bc410821b4c2d4b76dbbb9ac8473b559.png) + + ## 交流群🚀 @@ -164,5 +166,5 @@ server { | 公众号 | 交流群 | | ------------------------------------------------------------ | ------------------------------------------------------------ | -| | | +| | | From 83d9ea842a101c59d470f24d358e5245c7923f85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com> Date: Mon, 26 Jun 2023 05:04:39 +0000 Subject: [PATCH 07/14] =?UTF-8?q?docs:=20=E9=A1=B9=E7=9B=AE=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9=20Former-commit-i?= =?UTF-8?q?d:=20c17004a4d8770a97dfc593791ba84c514f191c9d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 059d7c1b..0e9e2337 100644 --- a/README.md +++ b/README.md @@ -29,19 +29,19 @@ - **控制台** - ![暗黑模式](https://img-blog.csdnimg.cn/img_convert/91d571bf1b7a7d64357030a8b29d76b6.png) + ![暗黑模式](https://foruda.gitee.com/images/1687755822903300961/a4d63e22_716974.png) - **接口文档** - ![接口文档](https://img-blog.csdnimg.cn/02e77660017e4444a711cb4b639e1f00.png#pic_center) + ![接口文档](https://foruda.gitee.com/images/1687755822857820115/96054330_716974.png) - **权限管理系统** - |![在这里插入图片描述](https://img-blog.csdnimg.cn/0d82e1e1feee4b648994fe5977e796a0.png#pic_center) | ![角色管理](https://img-blog.csdnimg.cn/img_convert/50af023406ff3d7402589bc2679d6251.png) | + |![在这里插入图片描述](https://foruda.gitee.com/images/1687755822816437081/b7620905_716974.png) | ![角色管理](https://foruda.gitee.com/images/1687755822852085747/c13a4d19_716974.png) | | ------------------------------------------------------ | ------------------------------------------------------ | - | ![菜单管理](https://img-blog.csdnimg.cn/img_convert/27b2cd312a828c7843abd94249686ef5.png) | ![在这里插入图片描述](https://img-blog.csdnimg.cn/3863aaaa92e1443e84d91fa49b6fa933.png#pic_center) + | ![菜单管理](https://foruda.gitee.com/images/1687755822966247550/4d4f8118_716974.png) | ![在这里插入图片描述](https://foruda.gitee.com/images/1687755822828758939/8035a91f_716974.png) ## 项目地址 @@ -56,7 +56,7 @@ | -------------------- | :----------------------------------------------------------- | ------------------------------------------------------------ | | **开发工具** | VSCode | [下载地址](https://code.visualstudio.com/Download) | | **运行环境** | Node 16+ | [下载地址](http://nodejs.cn/download) | -| **VSCode插件(必装)** | 1. `Vue Language Features (Volar) `
2. `TypeScript Vue Plugin (Volar) `
3. 禁用 Vetur | ![vscode-plugin](https://img-blog.csdnimg.cn/img_convert/e1e3d289f6117ba0639fc5d0c188568d.png) | +| **VSCode插件(必装)** | 1. `Vue Language Features (Volar) `
2. `TypeScript Vue Plugin (Volar) `
3. 禁用 Vetur | ![vscode-plugin](https://foruda.gitee.com/images/1687755823108948048/d0198b2d_716974.png) | ## 项目启动 @@ -107,7 +107,7 @@ server { 模板项目的组件类型声明已自动生成。如果添加和使用新的组件，请按照图示方法开启自动生成。在自动生成完成后，记得将其设置为 `false`，避免重复执行引发冲突。 - ![](https://img-blog.csdnimg.cn/img_convert/6484b14dc4f11a52c33a828a1df998fa.png) + ![](https://foruda.gitee.com/images/1687755823137387608/412ea803_716974.png) - **项目启动浏览器访问空白** @@ -151,7 +151,7 @@ server { 执行 `pnpm run commit` 唤起 git commit 交互，根据提示完成信息的输入和选择。 -![](https://img-blog.csdnimg.cn/img_convert/bc410821b4c2d4b76dbbb9ac8473b559.png) +![](https://foruda.gitee.com/images/1687755823165218215/c1705416_716974.png) From ca41d81292a417010ff16db698a0191d173e4cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com> Date: Mon, 26 Jun 2023 08:37:56 +0000 Subject: [PATCH 08/14] =?UTF-8?q?fix:=20=E4=BB=A3=E7=90=86=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20Former-commit-id:=20c594503031bcd1563cc59c6ddb8e8f7978e78dd9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vite.config.ts b/vite.config.ts index 80d0cc26..6f208d78 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -45,7 +45,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => { [env.VITE_APP_BASE_API]: { target: "http://vapi.youlai.tech", // 线上接口地址 // target: 'http://localhost:8989', // 本地接口地址 , 后端工程仓库地址：https://gitee.com/youlaiorg/youlai-boot - changeOrigin: false, + changeOrigin: true, rewrite: (path) => path.replace(new RegExp("^" + env.VITE_APP_BASE_API), ""), // 替换 /dev-api 为 target 接口地址 }, From d97de69f679069634d08731528f9ebb644dd8b6f Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Fri, 30 Jun 2023 23:25:18 +0800 Subject: [PATCH 09/14] =?UTF-8?q?docs:=20:memo:=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=91=BD=E4=BB=A4=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 913be6da1cb421b292c4c945860549ffa48fdb55 --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 0e9e2337..7ae7ea76 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,9 @@ # 克隆代码 git clone https://gitee.com/youlaiorg/vue3-element-admin.git +# 切换目录 +cd vue3-element-admin + # 安装 pnpm npm install pnpm -g From e1ad6588e537942b596e80dfd641f5fdf4503afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=B0=E9=BE=99?= Date: Thu, 6 Jul 2023 18:08:06 +0800 Subject: [PATCH 10/14] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=A0=A1=E9=AA=8C=E4=B8=8D=E9=80=9A=E8=BF=87=EF=BC=8C?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=80=E7=9B=B4loading=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: fc1dc88ba888fae28b57d28e8c753d4ce798b349 --- src/views/system/dict/DictData.vue | 2 +- src/views/system/dict/index.vue | 2 +- src/views/system/role/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/system/dict/DictData.vue b/src/views/system/dict/DictData.vue index 605c3365..03f15200 100644 --- a/src/views/system/dict/DictData.vue +++ b/src/views/system/dict/DictData.vue @@ -121,9 +121,9 @@ function openDialog(dictId?: number) { * 字典表单提交 */ function handleSubmit() { - loading.value = false; dataFormRef.value.validate((isValid: boolean) => { if (isValid) { + loading.value = false; const dictId = formData.id; if (dictId) { updateDict(dictId, formData) diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 518f121a..e868241a 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -96,9 +96,9 @@ function openDialog(dicTypeId?: number) { * 字典类型表单提交 */ function handleSubmit() { - loading.value = false; dataFormRef.value.validate((isValid: boolean) => { if (isValid) { + loading.value = false; const dictTypeId = formData.id; if (dictTypeId) { updateDictType(dictTypeId, formData) diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index b2a2a697..59785f6b 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -111,9 +111,9 @@ function openDialog(roleId?: number) { * 角色表单提交 */ function handleSubmit() { - loading.value = true; roleFormRef.value.validate((valid: any) => { if (valid) { + loading.value = true; const roleId = formData.id; if (roleId) { updateRole(roleId, formData) From 7058b2ecf555f68e1bc03ccc4427da19ec235b5a Mon Sep 17 00:00:00 2001 From: hxr <1490493387@qq.com> Date: Sun, 9 Jul 2023 23:42:22 +0800 Subject: [PATCH 11/14] =?UTF-8?q?chore(package.json):=20:hammer:=20?= =?UTF-8?q?=E5=8D=87=E7=BA=A7vue=E3=80=81vite=E3=80=81element-plus?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 47dffd4b2b806220acc877537a2b229353ce68aa --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 246cdf28..dc9e8dee 100644 --- a/package.json +++ b/package.json @@ -48,14 +48,14 @@ "axios": "^1.4.0", "codemirror": "^5.65.13", "echarts": "^5.2.2", - "element-plus": "^2.3.6", + "element-plus": "^2.3.7", "lodash-es": "^4.17.21", "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.0", "pinia": "^2.0.33", "screenfull": "^6.0.0", - "vue": "^3.3.1", + "vue": "^3.3.4", "vue-i18n": "9.2.2", "vue-router": "^4.2.0" }, @@ -96,7 +96,7 @@ "unplugin-auto-import": "^0.15.3", "unplugin-icons": "^0.16.1", "unplugin-vue-components": "^0.24.1", - "vite": "^4.3.5", + "vite": "^4.4.2", "vite-plugin-svg-icons": "^2.0.1", "vue-tsc": "^1.6.5 " }, From 88246c37fa3ed21a3da84bd5344bb23ce24fa7d1 Mon Sep 17 00:00:00 2001 From: hxr <1490493387@qq.com> Date: Tue, 11 Jul 2023 07:13:21 +0800 Subject: [PATCH 12/14] =?UTF-8?q?docs:=20:memo:=20=E8=A1=A5=E5=85=85=20lic?= =?UTF-8?q?ense=20=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 515b082ca95ee7880aaa82e8ada77dc571f00cf0 --- LICENSE | 42 ++++++++++++++--------------- licenses/vue-element-admin/LICENSE | 21 +++++++++++++++ licenses/vue3-element-admin/LICENSE | 21 +++++++++++++++ 3 files changed, 63 insertions(+), 21 deletions(-) create mode 100644 licenses/vue-element-admin/LICENSE create mode 100644 licenses/vue3-element-admin/LICENSE diff --git a/LICENSE b/LICENSE index c4c9813d..9825cba0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,21 @@ -MIT License - -Copyright (c) 2022 有来开源组织 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +MIT License + +Copyright (c) 2021-present 有来开源组织 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/licenses/vue-element-admin/LICENSE b/licenses/vue-element-admin/LICENSE new file mode 100644 index 00000000..3fce3848 --- /dev/null +++ b/licenses/vue-element-admin/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017-present PanJiaChen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/licenses/vue3-element-admin/LICENSE b/licenses/vue3-element-admin/LICENSE new file mode 100644 index 00000000..9825cba0 --- /dev/null +++ b/licenses/vue3-element-admin/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021-present 有来开源组织 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From ede7e575ebfd677a32c5e5f1722ad89f03bd6157 Mon Sep 17 00:00:00 2001 From: hxr <1490493387@qq.com> Date: Tue, 11 Jul 2023 07:21:06 +0800 Subject: [PATCH 13/14] =?UTF-8?q?fix:=20:bug:=20=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=9D=E5=AD=98`typeCode`=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E6=9C=AA=E5=AE=9E=E6=97=B6=E6=9B=B4=E6=96=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: c375a91846db90ad2e33412ac5afb9da74c4ea26 --- src/views/system/dict/DictData.vue | 1 + src/views/system/dict/index.vue | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/system/dict/DictData.vue b/src/views/system/dict/DictData.vue index 03f15200..ce3b12f7 100644 --- a/src/views/system/dict/DictData.vue +++ b/src/views/system/dict/DictData.vue @@ -33,6 +33,7 @@ watch( () => props.typeCode, (newVal: string) => { queryParams.typeCode = newVal; + formData.typeCode = newVal; resetQuery(); } ); diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index e868241a..9d7e07fb 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -166,11 +166,10 @@ const dictDataDialog = reactive({ visible: false, }); -// 当前选中的字典类型 -const selectedDictType = reactive({ typeCode: "", typeName: "" }); +const selectedDictType = reactive({ typeCode: "", typeName: "" }); // 当前选中的字典类型 /** - * 打开字典弹窗 + * 打开字典数据弹窗 */ function openDictDialog(row: DictTypePageVO) { dictDataDialog.visible = true; @@ -181,7 +180,7 @@ function openDictDialog(row: DictTypePageVO) { } /** - * 关闭字典弹窗 + * 关闭字典数据弹窗 */ function closeDictDialog() { dictDataDialog.visible = false; From 01965ad86d1f652ad89eb9d9a40ab0bf7f7f3e8e Mon Sep 17 00:00:00 2001 From: hxr <1490493387@qq.com> Date: Tue, 11 Jul 2023 07:26:12 +0800 Subject: [PATCH 14/14] =?UTF-8?q?refactor:=20:recycle:=20=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E6=95=B0=E6=8D=AE=E5=AF=B9=E9=BD=90=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 0a6a93042b4c207b556bab8acc4ab00e3f152643 --- src/views/dashboard/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 546f0ee1..417e372c 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -121,7 +121,7 @@ orderCount.value = 2000;
访问数
-
+
{{ Math.round(visitCountOutput) }}
@@ -138,7 +138,7 @@ orderCount.value = 2000;
消息数
-
+
{{ Math.round(messageCountOutput) }}
@@ -169,7 +169,7 @@ orderCount.value = 2000;
订单数
-
+
{{ Math.round(orderCountOutput) }}