From b053e583d80af4daf5efc91b313cecbbe98518f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B7=E5=8B=87?= <shyinyong@outlook.com>
Date: Thu, 17 Aug 2023 11:46:12 +0800
Subject: [PATCH] Update db.sql

---
 database/frienddb.sql | 82 ++++++++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 37 deletions(-)

diff --git a/database/frienddb.sql b/database/frienddb.sql
index a18abdc3..d1f509cf 100644
--- a/database/frienddb.sql
+++ b/database/frienddb.sql
@@ -38,45 +38,53 @@ UNIQUE KEY `friend_req` (`sender_account_id`,`receiver_account_id`)
 
 -- 公会相关 --
 drop table if exists t_guild;
-CREATE TABLE t_guild (
-`idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id',
-name VARCHAR(255) NOT NULL,
-leader_id VARCHAR(255) NOT NULL,
-max_members INT DEFAULT "0",
-level INT default "0",
-exp  INT default "0",
-badge  INT default "0",
-`createtime` int NOT NULL DEFAULT '0' COMMENT '创建时间',
-`modifytime` int NOT NULL DEFAULT '0' COMMENT '修改时间',
+CREATE TABLE `t_guild` (
+`idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id',
+`name` varchar(48) NOT NULL,
+`leader_account_id` varchar(60) NOT NULL,
+`max_members` int(11) DEFAULT '0',
+`level` int(11) DEFAULT '0',
+`exp` int(11) DEFAULT '0',
+`badge` int(11) DEFAULT '0',
+`createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
+`modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
 PRIMARY KEY (`idx`),
-UNIQUE KEY `guild_name` (`name`,`leader_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin
-COMMENT "公会表"
-;
+UNIQUE KEY `guild_name` (`name`,`leader_account_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='公会表';
 
 drop table if exists t_guild_members;
-CREATE TABLE t_guild_members (
-guild_id  INT NOT NULL,
-account_id VARCHAR(255) NOT NULL,
-`createtime` int NOT NULL DEFAULT '0' COMMENT '创建时间',
-`modifytime` int NOT NULL DEFAULT '0' COMMENT '修改时间',
-PRIMARY KEY (`guild_id`, `account_id`),
-key createtime(`createtime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin
-COMMENT "公会成员表"
-;
+CREATE TABLE `t_guild_members` (
+`guild_id` bigint(20) NOT NULL,
+`account_id` varchar(60) COLLATE utf8_bin NOT NULL,
+`createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
+`modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
+PRIMARY KEY (`guild_id`,`account_id`),
+KEY `account_id` (`account_id`),
+KEY `createtime` (`createtime`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='公会成员表';
 
-drop table if exists t_guild_logs;
-CREATE TABLE t_guild_logs (
-`idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id',
-guild_id  INT NOT NULL,
-account_id VARCHAR(255) NOT NULL,
-log_type tinyint NOT NULL default '0' COMMENT "日志类型",
-`createtime` int NOT NULL DEFAULT '0' COMMENT '创建时间',
-`modifytime` int NOT NULL DEFAULT '0' COMMENT '修改时间',
+drop table if exists `t_guild_logs`;
+CREATE TABLE `t_guild_logs` (
+`idx` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增id',
+`guild_id` bigint(20) NOT NULL,
+`account_id` varchar(60) COLLATE utf8_bin NOT NULL,
+`log_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '日志类型',
+`content` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT '日志内容',
+`createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
+`modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
 PRIMARY KEY (`idx`),
-key guild_name(`guild_id`, `account_id`, `log_type`),
-key createtime(`createtime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin
-COMMENT "公会日志表"
-;
\ No newline at end of file
+KEY `guild_name` (`guild_id`,`account_id`,`log_type`),
+KEY `createtime` (`createtime`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='公会日志表';
+
+
+drop table if exists `t_guild_pending_request`;
+CREATE TABLE `t_guild_pending_request` (
+`guild_id` bigint(20) NOT NULL,
+`account_id` varchar(60) COLLATE utf8_bin NOT NULL,
+`createtime` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
+`modifytime` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间',
+PRIMARY KEY (`guild_id`,`account_id`),
+KEY `account_id` (`account_id`),
+KEY `createtime` (`createtime`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='公会请求申请表'