- update utils

utils/gobase64/gobase64.go

@@ -2,7 +2,7 @@ package gobase64
 
 import (
 	"encoding/base64"
-	"go.dtapp.net/library/gophp"
+	"go.dtapp.net/library/utils/gophp"
 )
 
 // Encode base64编码

utils/godecimal/godecimal.go

@@ -2,7 +2,7 @@ package godecimal
 
 import (
 	"fmt"
-	"go.dtapp.net/library/gostring"
+	"go.dtapp.net/library/utils/gostring"
 	"math"
 	"strconv"
 )

utils/goenv/goenv.go

@@ -1,7 +1,7 @@
 package goenv
 
 import (
-	"go.dtapp.net/library/gostring"
+	"go.dtapp.net/library/utils/gostring"
 	"os"
 	"strings"
 )

utils/goip/goip.go

@@ -1,9 +1,9 @@
 package goip
 
 import (
-	"go.dtapp.net/library/goip/ip2region"
-	"go.dtapp.net/library/goip/v4"
-	"go.dtapp.net/library/goip/v6"
+	"go.dtapp.net/library/utils/goip/ip2region"
+	"go.dtapp.net/library/utils/goip/v4"
+	"go.dtapp.net/library/utils/goip/v6"
 	"log"
 	"strings"
 )

utils/goip/ip.go

@@ -2,7 +2,7 @@ package goip
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net"
 )
 

utils/goip/ip2region/ip2region.go

