fix: 解决上传文件夹权限没改的问题 (#5919)

Refs https://github.com/1Panel-dev/1Panel/issues/5900

backend/app/api/v1/app.go

@@ -155,7 +155,7 @@ func (b *BaseApi) GetIgnoredApp(c *gin.Context) {
 // @Success 200 {object} model.AppInstall
 // @Security ApiKeyAuth
 // @Router /apps/install [post]
-// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[{"input_column":"name","input_value":"name","isList":false,"db":"app_installs","output_column":"app_id","output_value":"appId"},{"info":"appId","isList":false,"db":"apps","output_column":"key","output_value":"appKey"}],"formatZH":"安装应用 [appKey]-[name]","formatEN":"Install app [appKey]-[name]"}
+// @x-panel-log {"bodyKeys":["name"],"paramKeys":[],"BeforeFunctions":[],"formatZH":"安装应用 [name]","formatEN":"Install app [name]"}
 func (b *BaseApi) InstallApp(c *gin.Context) {
 	var req request.AppInstallCreate
 	if err := helper.CheckBindAndValidate(&req, c); err != nil {

backend/app/api/v1/file.go

@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"syscall"
 
 	"github.com/1Panel-dev/1Panel/backend/app/api/v1/helper"
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
@@ -336,8 +337,12 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 		return
 	}
 	mode := info.Mode()
-
 	fileOp := files.NewFileOp()
+	stat, ok := info.Sys().(*syscall.Stat_t)
+	uid, gid := -1, -1
+	if ok {
+		uid, gid = int(stat.Uid), int(stat.Gid)
+	}
 
 	success := 0
 	failures := make(buserr.MultiErr)
@@ -351,6 +356,7 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 				global.LOG.Error(e)
 				continue
 			}
+			_ = os.Chown(dstDir, uid, gid)
 		}
 		tmpFilename := dstFilename + ".tmp"
 		if err := c.SaveUploadedFile(file, tmpFilename); err != nil {
@@ -378,6 +384,9 @@ func (b *BaseApi) UploadFiles(c *gin.Context) {
 		} else {
 			_ = os.Chmod(dstFilename, mode)
 		}
+		if uid != -1 && gid != -1 {
+			_ = os.Chown(dstFilename, uid, gid)
+		}
 		success++
 	}
 	if success == 0 {
@@ -603,9 +612,17 @@ func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int,
 	if mode == 0 {
 		mode = 0755
 	}
-	if _, err := os.Stat(dstDir); err != nil && os.IsNotExist(err) {
-		if err = op.CreateDir(dstDir, mode); err != nil {
-			return err
+	uid, gid := -1, -1
+	if info, err := os.Stat(dstDir); err != nil {
+		if os.IsNotExist(err) {
+			if err = op.CreateDir(dstDir, mode); err != nil {
+				return err
+			}
+		}
+	} else {
+		stat, ok := info.Sys().(*syscall.Stat_t)
+		if ok {
+			uid, gid = int(stat.Uid), int(stat.Gid)
 		}
 	}
 	dstFileName := filepath.Join(dstDir, fileName)
@@ -615,6 +632,7 @@ func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int,
 	} else {
 		mode = 0644
 	}
+
 	if overwrite {
 		_ = os.Remove(dstFileName)
 	}
@@ -635,6 +653,9 @@ func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int,
 		}
 		_ = os.Remove(chunkPath)
 	}
+	if uid != -1 && gid != -1 {
+		_ = os.Chown(dstFileName, uid, gid)
+	}
 
 	return nil
 }

backend/app/service/app.go

