Merge pull request #32 from origadmin/dev

Merge dev into main
origadmin · Nov 26, 2024 · b63ac98 · b63ac98
2 parents 3ccd42a + 1b510bb
commit b63ac98
Show file tree

Hide file tree

Showing 237 changed files with 1,273 additions and 223 deletions.
diff --git a/cmd/protoc-gen-go-gins/gins.go b/cmd/protoc-gen-go-gins/gins.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package main
 
 import (

diff --git a/cmd/protoc-gen-go-gins/ginsTemplate.tpl b/cmd/protoc-gen-go-gins/ginsTemplate.tpl
@@ -26,28 +26,28 @@ func Register{{.ServiceType}}GINSServer(router gin.IRouter, srv {{.ServiceType}}
 	var in {{.Request}}
   {{- if.HasBody}}
 		if err := gins.BindBody(ctx,&in{{.Body}}); err != nil {
-		ctx.Error(err)
+		gins.RetError(ctx,err)
 		return
 		}
   {{- end}}
 	if err := gins.BindQuery(ctx,&in); err != nil {
-	ctx.Error(err)
+	gins.RetError(ctx,err)
 	return
 	}
   {{- if.HasVars}}
 		if err := gins.BindURI(ctx,&in); err != nil {
-		ctx.Error(err)
+		gins.RetError(ctx,err)
 		return
 		}
   {{- end}}
 	gins.SetOperation(ctx, {{$svrType}}_{{.OriginalName}}_OperationName)
 	newCtx := gins.NewContext(ctx)
 	reply, err := srv.{{.Name}}(newCtx, &in)
 	if err != nil {
-	ctx.Error(err)
+	gins.RetError(ctx,err)
 	return
 	}
-	ctx.JSON(200, reply{{.ResponseBody}})
+	gins.RetJSON(ctx,200, reply{{.ResponseBody}})
 	return
 	}
 	}

