Skip to content

Commit dc2d183

Browse files
modstartmodstart
committed
feat: routes optimized
1 parent 0e6ce03 commit dc2d183

File tree

83 files changed

+1657
-341
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1657
-341
lines changed

‎module/AdminManager/Admin/Controller/UpgradeController.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private function doNext($step, $msgs = [], $data = [])
4040
return Response::generateSuccessData([
4141
'msg' => array_map(function ($item) {
4242
if (!starts_with($item, '<')) {
43-
$item = "<span class='ub-text-default'>$item</span>";
43+
$item = "<span class='ub-text-white'>$item</span>";
4444
}
4545
return '<i class="iconfont icon-hr"></i> ' . $item;
4646
}, $msgs),
@@ -79,23 +79,27 @@ public function index()
7979
BizException::throwsIfResponseError($ret);
8080
return $this->doNext('upgradePackage', [
8181
'<span class="ub-text-success">获取安装包完成，大小 ' . FileUtil::formatByte($ret['data']['packageSize']) . '</span>',
82-
'<span class="ub-text-default">开始解压升级装包...</span>'
82+
'<span class="ub-text-white">开始解压升级装包...</span>'
8383
], [
8484
'package' => $ret['data']['package'],
8585
'diffContentFile' => $ret['data']['diffContentFile'],
8686
]);
8787
case 'checkPackage':
88-
$exitCode = Artisan::call("migrate");
88+
try {
89+
$exitCode = Artisan::call("migrate");
90+
} catch (\Exception $e) {
91+
$exitCode = -1;
92+
}
8993
BizException::throwsIf("调用 php artisan 命令失败，不能自动升级", 0 != $exitCode);
9094
return $this->doNext('downloadPackage', [
9195
'PHP版本: v' . PHP_VERSION,
9296
'<span class="ub-text-success">预检通过</span>',
93-
'<span class="ub-text-default">开始下载升级包...</span>'
97+
'<span class="ub-text-white">开始下载升级包...</span>'
9498
]);
9599
default:
96100
return $this->doNext('checkPackage', [
97101
'<span class="ub-text-success">开始升级系统，从 V' . AppConstant::VERSION . ' 到 V' . $toVersion . '</span>',
98-
'<span class="ub-text-default">开始预检系统...</span>'
102+
'<span class="ub-text-white">开始预检系统...</span>'
99103
]);
100104
}
101105
}

‎module/AdminManager/Docs/release.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 1.8.0
2+
3+
- 新增：系统升级调用命令容错处理
4+
- 优化：系统升级界面日志颜色优化
5+
6+
---
7+
18
## 1.7.0 文件上传和文件管理逻辑优化
29

310
- 新增：文件上传和文件管理逻辑优化

‎module/AdminManager/Util/UpgradeUtil.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,11 @@ public static function upgradePackage($package, $diffContentFile)
110110
}
111111
$zipper->close();
112112
ModStart::clearCache();
113-
$exitCode = Artisan::call("migrate");
113+
try {
114+
$exitCode = Artisan::call("migrate");
115+
} catch (\Exception $e) {
116+
$exitCode = -1;
117+
}
114118
BizException::throwsIf("调用 php artisan migrate 失败", 0 != $exitCode);
115119
$exitCode = Artisan::call("modstart:module-install-all");
116120
BizException::throwsIf("调用 php artisan modstart:module-install-all 失败", 0 != $exitCode);

‎module/AdminManager/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"Vendor"
1212
],
1313
"title": "管理员基础框架",
14-
"version": "1.7.0",
14+
"version": "1.8.0",
1515
"author": "ModStart",
1616
"modstartVersion": ">=3.3.0",
1717
"description": "提供基于管理员角色、管理员、管理日志基础功能"

‎module/Banner/Admin/routes.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
$router->match(['get', 'post'], 'banner', '\Module\Banner\Admin\Controller\BannerController@index');
55
$router->match(['get', 'post'], 'banner/add', '\Module\Banner\Admin\Controller\BannerController@add');
66
$router->match(['get', 'post'], 'banner/edit', '\Module\Banner\Admin\Controller\BannerController@edit');
7-
$router->match(['get', 'post'], 'banner/delete', '\Module\Banner\Admin\Controller\BannerController@delete');
8-
$router->match(['get', 'post'], 'banner/show', '\Module\Banner\Admin\Controller\BannerController@show');
9-
$router->match(['get', 'post'], 'banner/sort', '\Module\Banner\Admin\Controller\BannerController@sort');
7+
$router->match(['post'], 'banner/delete', '\Module\Banner\Admin\Controller\BannerController@delete');
8+
$router->match(['get'], 'banner/show', '\Module\Banner\Admin\Controller\BannerController@show');
9+
$router->match(['post'], 'banner/sort', '\Module\Banner\Admin\Controller\BannerController@sort');