@@ -145,6 +145,9 @@ func (a AppService) GetAppTags() ([]response.TagDTO, error) {
 
 func (a AppService) GetApp(key string) (*response.AppDTO, error) {
 	var appDTO response.AppDTO
+	if key == "postgres" {
+		key = "postgresql"
+	}
 	app, err := appRepo.GetFirst(appRepo.WithKey(key))
 	if err != nil {
 		return nil, err

backend/app/service/website.go

@@ -910,6 +910,7 @@ func (w WebsiteService) OpWebsiteHTTPS(ctx context.Context, req request.WebsiteH
 		websiteSSL.Provider = constant.Manual
 		websiteSSL.PrivateKey = privateKey
 		websiteSSL.Pem = certificate
+		websiteSSL.Status = constant.SSLReady
 
 		res.SSL = websiteSSL
 	}

backend/middleware/operation.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"reflect"
 	"strings"
 	"time"
 
@@ -96,10 +97,11 @@ func OperationLog() gin.HandlerFunc {
 					if funcs.InputValue == key {
 						var names []string
 						if funcs.IsList {
-							sql := fmt.Sprintf("SELECT %s FROM %s where %s in (?);", funcs.OutputColumn, funcs.DB, funcs.InputColumn)
-							_ = global.DB.Raw(sql, value).Scan(&names)
+							query := fmt.Sprintf("SELECT %s FROM %s WHERE %s in (?)", funcs.OutputColumn, funcs.DB, funcs.InputColumn)
+							_ = global.DB.Raw(query, value).Scan(&names)
 						} else {
-							_ = global.DB.Raw(fmt.Sprintf("select %s from %s where %s = ?;", funcs.OutputColumn, funcs.DB, funcs.InputColumn), value).Scan(&names)
+							query := fmt.Sprintf("SELECT %s FROM %s WHERE %s = ?", funcs.OutputColumn, funcs.DB, funcs.InputColumn)
+							_ = global.DB.Raw(query, value).Scan(&names)
 						}
 						formatMap[funcs.OutputValue] = strings.Join(names, ",")
 						break
@@ -109,12 +111,21 @@ func OperationLog() gin.HandlerFunc {
 		}
 		for key, value := range formatMap {
 			if strings.Contains(operationDic.FormatEN, "["+key+"]") {
-				if arrays, ok := value.([]string); ok {
-					operationDic.FormatZH = strings.ReplaceAll(operationDic.FormatZH, "["+key+"]", fmt.Sprintf("[%v]", strings.Join(arrays, ",")))
-					operationDic.FormatEN = strings.ReplaceAll(operationDic.FormatEN, "["+key+"]", fmt.Sprintf("[%v]", strings.Join(arrays, ",")))
-				} else {
+				t := reflect.TypeOf(value)
+				if t.Kind() != reflect.Array && t.Kind() != reflect.Slice {
 					operationDic.FormatZH = strings.ReplaceAll(operationDic.FormatZH, "["+key+"]", fmt.Sprintf("[%v]", value))
 					operationDic.FormatEN = strings.ReplaceAll(operationDic.FormatEN, "["+key+"]", fmt.Sprintf("[%v]", value))
+				} else {
+					val := reflect.ValueOf(value)
+					length := val.Len()
+
+					var elements []string
+					for i := 0; i < length; i++ {
+						element := val.Index(i).Interface().(string)
+						elements = append(elements, element)
+					}
+					operationDic.FormatZH = strings.ReplaceAll(operationDic.FormatZH, "["+key+"]", fmt.Sprintf("[%v]", strings.Join(elements, ",")))
+					operationDic.FormatEN = strings.ReplaceAll(operationDic.FormatEN, "["+key+"]", fmt.Sprintf("[%v]", strings.Join(elements, ",")))
 				}
 			}
 		}

backend/utils/mysql/helper/dump.go

@@ -1,303 +0,0 @@
-package helper
-
-import (
-	"bufio"
-	"database/sql"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
-	_ "github.com/go-sql-driver/mysql"
-)
-
-func init() {}
-
-type dumpOption struct {
-	isData bool
-
-	tables      []string
-	isAllTable  bool
-	isDropTable bool
-	writer      io.Writer
-}
-
-type DumpOption func(*dumpOption)
-
-func WithDropTable() DumpOption {
-	return func(option *dumpOption) {
-		option.isDropTable = true
-	}
-}
-
-func WithData() DumpOption {
-	return func(option *dumpOption) {
-		option.isData = true
-	}
-}
-
-func WithWriter(writer io.Writer) DumpOption {
-	return func(option *dumpOption) {
-		option.writer = writer
-	}
-}
-
-func Dump(dns string, opts ...DumpOption) error {
-	start := time.Now()
-	global.LOG.Infof("dump start at %s\n", start.Format(constant.DateTimeLayout))
-	defer func() {
-		end := time.Now()
-		global.LOG.Infof("dump end at %s, cost %s\n", end.Format(constant.DateTimeLayout), end.Sub(start))
-	}()
-
-	var err error
-
-	var o dumpOption
-
-	for _, opt := range opts {
-		opt(&o)
-	}
-
-	if len(o.tables) == 0 {
-		o.isAllTable = true
-	}
-
-	if o.writer == nil {
-		o.writer = os.Stdout
-	}
-
-	buf := bufio.NewWriter(o.writer)
-	defer buf.Flush()
-
-	itemFile, lineNumber := "", 0
-
-	itemFile += "-- ----------------------------\n"
-	itemFile += "-- MySQL Database Dump\n"
-	itemFile += "-- Start Time: " + start.Format(constant.DateTimeLayout) + "\n"
-	itemFile += "-- ----------------------------\n\n\n"
-
-	db, err := sql.Open("mysql", dns)
-	if err != nil {
-		global.LOG.Errorf("open mysql db failed, err: %v", err)
-		return err
-	}
-	defer db.Close()
-
-	dbName, err := getDBNameFromDNS(dns)
-	if err != nil {
-		global.LOG.Errorf("get db name from dns failed, err: %v", err)
-		return err
-	}
-	_, err = db.Exec(fmt.Sprintf("USE `%s`", dbName))
-	if err != nil {
-		global.LOG.Errorf("exec `use %s` failed, err: %v", dbName, err)
-		return err
-	}
-
-	var tables []string
-	if o.isAllTable {
-		tmp, err := getAllTables(db)
-		if err != nil {
-			global.LOG.Errorf("get all tables failed, err: %v", err)
-			return err
-		}
-		tables = tmp
-	} else {
-		tables = o.tables
-	}
-
-	for _, table := range tables {
-		if o.isDropTable {
-			itemFile += fmt.Sprintf("DROP TABLE IF EXISTS `%s`;\n", table)
-		}
-
-		itemFile += "-- ----------------------------\n"
-		itemFile += fmt.Sprintf("-- Table structure for %s\n", table)
-		itemFile += "-- ----------------------------\n"
-
-		createTableSQL, err := getCreateTableSQL(db, table)
-		if err != nil {
-			global.LOG.Errorf("get create table sql failed, err: %v", err)
-			return err
-		}
-		itemFile += createTableSQL
-		itemFile += ";\n\n\n\n"
-
-		if o.isData {
-			itemFile += "-- ----------------------------\n"
-			itemFile += fmt.Sprintf("-- Records of %s\n", table)
-			itemFile += "-- ----------------------------\n"
-
-			lineRows, err := db.Query(fmt.Sprintf("SELECT * FROM `%s`", table))
-			if err != nil {
-				global.LOG.Errorf("exec `select * from %s` failed, err: %v", table, err)
-				return err
-			}
-			defer lineRows.Close()
-
-			var columns []string
-			columns, err = lineRows.Columns()
-			if err != nil {
-				global.LOG.Errorf("get columes failed, err: %v", err)
-				return err
-			}
-			columnTypes, err := lineRows.ColumnTypes()
-			if err != nil {
-				global.LOG.Errorf("get colume types failed, err: %v", err)
-				return err
-			}
-			for lineRows.Next() {
-				row := make([]interface{}, len(columns))
-				rowPointers := make([]interface{}, len(columns))
-				for i := range columns {
-					rowPointers[i] = &row[i]
-				}
-				if err = lineRows.Scan(rowPointers...); err != nil {
-					global.LOG.Errorf("scan row data failed, err: %v", err)
-					return err
-				}
-				ssql := loadDataSql(row, columnTypes, table)
-				if len(ssql) != 0 {
-					itemFile += ssql
-					lineNumber++
-				}
-				if lineNumber > 500 {
-					_, _ = buf.WriteString(itemFile)
-					itemFile = ""
-					lineNumber = 0
-				}
-			}
-
-			itemFile += "\n\n"
-		}
-	}
-
-	itemFile += "-- ----------------------------\n"
-	itemFile += "-- Dumped by mysqldump\n"
-	itemFile += "-- Cost Time: " + time.Since(start).String() + "\n"
-	itemFile += "-- ----------------------------\n"
-
-	_, _ = buf.WriteString(itemFile)
-	_ = buf.Flush()
-
-	return nil
-}
-
-func getCreateTableSQL(db *sql.DB, table string) (string, error) {
-	var createTableSQL string
-	err := db.QueryRow(fmt.Sprintf("SHOW CREATE TABLE `%s`", table)).Scan(&table, &createTableSQL)
-	if err != nil {
-		return "", err
-	}
-	createTableSQL = strings.Replace(createTableSQL, "CREATE TABLE", "CREATE TABLE IF NOT EXISTS", 1)
-	return createTableSQL, nil
-}
-
-func getAllTables(db *sql.DB) ([]string, error) {
-	var tables []string
-	rows, err := db.Query("SHOW TABLES")
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	for rows.Next() {
-		var table string
-		err = rows.Scan(&table)
-		if err != nil {
-			return nil, err
-		}
-		tables = append(tables, table)
-	}
-	return tables, nil
-}
-
-func loadDataSql(row []interface{}, columnTypes []*sql.ColumnType, table string) string {
-	ssql := "INSERT INTO `" + table + "` VALUES ("
-	for i, col := range row {
-		if col == nil {
-			ssql += "NULL"
-		} else {
-			Type := columnTypes[i].DatabaseTypeName()
-			Type = strings.Replace(Type, "UNSIGNED", "", -1)
-			Type = strings.Replace(Type, " ", "", -1)
-			switch Type {
-			case "TINYINT", "SMALLINT", "MEDIUMINT", "INT", "INTEGER", "BIGINT":
-				if bs, ok := col.([]byte); ok {
-					ssql += string(bs)
-				} else {
-					ssql += fmt.Sprintf("%d", col)
-				}
-			case "FLOAT", "DOUBLE":
-				if bs, ok := col.([]byte); ok {
-					ssql += string(bs)
-				} else {
-					ssql += fmt.Sprintf("%f", col)
-				}
-			case "DECIMAL", "DEC":
-				ssql += fmt.Sprintf("%s", col)
-
-			case "DATE":
-				t, ok := col.(time.Time)
-				if !ok {
-					global.LOG.Errorf("the DATE type conversion failed, err value: %v", col)
-					return ""
-				}
-				ssql += fmt.Sprintf("'%s'", t.Format("2006-01-02"))
-			case "DATETIME":
-				t, ok := col.(time.Time)
-				if !ok {
-					global.LOG.Errorf("the DATETIME type conversion failed, err value: %v", col)
-					return ""
-				}
-				ssql += fmt.Sprintf("'%s'", t.Format(constant.DateTimeLayout))
-			case "TIMESTAMP":
-				t, ok := col.(time.Time)
-				if !ok {
-					global.LOG.Errorf("the TIMESTAMP type conversion failed, err value: %v", col)
-					return ""
-				}
-				ssql += fmt.Sprintf("'%s'", t.Format(constant.DateTimeLayout))
-			case "TIME":
-				t, ok := col.([]byte)
-				if !ok {
-					global.LOG.Errorf("the TIME type conversion failed, err value: %v", col)
-					return ""
-				}
-				ssql += fmt.Sprintf("'%s'", string(t))
-			case "YEAR":
-				t, ok := col.([]byte)
-				if !ok {
-					global.LOG.Errorf("the YEAR type conversion failed, err value: %v", col)
-					return ""
-				}
-				ssql += string(t)
-			case "CHAR", "VARCHAR", "TINYTEXT", "TEXT", "MEDIUMTEXT", "LONGTEXT":
-				ssql += fmt.Sprintf("'%s'", strings.Replace(fmt.Sprintf("%s", col), "'", "''", -1))
-			case "BIT", "BINARY", "VARBINARY", "TINYBLOB", "BLOB", "MEDIUMBLOB", "LONGBLOB":
-				ssql += fmt.Sprintf("0x%X", col)
-			case "ENUM", "SET":
-				ssql += fmt.Sprintf("'%s'", col)
-			case "BOOL", "BOOLEAN":
-				if col.(bool) {
-					ssql += "true"
-				} else {
-					ssql += "false"
-				}
-			case "JSON":
-				ssql += fmt.Sprintf("'%s'", col)
-			default:
-				global.LOG.Errorf("unsupported colume type: %s", Type)
-				return ""
-			}
-		}
-		if i < len(row)-1 {
-			ssql += ","
-		}
-	}
-	ssql += ");\n"
-	return ssql
-}

backend/utils/mysql/helper/source.go

@@ -1,244 +0,0 @@
-package helper
-
-import (
-	"bufio"
-	"database/sql"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-	"time"
-
-	"github.com/1Panel-dev/1Panel/backend/constant"
-	"github.com/1Panel-dev/1Panel/backend/global"
-)
-
-type sourceOption struct {
-	dryRun      bool
-	mergeInsert int
-	debug       bool
-}
-type SourceOption func(*sourceOption)
-
-func WithMergeInsert(size int) SourceOption {
-	return func(o *sourceOption) {
-		o.mergeInsert = size
-	}
-}
-
-type dbWrapper struct {
-	DB     *sql.DB
-	debug  bool
-	dryRun bool
-}
-
-func newDBWrapper(db *sql.DB, dryRun, debug bool) *dbWrapper {
-
-	return &dbWrapper{
-		DB:     db,
-		dryRun: dryRun,
-		debug:  debug,
-	}
-}
-
-func (db *dbWrapper) Exec(query string, args ...interface{}) (sql.Result, error) {
-	if db.debug {
-		global.LOG.Debugf("query %s", query)
-	}
-
-	if db.dryRun {
-		return nil, nil
-	}
-	return db.DB.Exec(query, args...)
-}
-
-func Source(dns string, reader io.Reader, opts ...SourceOption) error {
-	start := time.Now()
-	global.LOG.Infof("source start at %s", start.Format(constant.DateTimeLayout))
-	defer func() {
-		end := time.Now()
-		global.LOG.Infof("source end at %s, cost %s", end.Format(constant.DateTimeLayout), end.Sub(start))
-	}()
-
-	var err error
-	var db *sql.DB
-	var o sourceOption
-	for _, opt := range opts {
-		opt(&o)
-	}
-
-	dbName, err := getDBNameFromDNS(dns)
-	if err != nil {
-		global.LOG.Errorf("get db name from dns failed, err: %v", err)
-		return err
-	}
-
-	db, err = sql.Open("mysql", dns)
-	if err != nil {
-		global.LOG.Errorf("open mysql db failed, err: %v", err)
-		return err
-	}
-	defer db.Close()
-
-	dbWrapper := newDBWrapper(db, o.dryRun, o.debug)
-
-	_, err = dbWrapper.Exec(fmt.Sprintf("USE `%s`;", dbName))
-	if err != nil {
-		global.LOG.Errorf("exec `use %s` failed, err: %v", dbName, err)
-		return err
-	}
-
-	db.SetConnMaxLifetime(3600)
-
-	r := bufio.NewReader(reader)
-	_, err = dbWrapper.Exec("SET autocommit=0;")
-	if err != nil {
-		global.LOG.Errorf("exec `set autocommit=0` failed, err: %v", err)
-		return err
-	}
-
-	for {
-		line, err := readLine(r)
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			global.LOG.Errorf("read sql failed, err: %v", err)
-			return err
-		}
-
-		ssql, err := trim(line)
-		if err != nil {
-			global.LOG.Errorf("trim sql failed, err: %v", err)
-			return err
-		}
-
-		afterInsertSql := ""
-		if o.mergeInsert > 1 && strings.HasPrefix(ssql, "INSERT INTO") {
-			var insertSQLs []string
-			insertSQLs = append(insertSQLs, ssql)
-			for i := 0; i < o.mergeInsert-1; i++ {
-				line, err := readLine(r)
-				if err != nil {
-					if err == io.EOF {
-						break
-					}
-					return err
-				}
-				ssql2, err := trim(line)
-				if err != nil {
-					global.LOG.Errorf("trim merge insert sql failed, err: %v", err)
-					return err
-				}
-				if strings.HasPrefix(ssql2, "INSERT INTO") {
-					insertSQLs = append(insertSQLs, ssql2)
-					continue
-				}
-				afterInsertSql = ssql2
-				break
-			}
-			ssql, err = mergeInsert(insertSQLs)
-			if err != nil {
-				global.LOG.Errorf("do merge insert failed, err: %v", err)
-				return err
-			}
-		}
-
-		_, err = dbWrapper.Exec(ssql)
-		if err != nil {
-			global.LOG.Errorf("exec sql failed, err: %v", err)
-			return err
-		}
-		if len(afterInsertSql) != 0 {
-			_, err = dbWrapper.Exec(afterInsertSql)
-			if err != nil {
-				global.LOG.Errorf("exec sql failed, err: %v", err)
-				return err
-			}
-		}
-	}
-
-	_, err = dbWrapper.Exec("COMMIT;")
-	if err != nil {
-		global.LOG.Errorf("exec `commit` failed, err: %v", err)
-		return err
-	}
-
-	_, err = dbWrapper.Exec("SET autocommit=1;")
-	if err != nil {
-		global.LOG.Errorf("exec `autocommit=1` failed, err: %v", err)
-		return err
-	}
-
-	return nil
-}
-
-func mergeInsert(insertSQLs []string) (string, error) {
-	if len(insertSQLs) == 0 {
-		return "", errors.New("no input provided")
-	}
-	builder := strings.Builder{}
-	sql1 := insertSQLs[0]
-	sql1 = strings.TrimSuffix(sql1, ";")
-	builder.WriteString(sql1)
-	for i, insertSQL := range insertSQLs[1:] {
-		if i < len(insertSQLs)-1 {
-			builder.WriteString(",")
-		}
-
-		valuesIdx := strings.Index(insertSQL, "VALUES")
-		if valuesIdx == -1 {
-			return "", errors.New("invalid SQL: missing VALUES keyword")
-		}
-		sqln := insertSQL[valuesIdx:]
-		sqln = strings.TrimPrefix(sqln, "VALUES")
-		sqln = strings.TrimSuffix(sqln, ";")
-		builder.WriteString(sqln)
-
-	}
-	builder.WriteString(";")
-
-	return builder.String(), nil
-}
-
-func trim(s string) (string, error) {
-	s = strings.TrimLeft(s, "\n")
-	s = strings.TrimSpace(s)
-	return s, nil
-}
-
-func getDBNameFromDNS(dns string) (string, error) {
-	ss1 := strings.Split(dns, "/")
-	if len(ss1) == 2 {
-		ss2 := strings.Split(ss1[1], "?")
-		if len(ss2) == 2 {
-			return ss2[0], nil
-		}
-	}
-
-	return "", fmt.Errorf("dns error: %s", dns)
-}
-
-func readLine(r *bufio.Reader) (string, error) {
-	lineItem, err := r.ReadString('\n')
-	if err != nil {
-		if err == io.EOF {
-			return lineItem, err
-		}
-		global.LOG.Errorf("read merge insert sql failed, err: %v", err)
-		return "", err
-	}
-	if strings.HasSuffix(lineItem, ";\n") {
-		return lineItem, nil
-	}
-	lineAppend, err := readLine(r)
-	if err != nil {
-		if err == io.EOF {
-			return lineItem, err
-		}
-		global.LOG.Errorf("read merge insert sql failed, err: %v", err)
-		return "", err
-	}
-
-	return lineItem + lineAppend, nil
-}

cmd/server/docs/docs.go

@@ -1,5 +1,4 @@
-// Code generated by swaggo/swag. DO NOT EDIT.
-
+// Package docs Code generated by swaggo/swag. DO NOT EDIT
 package docs
 
 import "github.com/swaggo/swag"
@@ -216,28 +215,12 @@ const docTemplate = `{
                     }
                 },
                 "x-panel-log": {
-                    "BeforeFunctions": [
-                        {
-                            "db": "app_installs",
-                            "input_column": "name",
-                            "input_value": "name",
-                            "isList": false,
-                            "output_column": "app_id",
-                            "output_value": "appId"
-                        },
-                        {
-                            "db": "apps",
-                            "info": "appId",
-                            "isList": false,
-                            "output_column": "key",
-                            "output_value": "appKey"
-                        }
-                    ],
+                    "BeforeFunctions": [],
                     "bodyKeys": [
                         "name"
                     ],
-                    "formatEN": "Install app [appKey]-[name]",
-                    "formatZH": "安装应用 [appKey]-[name]",
+                    "formatEN": "Install app [name]",
+                    "formatZH": "安装应用 [name]",
                     "paramKeys": []
                 }
             }
@@ -11486,7 +11469,7 @@ const docTemplate = `{
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/dto.SearchWithPage"
+                            "$ref": "#/definitions/dto.SearchClamWithPage"
                         }
                     }
                 ],
@@ -19321,6 +19304,42 @@ const docTemplate = `{
                 }
             }
         },
+        "dto.SearchClamWithPage": {
+            "type": "object",
+            "required": [
+                "order",
+                "orderBy",
+                "page",
+                "pageSize"
+            ],
+            "properties": {
+                "info": {
+                    "type": "string"
+                },
+                "order": {
+                    "type": "string",
+                    "enum": [
+                        "null",
+                        "ascending",
+                        "descending"
+                    ]
+                },
+                "orderBy": {
+                    "type": "string",
+                    "enum": [
+                        "name",
+                        "status",
+                        "created_at"
+                    ]
+                },
+                "page": {
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "type": "integer"
+                }
+            }
+        },
         "dto.SearchForTree": {
             "type": "object",
             "properties": {
@@ -23457,6 +23476,8 @@ var SwaggerInfo = &swag.Spec{
 	Description:      "开源Linux面板",
 	InfoInstanceName: "swagger",
 	SwaggerTemplate:  docTemplate,
+	LeftDelim:        "{{",
+	RightDelim:       "}}",
 }
 
 func init() {

cmd/server/docs/swagger.json

@@ -209,28 +209,12 @@
                     }
                 },
                 "x-panel-log": {
-                    "BeforeFunctions": [
-                        {
-                            "db": "app_installs",
-                            "input_column": "name",
-                            "input_value": "name",
-                            "isList": false,
-                            "output_column": "app_id",
-                            "output_value": "appId"
-                        },
-                        {
-                            "db": "apps",
-                            "info": "appId",
-                            "isList": false,
-                            "output_column": "key",
-                            "output_value": "appKey"
-                        }
-                    ],
+                    "BeforeFunctions": [],
                     "bodyKeys": [
                         "name"
                     ],
-                    "formatEN": "Install app [appKey]-[name]",
-                    "formatZH": "安装应用 [appKey]-[name]",
+                    "formatEN": "Install app [name]",
+                    "formatZH": "安装应用 [name]",
                     "paramKeys": []
                 }
             }
@@ -11479,7 +11463,7 @@
                         "in": "body",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/dto.SearchWithPage"
+                            "$ref": "#/definitions/dto.SearchClamWithPage"
                         }
                     }
                 ],
@@ -19314,6 +19298,42 @@
                 }
             }
         },
+        "dto.SearchClamWithPage": {
+            "type": "object",
+            "required": [
+                "order",
+                "orderBy",
+                "page",
+                "pageSize"
+            ],
+            "properties": {
+                "info": {
+                    "type": "string"
+                },
+                "order": {
+                    "type": "string",
+                    "enum": [
+                        "null",
+                        "ascending",
+                        "descending"
+                    ]
+                },
+                "orderBy": {
+                    "type": "string",
+                    "enum": [
+                        "name",
+                        "status",
+                        "created_at"
+                    ]
+                },
+                "page": {
+                    "type": "integer"
+                },
+                "pageSize": {
+                    "type": "integer"
+                }
+            }
+        },
         "dto.SearchForTree": {
             "type": "object",
             "properties": {

cmd/server/docs/swagger.yaml

@@ -2748,6 +2748,32 @@ definitions:
     - ssl
     - sslType
     type: object
+  dto.SearchClamWithPage:
+    properties:
+      info:
+        type: string
+      order:
+        enum:
+        - "null"
+        - ascending
+        - descending
+        type: string
+      orderBy:
+        enum:
+        - name
+        - status
+        - created_at
+        type: string
+      page:
+        type: integer
+      pageSize:
+        type: integer
+    required:
+    - order
+    - orderBy
+    - page
+    - pageSize
+    type: object
   dto.SearchForTree:
     properties:
       info:
@@ -5633,22 +5659,11 @@ paths:
       tags:
       - App
       x-panel-log:
-        BeforeFunctions:
-        - db: app_installs
-          input_column: name
-          input_value: name
-          isList: false
-          output_column: app_id
-          output_value: appId
-        - db: apps
-          info: appId
-          isList: false
-          output_column: key
-          output_value: appKey
+        BeforeFunctions: []
         bodyKeys:
         - name
-        formatEN: Install app [appKey]-[name]
-        formatZH: 安装应用 [appKey]-[name]
+        formatEN: Install app [name]
+        formatZH: 安装应用 [name]
         paramKeys: []
   /apps/installed/check:
     post:
@@ -12769,7 +12784,7 @@ paths:
         name: request
         required: true
         schema:
-          $ref: '#/definitions/dto.SearchWithPage'
+          $ref: '#/definitions/dto.SearchClamWithPage'
       responses:
         "200":
           description: OK

frontend/src/views/app-store/detail/index.vue

@@ -147,6 +147,12 @@ const openInstall = () => {
         case 'node':
             router.push({ path: '/websites/runtimes/node' });
             break;
+        case 'java':
+            router.push({ path: '/websites/runtimes/java' });
+            break;
+        case 'go':
+            router.push({ path: '/websites/runtimes/go' });
+            break;
         default:
             const params = {
                 app: app.value,