@@ -3,7 +3,7 @@ package ip2region
 import (
 	_ "embed"
 	"errors"
-	"go.dtapp.net/library/gostring"
+	"go.dtapp.net/library/utils/gostring"
 	"io/ioutil"
 	"log"
 	"os"

utils/goip/v4/ipv4.go

@@ -4,7 +4,7 @@ import (
 	_ "embed"
 	"encoding/binary"
 	"errors"
-	"go.dtapp.net/library/gostring"
+	"go.dtapp.net/library/utils/gostring"
 	"golang.org/x/text/encoding/simplifiedchinese"
 	"io/ioutil"
 	"log"

utils/goip/v6/ipv6.go

@@ -4,7 +4,7 @@ import (
 	_ "embed"
 	"encoding/binary"
 	"errors"
-	"go.dtapp.net/library/gostring"
+	"go.dtapp.net/library/utils/gostring"
 	"io/ioutil"
 	"log"
 	"math/big"

utils/gojobs/consts.go

@@ -2,7 +2,7 @@ package gojobs
 
 import (
 	"fmt"
-	"go.dtapp.net/library/goip"
+	"go.dtapp.net/library/utils/goip"
 )
 
 var ip string

utils/gojobs/cron.go

@@ -2,7 +2,7 @@ package gojobs
 
 import (
 	"context"
-	pb2 "go.dtapp.net/library/gojobs/pb"
+	"go.dtapp.net/library/utils/gojobs/pb"
 	"google.golang.org/grpc"
 	"log"
 )
@@ -15,7 +15,7 @@ type CronConfig struct {
 // Cron 定时任务
 type Cron struct {
 	CronConfig                  // 配置
-	Pub        pb2.PubSubClient // 订阅
+	Pub        pb.PubSubClient  // 订阅
 	Conn       *grpc.ClientConn // 链接信息
 }
 
@@ -39,13 +39,13 @@ func NewCron(config *CronConfig) *Cron {
 	}
 
 	// 新建一个客户端
-	c.Pub = pb2.NewPubSubClient(c.Conn)
+	c.Pub = pb.NewPubSubClient(c.Conn)
 
 	return c
 }
 
 // Send 发送
-func (c *Cron) Send(in *pb2.PublishRequest) (*pb2.PublishResponse, error) {
+func (c *Cron) Send(in *pb.PublishRequest) (*pb.PublishResponse, error) {
 	log.Printf("[定时任务]{广播开始}编号：%s 类型：%s ip：%s\n", in.GetId(), in.GetValue(), in.GetIp())
 	stream, err := c.Pub.Publish(context.Background(), in)
 	if err != nil {

utils/gojobs/etcd_worker.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"go.dtapp.net/library/goip"
+	"go.dtapp.net/library/utils/goip"
 	"go.etcd.io/etcd/client/v3"
 	"log"
 	"time"

utils/gojobs/pb/pubsub.server.go

@@ -2,7 +2,7 @@ package pb
 
 import (
 	"context"
-	"go.dtapp.net/library/gojobs/pubsub"
+	"go.dtapp.net/library/utils/gojobs/pubsub"
 	"log"
 	"strings"
 	"time"

utils/gojobs/server.go

@@ -2,8 +2,8 @@ package gojobs
 
 import (
 	"errors"
-	pb2 "go.dtapp.net/library/gojobs/pb"
-	"go.dtapp.net/library/gojobs/pubsub"
+	"go.dtapp.net/library/utils/gojobs/pb"
+	"go.dtapp.net/library/utils/gojobs/pubsub"
 	"google.golang.org/grpc"
 	"log"
 	"net"
@@ -44,7 +44,7 @@ func NewServer(config *ServerConfig) *Server {
 	s.Conn = grpc.NewServer()
 
 	// 注册
-	pb2.RegisterPubSubServer(s.Conn, pb2.NewPubSubServerService())
+	pb.RegisterPubSubServer(s.Conn, pb.NewPubSubServerService())
 
 	return s
 }

utils/gojobs/worker.go

@@ -2,8 +2,8 @@ package gojobs
 
 import (
 	"context"
-	pb2 "go.dtapp.net/library/gojobs/pb"
-	"go.dtapp.net/library/gouuid"
+	"go.dtapp.net/library/utils/gojobs/pb"
+	"go.dtapp.net/library/utils/gouuid"
 	"google.golang.org/grpc"
 )
 
@@ -16,7 +16,7 @@ type WorkerConfig struct {
 // Worker 工作
 type Worker struct {
 	WorkerConfig                  // 配置
-	Pub          pb2.PubSubClient // 订阅
+	Pub          pb.PubSubClient  // 订阅
 	Conn         *grpc.ClientConn // 链接信息
 }
 
@@ -44,14 +44,14 @@ func NewWorker(config *WorkerConfig) *Worker {
 	}
 
 	// 新建一个客户端
-	w.Pub = pb2.NewPubSubClient(w.Conn)
+	w.Pub = pb.NewPubSubClient(w.Conn)
 
 	return w
 }
 
 // SubscribeCron 订阅服务
-func (w *Worker) SubscribeCron() pb2.PubSub_SubscribeClient {
-	stream, err := w.Pub.Subscribe(context.Background(), &pb2.SubscribeRequest{
+func (w *Worker) SubscribeCron() pb.PubSub_SubscribeClient {
+	stream, err := w.Pub.Subscribe(context.Background(), &pb.SubscribeRequest{
 		Id:    gouuid.GetUuId(),
 		Value: prefix,
 		Ip:    w.ClientIp,
@@ -63,8 +63,8 @@ func (w *Worker) SubscribeCron() pb2.PubSub_SubscribeClient {
 }
 
 // StartCron 启动任务
-func (w *Worker) StartCron() pb2.PubSub_SubscribeClient {
-	stream, err := w.Pub.Subscribe(context.Background(), &pb2.SubscribeRequest{
+func (w *Worker) StartCron() pb.PubSub_SubscribeClient {
+	stream, err := w.Pub.Subscribe(context.Background(), &pb.SubscribeRequest{
 		Id:    gouuid.GetUuId(),
 		Value: prefixSprintf(w.ClientIp),
 		Ip:    w.ClientIp,

utils/golock/redis.go

@@ -1,7 +1,7 @@
 package golock
 
 import (
-	"go.dtapp.net/library/goredis"
+	"go.dtapp.net/library/utils/goredis"
 	"time"
 )
 

utils/golog/api.go

@@ -1,7 +1,7 @@
 package golog
 
 import (
-	"go.dtapp.net/library/goip"
+	"go.dtapp.net/library/utils/goip"
 	"gorm.io/datatypes"
 	"gorm.io/gorm"
 	"log"

utils/golog/gin.go

@@ -1,7 +1,7 @@
 package golog
 
 import (
-	"go.dtapp.net/library/goip"
+	"go.dtapp.net/library/utils/goip"
 	"gorm.io/datatypes"
 	"gorm.io/gorm"
 	"log"

utils/golog/time.go

@@ -4,7 +4,7 @@ import (
 	"database/sql/driver"
 	"errors"
 	"fmt"
-	"go.dtapp.net/library/gotime"
+	"go.dtapp.net/library/utils/gotime"
 	"gorm.io/gorm"
 	"gorm.io/gorm/schema"
 	"time"

utils/gomongo/time.go

@@ -1,7 +1,7 @@
 package gomongo
 
 import (
-	"go.dtapp.net/library/gotime"
+	"go.dtapp.net/library/utils/gotime"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/bsontype"
 	"time"

utils/goorder/goorder.go

@@ -2,8 +2,8 @@ package goorder
 
 import (
 	"fmt"
-	"go.dtapp.net/library/gorandom"
-	"go.dtapp.net/library/gotime"
+	"go.dtapp.net/library/utils/gorandom"
+	"go.dtapp.net/library/utils/gotime"
 )
 
 // GenerateOrDate 生成订单号

utils/gophp/gophp.go

@@ -1,7 +1,7 @@
 package gophp
 
 import (
-	serialize2 "go.dtapp.net/library/gophp/serialize"
+	"go.dtapp.net/library/utils/gophp/serialize"
 	"strconv"
 	"strings"
 	"unicode"
@@ -9,12 +9,12 @@ import (
 
 // Serialize 序列
 func Serialize(value any) ([]byte, error) {
-	return serialize2.Marshal(value)
+	return serialize.Marshal(value)
 }
 
 // Unserialize 反序列
 func Unserialize(data []byte) (any, error) {
-	return serialize2.UnMarshal(data)
+	return serialize.UnMarshal(data)
 }
 
 func BaseConvert(number string, frombase, tobase int) (string, error) {

utils/gophp/serialize/serialize.go

@@ -3,7 +3,7 @@ package serialize
 import (
 	"bytes"
 	"fmt"
-	"go.dtapp.net/library/gostring"
+	"go.dtapp.net/library/utils/gostring"
 	"reflect"
 	"sort"
 )

utils/gophp/serialize/unserialize.go

@@ -3,7 +3,7 @@ package serialize
 import (
 	"bytes"
 	"fmt"
-	"go.dtapp.net/library/gostring"
+	"go.dtapp.net/library/utils/gostring"
 	"strconv"
 )