qiushanhe/ss-oa-manage-web
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: qiushanhe:main
Branches Tags
qiushanhe:main qiushanhe:dev-cl qiushanhe:dev-zcx
...
compare: qiushanhe:b05e42f9c708a1102c4b4a0c23c26c905246889b
Branches Tags
qiushanhe:main qiushanhe:dev-cl qiushanhe:dev-zcx

9 Commits
main ... b05e42f9c7

Author SHA1 Message Date
caolin
b05e42f9c7 Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-oa-manage-web into dev-cl 2025-05-28 22:42:10 +08:00
caolin
6d08fd8390 Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-oa-manage-web into dev-cl 
# Conflicts:
#	.env.base
 2025-05-13 22:54:02 +08:00
caolin
1413ce44c7 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl 
# Conflicts:
#	.env.base
 2025-04-18 22:50:51 +08:00
caolin
5d88d06707 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl 2025-04-13 11:11:52 +08:00
caolin
f0afdcf18e Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl 2025-04-09 23:27:00 +08:00
caolin
b019400409 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl 2025-03-31 23:21:47 +08:00
caolin
69a496dc6e Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl 2025-03-30 15:11:30 +08:00
caolin
7c7bf51518 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-oa-manage-web into dev-cl 
# Conflicts:
#	.env.base
#	yarn.lock
 2025-03-26 23:12:53 +08:00
caolin
65dae80239 1 2025-03-26 23:10:46 +08:00
2 changed files with 4 additions and 2 deletions
Expand all files Collapse all files

4
.env.base
View File

@@ -4,11 +4,11 @@ VITE_NODE_ENV=development
VITE_DEV=true VITE_DEV=true
# 请求路径 # 请求路径
# VITE_BASE_URL='http://localhost:48080' VITE_BASE_URL='http://localhost:48080'
# VITE_BASE_URL='http://47.98.161.246:48080' # VITE_BASE_URL='http://47.98.161.246:48080'
# VITE_BASE_URL='http://114.55.169.15:48080' # VITE_BASE_URL='http://114.55.169.15:48080'
VITE_BASE_URL='http://114.215.207.150:48080' #VITE_BASE_URL='http://114.215.207.150:48080'
# 上传路径 # 上传路径
VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload' VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'

2
.env.dev
View File

@@ -4,8 +4,10 @@ VITE_NODE_ENV=production
VITE_DEV=false VITE_DEV=false
# 请求路径 # 请求路径
#VITE_BASE_URL='http://47.98.161.246:48080'
VITE_BASE_URL='http://localhost:48080' VITE_BASE_URL='http://localhost:48080'
# 上传路径 # 上传路径
VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload' VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'