diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f2149f8..4201b66a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,15 @@ 所有重要的更改都将在此文件中记录。 +## [20230130] - 常规更新 -## [20230108] - 常规更新 +- 代码格式化 +- 更新许可证 +- 修复备份逻辑错误 +- 主页新增新年祝福 +- 主页新增检查更新 + +## [20230113] - 常规更新 - 优化更新流程 - 优化备份流程 diff --git a/app/Http/Controllers/Api/InfosController.php b/app/Http/Controllers/Api/InfosController.php index 5f4a0ddb..209f9b41 100644 --- a/app/Http/Controllers/Api/InfosController.php +++ b/app/Http/Controllers/Api/InfosController.php @@ -10,6 +10,7 @@ use App\Http\Controllers\Controller; use App\Models\Plugin; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Http; class InfosController extends Controller { @@ -293,4 +294,33 @@ class InfosController extends Controller ); return response()->json($res); } + + /** + * 检查更新 + */ + public function checkUpdate(): JsonResponse + { + $version = config('panel.version'); + $remoteVersion = Http::get('https://api.panel.haozi.xyz/api/version/info')->json(); + + if ($remoteVersion['code'] != 0) { + $res['code'] = 1; + $res['msg'] = '获取远程版本信息失败'; + $res['data'] = []; + return response()->json($res); + } + + $res['code'] = 0; + $res['msg'] = 'success'; + if (version_compare($version, $remoteVersion['data']['version'], '<')) { + $res['data'] = [ + 'version' => $remoteVersion['data']['version'], + 'describe' => $remoteVersion['data']['describe'], + ]; + } else { + $res['data'] = []; + } + + return response()->json($res); + } } diff --git a/config/panel.php b/config/panel.php index 94af547c..ff4b4d19 100644 --- a/config/panel.php +++ b/config/panel.php @@ -1,6 +1,6 @@ '耗子Linux面板', - 'version' => '20230113', + 'version' => '20230130', 'plugin_dir' => '/www/panel/plugins', ]; \ No newline at end of file diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 80cd1cd6..beb78299 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -14,9 +14,11 @@ Date: 2022-11-30 耗子博客 WeAvatar - 互联网公共头像服务 + title="WeAvatar" target="_blank"> + WeAvatar - 互联网公共头像服务 WePublish - WordPress的本土化版本 + title="WePublish" target="_blank"> + WePublish - WordPress的本土化版本 @@ -149,7 +151,9 @@ Date: 2022-11-30
开发组祝大家2023新年快乐!新的一年永无Bug,永不宕机!
-@@ -258,21 +262,46 @@ Date: 2022-11-30 }); // 监听更新按钮点击事件 $('#update_panel').click(function () { - admin.popup({ - title: '提示' - , - shade: 0 - , - anim: -1 - , - area: ['400px', '200px'] - , - id: 'layadmin-layer-skin-update-panel' - , - skin: 'layui-anim layui-anim-upbit' - , - content: '请在SSH执行panel update以更新面板!' + index = layer.msg('正在获取版本信息...', { + icon: 16 + , time: 0 }); + admin.req( + { + url: '/api/panel/info/checkUpdate' + , method: 'get' + , success: function (result) { + layer.close(index); + if (result.code !== 0) { + layer.msg('获取版本信息失败,请刷新重试!') + return false; + } + if (result.data.version) { + admin.popup({ + title: '提示' + , + shade: 0 + , + anim: -1 + , + area: ['400px', '200px'] + , + id: 'layadmin-layer-skin-update-panel' + , + skin: 'layui-anim layui-anim-upbit' + , + content: '最新版本:' + result.data.version + '欢迎您使用耗子Linux面板。如遇到问题/Bug,可通过 Q群12370907 / QQ频道 寻求帮助
+欢迎您使用耗子Linux面板。如遇到问题/Bug,可通过 Q群12370907 / QQ频道 寻求帮助