diff --git a/app/http/controllers/plugin_controller.go b/app/http/controllers/plugin_controller.go index 153401d4..9f2a759d 100644 --- a/app/http/controllers/plugin_controller.go +++ b/app/http/controllers/plugin_controller.go @@ -41,7 +41,6 @@ func (r *PluginController) List(ctx http.Context) { type plugin struct { Name string `json:"name"` - Author string `json:"author"` Description string `json:"description"` Slug string `json:"slug"` Version string `json:"version"` @@ -62,7 +61,6 @@ func (r *PluginController) List(ctx http.Context) { } p = append(p, plugin{ Name: item.Name, - Author: item.Author, Description: item.Description, Slug: item.Slug, Version: item.Version, diff --git a/app/http/controllers/plugins/s3fs/s3fs_controller.go b/app/http/controllers/plugins/s3fs/s3fs_controller.go index b620f949..0751c182 100644 --- a/app/http/controllers/plugins/s3fs/s3fs_controller.go +++ b/app/http/controllers/plugins/s3fs/s3fs_controller.go @@ -191,8 +191,8 @@ func (c *S3fsController) Delete(ctx http.Context) { return } - tools.ExecShell(`fusermount -u '` + mount.Path + `'`) - tools.ExecShell(`umount '` + mount.Path + `'`) + tools.ExecShell(`fusermount -u '` + mount.Path + `' 2>&1`) + tools.ExecShell(`umount '` + mount.Path + `' 2>&1`) tools.ExecShell(`sed -i 's@^s3fs#` + mount.Bucket + `\s` + mount.Path + `.*$@@g' /etc/fstab`) check := tools.ExecShell("mount -a 2>&1") if len(check) != 0 { diff --git a/app/plugins/mysql57/mysql57.go b/app/plugins/mysql57/mysql57.go index 6136d3e5..14c6395f 100644 --- a/app/plugins/mysql57/mysql57.go +++ b/app/plugins/mysql57/mysql57.go @@ -2,7 +2,6 @@ package mysql57 var ( Name = "MySQL-5.7" - Author = "耗子" Description = "MySQL 是最流行的关系型数据库管理系统之一,Oracle 旗下产品。" Slug = "mysql57" Version = "5.7.42" diff --git a/app/plugins/mysql80/mysql80.go b/app/plugins/mysql80/mysql80.go index 8f97bf68..a15f4067 100644 --- a/app/plugins/mysql80/mysql80.go +++ b/app/plugins/mysql80/mysql80.go @@ -2,7 +2,6 @@ package mysql80 var ( Name = "MySQL-8.0" - Author = "耗子" Description = "MySQL 是最流行的关系型数据库管理系统之一,Oracle 旗下产品。(内存 < 4G 无法安装)" Slug = "mysql80" Version = "8.0.33" diff --git a/app/plugins/openresty/openresty.go b/app/plugins/openresty/openresty.go index 81806bb2..c84a4d96 100644 --- a/app/plugins/openresty/openresty.go +++ b/app/plugins/openresty/openresty.go @@ -2,7 +2,6 @@ package openresty var ( Name = "OpenResty" - Author = "耗子" Description = "OpenResty® 是一款基于 NGINX 和 LuaJIT 的 Web 平台。" Slug = "openresty" Version = "1.21.4.1" diff --git a/app/plugins/php74/php74.go b/app/plugins/php74/php74.go index 729590c5..11dd8443 100644 --- a/app/plugins/php74/php74.go +++ b/app/plugins/php74/php74.go @@ -2,7 +2,6 @@ package php74 var ( Name = "PHP-7.4" - Author = "耗子" Description = "PHP 是世界上最好的语言!" Slug = "php74" Version = "7.4.33" diff --git a/app/plugins/php80/php80.go b/app/plugins/php80/php80.go index d7053ef0..e1956c73 100644 --- a/app/plugins/php80/php80.go +++ b/app/plugins/php80/php80.go @@ -2,7 +2,6 @@ package php80 var ( Name = "PHP-8.0" - Author = "耗子" Description = "PHP 是世界上最好的语言!" Slug = "php80" Version = "8.0.29" diff --git a/app/plugins/phpmyadmin/phpmyadmin.go b/app/plugins/phpmyadmin/phpmyadmin.go index e0f9fb03..fb07a9ce 100644 --- a/app/plugins/phpmyadmin/phpmyadmin.go +++ b/app/plugins/phpmyadmin/phpmyadmin.go @@ -2,7 +2,6 @@ package phpmyadmin var ( Name = "phpMyAdmin" - Author = "耗子" Description = "phpMyAdmin 是一个以 PHP 为基础,以 Web-Base 方式架构在网站主机上的 MySQL 数据库管理工具。" Slug = "phpmyadmin" Version = "5.2.1" diff --git a/app/plugins/s3fs/s3fs.go b/app/plugins/s3fs/s3fs.go index fb6630e2..3ea5d230 100644 --- a/app/plugins/s3fs/s3fs.go +++ b/app/plugins/s3fs/s3fs.go @@ -2,7 +2,6 @@ package s3fs var ( Name = "S3fs" - Author = "耗子" Description = "S3fs 通过 FUSE 挂载兼容 S3 标准的存储桶,例如Amazon S3、阿里云OSS、腾讯云COS、七牛云Kodo等。" Slug = "s3fs" Version = "1.9" diff --git a/app/services/plugin.go b/app/services/plugin.go index 8a567fb4..c91c2f5a 100644 --- a/app/services/plugin.go +++ b/app/services/plugin.go @@ -17,7 +17,6 @@ import ( // PanelPlugin 插件元数据结构 type PanelPlugin struct { Name string - Author string Description string Slug string Version string @@ -58,7 +57,6 @@ func (r *PluginImpl) All() []PanelPlugin { p = append(p, PanelPlugin{ Name: openresty.Name, - Author: openresty.Author, Description: openresty.Description, Slug: openresty.Slug, Version: openresty.Version, @@ -70,7 +68,6 @@ func (r *PluginImpl) All() []PanelPlugin { }) p = append(p, PanelPlugin{ Name: mysql57.Name, - Author: mysql57.Author, Description: mysql57.Description, Slug: mysql57.Slug, Version: mysql57.Version, @@ -82,7 +79,6 @@ func (r *PluginImpl) All() []PanelPlugin { }) p = append(p, PanelPlugin{ Name: mysql80.Name, - Author: mysql80.Author, Description: mysql80.Description, Slug: mysql80.Slug, Version: mysql80.Version, @@ -94,7 +90,6 @@ func (r *PluginImpl) All() []PanelPlugin { }) p = append(p, PanelPlugin{ Name: php74.Name, - Author: php74.Author, Description: php74.Description, Slug: php74.Slug, Version: php74.Version, @@ -106,7 +101,6 @@ func (r *PluginImpl) All() []PanelPlugin { }) p = append(p, PanelPlugin{ Name: php80.Name, - Author: php80.Author, Description: php80.Description, Slug: php80.Slug, Version: php80.Version, @@ -118,7 +112,6 @@ func (r *PluginImpl) All() []PanelPlugin { }) p = append(p, PanelPlugin{ Name: phpmyadmin.Name, - Author: phpmyadmin.Author, Description: phpmyadmin.Description, Slug: phpmyadmin.Slug, Version: phpmyadmin.Version, @@ -130,7 +123,6 @@ func (r *PluginImpl) All() []PanelPlugin { }) p = append(p, PanelPlugin{ Name: s3fs.Name, - Author: s3fs.Author, Description: s3fs.Description, Slug: s3fs.Slug, Version: s3fs.Version, diff --git a/public/panel/views/plugin.html b/public/panel/views/plugin.html index ec2a069c..3825fbbc 100644 --- a/public/panel/views/plugin.html +++ b/public/panel/views/plugin.html @@ -48,7 +48,6 @@ {field: 'slug', hide: true, title: 'Slug'} , {field: 'name', width: 150, title: '插件名', sort: true} , {field: 'description', title: '描述'} - , {field: 'author', width: 100, title: '作者'} , {field: 'installed_version', width: 140, title: '已装版本'} , {field: 'version', width: 140, title: '最新版本'} , {field: 'show', title: '首页显示', width: 90, templet: '#plugin-show', unresize: true}