-
+
获取中...
@@ -141,54 +141,50 @@
// 事件监听
$('#openresty-start').click(function () {
- admin.popup({
- title: '警告'
- ,
- shade: 0
- ,
- anim: -1
- ,
- area: ['300px', '200px']
- ,
- id: 'layadmin-layer-skin-openresty-start'
- ,
- skin: 'layui-anim layui-anim-upbit'
- ,
- content: '面板的正常访问依赖OpenResty，因此不支持在面板启动OpenResty，如您确需操作，请在SSH执行systemctl start nginx以启动OpenResty！'
- })
+ index = layer.msg('正在启动OpenResty...', { icon: 16, time: 0, shade: 0.3 })
+ admin.req({
+ url: '/api/plugins/openresty/start'
+ , method: 'post'
+ , success: function (result) {
+ layer.close(index)
+ if (result.code !== 0) {
+ return false
+ }
+ admin.events.refresh()
+ layer.alert('OpenResty启动成功！')
+ }
+ })
})
$('#openresty-stop').click(function () {
- admin.popup({
- title: '警告'
- ,
- shade: 0
- ,
- anim: -1
- ,
- area: ['300px', '200px']
- ,
- id: 'layadmin-layer-skin-openresty-stop'
- ,
- skin: 'layui-anim layui-anim-upbit'
- ,
- content: '面板的正常访问依赖OpenResty，因此不支持在面板停止OpenResty，如您确需操作，请在SSH执行systemctl stop nginx以停止OpenResty！'
- })
+ layer.confirm('停止OpenResty将导致网站无法访问，是否继续停止？', {
+ btn: ['停止', '取消']
+ }, function () {
+ index = layer.msg('正在停止OpenResty...', { icon: 16, time: 0, shade: 0.3 })
+ admin.req({
+ url: '/api/plugins/openresty/stop'
+ , method: 'post'
+ , success: function (result) {
+ layer.close(index)
+ if (result.code !== 0) {
+ return false
+ }
+ admin.events.refresh()
+ layer.alert('OpenResty停止成功！')
+ }
+ })
+ })
})
$('#openresty-restart').click(function () {
- layer.confirm('重启OpenResty有可能导致面板短时间无法访问，是否继续重启？', {
+ layer.confirm('重启OpenResty将导致网站短时间无法访问，是否继续重启？', {
btn: ['重启', '取消']
}, function () {
- index = layer.msg('正在重启OpenResty...', { icon: 16, time: 0 })
+ index = layer.msg('正在重启OpenResty...', { icon: 16, time: 0, shade: 0.3 })
admin.req({
url: '/api/plugins/openresty/restart'
, method: 'post'
- , beforeSend: function () {
- layer.msg('已发送重启请求，请稍后刷新确认重启状态。')
- }
, success: function (result) {
layer.close(index)
if (result.code !== 0) {
- console.log('耗子Linux面板：OpenResty重启失败，接口返回' + result)
return false
}
admin.events.refresh()
@@ -198,22 +194,22 @@
})
})
$('#openresty-reload').click(function () {
- index = layer.msg('正在重载OpenResty...', { icon: 16, time: 0 })
+ index = layer.msg('正在重载OpenResty...', { icon: 16, time: 0, shade: 0.3 })
admin.req({
url: '/api/plugins/openresty/reload'
, method: 'post'
, success: function (result) {
layer.close(index)
if (result.code !== 0) {
- console.log('耗子Linux面板：OpenResty重载失败，接口返回' + result)
return false
}
+ admin.events.refresh()
layer.alert('OpenResty重载成功！')
}
})
})
$('#openresty-config-save').click(function () {
- index = layer.msg('正在保存OpenResty主配置...', { icon: 16, time: 0 })
+ index = layer.msg('正在保存OpenResty主配置...', { icon: 16, time: 0, shade: 0.3 })
admin.req({
url: '/api/plugins/openresty/config'
, method: 'post'
@@ -223,17 +219,16 @@
, success: function (result) {
layer.close(index)
if (result.code !== 0) {
- console.log('耗子Linux面板：OpenResty配置保存失败，接口返回' + result)
return false
}
layer.alert('OpenResty配置保存成功！')
}
})
})
- $('#openresty-clean-error-log').click(function () {
- index = layer.msg('正在清空OpenResty错误日志...', { icon: 16, time: 0 })
+ $('#openresty-clear-error-log').click(function () {
+ index = layer.msg('正在清空OpenResty错误日志...', { icon: 16, time: 0, shade: 0.3 })
admin.req({
- url: '/api/plugins/openresty/cleanErrorLog'
+ url: '/api/plugins/openresty/clearErrorLog'
, method: 'post'
, success: function (result) {
layer.close(index)
diff --git a/public/panel/views/task.html b/public/panel/views/task.html
new file mode 100644
index 0000000000..f41d4918cb
--- /dev/null
+++ b/public/panel/views/task.html
@@ -0,0 +1,158 @@
+
+
+任务中心
+
+
+
diff --git a/routes/plugin.go b/routes/plugin.go
index 70318f9c50..413a9717c8 100644
--- a/routes/plugin.go
+++ b/routes/plugin.go
@@ -23,7 +23,7 @@ func Plugin() {
route.Get("config", openRestyController.GetConfig)
route.Post("config", openRestyController.SaveConfig)
route.Get("errorLog", openRestyController.ErrorLog)
- route.Get("clearErrorLog", openRestyController.ClearErrorLog)
+ route.Post("clearErrorLog", openRestyController.ClearErrorLog)
})
facades.Route().Prefix("api/plugins/mysql80").Middleware(middleware.Jwt()).Group(func(route route.Route) {
mysql80Controller := mysql80.NewMysql80Controller()
diff --git a/routes/web.go b/routes/web.go
index 8917bc1f75..db7246a919 100644
--- a/routes/web.go
+++ b/routes/web.go
@@ -19,6 +19,8 @@ func Web() {
r.Middleware(middleware.Jwt()).Get("nowMonitor", infoController.NowMonitor)
r.Middleware(middleware.Jwt()).Get("systemInfo", infoController.SystemInfo)
r.Middleware(middleware.Jwt()).Get("installedDbAndPhp", infoController.InstalledDbAndPhp)
+ r.Middleware(middleware.Jwt()).Get("checkUpdate", infoController.CheckUpdate)
+ r.Middleware(middleware.Jwt()).Post("update", infoController.Update)
})
r.Prefix("user").Group(func(r route.Route) {
userController := controllers.NewUserController()
diff --git a/scripts/install_panel.sh b/scripts/install_panel.sh
index c6ee700b68..ef0486c0ec 100644
--- a/scripts/install_panel.sh
+++ b/scripts/install_panel.sh
@@ -58,8 +58,7 @@ Prepare_system() {
exit 1
fi
- wwwUserCheck=$(cat /etc/passwd | grep www)
- if [ "${wwwUserCheck}" == "" ]; then
+ if ! id -u "www" >/dev/null 2>&1; then
groupadd www
useradd -s /sbin/nologin -g www www
fi
diff --git a/scripts/openresty/install.sh b/scripts/openresty/install.sh
index fa30ad1c64..7ca0c78fa7 100644
--- a/scripts/openresty/install.sh
+++ b/scripts/openresty/install.sh
@@ -362,6 +362,6 @@ systemctl daemon-reload
systemctl enable openresty.service
systemctl start openresty.service
-panel writePlugin openresty
+panel writePlugin openresty ${openrestyVersion}
echo -e "${HR}\nOpenResty install completed.\n${HR}"