升级：升级前端依赖，并更换包管理器 yarn => pnpm
1.arco design pro vue 2.6.1 => 2.7.0 2.arco design vue 2.40.1 => 2.44.5 3.vue 3.2.45 => 3.2.47 4.typescript 4.9.4 => 4.9.5 5.其他依赖升级
This commit is contained in:
Charles7c
parent
0f49d7b810
commit
6164110462
23
.github/workflows/deploy.yml
vendored
23
.github/workflows/deploy.yml
vendored
@ -58,22 +58,27 @@ jobs:
|
||||
# 1、检出源码
|
||||
- name: Checkout
|
||||
uses: actions/checkout@master
|
||||
# 2、安装 Node 环境
|
||||
# 2、安装 PNPM
|
||||
- name: Setup PNPM
|
||||
uses: pnpm/action-setup@v2
|
||||
with:
|
||||
version: latest
|
||||
# 3、安装 Node 环境
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 16
|
||||
cache: yarn
|
||||
cache-dependency-path: ./continew-admin-ui/yarn.lock
|
||||
# 3、安装依赖
|
||||
cache: pnpm
|
||||
cache-dependency-path: ./continew-admin-ui/pnpm-lock.yaml
|
||||
# 4、安装依赖
|
||||
- name: Install Dependencies
|
||||
run: yarn install --frozen-lockfile
|
||||
run: pnpm i --frozen-lockfile
|
||||
working-directory: ./continew-admin-ui
|
||||
# 4、打包
|
||||
# 5、打包
|
||||
- name: Build
|
||||
run: yarn build
|
||||
run: pnpm build
|
||||
working-directory: ./continew-admin-ui
|
||||
# 5、拷贝文件到服务器
|
||||
# 6、拷贝文件到服务器
|
||||
- name: Copy
|
||||
uses: garygrossgarten/github-action-scp@release
|
||||
with:
|
||||
@ -83,7 +88,7 @@ jobs:
|
||||
password: ${{ secrets.SERVER_PASSWORD }}
|
||||
local: ./continew-admin-ui/dist
|
||||
remote: /docker/continew-admin/tmp
|
||||
# 6、重启前端服务
|
||||
# 7、重启前端服务
|
||||
- name: Restart
|
||||
uses: appleboy/ssh-action@master
|
||||
with:
|
||||
|
||||
22
README.md
22
README.md
@ -29,8 +29,8 @@ ContiNew Admin 中后台管理框架/脚手架，Continue New Admin，持续以
|
||||
|
||||
| 开源平台 | 源码地址 |
|
||||
| ------------- | ------------------------------------------- |
|
||||
| GitHub | <a href="https://github.com/Charles7c/continew-admin" target="_blank">https://github.com/Charles7c/continew-admin</a> |
|
||||
| Gitee（码云） | <a href="https://gitee.com/Charles7c/continew-admin" target="_blank">https://gitee.com/Charles7c/continew-admin</a> |
|
||||
| GitHub | https://github.com/Charles7c/continew-admin |
|
||||
| Gitee（码云） | https://gitee.com/Charles7c/continew-admin |
|
||||
|
||||
## 主要特性
|
||||
|
||||
@ -76,8 +76,8 @@ ContiNew Admin 中后台管理框架/脚手架，Continue New Admin，持续以
|
||||
- [ ] 通知管理：提供系统通知管理，设为已读、未读
|
||||
- [ ] 仪表盘优化：各区块数据动态渲染
|
||||
- [ ] 网站配置：支持配置系统网站标题、网站 Logo、favicon、版权信息等
|
||||
- [ ] 依赖升级：升级至最新 Spring Boot 2.x 版本
|
||||
- [ ] 依赖升级：其他依赖升级
|
||||
- [x] 依赖升级：升级至最新 Spring Boot 2.x 版本
|
||||
- [x] 依赖升级：其他依赖升级
|
||||
- [ ] 其他需求汇集中...
|
||||
|
||||
**v1.0.0：** 初步完成中后台管理框架/脚手架的基础功能。
|
||||
@ -255,9 +255,9 @@ continew-admin
|
||||
|
||||
| 名称 | 版本 | 简介 |
|
||||
| :----------------------------------------------------------- | :----------- | :----------------------------------------------------------- |
|
||||
| <a href="https://cn.vuejs.org/" target="_blank">Vue</a> | 3.2.45 | 渐进式 JavaScript 框架，易学易用，性能出色，适用场景丰富的 Web 前端框架。 |
|
||||
| <a href="https://www.typescriptlang.org/zh/" target="_blank">TypeScript</a> | 4.9.4 | TypeScript 是微软开发的一个开源的编程语言，通过在 JavaScript 的基础上添加静态类型定义构建而成。 |
|
||||
| <a href="https://arco.design/vue/docs/start" target="_blank">Arco Design Vue</a> | 2.40.1 | 字节跳动推出的前端 UI 框架，样式美观，组件丰富。 |
|
||||
| <a href="https://cn.vuejs.org/" target="_blank">Vue</a> | 3.2.47 | 渐进式 JavaScript 框架，易学易用，性能出色，适用场景丰富的 Web 前端框架。 |
|
||||
| <a href="https://www.typescriptlang.org/zh/" target="_blank">TypeScript</a> | 4.9.5 | TypeScript 是微软开发的一个开源的编程语言，通过在 JavaScript 的基础上添加静态类型定义构建而成。 |
|
||||
| <a href="https://arco.design/vue/docs/start" target="_blank">Arco Design Vue</a> | 2.44.5 | 字节跳动推出的前端 UI 框架，样式美观，组件丰富。 |
|
||||
| <a href="https://spring.io/projects/spring-boot" target="_blank">Spring Boot</a> | 2.7.10 | 简化新 Spring 应用的初始搭建以及开发过程。 |
|
||||
| <a href="https://undertow.io/" target="_blank">Undertow</a> | 2.2.23.Final | 采用 Java 开发的灵活的高性能 Web 服务器，提供包括阻塞和基于 NIO 的非堵塞机制。 |
|
||||
| <a href="https://sa-token.dev33.cn/" target="_blank">Sa-Token + JWT</a> | 1.34.0 | 轻量级 Java 权限认证框架，让鉴权变得简单、优雅。 |
|
||||
@ -369,19 +369,19 @@ git clone https://github.com/Charles7c/continew-admin.git
|
||||
# 2.在 IDE（Visual Studio Code/WebStorm）中打开前端项目 continew-admin-ui
|
||||
|
||||
# 3.配置淘宝源
|
||||
yarn config set registry https://registry.npm.taobao.org
|
||||
pnpm config set registry https://registry.npm.taobao.org
|
||||
|
||||
# 4.安装依赖
|
||||
yarn install
|
||||
pnpm i
|
||||
|
||||
# 5.启动程序
|
||||
# 5.1 启动成功：访问 http://localhost:5173/
|
||||
yarn dev
|
||||
pnpm dev
|
||||
|
||||
# 6.部署
|
||||
# 6.1 Docker 部署
|
||||
# 6.1.1 服务器安装好 docker 及 docker-compose（参考：https://blog.charles7c.top/categories/fragments/2022/10/31/CentOS%E5%AE%89%E8%A3%85Docker）
|
||||
# 6.1.2 执行 yarn build 进行项目打包，将 dist 目录下的所有文件放到 /docker/continew-admin/web 目录下
|
||||
# 6.1.2 执行 pnpm build 进行项目打包，将 dist 目录下的所有文件放到 /docker/continew-admin/web 目录下
|
||||
# 6.1.3 将 docker 目录上传到服务器 / 目录下，并授权（chmod -R 777 /docker）
|
||||
# 6.1.4 修改 docker-compose.yml 中的 MariaDB 配置、Redis 配置、continew-admin-server 配置、Nginx 配置
|
||||
# 6.1.5 执行 docker-compose up -d 创建并后台运行所有容器
|
||||
|
||||
6
continew-admin-ui/components.d.ts
vendored
6
continew-admin-ui/components.d.ts
vendored
@ -1,5 +1,7 @@
|
||||
// generated by unplugin-vue-components
|
||||
// We suggest you to commit this file into source control
|
||||
/* eslint-disable */
|
||||
/* prettier-ignore */
|
||||
// @ts-nocheck
|
||||
// Generated by unplugin-vue-components
|
||||
// Read more: https://github.com/vuejs/core/pull/3399
|
||||
import '@vue/runtime-core'
|
||||
|
||||
|
||||
@ -29,63 +29,62 @@
|
||||
]
|
||||
},
|
||||
"dependencies": {
|
||||
"@arco-design/web-vue": "^2.40.1",
|
||||
"@vueuse/core": "^9.9.0",
|
||||
"arco-design-pro-vue": "^2.6.1",
|
||||
"@arco-design/web-vue": "^2.44.5",
|
||||
"@vueuse/core": "^9.13.0",
|
||||
"axios": "^0.24.0",
|
||||
"crypto-js": "^4.1.1",
|
||||
"dayjs": "^1.11.7",
|
||||
"echarts": "^5.4.0",
|
||||
"jsencrypt": "^3.3.1",
|
||||
"echarts": "^5.4.2",
|
||||
"jsencrypt": "^3.3.2",
|
||||
"lodash": "^4.17.21",
|
||||
"mitt": "^3.0.0",
|
||||
"nprogress": "^0.2.0",
|
||||
"pinia": "^2.0.28",
|
||||
"pinia": "^2.0.33",
|
||||
"query-string": "^8.1.0",
|
||||
"sortablejs": "^1.15.0",
|
||||
"vue": "^3.2.45",
|
||||
"vue-echarts": "^6.3.3",
|
||||
"vue": "^3.2.47",
|
||||
"vue-echarts": "^6.5.4",
|
||||
"vue-i18n": "^9.2.2",
|
||||
"vue-json-pretty": "^2.2.3",
|
||||
"vue-json-pretty": "^2.2.4",
|
||||
"vue-router": "^4.1.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@commitlint/cli": "^17.3.0",
|
||||
"@commitlint/config-conventional": "^17.3.0",
|
||||
"@commitlint/cli": "^17.5.0",
|
||||
"@commitlint/config-conventional": "^17.4.4",
|
||||
"@types/crypto-js": "^4.1.1",
|
||||
"@types/lodash": "^4.14.191",
|
||||
"@types/mockjs": "^1.0.7",
|
||||
"@types/nprogress": "^0.2.0",
|
||||
"@types/sortablejs": "^1.15.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.47.1",
|
||||
"@typescript-eslint/parser": "^5.47.1",
|
||||
"@types/sortablejs": "^1.15.1",
|
||||
"@typescript-eslint/eslint-plugin": "^5.56.0",
|
||||
"@typescript-eslint/parser": "^5.46.0",
|
||||
"@vitejs/plugin-vue": "^3.1.2",
|
||||
"@vitejs/plugin-vue-jsx": "^2.0.1",
|
||||
"@vue/babel-plugin-jsx": "^1.1.1",
|
||||
"consola": "^2.15.3",
|
||||
"cross-env": "^7.0.3",
|
||||
"eslint": "^8.30.0",
|
||||
"eslint": "^8.36.0",
|
||||
"eslint-config-airbnb-base": "^15.0.0",
|
||||
"eslint-config-prettier": "^8.5.0",
|
||||
"eslint-config-prettier": "^8.8.0",
|
||||
"eslint-import-resolver-typescript": "^3.5.2",
|
||||
"eslint-plugin-import": "^2.26.0",
|
||||
"eslint-plugin-import": "^2.27.5",
|
||||
"eslint-plugin-prettier": "^4.2.1",
|
||||
"eslint-plugin-vue": "^9.8.0",
|
||||
"eslint-plugin-vue": "^9.10.0",
|
||||
"less": "^4.1.3",
|
||||
"lint-staged": "^13.1.0",
|
||||
"lint-staged": "^13.2.0",
|
||||
"mockjs": "^1.1.0",
|
||||
"postcss-html": "^1.5.0",
|
||||
"prettier": "^2.8.1",
|
||||
"rollup": "^3.9.1",
|
||||
"rollup-plugin-visualizer": "^5.8.2",
|
||||
"prettier": "^2.8.7",
|
||||
"rollup": "^3.20.2",
|
||||
"rollup-plugin-visualizer": "^5.9.0",
|
||||
"stylelint": "^14.13.0",
|
||||
"stylelint-config-prettier": "^9.0.3",
|
||||
"stylelint-config-prettier": "^9.0.5",
|
||||
"stylelint-config-rational-order": "^0.1.2",
|
||||
"stylelint-config-recommended-vue": "^1.4.0",
|
||||
"stylelint-config-standard": "^29.0.0",
|
||||
"stylelint-order": "^5.0.0",
|
||||
"typescript": "^4.9.4",
|
||||
"unplugin-vue-components": "^0.22.8",
|
||||
"typescript": "^4.9.5",
|
||||
"unplugin-vue-components": "^0.24.1",
|
||||
"vite": "^3.2.5",
|
||||
"vite-plugin-compression": "^0.5.1",
|
||||
"vite-plugin-eslint": "^1.8.1",
|
||||
@ -93,7 +92,7 @@
|
||||
"vite-plugin-style-import": "1.4.1",
|
||||
"vite-plugin-svg-icons": "^2.0.1",
|
||||
"vite-svg-loader": "^3.6.0",
|
||||
"vue-tsc": "^1.0.14"
|
||||
"vue-tsc": "^1.2.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.0.0"
|
||||
|
||||
9151
continew-admin-ui/pnpm-lock.yaml
generated
Normal file
9151
continew-admin-ui/pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -11,6 +11,7 @@ const defaultLocale = localStorage.getItem('arco-locale') || 'zh-CN';
|
||||
const i18n = createI18n({
|
||||
locale: defaultLocale,
|
||||
fallbackLocale: 'en-US',
|
||||
legacy: false,
|
||||
allowComposition: true,
|
||||
messages: {
|
||||
'en-US': en,
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
const debug = process.env.NODE_ENV !== 'production';
|
||||
const debug = import.meta.env.NODE_ENV !== 'production';
|
||||
|
||||
export default debug;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user