Skip to content

Commit f55c9b7

Browse files
committed
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
2 parents dee479c + a0996bd commit f55c9b7

File tree

25 files changed

+28
-1020
lines changed

25 files changed

+28
-1020
lines changed

.env.dev

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ VITE_UPLOAD_TYPE=server
1212
# 上传路径
1313
VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
1414

15-
# 接口前缀
16-
VITE_API_BASEPATH=/dev-api
17-
1815
# 接口地址
1916
VITE_API_URL=/admin-api
2017

.env.local

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
1111
# 上传路径
1212
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
1313

14-
# 接口前缀
15-
VITE_API_BASEPATH=/dev-api
16-
1714
# 接口地址
1815
VITE_API_URL=/admin-api
1916

.env.prod

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
1111
# 上传路径
1212
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
1313

14-
# 接口前缀
15-
VITE_API_BASEPATH=
16-
1714
# 接口地址
1815
VITE_API_URL=/admin-api
1916

.env.stage

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
1111
# 上传路径
1212
VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
1313

14-
# 接口前缀
15-
VITE_API_BASEPATH=
16-
1714
# 接口地址
1815
VITE_API_URL=/admin-api
1916

.env.test

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
1111
# 上传路径
1212
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
1313

14-
# 接口前缀
15-
VITE_API_BASEPATH=
16-
1714
# 接口地址
1815
VITE_API_URL=/admin-api
1916

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@wangeditor/editor-for-vue": "^5.1.10",
3636
"@zxcvbn-ts/core": "^3.0.4",
3737
"animate.css": "^4.1.1",
38-
"axios": "^1.6.7",
38+
"axios": "^1.6.8",
3939
"benz-amr-recorder": "^1.1.5",
4040
"bpmn-js-token-simulation": "^0.10.0",
4141
"camunda-bpmn-moddle": "^7.0.1",
@@ -46,7 +46,7 @@
4646
"driver.js": "^1.3.1",
4747
"echarts": "^5.5.0",
4848
"echarts-wordcloud": "^2.1.0",
49-
"element-plus": "2.5.3",
49+
"element-plus": "2.6.1",
5050
"fast-xml-parser": "^4.3.2",
5151
"highlight.js": "^11.9.0",
5252
"jsencrypt": "^3.3.2",
@@ -55,15 +55,15 @@
5555
"mitt": "^3.0.1",
5656
"nprogress": "^0.2.0",
5757
"pinia": "^2.1.7",
58-
"pinia-plugin-persistedstate": "^3.2.0",
58+
"pinia-plugin-persistedstate": "^3.2.1",
5959
"qrcode": "^1.5.3",
60-
"qs": "^6.11.2",
60+
"qs": "^6.12.0",
6161
"steady-xml": "^0.1.0",
6262
"url": "^0.11.3",
6363
"video.js": "^7.21.5",
64-
"vue": "3.4.20",
64+
"vue": "3.4.21",
6565
"vue-dompurify-html": "^4.1.4",
66-
"vue-i18n": "9.9.1",
66+
"vue-i18n": "9.10.2",
6767
"vue-router": "^4.3.0",
6868
"vue-types": "^5.1.1",
6969
"vuedraggable": "^4.1.0",

src/api/infra/dbDoc/index.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/api/system/errorCode/index.ts

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/api/system/mail/account/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export interface MailAccountVO {
88
host: string
99
port: number
1010
sslEnable: boolean
11+
starttlsEnable: boolean
1112
}
1213

1314
// 查询邮箱账号列表

src/api/system/sensitiveWord/index.ts

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)