diff --git a/cmd/protoc-gen-go-gins/gins_test.go b/cmd/protoc-gen-go-gins/gins_test.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package main
 
 import (

diff --git a/cmd/protoc-gen-go-gins/main.go b/cmd/protoc-gen-go-gins/main.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package main
 
 import (

diff --git a/cmd/protoc-gen-go-gins/template.go b/cmd/protoc-gen-go-gins/template.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package main
 
 import (

diff --git a/cmd/protoc-gen-go-gins/version.go b/cmd/protoc-gen-go-gins/version.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package main
 
 // version is the current protoc-gen-go-gins version.

diff --git a/cmd/version/main.go b/cmd/version/main.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package main
 
 import (

diff --git a/codec/codec.go b/codec/codec.go
@@ -1,4 +1,6 @@
-// Copyright (c) 2024 OrigAdmin. All rights reserved.
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
 
 // Package codec is the codec package for encoding and decoding
 package codec

diff --git a/codec/decode.go b/codec/decode.go
@@ -1,4 +1,6 @@
-// Copyright (c) 2024 OrigAdmin. All rights reserved.
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
 
 // Package codec is the codec package for encoding and decoding
 package codec

diff --git a/codec/encode.go b/codec/encode.go
@@ -1,4 +1,6 @@
-// Copyright (c) 2024 OrigAdmin. All rights reserved.
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
 
 // Package codec is the codec package for encoding and decoding
 package codec

diff --git a/codec/ini/Marshal_test.go b/codec/ini/Marshal_test.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package ini
 
 import (

diff --git a/codec/ini/Unmarshal_test.go b/codec/ini/Unmarshal_test.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package ini
 
 import (

diff --git a/codec/ini/codec.go b/codec/ini/codec.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package ini
 
 var (

diff --git a/codec/ini/ini.go b/codec/ini/ini.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package ini
 
 import (

diff --git a/codec/json/codec.go b/codec/json/codec.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package json
 
 var (

diff --git a/codec/json/json.go b/codec/json/json.go
@@ -1,7 +1,9 @@
-// Copyright (c) 2024 OrigAdmin. All rights reserved.
-
 //go:build !jsoniter && !sonic
 
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 // Package json provides the json functions based on standard library
 package json
 

diff --git a/codec/json/jsoniter.go b/codec/json/jsoniter.go
@@ -1,7 +1,9 @@
-// Copyright (c) 2024 OrigAdmin. All rights reserved.
-
 //go:build jsoniter
 
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 // Package json provides the json functions based on github.com/json-iterator/go
 package json
 

diff --git a/codec/json/sonic.go b/codec/json/sonic.go
@@ -1,7 +1,9 @@
-// Copyright (c) 2024 OrigAdmin. All rights reserved.
-
 //go:build sonic
 
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 // Package json provides the json functions based on standard library
 package json
 

diff --git a/codec/toml/codec.go b/codec/toml/codec.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package toml
 
 var (

diff --git a/codec/toml/toml.go b/codec/toml/toml.go
@@ -1,4 +1,6 @@
-// Copyright (c) 2024 OrigAdmin. All rights reserved.
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
 
 // Package toml provides the toml functions
 package toml

diff --git a/codec/toml/toml_test.go b/codec/toml/toml_test.go
@@ -1,4 +1,6 @@
-// Copyright (c) 2024 OrigAdmin. All rights reserved.
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
 
 // Package toml provides the helpers functions
 package toml

diff --git a/codec/type.go b/codec/type.go
@@ -1,7 +1,12 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package codec
 
 import (
 	"io"
+	"path/filepath"
 
 	"github.com/origadmin/toolkits/codec/ini"
 	"github.com/origadmin/toolkits/codec/json"
@@ -149,3 +154,8 @@ func TypeFromExt(ext string) Type {
 		return UNKNOWN
 	}
 }
+
+// TypeFromPath returns the codec type from the file path.
+func TypeFromPath(path string) Type {
+	return TypeFromExt(filepath.Ext(path))
+}
diff --git a/codec/xml/codec.go b/codec/xml/codec.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package xml
 
 var (

diff --git a/codec/xml/xml.go b/codec/xml/xml.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package xml
 
 import (

diff --git a/codec/yaml/codec.go b/codec/yaml/codec.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package yaml
 
 var (

diff --git a/codec/yaml/yaml.go b/codec/yaml/yaml.go
@@ -1,4 +1,6 @@
-// Copyright (c) 2024 OrigAdmin. All rights reserved.
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
 
 // Package yaml provides the yaml functions
 package yaml

diff --git a/context/alias.go b/context/alias.go
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
+// Package context provides the context functions
 package context
 
 import (

diff --git a/context/context.go b/context/context.go
@@ -1,4 +1,6 @@
-// Copyright (c) 2024 OrigAdmin. All rights reserved.
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
 
 // Package context provides the context functions
 package context

diff --git a/context/context_test.go b/context/context_test.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package context
 
 import (

diff --git a/contrib/cache/memory/memory.go b/contrib/cache/memory/memory.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package memory
 
 import (

diff --git a/contrib/casbin/ent/ent.go b/contrib/casbin/ent/ent.go
@@ -1,4 +1,6 @@
-// Copyright (c) 2024 OrigAdmin. All rights reserved.
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
 
 // Package ent is the casbin ent adapter package
 package ent

diff --git a/contrib/casbin/memory/memory.go b/contrib/casbin/memory/memory.go
@@ -1,4 +1,6 @@
-// Copyright (c) 2024 OrigAdmin. All rights reserved.
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
 
 // Package memory is the memory adapter of Casbin.
 package memory

diff --git a/contrib/config/envf/envf.go b/contrib/config/envf/envf.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package envf
 
 import (

diff --git a/contrib/config/envf/envf_test.go b/contrib/config/envf/envf_test.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package envf
 
 import (

diff --git a/contrib/config/envf/watcher.go b/contrib/config/envf/watcher.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package envf
 
 import (

diff --git a/contrib/config/envf/watcher_test.go b/contrib/config/envf/watcher_test.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package envf
 
 import (

diff --git a/contrib/config/obj/object.go b/contrib/config/obj/object.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package obj
 
 import (

diff --git a/contrib/config/obj/object_test.go b/contrib/config/obj/object_test.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package obj
 
 import (

diff --git a/contrib/config/obj/watcher.go b/contrib/config/obj/watcher.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package obj
 
 import (

diff --git a/contrib/config/source.go b/contrib/config/source.go
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 OrigAdmin. All rights reserved.
+ */
+
 package config
 
 import (