opt appinfo cache

Author: yuwnloyblog

apis/validate.go

@@ -3,6 +3,7 @@ package apis
 import (
 	"strings"
 
+	"github.com/juggleim/commons/appinfos"
 	utils "github.com/juggleim/commons/tools"
 	"github.com/juggleim/jugglechat-server/apis/responses"
 	"github.com/juggleim/jugglechat-server/ctxs"
@@ -32,7 +33,7 @@ func Validate(ctx *gin.Context) {
 	}
 	ctx.Set(string(ctxs.CtxKey_AppKey), appkey)
 	//check app exist
-	appInfo, exist := services.GetAppInfo(appkey)
+	appInfo, exist := appinfos.GetAppInfo(appkey)
 	if !exist {
 		responses.ErrorHttpResp(ctx, errs.IMErrorCode_APP_NOT_EXISTED)
 		ctx.Abort()

docs/appbusiness.sql

@@ -22,6 +22,16 @@ CREATE TABLE IF NOT EXISTS `appexts` (
   UNIQUE KEY `IDX_APPKEY_APPITEMKEY` (`app_key`,`app_item_key`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
+CREATE TABLE IF NOT EXISTS `globalconfs` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `conf_key` varchar(50) DEFAULT NULL,
+  `conf_value` varchar(2000) DEFAULT NULL,
+  `created_at` datetime(3) DEFAULT CURRENT_TIMESTAMP(3),
+  `updated_at` datetime(3) DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uniq_key` (`conf_key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
 CREATE TABLE IF NOT EXISTS `fileconfs` (
   `id` int unsigned NOT NULL AUTO_INCREMENT,
   `app_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
@@ -224,4 +234,5 @@ CREATE TABLE IF NOT EXISTS `feedbacks` (
   KEY `idx_time` (`app_key`,`created_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
-INSERT IGNORE INTO `globalconfs` (`conf_key`,`conf_value`)VALUES('jchatdb_versaion','20250201');
+INSERT IGNORE INTO `globalconfs` (`conf_key`,`conf_value`)VALUES('jchatcommondb_version','20250201');
+INSERT IGNORE INTO `globalconfs` (`conf_key`,`conf_value`)VALUES('jchatdb_version','20250201');

go.mod

@@ -5,6 +5,7 @@ go 1.23.2
 require github.com/juggleim/imserver-sdk-go v1.0.6
 
 require (
+	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/BurntSushi/toml v1.3.2 // indirect
 	github.com/alex-ant/gomath v0.0.0-20160516115720-89013a210a82 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
@@ -38,7 +39,7 @@ require (
 	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.14.0 // indirect
-	github.com/go-sql-driver/mysql v1.7.1
+	github.com/go-sql-driver/mysql v1.9.3 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.2
 	github.com/google/uuid v1.6.0 // indirect
@@ -47,7 +48,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.1
+	github.com/juggleim/commons v1.0.2
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible

go.sum

@@ -1,3 +1,5 @@
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
@@ -54,8 +56,8 @@ github.com/go-playground/validator/v10 v10.7.0/go.mod h1:xm76BBt941f7yWdGnI2DVPF
 github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
 github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
-github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
+github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
@@ -90,8 +92,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.1 h1:HNuCy+qkYvGGlb43FgqvdipSlCV9/WGmP+tfhiTbtUo=
-github.com/juggleim/commons v1.0.1/go.mod h1:DCcj+TFBXuJIaENWj1wrAwOxJrzasfsSKBbFHfhDLpw=
+github.com/juggleim/commons v1.0.2 h1:ERfK3a2y15ySHYxPxlJf4d5s+M+x/w86NPS7i/hPjNs=
+github.com/juggleim/commons v1.0.2/go.mod h1:KWeUVxZRsWn7cE6qy51tuPQeswaO1bJoZguChs5r04w=
 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=

main.go

@@ -7,11 +7,11 @@ import (
 	"syscall"
 
 	"github.com/gin-gonic/gin"
+	"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"
-	"github.com/juggleim/jugglechat-server/storages/dbs/dbcommons"
 )
 
 func main() {
@@ -23,7 +23,7 @@ func main() {
 	//init log
 	log.InitLogs()
 	//init mysql
-	if err := dbcommons.InitMysql(); err != nil {
+	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 {
 		log.Error("Init Mysql failed.", err)
 		return
 	}

services/appinfoservice.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"time"
 
+	"github.com/juggleim/commons/appinfos"
 	utils "github.com/juggleim/commons/tools"
 	"github.com/juggleim/jugglechat-server/services/pbobjs"
 )
@@ -51,7 +52,7 @@ func GenerateToken(appkey, userId string) string {
 		UserId:    userId,
 		TokenTime: time.Now().UnixMilli(),
 	}
-	if appInfo, exist := GetAppInfo(appkey); exist {
+	if appInfo, exist := appinfos.GetAppInfo(appkey); exist {
 		token, _ = t.ToTokenString([]byte(appInfo.AppSecureKey))
 	}
 	return token

services/authtokenservice.go

@@ -3,8 +3,8 @@ package imsdk
 import (
 	"sync"
 
+	"github.com/juggleim/commons/dbcommons"
 	"github.com/juggleim/jugglechat-server/configures"
-	"github.com/juggleim/jugglechat-server/storages/dbs"
 
 	juggleimsdk "github.com/juggleim/imserver-sdk-go"
 )
@@ -27,7 +27,7 @@ func GetImSdk(appkey string) *juggleimsdk.JuggleIMSdk {
 		if val, exist := imsdkMap.Load(appkey); exist {
 			return val.(*juggleimsdk.JuggleIMSdk)
 		} else {
-			dao := dbs.AppInfoDao{}
+			dao := dbcommons.AppInfoDao{}
 			appinfo, _ := dao.FindByAppkey(appkey)
 			if appinfo != nil {
 				sdk := juggleimsdk.NewJuggleIMSdk(appkey, appinfo.AppSecret, configures.Config.ImApiDomain)

services/imsdk/imsdk.go

@@ -5,6 +5,8 @@ import (
 	"math/rand"
 	"time"
 
+	"github.com/juggleim/commons/appinfos"
+	"github.com/juggleim/commons/dbcommons"
 	"github.com/juggleim/commons/smsengines"
 	utils "github.com/juggleim/commons/tools"
 	"github.com/juggleim/jugglechat-server/ctxs"
@@ -84,11 +86,11 @@ func CheckEmailCode(ctx context.Context, email, code string) errs.IMErrorCode {
 }
 
 func GetSmsEngine(appkey string) smsengines.ISmsEngine {
-	appInfo, exist := GetAppInfo(appkey)
+	appInfo, exist := appinfos.GetAppInfo(appkey)
 	if exist && appInfo != nil {
 		if appInfo.SmsEngine == nil {
-			appLock.Lock()
-			defer appLock.Unlock()
+			appinfos.GetAppLock().Lock()
+			defer appinfos.GetAppLock().Unlock()
 			loadSmsEngine(appInfo)
 		}
 		if appInfo.SmsEngine != nil {
@@ -98,9 +100,9 @@ func GetSmsEngine(appkey string) smsengines.ISmsEngine {
 	return smsengines.DefaultSmsEngine
 }
 
-func loadSmsEngine(appInfo *AppInfo) {
-	storage := storages.NewAppExtStorage()
-	ext, err := storage.Find(appInfo.AppKey, "sms_engine_conf")
+func loadSmsEngine(appInfo *appinfos.AppInfo) {
+	extDao := dbcommons.AppExtDao{}
+	ext, err := extDao.Find(appInfo.AppKey, "sms_engine_conf")
 	if err == nil && ext.AppItemValue != "" {
 		smsConf := &SmsEngineConf{}
 		err := utils.JsonUnMarshal([]byte(ext.AppItemValue), smsConf)

services/smsservice.go

@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/juggleim/commons/appinfos"
 	utils "github.com/juggleim/commons/tools"
 	apimodels "github.com/juggleim/jugglechat-server/apis/models"
 	"github.com/juggleim/jugglechat-server/configures"
@@ -138,7 +139,7 @@ func UnActiveTelebotProxy(ctx context.Context, rel *TeleBotRel) {
 
 func getBotConnectorHeaders(ctx context.Context) map[string]string {
 	appkey := ctxs.GetAppKeyFromCtx(ctx)
-	appinfo, exist := GetAppInfo(appkey)
+	appinfo, exist := appinfos.GetAppInfo(appkey)
 	if exist {
 		nonce := fmt.Sprintf("%d", rand.Int31n(10000))
 		timestamp := fmt.Sprintf("%d", time.Now().UnixMilli())