8
0

2 コミット 3ae115f6cc ... e465cb1312

作者 SHA1 メッセージ 日付
  Matt Evan e465cb1312 go: move to git.simanc.com/software/golib/v4 6 日 前
  Matt Evan 3ae115f6cc go: move to git.simanc.com/golib 6 日 前

+ 1 - 1
README.md

@@ -1,3 +1,3 @@
-# git.simanc.com/golib/v4
+# git.simanc.com/software/golib/v4
 
 download latest Go version: https://go.dev/dl/

+ 1 - 1
features/mo/mongo.go

@@ -25,7 +25,7 @@ func DialOptions(opts *options.ClientOptions) (*Client, error) {
 		opts.SetConnectTimeout(DefaultTimout / 2)
 	}
 	if opts.AppName == nil {
-		opts.SetAppName("git.simanc.com/golib/v4")
+		opts.SetAppName("git.simanc.com/software/golib/v4/v4")
 	}
 	return mongo.Connect(opts)
 }

+ 3 - 3
gnet/modbus/conn.go

@@ -11,9 +11,9 @@ import (
 	"sync"
 	"time"
 
-	"git.simanc.com/golib/v4/gio"
-	"git.simanc.com/golib/v4/gnet"
-	"git.simanc.com/golib/v4/log"
+	"git.simanc.com/software/golib/v4/v4/gio"
+	"git.simanc.com/software/golib/v4/v4/gnet"
+	"git.simanc.com/software/golib/v4/v4/log"
 )
 
 type PLC interface {

+ 2 - 2
gnet/modbus/conn_test.go

@@ -6,8 +6,8 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"git.simanc.com/golib/v4/gnet"
-	"git.simanc.com/golib/v4/log"
+	"git.simanc.com/software/golib/v4/v4/gnet"
+	"git.simanc.com/software/golib/v4/v4/log"
 )
 
 func TestDialer_ReadData(t *testing.T) {

+ 1 - 1
gnet/modbus/helper.go

@@ -6,7 +6,7 @@ import (
 	"encoding/hex"
 	"math"
 
-	"git.simanc.com/golib/v4/gnet"
+	"git.simanc.com/software/golib/v4/v4/gnet"
 )
 
 type Helper struct{}

+ 1 - 1
gnet/modbus/register.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"git.simanc.com/golib/v4/gnet"
+	"git.simanc.com/software/golib/v4/v4/gnet"
 )
 
 func ReadRegisterFrom(r io.Reader, register, quantity int) ([]byte, error) {

+ 1 - 1
gnet/modbus/socket.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 
-	"git.simanc.com/golib/v4/gnet"
+	"git.simanc.com/software/golib/v4/v4/gnet"
 )
 
 type SocketReader interface {

+ 1 - 1
go.mod

@@ -1,4 +1,4 @@
-module git.simanc.com/golib/v4
+module git.simanc.com/software/golib/v4
 
 go 1.25.0
 

+ 2 - 2
infra/ii/common.go

@@ -7,8 +7,8 @@ import (
 	"slices"
 	"time"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/gio"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/gio"
 )
 
 const (

+ 1 - 1
infra/ii/field.go

@@ -3,7 +3,7 @@ package ii
 import (
 	"regexp"
 
-	"git.simanc.com/golib/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
 )
 
 // FieldInfo XML 字段信息

+ 7 - 7
infra/ii/field_arg.go

@@ -2,8 +2,8 @@ package ii
 
 import (
 	"strings"
-
-	"git.simanc.com/golib/v4/features/mo"
+	
+	"git.simanc.com/software/golib/v4/v4/features/mo"
 )
 
 func (f *FieldInfo) HasLookup(asName string) (*Lookup, bool) {
@@ -31,9 +31,9 @@ func (f *FieldInfo) ArgLookup(lookup *Lookup) *mo.Looker {
 	l.SetLocalField(f.Name)
 	l.SetForeignField(lookup.ForeignField)
 	l.SetAs(lookup.AS)
-
+	
 	pipe := mo.Pipeline{}
-
+	
 	if len(f.Fields) > 0 {
 		p := mo.Projects{}
 		for _, field := range f.Fields {
@@ -41,18 +41,18 @@ func (f *FieldInfo) ArgLookup(lookup *Lookup) *mo.Looker {
 		}
 		pipe = append(pipe, p.Pipeline())
 	}
-
+	
 	if lookup.SUM != "" {
 		group := mo.Grouper{}
 		group.Add(mo.OID, nil)
 		group.Add(lookup.SUM, mo.D{{Key: mo.OptSum, Value: "$" + lookup.SUM}})
 		pipe = append(pipe, group.Pipeline())
 	}
-
+	
 	if !lookup.List {
 		pipe = append(pipe, mo.NewLimiter(1).Pipeline())
 	}
-
+	
 	l.SetPipe(pipe)
 	return l
 }

+ 3 - 3
infra/ii/field_convert.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/gnet"
-	"git.simanc.com/golib/v4/pkg/tuid"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/gnet"
+	"git.simanc.com/software/golib/v4/v4/pkg/tuid"
 )
 
 var (

+ 2 - 2
infra/ii/field_convert_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/gnet"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/gnet"
 )
 
 func TestFieldInfo_ConvertDouble(t *testing.T) {

+ 2 - 2
infra/ii/field_method.go

@@ -1,8 +1,8 @@
 package ii
 
 import (
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/pkg/tuid"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/pkg/tuid"
 )
 
 func (f *FieldInfo) getFields() []*FieldInfo {

+ 1 - 1
infra/ii/field_validate.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"git.simanc.com/golib/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
 )
 
 var (

+ 1 - 1
infra/ii/form_http.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"git.simanc.com/golib/v4/gio"
+	"git.simanc.com/software/golib/v4/v4/gio"
 )
 
 const (

+ 1 - 1
infra/ii/item.go

@@ -6,7 +6,7 @@ import (
 	"slices"
 	"strings"
 
-	"git.simanc.com/golib/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
 )
 
 var (

+ 1 - 1
infra/ii/item_arg.go

@@ -3,7 +3,7 @@ package ii
 import (
 	"fmt"
 
-	"git.simanc.com/golib/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
 )
 
 // ArgLookup 检查错误并返回 ItemInfo.Fields 中已配置的 Lookup 过滤器

+ 1 - 1
infra/ii/item_convert.go

@@ -1,7 +1,7 @@
 package ii
 
 import (
-	"git.simanc.com/golib/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
 )
 
 func (c *ItemInfo) Convert(data mo.M, k string) (any, error) {

+ 1 - 1
infra/ii/item_init.go

@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strings"
 
-	"git.simanc.com/golib/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
 )
 
 func (c *ItemInfo) init() error {

+ 1 - 1
infra/ii/perms.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"git.simanc.com/golib/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
 )
 
 // Perms 权限, 由每个键值组成.

+ 1 - 1
infra/ii/perms_test.go

@@ -3,7 +3,7 @@ package ii
 import (
 	"testing"
 
-	"git.simanc.com/golib/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
 )
 
 type testUser mo.M

+ 3 - 3
infra/ii/svc/bootable/common.go

@@ -3,9 +3,9 @@ package bootable
 import (
 	"io"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/infra/ii"
-	"git.simanc.com/golib/v4/infra/ii/svc"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/infra/ii/svc"
 )
 
 func ResolveFilter(reader io.Reader) (Filter, error) {

+ 3 - 3
infra/ii/svc/bootable/handle2Point.go

@@ -3,9 +3,9 @@ package bootable
 import (
 	"strings"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/infra/ii"
-	"git.simanc.com/golib/v4/infra/ii/svc"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/infra/ii/svc"
 )
 
 // handle2Point

+ 2 - 2
infra/ii/svc/bootable/handleDate.go

@@ -4,8 +4,8 @@ import (
 	"strings"
 	"time"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
 )
 
 const (

+ 2 - 2
infra/ii/svc/bootable/handler.go

@@ -3,8 +3,8 @@ package bootable
 import (
 	"strings"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
 )
 
 // handleSinglePoint 处理带 . 的字段查找

+ 2 - 2
infra/ii/svc/bootable/type.go

@@ -1,8 +1,8 @@
 package bootable
 
 import (
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
 )
 
 type Response struct {

+ 5 - 5
infra/ii/svc/bootable/type_test.go

@@ -10,11 +10,11 @@ import (
 	"strings"
 	"testing"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/gnet"
-	"git.simanc.com/golib/v4/infra/ii"
-	"git.simanc.com/golib/v4/infra/ii/svc"
-	"git.simanc.com/golib/v4/log"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/gnet"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/infra/ii/svc"
+	"git.simanc.com/software/golib/v4/v4/log"
 )
 
 func TestQueryLimit(t *testing.T) {

+ 2 - 2
infra/ii/svc/bootable/utils.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"sync"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
 )
 
 func objectToStr(row mo.M) string {

+ 2 - 2
infra/ii/svc/cache.go

@@ -4,8 +4,8 @@ import (
 	"sync"
 	"time"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
 )
 
 // Cache 数据库缓存

+ 4 - 4
infra/ii/svc/default.go

@@ -3,10 +3,10 @@ package svc
 import (
 	"context"
 	"time"
-
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/infra/ii"
-	"git.simanc.com/golib/v4/log"
+	
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/log"
 )
 
 var (

+ 3 - 3
infra/ii/svc/default_test.go

@@ -3,9 +3,9 @@ package svc
 import (
 	"testing"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/infra/ii"
-	"git.simanc.com/golib/v4/log"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/log"
 )
 
 type svcTestUser mo.M

+ 2 - 2
infra/ii/svc/row.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
 )
 
 type Row struct {

+ 3 - 3
infra/ii/svc/service.go

@@ -5,9 +5,9 @@ import (
 	"errors"
 	"time"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/infra/ii"
-	"git.simanc.com/golib/v4/log"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/log"
 )
 
 var (

+ 4 - 4
infra/ii/svc/service_http.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"net/http"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/gio"
-	"git.simanc.com/golib/v4/gnet"
-	"git.simanc.com/golib/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/gio"
+	"git.simanc.com/software/golib/v4/v4/gnet"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
 )
 
 const (

+ 3 - 3
infra/ii/svc/service_http_test.go

@@ -7,9 +7,9 @@ import (
 	"net/http"
 	"testing"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/gio"
-	"git.simanc.com/golib/v4/gnet"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/gio"
+	"git.simanc.com/software/golib/v4/v4/gnet"
 )
 
 func TestHttpHandler_ServeHTTP(t *testing.T) {

+ 2 - 2
infra/ii/svc/service_utils.go

@@ -6,8 +6,8 @@ import (
 	"reflect"
 	"strings"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
 )
 
 func (s *Service) resolveInsert(value any) (mo.D, error) {

+ 2 - 2
infra/ii/svc/svc.go

@@ -3,8 +3,8 @@ package svc
 import (
 	"errors"
 
-	"git.simanc.com/golib/v4/features/mo"
-	"git.simanc.com/golib/v4/infra/ii"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/infra/ii"
 )
 
 type WithUser struct {

+ 1 - 1
infra/ii/user.go

@@ -1,7 +1,7 @@
 package ii
 
 import (
-	"git.simanc.com/golib/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
 )
 
 type User interface {

+ 1 - 1
infra/ii/utils.go

@@ -8,7 +8,7 @@ import (
 	"runtime"
 	"strings"
 
-	"git.simanc.com/golib/v4/features/mo"
+	"git.simanc.com/software/golib/v4/v4/features/mo"
 )
 
 var (

+ 1 - 1
infra/om/dao.go

@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"strings"
 
-	"git.simanc.com/golib/v4/features/sdb"
+	"git.simanc.com/software/golib/v4/v4/features/sdb"
 )
 
 var (

+ 1 - 1
infra/om/om.go

@@ -3,7 +3,7 @@ package om
 import (
 	"errors"
 
-	"git.simanc.com/golib/v4/features/sdb"
+	"git.simanc.com/software/golib/v4/v4/features/sdb"
 )
 
 var (

+ 2 - 2
infra/om/om_test.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	"git.simanc.com/golib/v4/features/sdb"
-	"git.simanc.com/golib/v4/pkg/tuid"
+	"git.simanc.com/software/golib/v4/v4/features/sdb"
+	"git.simanc.com/software/golib/v4/v4/pkg/tuid"
 )
 
 var (

+ 1 - 1
infra/om/querybuilder.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"strings"
 
-	"git.simanc.com/golib/v4/features/sdb"
+	"git.simanc.com/software/golib/v4/v4/features/sdb"
 )
 
 type Builder struct {

+ 1 - 1
log/main/server.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"syscall"
 
-	"git.simanc.com/golib/v4/log"
+	"git.simanc.com/software/golib/v4/v4/log"
 )
 
 type addrFlag []string

+ 1 - 1
pkg/timer/timer.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"git.simanc.com/golib/v4/log"
+	"git.simanc.com/software/golib/v4/v4/log"
 )
 
 type Handler func() error