‎module/Blog/Admin/routes.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@
88
Route::match(['get', 'post'], 'blog/message', 'BlogMessageController@index');
99
Route::match(['get', 'post'], 'blog/message/add', 'BlogMessageController@add');
1010
Route::match(['get', 'post'], 'blog/message/edit', 'BlogMessageController@edit');
11-
Route::match(['get', 'post'], 'blog/message/delete', 'BlogMessageController@delete');
12-
Route::match(['get', 'post'], 'blog/message/show', 'BlogMessageController@show');
11+
Route::match(['post'], 'blog/message/delete', 'BlogMessageController@delete');
12+
Route::match(['get'], 'blog/message/show', 'BlogMessageController@show');
1313
Route::match(['get', 'post'], 'blog/message/verify_pass', 'BlogMessageController@verifyPass');
1414
Route::match(['get', 'post'], 'blog/message/verify_reject', 'BlogMessageController@verifyReject');
1515

1616
Route::match(['get', 'post'], 'blog/blog', 'BlogController@index');
1717
Route::match(['get', 'post'], 'blog/blog/add', 'BlogController@add');
1818
Route::match(['get', 'post'], 'blog/blog/edit', 'BlogController@edit');
19-
Route::match(['get', 'post'], 'blog/blog/delete', 'BlogController@delete');
20-
Route::match(['get', 'post'], 'blog/blog/show', 'BlogController@show');
19+
Route::match(['post'], 'blog/blog/delete', 'BlogController@delete');
20+
Route::match(['get'], 'blog/blog/show', 'BlogController@show');
2121

2222
Route::match(['get', 'post'], 'blog/comment', 'BlogCommentController@index');
2323
Route::match(['get', 'post'], 'blog/comment/add', 'BlogCommentController@add');
2424
Route::match(['get', 'post'], 'blog/comment/edit', 'BlogCommentController@edit');
25-
Route::match(['get', 'post'], 'blog/comment/delete', 'BlogCommentController@delete');
26-
Route::match(['get', 'post'], 'blog/comment/show', 'BlogCommentController@show');
25+
Route::match(['post'], 'blog/comment/delete', 'BlogCommentController@delete');
26+
Route::match(['get'], 'blog/comment/show', 'BlogCommentController@show');
2727
Route::match(['get', 'post'], 'blog/comment/verify_pass', 'BlogCommentController@verifyPass');
2828
Route::match(['get', 'post'], 'blog/comment/verify_reject', 'BlogCommentController@verifyReject');
2929

3030
Route::match(['get', 'post'], 'blog/category', 'BlogCategoryController@index');
3131
Route::match(['get', 'post'], 'blog/category/add', 'BlogCategoryController@add');
3232
Route::match(['get', 'post'], 'blog/category/edit', 'BlogCategoryController@edit');
33-
Route::match(['get', 'post'], 'blog/category/delete', 'BlogCategoryController@delete');
34-
Route::match(['get', 'post'], 'blog/category/show', 'BlogCategoryController@show');
35-
Route::match(['get', 'post'], 'blog/category/sort', 'BlogCategoryController@sort');
33+
Route::match(['post'], 'blog/category/delete', 'BlogCategoryController@delete');
34+
Route::match(['get'], 'blog/category/show', 'BlogCategoryController@show');
35+
Route::match(['post'], 'blog/category/sort', 'BlogCategoryController@sort');
3636

3737

3838

‎module/ModuleStore/Asset/entry/moduleStore.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎module/ModuleStore/Docs/release.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
- 新增：模块市场预览包功能支持
44
- 新增：模块管理模块升级判断逻辑修改
5+
- 优化：模块显示界面优化
56

67
---
78

‎module/ModuleStore/Docs/release/1.0.0.md

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

‎module/ModuleStore/Docs/release/1.1.0.md

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

0 commit comments

Comments
 (0)