Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
庞 凯升
PbootCMS
Commits
9a7a4b29
Commit
9a7a4b29
authored
5 years ago
by
星梦
Browse files
Options
Download
Email Patches
Plain Diff
V2.0.5
parent
12b90230
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
apps/admin/controller/system/UpgradeController.php
+26
-30
apps/admin/controller/system/UpgradeController.php
apps/admin/view/default/system/upgrade.html
+1
-1
apps/admin/view/default/system/upgrade.html
apps/common/version.php
+2
-2
apps/common/version.php
doc/ChangeLog.txt
+1
-1
doc/ChangeLog.txt
with
30 additions
and
34 deletions
+30
-34
apps/admin/controller/system/UpgradeController.php
+
26
-
30
View file @
9a7a4b29
...
...
@@ -97,42 +97,38 @@ class UpgradeController extends Controller
// 执行下载
public
function
down
()
{
if
(
$_POST
)
{
if
(
!
!
$list
=
post
(
'list'
))
{
if
(
!
is_array
(
$list
))
{
// 单个文件转换为数组
$list
=
array
(
$list
);
}
$len
=
count
(
$list
)
?:
0
;
foreach
(
$list
as
$value
)
{
// 本地存储路径
$path
=
RUN_PATH
.
'/upgrade'
.
$value
;
// 自动创建目录
if
(
!
check_dir
(
dirname
(
$path
),
true
))
{
json
(
0
,
'目录写入权限不足,无法下载升级文件!'
.
dirname
(
$path
));
}
// 定义执行下载的类型
$types
=
'.zip|.rar|.doc|.docx|.ppt|.pptx|.xls|.xlsx|.chm|'
;
$pathinfo
=
explode
(
"."
,
basename
(
$path
));
$ext
=
end
(
$pathinfo
);
// 获取扩展
if
(
preg_match
(
'/\.'
.
$ext
.
'\|/i'
,
$types
))
{
$result
=
$this
->
getServerDown
(
'/release/'
.
$this
->
branch
.
$value
,
$path
);
}
else
{
$result
=
$this
->
getServerFile
(
$value
,
$path
);
}
if
(
!
!
$list
=
get
(
'list'
))
{
if
(
!
is_array
(
$list
))
{
// 单个文件转换为数组
$list
=
array
(
$list
);
}
$len
=
count
(
$list
)
?:
0
;
foreach
(
$list
as
$value
)
{
// 本地存储路径
$path
=
RUN_PATH
.
'/upgrade'
.
$value
;
// 自动创建目录
if
(
!
check_dir
(
dirname
(
$path
),
true
))
{
json
(
0
,
'目录写入权限不足,无法下载升级文件!'
.
dirname
(
$path
));
}
if
(
$len
==
1
)
{
json
(
1
,
"更新文件 "
.
basename
(
$value
)
.
" 下载成功!"
);
// 定义执行下载的类型
$types
=
'.zip|.rar|.doc|.docx|.ppt|.pptx|.xls|.xlsx|.chm|.ttf|.otf|'
;
$pathinfo
=
explode
(
"."
,
basename
(
$path
));
$ext
=
end
(
$pathinfo
);
// 获取扩展
if
(
preg_match
(
'/\.'
.
$ext
.
'\|/i'
,
$types
))
{
$result
=
$this
->
getServerDown
(
'/release/'
.
$this
->
branch
.
$value
,
$path
);
}
else
{
json
(
1
,
"更新文件"
.
basename
(
$value
)
.
"等文件全部下载成功!"
);
$result
=
$this
->
getServerFile
(
$value
,
$path
);
}
}
if
(
$len
==
1
)
{
json
(
1
,
"更新文件 "
.
basename
(
$value
)
.
" 下载成功!"
);
}
else
{
json
(
0
,
'请选择要下载的文件!'
);
json
(
1
,
"更新文件"
.
basename
(
$value
)
.
"等文件全部下载成功!"
);
}
}
else
{
json
(
0
,
'请
使用POST提交请求
!'
);
json
(
0
,
'请
选择要下载的文件
!'
);
}
}
...
...
This diff is collapsed.
Click to expand it.
apps/admin/view/default/system/upgrade.html
+
1
-
1
View file @
9a7a4b29
...
...
@@ -177,7 +177,7 @@ function down(){
$
(
checked
).
each
(
function
(
index
,
element
){
setTimeout
(
function
()
{
//延迟执行、避免文件太多卡死问题
$
.
ajax
({
type
:
'
POS
T
'
,
type
:
'
GE
T
'
,
url
:
url
,
dataType
:
'
json
'
,
async
:
true
,
...
...
This diff is collapsed.
Click to expand it.
apps/common/version.php
+
2
-
2
View file @
9a7a4b29
...
...
@@ -4,9 +4,9 @@ return array(
'app_version'
=>
'2.0.5'
,
// 发布时间
'release_time'
=>
'2020013
0
'
,
'release_time'
=>
'2020013
1
'
,
// 修订版本
'revise_version'
=>
'
1
'
'revise_version'
=>
'
0
'
);
This diff is collapsed.
Click to expand it.
doc/ChangeLog.txt
+
1
-
1
View file @
9a7a4b29
...
...
@@ -4,7 +4,7 @@
版权所有:湖南翱云网络科技有限公司
##########################################
PbootCMS V2.0.5 build 2020-01-3
0
PbootCMS V2.0.5 build 2020-01-3
1
1、优化前台404.html,并支持内容内{info}自适应提示文字;
2、优化内容列表排序方式,并修复api使用随机排序无效问题;
3、修复后台入口文件修改名字后在线升级无法自适应问题;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help