Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei

README.md

@@ -217,7 +217,7 @@ func main() {
 	lego.Run(s, //装备模块
 		user.NewModule(),                           //装备用户模块          
 		pack.NewModule(),                           //装备背包模块          
-		mail.NewModule(),                           //装备邮件模块            
+		mail.NewModule(),                           //装备邮件模块   
 	)
 
 }

comm/core.go

@@ -22,12 +22,13 @@ const (
 
 //模块名定义处
 const (
-	SM_GateModule   core.M_Modules = "gateway" //gate模块 	网关服务模块
+	SM_GateModule     core.M_Modules = "gateway" //gate模块 	网关服务模块
-	SM_WebModule    core.M_Modules = "web"     //web模块
+	SM_WebModule      core.M_Modules = "web"     //web模块
-	SM_UserModule   core.M_Modules = "user"    //用户模块
+	SM_UserModule     core.M_Modules = "user"    //用户模块
-	SM_PackModule   core.M_Modules = "pack"    //背包模块
+	SM_PackModule     core.M_Modules = "pack"    //背包模块
-	SM_MailModule   core.M_Modules = "mail"    //邮件模块
+	SM_MailModule     core.M_Modules = "mail"    //邮件模块
-	SM_FriendModule core.M_Modules = "friend"  //好友模块
+	SM_FriendModule   core.M_Modules = "friend"  //好友模块
+	SM_LogModelMueule core.M_Modules = "model"   //日志模块
 )
 
 //RPC服务接口定义处

modules/model/api.go

@@ -0,0 +1,20 @@
+package model
+
+import (
+	"go_dreamfactory/modules"
+
+	"go_dreamfactory/lego/core"
+)
+
+type Api_Comp struct {
+	modules.MComp_GateComp
+	service core.IService
+	module  *Model
+}
+
+func (this *Api_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+	this.MComp_GateComp.Init(service, module, comp, options)
+	this.service = service
+	this.module = module.(*Model)
+	return
+}

modules/model/configure_comp.go

@@ -0,0 +1,16 @@
+package model
+
+import (
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/core/cbase"
+)
+
+// 邮件配置管理组件
+type Configure_Comp struct {
+	cbase.ModuleCompBase
+}
+
+func (this *Configure_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+	this.ModuleCompBase.Init(service, module, comp, options)
+	return
+}

modules/model/db_comp.go

@@ -0,0 +1,174 @@
+package model
+
+import (
+	"context"
+	"errors"
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/core/cbase"
+	"go_dreamfactory/lego/sys/log"
+	"go_dreamfactory/lego/sys/mgo"
+
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo/options"
+)
+
+const (
+	WriteMaxNum uint32 = 1000 //一次性最处理条数
+)
+
+type DB_Comp struct {
+	cbase.ModuleCompBase
+	mgo mgo.ISys
+}
+type Autogenerated struct {
+	ID  string `json:"_id"`
+	UID string `json:"uid"`
+	Act string `json:"act"` // insert update delete
+	D   []interface{}
+}
+
+type QueryStruct struct {
+	Selector bson.M
+	Query    bson.M
+}
+
+const (
+	DB_ModelTable core.SqlTable = "model"
+)
+
+type IModel interface {
+	Model_UpdateDBBylog() (err error)                    // 读取日志并更新对应的表
+	Model_InsertDBBylog(data *Autogenerated) (err error) // 插入日志
+	Model_UpdateUserDataByUid(uid string) (err error)    // 读取指定玩家信息到db中
+}
+
+func (this *DB_Comp) Model_UpdateDBBylog() (err error) {
+
+	_delID := make([]string, 0) // 处理完成要删除的id
+	_data, err := this.mgo.Find(DB_ModelTable, bson.M{}, options.Find().SetLimit(int64(WriteMaxNum)))
+	if err != nil {
+		return err
+	}
+	for _data.Next(context.TODO()) { // 处理删除逻辑
+		data := &Autogenerated{}
+		if err = _data.Decode(data); err == nil {
+			_delID = append(_delID, data.ID)
+		} else {
+			log.Errorf("Decode Data err : %v", err)
+			continue
+		}
+
+		log.Debugf("======= insert log : %+v =======", data)
+		if data.Act == "insert" {
+			if len(data.D) < 2 { // 参数校验
+				log.Errorf("parameter len _id : %s,uid : %s d.len:%v", data.ID, data.UID, len(data.D))
+				return errors.New("parameter len err")
+			}
+			query := data.D[1].([]interface{})
+			_, err := this.mgo.InsertMany(data.D[0].(core.SqlTable), query)
+			if err != nil {
+				log.Errorf("insert %s db err:%v", data.D[0].(core.SqlTable), err)
+			}
+		} else if data.Act == "delete" {
+			if len(data.D) < 2 { // 参数校验
+				log.Errorf("parameter len _id : %s,uid : %s d.len:%v", data.ID, data.UID, len(data.D))
+				return errors.New("parameter len err")
+			}
+			_, err := this.mgo.DeleteMany(data.D[0].(core.SqlTable), data.D[1].(map[string]interface{}))
+			if err != nil {
+				log.Errorf("delete %s db err:%v", data.D[0].(core.SqlTable), err)
+			}
+		} else { // update
+			if len(data.D) < 3 { // 参数校验
+				log.Errorf("parameter len _id : %s,uid : %s d.len:%v", data.ID, data.UID, len(data.D))
+				return errors.New("parameter len err")
+			}
+			where := data.D[1].(map[string]interface{})
+			_obj := &QueryStruct{}
+			for k, v := range where {
+				_obj.Selector[k] = v
+			}
+			query := data.D[2].(map[string]interface{})
+			for k, v := range query {
+				_obj.Query[k] = v
+			}
+			this.mgo.UpdateMany(data.D[0].(core.SqlTable), _obj.Selector, _obj.Query)
+		}
+	}
+	// 批量删除已处理的数据
+	_, err = this.mgo.DeleteMany(DB_ModelTable, bson.M{"_id": bson.M{"$inc": _delID}}, options.Delete())
+	if err != nil {
+		log.Errorf("del err %v", err)
+	}
+	return
+}
+
+func (this *DB_Comp) Model_InsertDBBylog(data *Autogenerated) (err error) {
+
+	_, err = this.mgo.InsertOne(DB_ModelTable, data)
+	if err != nil {
+		log.Errorf("insert model db err %v", err)
+	}
+	return err
+}
+
+func (this *DB_Comp) Model_UpdateUserDataByUid(uid string) (err error) {
+
+	_delID := make([]string, 0) // 处理完成要删除的id
+	_data, err := this.mgo.Find(DB_ModelTable, bson.M{"userid": uid}, options.Find())
+	if err != nil {
+		return err
+	}
+	for _data.Next(context.TODO()) { // 处理删除逻辑
+		data := &Autogenerated{}
+		if err = _data.Decode(data); err == nil {
+			_delID = append(_delID, data.ID)
+		} else {
+			log.Errorf("Decode Data err : %v", err)
+			continue
+		}
+
+		log.Debugf("======= insert log : %+v =======", data)
+		if data.Act == "insert" {
+			if len(data.D) < 2 { // 参数校验
+				log.Errorf("parameter len _id : %s,uid : %s d.len:%v", data.ID, data.UID, len(data.D))
+				return errors.New("parameter len err")
+			}
+			query := data.D[1].([]interface{})
+			_, err := this.mgo.InsertMany(data.D[0].(core.SqlTable), query)
+			if err != nil {
+				log.Errorf("insert %s db err:%v", data.D[0].(core.SqlTable), err)
+			}
+		} else if data.Act == "delete" {
+			if len(data.D) < 2 { // 参数校验
+				log.Errorf("parameter len _id : %s,uid : %s d.len:%v", data.ID, data.UID, len(data.D))
+				return errors.New("parameter len err")
+			}
+			_, err := this.mgo.DeleteMany(data.D[0].(core.SqlTable), data.D[1].(map[string]interface{}))
+			if err != nil {
+				log.Errorf("delete %s db err:%v", data.D[0].(core.SqlTable), err)
+			}
+		} else { // update
+			if len(data.D) < 3 { // 参数校验
+				log.Errorf("parameter len _id : %s,uid : %s d.len:%v", data.ID, data.UID, len(data.D))
+				return errors.New("parameter len err")
+			}
+			where := data.D[1].(map[string]interface{})
+			_obj := &QueryStruct{}
+			for k, v := range where {
+				_obj.Selector[k] = v
+			}
+			query := data.D[2].(map[string]interface{})
+			for k, v := range query {
+				_obj.Query[k] = v
+			}
+			this.mgo.FindOneAndUpdate(data.D[0].(core.SqlTable), _obj.Selector, _obj.Query)
+		}
+	}
+	// 批量删除已处理的数据
+	_, err = this.mgo.DeleteMany(DB_ModelTable, bson.M{"_id": bson.M{"$inc": _delID}}, options.Delete())
+	if err != nil {
+		log.Errorf("del err %v", err)
+	}
+	return
+}

modules/model/dbservice_comp.go

@@ -0,0 +1,39 @@
+package model
+
+import (
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/lego/core/cbase"
+	"time"
+)
+
+type DBService_Comp struct {
+	cbase.ModuleCompBase
+	task chan string
+	DB_Comp
+}
+
+func (this *DBService_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
+	this.ModuleCompBase.Init(service, module, comp, options)
+
+	return
+}
+
+func (this *DBService_Comp) Start(err error) {
+	this.ModuleCompBase.Start()
+	go this.run()
+}
+
+func (this *DBService_Comp) run() {
+	for {
+		select {
+		case v := <-this.task:
+			this.Model_UpdateUserDataByUid(v)
+		case <-time.After(time.Second):
+			this.Model_UpdateDBBylog()
+		}
+	}
+}
+
+func (this *DBService_Comp) PushUserTask(uid string) {
+	this.task <- uid
+}

modules/model/module.go

@@ -0,0 +1,48 @@
+package model
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/core"
+	"go_dreamfactory/modules"
+	"time"
+)
+
+func NewModule() core.IModule {
+	m := new(Model)
+	return m
+}
+
+type Model struct {
+	modules.ModuleBase
+	api_comp       *Api_Comp
+	configure_comp *Configure_Comp
+}
+
+func (this *Model) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
+	err = this.ModuleBase.Init(service, module, options)
+
+	return
+}
+
+func (this *Model) Start() (err error) {
+	err = this.ModuleBase.Start()
+	//go this.RunWriteDB()
+	return
+}
+
+func (this *Model) GetType() core.M_Modules {
+	return comm.SM_LogModelMueule
+}
+
+func (this *Model) OnInstallComp() {
+	this.ModuleBase.OnInstallComp()
+	this.api_comp = this.RegisterComp(new(Api_Comp)).(*Api_Comp)
+	this.configure_comp = this.RegisterComp(new(Configure_Comp)).(*Configure_Comp)
+}
+
+func (this *Model) RunWriteDB() {
+	for {
+		time.Sleep(time.Second)
+
+	}
+}

