From 324de690cee84b49dd75a17e868c27c5a672fe5a Mon Sep 17 00:00:00 2001
From: wuaho <wuaho@legu.cc>
Date: Tue, 11 May 2021 15:08:55 +0800
Subject: [PATCH] 1

---
 settings.py   | 2 +-
 stop.sh       | 2 ++
 user_view.sql | 2 +-
 v2/db.py      | 4 +++-
 v2/sketch.py  | 4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 stop.sh

diff --git a/settings.py b/settings.py
index f56c2d7..56e57c5 100644
--- a/settings.py
+++ b/settings.py
@@ -17,7 +17,7 @@ class Config:
         # 每个游戏不一样
         'group_id': 'legu_group3'
     }
-
+    # 游戏数据库名
     GAME = 'shjy'
 
     # REDIS_CONF = {
diff --git a/stop.sh b/stop.sh
new file mode 100644
index 0000000..13512c6
--- /dev/null
+++ b/stop.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo `pstree -p 20015`|awk 'BEGIN{ FS="(" ; RS=")" } NF>1 { print $NF }'|xargs kill &>/dev/null
diff --git a/user_view.sql b/user_view.sql
index 819450f..791cba2 100644
--- a/user_view.sql
+++ b/user_view.sql
@@ -1,4 +1,4 @@
 create view shjy.user_view as select *
                  from shjy.user
-                 order by `#role_create_time` desc
+                 order by `#reg_time` desc
                  LIMIT 1 by `#account_id`
\ No newline at end of file
diff --git a/v2/db.py b/v2/db.py
index 49fdfd1..65d973d 100644
--- a/v2/db.py
+++ b/v2/db.py
@@ -65,10 +65,12 @@ class CK:
             data, columns = self.__client.execute(sql, columnar=True, with_column_types=True)
         except Exception as e:
             traceback.print_exc()
+            if e.code == 60:
+                return self.get_all(db, 'user', where, try_cnt - 1)
             self.__client.disconnect()
             self.__client = self.__create_client()
             if try_cnt > 0:
-                self.get_all(db, tb, where, try_cnt - 1)
+                return self.get_all(db, tb, where, try_cnt - 1)
 
         # 异常导致导致 避免认为用户不存在
         if data is None:
diff --git a/v2/sketch.py b/v2/sketch.py
index dc010c2..6fbcee3 100644
--- a/v2/sketch.py
+++ b/v2/sketch.py
@@ -60,7 +60,7 @@ class Sketch:
         self.db_client.execute(sql)
         sql = f"""create view {db}.user_view as select *
                  from {db}.user
-                 order by `#role_create_time` desc
+                 order by `#reg_time` desc
                  LIMIT 1 by `#account_id`"""
         self.db_client.execute(sql)
 
@@ -107,6 +107,6 @@ class Sketch:
                     print(f'添加字段 {k} 失败')
                     default_field.pop(k)
 
-        if set(default_field) - keys:
+        if tb=='user' and set(default_field) - keys:
             self.up_tb_struct(db, tb, default_field)
             self.update_user_view(db, tb)