diff --git a/.gitignore b/.gitignore index b5ac17639..663906327 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ pb/proto ./bin/vsdebug* ~$*.xlsx *.pid -cmd/luban/ \ No newline at end of file +cmd/luban/ +pb.bat \ No newline at end of file diff --git a/bin/build_linux.sh b/bin/build_linux.sh old mode 100755 new mode 100644 diff --git a/bin/start.sh b/bin/start.sh old mode 100755 new mode 100644 diff --git a/bin/stop.sh b/bin/stop.sh old mode 100755 new mode 100644 diff --git a/bin/stup.sh b/bin/stup.sh old mode 100755 new mode 100644 diff --git a/cmd/robot/user.go b/cmd/robot/user.go index 4e64c59ae..dc2749825 100644 --- a/cmd/robot/user.go +++ b/cmd/robot/user.go @@ -33,6 +33,14 @@ var user_builders = []*TestCase{ rsp: &pb.UserAddResResp{}, // enabled: true, }, + { + desc: "查看图鉴", + mainType: string(comm.ModuleUser), + subType: "gettujian", + req: &pb.UserGetTujianReq{}, + rsp: &pb.UserGetTujianResp{}, + enabled: true, + }, { desc: "添加资源", mainType: string(comm.ModuleUser), diff --git a/modules/mgolog/db_comp.go b/modules/mgolog/db_comp.go index 65ede2f13..32800d48c 100644 --- a/modules/mgolog/db_comp.go +++ b/modules/mgolog/db_comp.go @@ -40,13 +40,11 @@ func (this *DB_Comp) Start() (err error) { } func (this *DB_Comp) run() { - timer := time.NewTimer(time.Second * 2) - defer timer.Stop() for { select { case v := <-this.task: this.Model_UpdateDBByLog(v) - case <-timer.C: + case <-time.After(time.Second * 2): this.Model_UpdateDBByLog("") } if !this.isInit && this.Model_TotalCount() <= 0 { diff --git a/pb.bat b/pb.bat deleted file mode 100644 index 4f5ef9fc7..000000000 --- a/pb.bat +++ /dev/null @@ -1,22 +0,0 @@ -@echo off - -set PROJECT_ROOT=.\ - -set PROJECT_ROOT=. - -set SRC=%PROJECT_ROOT%\pb\proto -set TAR=%PROJECT_ROOT%\pb - -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\notify\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\user\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\friend\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\items\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\mail\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\equipment\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\hero\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\shop\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\mainline\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\task\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\chat\*.proto -pause \ No newline at end of file