Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
c5b5cb452c
1
.gitignore
vendored
1
.gitignore
vendored
@ -22,3 +22,4 @@ pb/proto
|
||||
~$*.xlsx
|
||||
*.pid
|
||||
cmd/luban/
|
||||
pb.bat
|
0
bin/build_linux.sh
Executable file → Normal file
0
bin/build_linux.sh
Executable file → Normal file
0
bin/start.sh
Executable file → Normal file
0
bin/start.sh
Executable file → Normal file
0
bin/stop.sh
Executable file → Normal file
0
bin/stop.sh
Executable file → Normal file
0
bin/stup.sh
Executable file → Normal file
0
bin/stup.sh
Executable file → Normal file
@ -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),
|
||||
|
@ -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 {
|
||||
|
22
pb.bat
22
pb.bat
@ -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
|
Loading…
Reference in New Issue
Block a user