update

.gitignore

@@ -4,7 +4,7 @@
 .idea
 .vscode
 *.log
-goinit.sh
 gomod.sh
-/vendor/
-*_test.go
+*_test.go
+mod.sh
+/vendor/

README.md

@@ -10,6 +10,6 @@
 
 #### 安装
 
-```go
-go get -v -u go.dtapp.net/weishi
+```shell
+go get -v -u go.dtapp.net/weishi@v1.0.13
 ```

api.go

@@ -2,9 +2,9 @@ package weishi
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"github.com/mvdan/xurls"
+	"go.dtapp.net/gojson"
 	"go.dtapp.net/gorequest"
 	"regexp"
 	"strings"
@@ -1086,6 +1086,6 @@ func (c *Client) Analysis(ctx context.Context, content string) *AnalysisResult {
 
 	// 定义
 	var response AnalysisResponse
-	err = json.Unmarshal(request.ResponseBody, &response)
+	err = gojson.Unmarshal(request.ResponseBody, &response)
 	return newAnalysisResult(response, request.ResponseBody, request, err)
 }

client.go

@@ -2,55 +2,35 @@ package weishi
 
 import (
 	"errors"
-	"go.dtapp.net/dorm"
 	"go.dtapp.net/golog"
 	"go.dtapp.net/gorequest"
-	"gorm.io/gorm"
 	"net/http"
 	"strings"
 )
 
-type ConfigClient struct {
-	MongoDb      *dorm.MongoClient // 日志数据库
-	PgsqlDb      *gorm.DB          // 日志数据库
-	DatabaseName string            // 库名
+// ClientConfig 实例配置
+type ClientConfig struct {
 }
 
+// Client 实例
 type Client struct {
-	ua     string           // 用户代理
-	client *gorequest.App   // 请求客户端
-	log    *golog.ApiClient // 日志服务
-	config *ConfigClient    // 配置
+	requestClient       *gorequest.App // 请求服务
+	requestClientStatus bool           // 请求服务状态
+	config              struct {
+		ua string // 用户代理
+	}
+	gormLog struct {
+		status bool           // 状态
+		client *golog.ApiGorm // 日志服务
+	}
 }
 
-func NewClient(config *ConfigClient) (*Client, error) {
-
-	var err error
-	c := &Client{config: config}
-
-	c.ua = "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1"
+// NewClient 创建实例化
+func NewClient(config *ClientConfig) (*Client, error) {
 
-	c.client = gorequest.NewHttp()
+	c := &Client{}
 
-	if c.config.PgsqlDb != nil {
-		c.log, err = golog.NewApiClient(
-			golog.WithGormClient(c.config.PgsqlDb),
-			golog.WithTableName(logTable),
-		)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if c.config.MongoDb != nil {
-		c.log, err = golog.NewApiClient(
-			golog.WithMongoClient(c.config.MongoDb),
-			golog.WithDatabaseName(c.config.DatabaseName),
-			golog.WithCollectionName(logTable),
-		)
-		if err != nil {
-			return nil, err
-		}
-	}
+	c.config.ua = "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1"
 
 	return c, nil
 }

config.go

@@ -0,0 +1,14 @@
+package weishi
+
+import (
+	"go.dtapp.net/golog"
+)
+
+// ConfigApiGormFun 接口日志配置
+func (c *Client) ConfigApiGormFun(apiClientFun golog.ApiGormFun) {
+	client := apiClientFun()
+	if client != nil {
+		c.gormLog.client = client
+		c.gormLog.status = true
+	}
+}

const.go

@@ -1,7 +1,5 @@
 package weishi
 
 const (
-	logTable = "weishi"
+	LogTable = "weishi"
 )
-
-const Version = "1.0.3"

get.go

@@ -0,0 +1 @@
+package weishi

go.mod

@@ -1,89 +1,77 @@
 module go.dtapp.net/weishi
 
-go 1.19
+go 1.21.5
 
 require (
 	github.com/mvdan/xurls v1.1.0
-	go.dtapp.net/dorm v1.0.17
-	go.dtapp.net/golog v1.0.22
-	go.dtapp.net/gorequest v1.0.24
-	gorm.io/gorm v1.23.8
+	go.dtapp.net/gojson v1.0.2
+	go.dtapp.net/golog v1.0.103
+	go.dtapp.net/gorequest v1.0.40
 )
 
 require (
+	github.com/MercuryEngineering/CookieMonster v0.0.0-20180304172713-1584578b3403 // indirect
 	github.com/basgys/goxml2json v1.1.0 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/bytedance/sonic v1.10.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/gin-gonic/gin v1.8.1 // indirect
-	github.com/go-playground/locales v0.14.0 // indirect
-	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/go-playground/validator/v10 v10.11.0 // indirect
-	github.com/go-redis/redis/v9 v9.0.0-beta.2 // indirect
-	github.com/go-sql-driver/mysql v1.6.0 // indirect
-	github.com/goccy/go-json v0.9.10 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.13.0 // indirect
-	github.com/jackc/pgio v1.0.0 // indirect
+	github.com/gin-gonic/gin v1.9.1 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.16.0 // indirect
+	github.com/go-sql-driver/mysql v1.7.1 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.1 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.12.0 // indirect
-	github.com/jackc/pgx/v4 v4.17.0 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
+	github.com/jackc/pgx/v5 v5.5.1 // indirect
+	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.15.9 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/lib/pq v1.10.6 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/montanaflynn/stats v0.6.6 // indirect
 	github.com/natefinch/lumberjack v2.0.0+incompatible // indirect
-	github.com/pelletier/go-toml/v2 v2.0.2 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/saracen/go7z v0.0.0-20191010121135-9c09b6bd7fda // indirect
-	github.com/saracen/solidblock v0.0.0-20190426153529-45df20abab6f // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/syndtr/goleveldb v1.0.0 // indirect
-	github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
-	github.com/ugorji/go/codec v1.2.7 // indirect
-	github.com/ulikunitz/xz v0.5.10 // indirect
-	github.com/upper/db/v4 v4.5.4 // indirect
-	github.com/uptrace/bun v1.1.7 // indirect
-	github.com/uptrace/bun/dialect/mysqldialect v1.1.7 // indirect
-	github.com/uptrace/bun/dialect/pgdialect v1.1.7 // indirect
-	github.com/uptrace/bun/driver/pgdriver v1.1.7 // indirect
-	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
-	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.1.1 // indirect
-	github.com/xdg-go/stringprep v1.0.3 // indirect
-	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
-	go.dtapp.net/goip v1.0.24 // indirect
-	go.dtapp.net/gojson v1.0.1 // indirect
-	go.dtapp.net/gorandom v1.0.1 // indirect
-	go.dtapp.net/gostring v1.0.6 // indirect
-	go.dtapp.net/gotime v1.0.5 // indirect
-	go.dtapp.net/goxml v1.0.1 // indirect
-	go.mongodb.org/mongo-driver v1.10.1 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.22.0 // indirect
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/net v0.0.0-20220811182439-13a9a731de15 // indirect
-	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
-	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
-	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gorm.io/datatypes v1.0.7 // indirect
-	gorm.io/driver/mysql v1.3.5 // indirect
-	gorm.io/driver/postgres v1.3.8 // indirect
-	mellium.im/sasl v0.2.1 // indirect
-	xorm.io/builder v0.3.12 // indirect
-	xorm.io/xorm v1.3.1 // indirect
+	github.com/oschwald/geoip2-golang v1.9.0 // indirect
+	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
+	github.com/redis/go-redis/v9 v9.3.1 // indirect
+	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/tklauser/go-sysconf v0.3.13 // indirect
+	github.com/tklauser/numcpus v0.7.0 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/yusufpapurcu/wmi v1.2.3 // indirect
+	go.dtapp.net/dorm v1.0.55 // indirect
+	go.dtapp.net/goip v1.0.43 // indirect
+	go.dtapp.net/gorandom v1.0.2 // indirect
+	go.dtapp.net/gostring v1.0.12 // indirect
+	go.dtapp.net/gotime v1.0.6 // indirect
+	go.dtapp.net/gotrace_id v1.0.6 // indirect
+	go.dtapp.net/gourl v1.0.0 // indirect
+	golang.org/x/arch v0.6.0 // indirect
+	golang.org/x/crypto v0.17.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.16.1 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gorm.io/datatypes v1.2.0 // indirect
+	gorm.io/driver/mysql v1.5.2 // indirect
+	gorm.io/driver/postgres v1.5.4 // indirect
+	gorm.io/gen v0.3.24 // indirect
+	gorm.io/gorm v1.25.5 // indirect
+	gorm.io/hints v1.1.2 // indirect
+	gorm.io/plugin/dbresolver v1.5.0 // indirect
 )

request.go

@@ -8,26 +8,23 @@ import (
 func (c *Client) request(ctx context.Context, url string) (gorequest.Response, error) {
 
 	// 创建请求
-	client := c.client
+	client := gorequest.NewHttp()
 
 	// 设置请求地址
 	client.SetUri(url)
 
 	// 设置用户代理
-	client.SetUserAgent(c.ua)
+	client.SetUserAgent(c.config.ua)
 
 	// 发起请求
-	request, err := client.Get()
+	request, err := client.Get(ctx)
 	if err != nil {
 		return gorequest.Response{}, err
 	}
 
-	// 日志
-	if c.config.PgsqlDb != nil {
-		go c.log.GormMiddleware(ctx, request, Version)
-	}
-	if c.config.MongoDb != nil {
-		go c.log.MongoMiddleware(request)
+	// 记录日志
+	if c.gormLog.status {
+		go c.gormLog.client.Middleware(ctx, request)
 	}
 
 	return request, err

version.go

@@ -0,0 +1,5 @@
+package weishi
+
+const (
+	Version = "1.0.13"
+)