format

Author: withchao

bootstrap.bat

@@ -0,0 +1,31 @@
+@echo off
+SETLOCAL
+
+mage -version >nul 2>&1
+IF %ERRORLEVEL% EQU 0 (
+    echo Mage is already installed.
+    GOTO DOWNLOAD
+)
+
+go version >nul 2>&1
+IF NOT %ERRORLEVEL% EQU 0 (
+    echo Go is not installed. Please install Go and try again.
+    exit /b 1
+)
+
+echo Installing Mage...
+go install github.com/magefile/mage@latest
+
+mage -version >nul 2>&1
+IF NOT %ERRORLEVEL% EQU 0 (
+    echo Mage installation failed.
+    echo Please ensure that %GOPATH%/bin is in your PATH.
+    exit /b 1
+)
+
+echo Mage installed successfully.
+
+:DOWNLOAD
+go mod download
+
+ENDLOCAL

bootstrap.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+if [[ ":$PATH:" == *":$HOME/.local/bin:"* ]]; then
+    TARGET_DIR="$HOME/.local/bin"
+else
+    TARGET_DIR="/usr/local/bin"
+    echo "Using /usr/local/bin as the installation directory. Might require sudo permissions."
+fi
+
+if ! command -v mage &> /dev/null; then
+    echo "Installing Mage to $TARGET_DIR ..."
+    GOBIN=$TARGET_DIR go install github.com/magefile/mage@latest
+fi
+
+if ! command -v mage &> /dev/null; then
+    echo "Mage installation failed."
+    echo "Please ensure that $TARGET_DIR is in your \$PATH."
+    exit 1
+fi
+
+echo "Mage installed successfully."
+
+go mod download

cmd/main.go cmd/openim-sdk/main.go

@@ -3,16 +3,16 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/openim-sigs/oimws/pkg/core_func"
+	gate2 "github.com/openim-sigs/oimws/pkg/gate"
+	module2 "github.com/openim-sigs/oimws/pkg/module"
+	"github.com/openim-sigs/oimws/pkg/network/tjson"
 	"os"
 	"os/signal"
 	"sync"
 	"syscall"
 	"time"
 
-	"github.com/openim-sigs/oimws/core_func"
-	"github.com/openim-sigs/oimws/gate"
-	"github.com/openim-sigs/oimws/module"
-	"github.com/openim-sigs/oimws/network/tjson"
 	log "github.com/xuexihuang/new_log15"
 )
 
@@ -26,22 +26,22 @@ const (
 var Processor = tjson.NewProcessor()
 
 type GateNet struct {
-	*gate.Gate
+	*gate2.Gate
 	CloseSig chan bool
 	Wg       sync.WaitGroup
 }
 
 // Initsever initializes a new GateNet instance with the given WebSocket port and default configurations.
 func Initsever(wsPort int) *GateNet {
 	gatenet := new(GateNet)
-	gatenet.Gate = gate.NewGate(MaxConnNum, MaxMsgLen,
+	gatenet.Gate = gate2.NewGate(MaxConnNum, MaxMsgLen,
 		Processor, ":"+fmt.Sprintf("%d", wsPort), HTTPTimeout, WriterChanLen)
 	gatenet.CloseSig = make(chan bool, 1)
 	return gatenet
 }
 
 // SetMsgFun sets the functions that will be called on new connection, disconnection, and data reception events.
-func (gt *GateNet) SetMsgFun(Fun1 func(gate.Agent), Fun2 func(gate.Agent), Fun3 func(interface{}, gate.Agent)) {
+func (gt *GateNet) SetMsgFun(Fun1 func(gate2.Agent), Fun2 func(gate2.Agent), Fun3 func(interface{}, gate2.Agent)) {
 	gt.Gate.SetFun(Fun1, Fun2, Fun3)
 }
 
@@ -80,13 +80,13 @@ func main() {
 	fmt.Println("Client starting....")
 	log.Info("Client starting....")
 	gatenet := Initsever(*sdkWsPort)
-	gatenet.SetMsgFun(module.NewAgent, module.CloseAgent, module.DataRecv)
+	gatenet.SetMsgFun(module2.NewAgent, module2.CloseAgent, module2.DataRecv)
 	go gatenet.Runloop()
 	/////////////////////////////////////
 	//statusGate := Initsever(90)
 	//gatenet.SetMsgFun(module.NewStatusAgent, module.CloseStatusAgent, module.DataRecvStatus)
 	//go gatenet.Runloop()
-	module.ProgressStartTime = time.Now().Unix()
+	module2.ProgressStartTime = time.Now().Unix()
 	///////////////////////////////////////////
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt, os.Kill, syscall.SIGQUIT, syscall.SIGTERM)

config/config.yml

@@ -0,0 +1,4 @@
+openimApi: "http://127.0.0.1:10002"
+openimWs: "ws://127.0.0.1:10001"
+sdkWsPort: [ 10003 ]
+dbDir: "./db"

config/log.yml

@@ -0,0 +1,14 @@
+
+# Log storage path, default is acceptable, change to a full path if modification is needed
+storageLocation: ../../../../logs/
+# Log rotation period (in hours), default is acceptable
+rotationTime: 24
+# Number of log files to retain, default is acceptable
+remainRotationCount: 2
+# Log level settings: 3 for production environment; 6 for more verbose logging in debugging environments
+remainLogLevel: 6
+# Whether to output to standard output, default is acceptable
+isStdout: false
+# Whether to log in JSON format, default is acceptable
+isJson: false
+

go.mod

@@ -1,53 +1,81 @@
 module github.com/openim-sigs/oimws
 
-go 1.19
+go 1.21.2
+
+toolchain go1.21.9
 
 require (
 	github.com/OpenIMSDK/tools v0.0.24
 	github.com/bwmarrin/snowflake v0.3.0
-	github.com/gorilla/websocket v1.5.0
+	github.com/gorilla/websocket v1.5.1
+	github.com/mitchellh/mapstructure v1.5.0
+	github.com/openimsdk/gomake v0.0.11
 	github.com/openimsdk/openim-sdk-core/v3 v3.5.1-beta.1
-	github.com/stretchr/testify v1.8.3
+	github.com/openimsdk/tools v0.0.49-alpha.2
+	github.com/spf13/cobra v1.8.0
+	github.com/spf13/viper v1.18.2
+	github.com/stretchr/testify v1.9.0
 	github.com/xuexihuang/new_log15 v1.0.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/jinzhu/copier v0.3.5 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/jinzhu/copier v0.4.0 // indirect
 	github.com/mattn/go-sqlite3 v1.14.12 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
-	golang.org/x/image v0.14.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/image v0.15.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/grpc v1.56.2 // indirect
+	google.golang.org/grpc v1.62.1 // indirect
 	gorm.io/driver/sqlite v1.3.6 // indirect
 	nhooyr.io/websocket v1.8.10 // indirect
 )
 
 require (
 	github.com/OpenIMSDK/protocol v0.0.40 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // 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/lestrrat-go/file-rotatelogs v2.4.0+incompatible // indirect
 	github.com/lestrrat-go/strftime v1.0.6 // indirect
+	github.com/magefile/mage v1.15.0 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/openimsdk/protocol v0.0.63 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.13 // indirect
+	github.com/tklauser/numcpus v0.7.0 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gorm.io/gorm v1.23.8 // indirect
+	gorm.io/gorm v1.25.8 // indirect
 )