diff --git a/.gitignore b/.gitignore index e1f13e39a406..2aa84fb31cd0 100644 --- a/.gitignore +++ b/.gitignore @@ -34,10 +34,10 @@ __debug* # Dependency directories /pkg/ backend/__debug_bin -cmd/server/__debug_bin -cmd/server/web/assets -cmd/server/web/monacoeditorwork -cmd/server/web/index.html +core/cmd/server/__debug_bin +core/cmd/server/web/assets +core/cmd/server/web/monacoeditorwork +core/cmd/server/web/index.html frontend/auto-imports.d.ts frontend/components.d.ts frontend/src/xpack diff --git a/backend/router/entry_xpack.go b/backend/router/entry_xpack.go deleted file mode 120000 index 4dbb3d2476b5..000000000000 --- a/backend/router/entry_xpack.go +++ /dev/null @@ -1 +0,0 @@ -/usr/songliu/xpack-backend/other/entry_xpack.go \ No newline at end of file diff --git a/backend/server/init_xpack.go b/backend/server/init_xpack.go deleted file mode 120000 index a036f79e447e..000000000000 --- a/backend/server/init_xpack.go +++ /dev/null @@ -1 +0,0 @@ -/usr/songliu/xpack-backend/other/init_xpack.go \ No newline at end of file diff --git a/cmd/server/cmd/listen-ip.go b/core/cmd/server/cmd/listen-ip.go similarity index 100% rename from cmd/server/cmd/listen-ip.go rename to core/cmd/server/cmd/listen-ip.go diff --git a/cmd/server/cmd/reset.go b/core/cmd/server/cmd/reset.go similarity index 100% rename from cmd/server/cmd/reset.go rename to core/cmd/server/cmd/reset.go diff --git a/cmd/server/cmd/restore.go b/core/cmd/server/cmd/restore.go similarity index 100% rename from cmd/server/cmd/restore.go rename to core/cmd/server/cmd/restore.go diff --git a/cmd/server/cmd/root.go b/core/cmd/server/cmd/root.go similarity index 100% rename from cmd/server/cmd/root.go rename to core/cmd/server/cmd/root.go diff --git a/cmd/server/cmd/update.go b/core/cmd/server/cmd/update.go similarity index 100% rename from cmd/server/cmd/update.go rename to core/cmd/server/cmd/update.go diff --git a/cmd/server/cmd/user-info.go b/core/cmd/server/cmd/user-info.go similarity index 100% rename from cmd/server/cmd/user-info.go rename to core/cmd/server/cmd/user-info.go diff --git a/cmd/server/cmd/version.go b/core/cmd/server/cmd/version.go similarity index 94% rename from cmd/server/cmd/version.go rename to core/cmd/server/cmd/version.go index b81cebb891e3..9dc8e3aeb70a 100644 --- a/cmd/server/cmd/version.go +++ b/core/cmd/server/cmd/version.go @@ -2,9 +2,9 @@ package cmd import ( "fmt" - - "github.com/1Panel-dev/1Panel/cmd/server/conf" "github.com/1Panel-dev/1Panel/core/configs" + + "github.com/1Panel-dev/1Panel/core/cmd/server/conf" "gopkg.in/yaml.v3" "github.com/spf13/cobra" diff --git a/cmd/server/conf/app.yaml b/core/cmd/server/conf/app.yaml similarity index 100% rename from cmd/server/conf/app.yaml rename to core/cmd/server/conf/app.yaml diff --git a/cmd/server/conf/conf.go b/core/cmd/server/conf/conf.go similarity index 100% rename from cmd/server/conf/conf.go rename to core/cmd/server/conf/conf.go diff --git a/cmd/server/docs/docs.go b/core/cmd/server/docs/docs.go similarity index 99% rename from cmd/server/docs/docs.go rename to core/cmd/server/docs/docs.go index 858a4dfbd8ae..c0ca8b4ef80d 100644 --- a/cmd/server/docs/docs.go +++ b/core/cmd/server/docs/docs.go @@ -25213,4 +25213,4 @@ var SwaggerInfo = &swag.Spec{ func init() { swag.Register(SwaggerInfo.InstanceName(), SwaggerInfo) -} \ No newline at end of file +} diff --git a/cmd/server/docs/swagger.go b/core/cmd/server/docs/swagger.go similarity index 100% rename from cmd/server/docs/swagger.go rename to core/cmd/server/docs/swagger.go diff --git a/cmd/server/docs/swagger.json b/core/cmd/server/docs/swagger.json similarity index 100% rename from cmd/server/docs/swagger.json rename to core/cmd/server/docs/swagger.json diff --git a/cmd/server/docs/swagger_test.go b/core/cmd/server/docs/swagger_test.go similarity index 58% rename from cmd/server/docs/swagger_test.go rename to core/cmd/server/docs/swagger_test.go index b152a78ea3b6..682a11c0565b 100644 --- a/cmd/server/docs/swagger_test.go +++ b/core/cmd/server/docs/swagger_test.go @@ -3,76 +3,23 @@ package docs import ( "encoding/json" "fmt" - "go/ast" - "go/parser" - "go/token" + "github.com/spf13/afero" "os" "os/exec" - "path/filepath" "strings" "testing" ) -func TestGenerateXlog(t *testing.T) { - fset := token.NewFileSet() - - apiDirs := []string{"../../../agent/app/api/v2", "../../../core/app/api/v2", "../../../agent/xpack/app/api/v2", "../../../core/xpack/app/api/v2"} - - xlogMap := make(map[string]operationJson) - for _, dir := range apiDirs { - if err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error { - if err != nil { - return err - } - if info.IsDir() { - return nil - } - fileItem, err := parser.ParseFile(fset, path, nil, parser.ParseComments) - if err != nil { - return err - } - for _, decl := range fileItem.Decls { - switch d := decl.(type) { - case *ast.FuncDecl: - if d.Doc != nil { - routerContent := "" - logContent := "" - for _, comment := range d.Doc.List { - if strings.HasPrefix(comment.Text, "// @Router") { - routerContent = replaceStr(comment.Text, "// @Router", "[post]", "[get]", " ") - } - if strings.HasPrefix(comment.Text, "// @x-panel-log") { - logContent = replaceStr(comment.Text, "// @x-panel-log", " ") - } - } - if len(routerContent) != 0 && len(logContent) != 0 { - var item operationJson - if err := json.Unmarshal([]byte(logContent), &item); err != nil { - panic(fmt.Sprintf("json unamrshal failed, err: %v", err)) - } - xlogMap[routerContent] = item - } - } - } - } - return nil - }); err != nil { - panic(err) - } - } - - newJson, err := json.MarshalIndent(xlogMap, "", "\t") +func TestSome(t *testing.T) { + err := afero.NewOsFs().Rename("/opt/tmp/ceshi", "/opt/tmp/ceshi2") if err != nil { - panic(fmt.Sprintf("json marshal for new file failed, err: %v", err)) - } - if err := os.WriteFile("x-log.json", newJson, 0640); err != nil { - panic(fmt.Sprintf("write new swagger.json failed, err: %v", err)) + fmt.Println(err) } } func TestGenerateSwaggerDoc(t *testing.T) { - workDir := "/usr/songliu/1Panel" - swagBin := "/root/go/bin/swag" + workDir := "/Users/wangzhengkun/projects/github.com/1Panel-dev/1Panel" + swagBin := "/Users/wangzhengkun/go/bin/swag" cmd1 := exec.Command(swagBin, "init", "-o", workDir+"/cmd/server/docs/docs_agent", "-d", workDir+"/agent", "-g", "./cmd/server/main.go") cmd1.Dir = workDir @@ -129,6 +76,26 @@ func TestGenerateSwaggerDoc(t *testing.T) { newSwagger.Paths[key] = val } + newXLog := make(map[string]interface{}) + for key, val := range newSwagger.Paths { + methodMap, isMethodMap := val.(map[string]interface{}) + if !isMethodMap { + continue + } + dataMap, hasPost := methodMap["post"] + if !hasPost { + continue + } + data, isDataMap := dataMap.(map[string]interface{}) + if !isDataMap { + continue + } + xLog, hasXLog := data["x-panel-log"] + if !hasXLog { + continue + } + newXLog[key] = xLog + } newJson, err := json.MarshalIndent(newSwagger, "", "\t") if err != nil { fmt.Printf("json marshal for new file failed, err: %v", err) @@ -144,6 +111,16 @@ func TestGenerateSwaggerDoc(t *testing.T) { return } + newXLogFile, err := json.MarshalIndent(newXLog, "", "\t") + if err != nil { + fmt.Printf("json marshal for new x-log file failed, err: %v", err) + return + } + if err := os.WriteFile("x-log.json", newXLogFile, 0640); err != nil { + fmt.Printf("write new x-log.json failed, err: %v", err) + return + } + _ = os.RemoveAll(workDir + "/cmd/server/docs/docs_agent") _ = os.RemoveAll(workDir + "/cmd/server/docs/docs_core") } @@ -181,26 +158,3 @@ func init() { swag.Register(SwaggerInfo.InstanceName(), SwaggerInfo) }` } - -func replaceStr(val string, rep ...string) string { - for _, item := range rep { - val = strings.ReplaceAll(val, item, "") - } - return val -} - -type operationJson struct { - BodyKeys []string `json:"bodyKeys"` - ParamKeys []string `json:"paramKeys"` - BeforeFunctions []functionInfo `json:"beforeFunctions"` - FormatZH string `json:"formatZH"` - FormatEN string `json:"formatEN"` -} -type functionInfo struct { - InputColumn string `json:"input_column"` - InputValue string `json:"input_value"` - IsList bool `json:"isList"` - DB string `json:"db"` - OutputColumn string `json:"output_column"` - OutputValue string `json:"output_value"` -} diff --git a/cmd/server/docs/x-log.json b/core/cmd/server/docs/x-log.json similarity index 100% rename from cmd/server/docs/x-log.json rename to core/cmd/server/docs/x-log.json diff --git a/cmd/server/main.go b/core/cmd/server/main.go similarity index 79% rename from cmd/server/main.go rename to core/cmd/server/main.go index 395abff3e91d..836ed3e9c7d0 100644 --- a/cmd/server/main.go +++ b/core/cmd/server/main.go @@ -6,8 +6,8 @@ import ( _ "net/http/pprof" - "github.com/1Panel-dev/1Panel/cmd/server/cmd" - _ "github.com/1Panel-dev/1Panel/cmd/server/docs" + "github.com/1Panel-dev/1Panel/core/cmd/server/cmd" + _ "github.com/1Panel-dev/1Panel/core/cmd/server/docs" ) // @title 1Panel diff --git a/cmd/server/web/favicon.png b/core/cmd/server/web/favicon.png similarity index 100% rename from cmd/server/web/favicon.png rename to core/cmd/server/web/favicon.png diff --git a/cmd/server/web/web.go b/core/cmd/server/web/web.go similarity index 100% rename from cmd/server/web/web.go rename to core/cmd/server/web/web.go diff --git a/go.mod b/core/go.mod similarity index 99% rename from go.mod rename to core/go.mod index 243cc44c8db8..66b6b56fc863 100644 --- a/go.mod +++ b/core/go.mod @@ -1,4 +1,4 @@ -module github.com/1Panel-dev/1Panel +module github.com/1Panel-dev/1Panel/core go 1.23 diff --git a/go.sum b/core/go.sum similarity index 100% rename from go.sum rename to core/go.sum diff --git a/core/init/router/router.go b/core/init/router/router.go index dc3ae83c1222..1baa9dab6fc8 100644 --- a/core/init/router/router.go +++ b/core/init/router/router.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/1Panel-dev/1Panel/cmd/server/docs" - "github.com/1Panel-dev/1Panel/cmd/server/web" + "github.com/1Panel-dev/1Panel/core/cmd/server/docs" + "github.com/1Panel-dev/1Panel/core/cmd/server/web" "github.com/1Panel-dev/1Panel/core/global" "github.com/1Panel-dev/1Panel/core/i18n" "github.com/1Panel-dev/1Panel/core/middleware" diff --git a/core/init/viper/viper.go b/core/init/viper/viper.go index 771dbb0bcffe..05e2fc71f634 100644 --- a/core/init/viper/viper.go +++ b/core/init/viper/viper.go @@ -7,7 +7,7 @@ import ( "path" "strings" - "github.com/1Panel-dev/1Panel/cmd/server/conf" + "github.com/1Panel-dev/1Panel/core/cmd/server/conf" "github.com/1Panel-dev/1Panel/core/configs" "github.com/1Panel-dev/1Panel/core/global" "github.com/1Panel-dev/1Panel/core/utils/cmd" diff --git a/core/middleware/operation.go b/core/middleware/operation.go index 6838b9222115..00984a18afe1 100644 --- a/core/middleware/operation.go +++ b/core/middleware/operation.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "github.com/1Panel-dev/1Panel/cmd/server/docs" "github.com/1Panel-dev/1Panel/core/app/model" "github.com/1Panel-dev/1Panel/core/app/service" + "github.com/1Panel-dev/1Panel/core/cmd/server/docs" "github.com/1Panel-dev/1Panel/core/constant" "github.com/1Panel-dev/1Panel/core/global" "github.com/gin-gonic/gin" diff --git a/frontend/src/views/website/website/create/index.vue b/frontend/src/views/website/website/create/index.vue index 1802377c6335..37ddfe63d79f 100644 --- a/frontend/src/views/website/website/create/index.vue +++ b/frontend/src/views/website/website/create/index.vue @@ -646,6 +646,7 @@ const runtimeReq = ref({ page: 1, pageSize: 100, status: 'running', + type: 'php', }); const runtimes = ref([]); const versionExist = ref(true); @@ -789,6 +790,7 @@ const changeRuntime = (runID: number) => { const getRuntimes = async () => { try { + console.log(runtimeReq.value); const res = await SearchRuntimes(runtimeReq.value); runtimes.value = res.data.items || []; if (runtimes.value.length > 0) {