From 3c93c6a3d05cc057d2bd2dbc90572526a0d3fbe9 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 26 Jul 2022 10:26:15 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/robot/user.go         | 8 ++++++++
 modules/mgolog/db_comp.go | 4 +---
 2 files changed, 9 insertions(+), 3 deletions(-)

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 {

From da3fd812c6e4f64017a62a1f3632fe8d5726a3a9 Mon Sep 17 00:00:00 2001
From: zhaocy <sh_zcy@qq.com>
Date: Tue, 26 Jul 2022 10:38:49 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=BF=BD=E7=95=A5pb.bat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5261d6338..af9b51b8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,5 @@ bin/conf
 ./bin/vsdebug*
 ~$*.xlsx
 *.pid
-cmd/luban/
\ No newline at end of file
+cmd/luban/
+pb.bat
\ No newline at end of file

From 79eafa31449f5d625cbcdcec38d21359fb103cda Mon Sep 17 00:00:00 2001
From: zhaocy <sh_zcy@qq.com>
Date: Tue, 26 Jul 2022 10:40:44 +0800
Subject: [PATCH 3/4] update .gitignore

---
 bin/build_linux.sh |  0
 bin/start.sh       |  0
 bin/stop.sh        |  0
 bin/stup.sh        |  0
 pb.bat             | 22 ----------------------
 5 files changed, 22 deletions(-)
 mode change 100755 => 100644 bin/build_linux.sh
 mode change 100755 => 100644 bin/start.sh
 mode change 100755 => 100644 bin/stop.sh
 mode change 100755 => 100644 bin/stup.sh
 delete mode 100644 pb.bat

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/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

From a8ad99c774fc1a4ffc9f41dbf7d5c831db2b0391 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 26 Jul 2022 10:59:01 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E6=9C=AC=E5=9C=B0proto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index af9b51b8a..663906327 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@
 
 *.log
 bin/conf
-
+pb/proto
 .vscode/
 ./bin/conf
 ./bin/log