opt configures

Author: yuwnloyblog

admins/routers/router.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
+	"github.com/juggleim/commons/configures"
 	"github.com/juggleim/commons/ctxs"
 	"github.com/juggleim/jugglechat-server/admins/apis"
-	"github.com/juggleim/jugglechat-server/configures"
 )
 
 var Prefix string = ""

configures/configure.go

@@ -50,7 +50,7 @@ require (
 	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/juggleim/commons v1.0.3
+	github.com/juggleim/commons v1.0.4
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
@@ -72,5 +72,5 @@ require (
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
 	google.golang.org/protobuf v1.36.6
-	gopkg.in/yaml.v3 v3.0.1
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.mod

@@ -94,8 +94,8 @@ github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbd
 github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/juggleim/commons v1.0.3 h1:Z8q/Lu9mp4R14886dt03hcmLFWBBQfOAnlEAP6LibpM=
-github.com/juggleim/commons v1.0.3/go.mod h1:AthLZCP8m4SkQ7rnUmMVOOBEVHqR0UdP/iddrZqaYRU=
+github.com/juggleim/commons v1.0.4 h1:jzk9xFbukbqr6HpM2Mn/StvM0VXFm07IM5WPvoOPqj8=
+github.com/juggleim/commons v1.0.4/go.mod h1:AthLZCP8m4SkQ7rnUmMVOOBEVHqR0UdP/iddrZqaYRU=
 github.com/juggleim/imserver-sdk-go v1.0.6 h1:NL639nM2g4MKgRJSpwsMFLlAF/PBPg7BCrJnikdAeLE=
 github.com/juggleim/imserver-sdk-go v1.0.6/go.mod h1:xdxsGeW0b4GOYJvKJwnaU04Z+jGaUSrBvzeSbNvNOFk=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=

go.sum

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/juggleim/jugglechat-server/configures"
+	"github.com/juggleim/commons/configures"
 
 	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
 	"github.com/sirupsen/logrus"

log/log.go

@@ -7,9 +7,9 @@ import (
 	"syscall"
 
 	"github.com/gin-gonic/gin"
+	"github.com/juggleim/commons/configures"
 	"github.com/juggleim/commons/dbcommons"
 	adminRouters "github.com/juggleim/jugglechat-server/admins/routers"
-	"github.com/juggleim/jugglechat-server/configures"
 	"github.com/juggleim/jugglechat-server/log"
 	"github.com/juggleim/jugglechat-server/routers"
 )
@@ -23,7 +23,7 @@ func main() {
 	//init log
 	log.InitLogs()
 	//init mysql
-	if err := dbcommons.InitMysql(configures.Config.Mysql.Address, configures.Config.Mysql.DbName, configures.Config.Mysql.User, configures.Config.Mysql.Password, configures.Config.Mysql.Debug); err != nil {
+	if err := dbcommons.InitMysql(); err != nil {
 		log.Error("Init Mysql failed.", err)
 		return
 	}

main.go

@@ -3,8 +3,8 @@ package imsdk
 import (
 	"sync"
 
+	"github.com/juggleim/commons/configures"
 	"github.com/juggleim/commons/dbcommons"
-	"github.com/juggleim/jugglechat-server/configures"
 
 	juggleimsdk "github.com/juggleim/imserver-sdk-go"
 )

services/imsdk/imsdk.go

@@ -10,11 +10,11 @@ import (
 	"time"
 
 	"github.com/juggleim/commons/appinfos"
+	"github.com/juggleim/commons/configures"
 	"github.com/juggleim/commons/ctxs"
 	"github.com/juggleim/commons/errs"
 	utils "github.com/juggleim/commons/tools"
 	apimodels "github.com/juggleim/jugglechat-server/apis/models"
-	"github.com/juggleim/jugglechat-server/configures"
 	"github.com/juggleim/jugglechat-server/storages"
 	"github.com/juggleim/jugglechat-server/storages/models"
 

services/telebotservice.go

@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
+	"github.com/juggleim/commons/configures"
 	"github.com/juggleim/commons/dbcommons"
-	"github.com/juggleim/jugglechat-server/configures"
 	"github.com/juggleim/jugglechat-server/log"
 )
 
@@ -17,7 +17,7 @@ func main() {
 	//init log
 	log.InitLogs()
 	//init mysql
-	if err := dbcommons.InitMysql(configures.Config.Mysql.Address, configures.Config.Mysql.DbName, configures.Config.Mysql.User, configures.Config.Mysql.Password, false); err != nil {
+	if err := dbcommons.InitMysql(); err != nil {
 		log.Error("Init Mysql failed.", err)
 		return
 	}