services/worker/main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"go_dreamfactory/modules/friend"
 	"go_dreamfactory/modules/mail"
+	"go_dreamfactory/modules/model"
 	"go_dreamfactory/modules/pack"
 	"go_dreamfactory/modules/user"
 	"go_dreamfactory/services"
@@ -40,6 +41,7 @@ func main() {
 		pack.NewModule(),
 		mail.NewModule(),
 		friend.NewModule(),
+		model.NewModule(),
 	)
 
 }

sys/db/model.go

@@ -1,84 +0,0 @@
-package db
-
-import (
-	"errors"
-	"go_dreamfactory/lego/core"
-	"go_dreamfactory/lego/sys/log"
-
-	"go.mongodb.org/mongo-driver/bson"
-)
-
-type Autogenerated struct {
-	ID  string `json:"_id"`
-	UID string `json:"uid"`
-	Act string `json:"act"` // insert update delete
-	D   []interface{}
-}
-
-// type data struct {
-// 	Table      string
-// 	Wheremap   [map[string]]interface{} // 如果是insert 条件就是nil del 只有条件
-// 	Modifymap  map[string]map[string]interface{}
-// 	insertData []interface{}
-// }
-
-type QueryStruct struct {
-	Selector bson.M
-	Query    bson.M
-}
-
-const (
-	DB_ModelTable core.SqlTable = "model"
-)
-
-type IModel interface {
-	Model_UpdateDBBylog() (err error)                    // 读取日志并更新对应的表
-	Model_InsertDBBylog(data *Autogenerated) (err error) // 插入日志
-	Model_UpdateUserDataByUid(uid string) (err error)    // 读取指定玩家信息到db中
-}
-
-func (this *DB) Mail_UpdateDBBylog() (err error) {
-	data := &Autogenerated{}
-	this.mgo.FindOneAndDelete(DB_ModelTable, bson.M{}).Decode(data) // 查找最新的一条并且删除
-
-	log.Debugf("======= insert log : %+v =======", data)
-	if data.Act == "insert" {
-		query := data.D[1].([]interface{})
-
-		_, err := this.mgo.InsertMany(data.D[0].(core.SqlTable), query)
-		if err != nil {
-			log.Errorf("insert %s db err:%v", data.D[0].(core.SqlTable), err)
-		}
-	} else if data.Act == "delete" {
-
-		_, err := this.mgo.DeleteMany(data.D[0].(core.SqlTable), data.D[1].(map[string]interface{}))
-		if err != nil {
-			log.Errorf("delete %s db err:%v", data.D[0].(core.SqlTable), err)
-		}
-	} else { // update
-		if len(data.D) < 2 {
-			log.Errorf("parameter len _id : %s,uid : %s d.len:%v", data.ID, data.UID, len(data.D))
-			return errors.New("parameter len err")
-		}
-		where := data.D[1].(map[string]interface{})
-		_obj := &QueryStruct{}
-		for k, v := range where {
-			_obj.Selector[k] = v
-		}
-		query := data.D[2].(map[string]interface{})
-		for k, v := range query {
-			_obj.Query[k] = v
-		}
-		this.mgo.FindOneAndUpdate(data.D[0].(core.SqlTable), _obj.Selector, _obj.Query)
-	}
-	return
-}
-
-func (this *DB) Model_InsertDBBylog(data *Autogenerated) (err error) {
-
-	_, err = this.mgo.InsertOne(DB_ModelTable, data)
-	if err != nil {
-		log.Errorf("insert model db err %v", err)
-	}
-	return err
-}