From 6d8f98a554a78080cba24f7803b5f9141e8bdfe8 Mon Sep 17 00:00:00 2001 From: F4nniu Date: Sun, 19 Feb 2023 21:28:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=9F=E4=B8=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=97=E7=AC=A6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/command/Install.php | 2 +- .../admin/command/Install/fastadmin.sql | 38 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/application/admin/command/Install.php b/application/admin/command/Install.php index ec68f9422..07d35593d 100644 --- a/application/admin/command/Install.php +++ b/application/admin/command/Install.php @@ -182,7 +182,7 @@ class Install extends Command try { $pdo = new PDO("{$config['type']}:host={$mysqlHostname}" . ($mysqlHostport ? ";port={$mysqlHostport}" : ''), $mysqlUsername, $mysqlPassword); $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); - $pdo->query("CREATE DATABASE IF NOT EXISTS `{$mysqlDatabase}` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"); + $pdo->query("CREATE DATABASE IF NOT EXISTS `{$mysqlDatabase}` CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"); // 连接install命令中指定的数据库 $instance = Db::connect([ diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql index e71020fe2..8fef119d7 100755 --- a/application/admin/command/Install/fastadmin.sql +++ b/application/admin/command/Install/fastadmin.sql @@ -27,7 +27,7 @@ CREATE TABLE `fa_admin` ( `status` varchar(30) NOT NULL DEFAULT 'normal' COMMENT '状态', PRIMARY KEY (`id`), UNIQUE KEY `username` (`username`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='管理员表'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='管理员表'; -- ---------------------------- -- Records of fa_admin @@ -52,7 +52,7 @@ CREATE TABLE `fa_admin_log` ( `createtime` bigint(16) DEFAULT NULL COMMENT '操作时间', PRIMARY KEY (`id`), KEY `name` (`username`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='管理员日志表'; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='管理员日志表'; -- ---------------------------- -- Table structure for fa_area @@ -73,7 +73,7 @@ CREATE TABLE `fa_area` ( `lat` varchar(100) DEFAULT NULL COMMENT '纬度', PRIMARY KEY (`id`), KEY `pid` (`pid`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='地区表'; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='地区表'; -- ---------------------------- -- Table structure for fa_attachment @@ -99,7 +99,7 @@ CREATE TABLE `fa_attachment` ( `storage` varchar(100) NOT NULL DEFAULT 'local' COMMENT '存储位置', `sha1` varchar(40) DEFAULT '' COMMENT '文件 sha1编码', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='附件表'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='附件表'; -- ---------------------------- -- Records of fa_attachment @@ -121,7 +121,7 @@ CREATE TABLE `fa_auth_group` ( `updatetime` bigint(16) DEFAULT NULL COMMENT '更新时间', `status` varchar(30) DEFAULT '' COMMENT '状态', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='分组表'; +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='分组表'; -- ---------------------------- -- Records of fa_auth_group @@ -144,7 +144,7 @@ CREATE TABLE `fa_auth_group_access` ( UNIQUE KEY `uid_group_id` (`uid`,`group_id`), KEY `uid` (`uid`), KEY `group_id` (`group_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='权限分组表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='权限分组表'; -- ---------------------------- -- Records of fa_auth_group_access @@ -180,7 +180,7 @@ CREATE TABLE `fa_auth_rule` ( UNIQUE KEY `name` (`name`) USING BTREE, KEY `pid` (`pid`), KEY `weigh` (`weigh`) -) ENGINE=InnoDB AUTO_INCREMENT=66 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='节点表'; +) ENGINE=InnoDB AUTO_INCREMENT=66 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='节点表'; -- ---------------------------- -- Records of fa_auth_rule @@ -292,7 +292,7 @@ CREATE TABLE `fa_category` ( PRIMARY KEY (`id`), KEY `weigh` (`weigh`,`id`), KEY `pid` (`pid`) -) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='分类表'; +) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='分类表'; -- ---------------------------- -- Records of fa_category @@ -332,7 +332,7 @@ CREATE TABLE `fa_config` ( `setting` varchar(255) DEFAULT '' COMMENT '配置', PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='系统配置'; +) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='系统配置'; -- ---------------------------- -- Records of fa_config @@ -371,7 +371,7 @@ CREATE TABLE `fa_ems` ( `ip` varchar(30) DEFAULT '' COMMENT 'IP', `createtime` bigint(16) DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='邮箱验证码表'; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='邮箱验证码表'; -- ---------------------------- -- Table structure for fa_sms @@ -386,7 +386,7 @@ CREATE TABLE `fa_sms` ( `ip` varchar(30) DEFAULT '' COMMENT 'IP', `createtime` bigint(16) unsigned DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='短信验证码表'; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='短信验证码表'; -- ---------------------------- -- Table structure for fa_test @@ -429,7 +429,7 @@ CREATE TABLE `fa_test` ( `status` enum('normal','hidden') DEFAULT 'normal' COMMENT '状态', `state` enum('0','1','2') DEFAULT '1' COMMENT '状态值:0=禁用,1=正常,2=推荐', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='测试表'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='测试表'; -- ---------------------------- -- Records of fa_test @@ -475,7 +475,7 @@ CREATE TABLE `fa_user` ( KEY `username` (`username`), KEY `email` (`email`), KEY `mobile` (`mobile`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='会员表'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='会员表'; -- ---------------------------- -- Records of fa_user @@ -496,7 +496,7 @@ CREATE TABLE `fa_user_group` ( `updatetime` bigint(16) DEFAULT NULL COMMENT '更新时间', `status` enum('normal','hidden') DEFAULT NULL COMMENT '状态', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='会员组表'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='会员组表'; -- ---------------------------- -- Records of fa_user_group @@ -518,7 +518,7 @@ CREATE TABLE `fa_user_money_log` ( `memo` varchar(255) DEFAULT '' COMMENT '备注', `createtime` bigint(16) DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='会员余额变动表'; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='会员余额变动表'; -- ---------------------------- -- Table structure for fa_user_rule @@ -536,7 +536,7 @@ CREATE TABLE `fa_user_rule` ( `weigh` int(10) DEFAULT '0' COMMENT '权重', `status` enum('normal','hidden') DEFAULT NULL COMMENT '状态', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='会员规则表'; +) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='会员规则表'; -- ---------------------------- -- Records of fa_user_rule @@ -569,7 +569,7 @@ CREATE TABLE `fa_user_score_log` ( `memo` varchar(255) DEFAULT '' COMMENT '备注', `createtime` bigint(16) DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='会员积分变动表'; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='会员积分变动表'; -- ---------------------------- -- Table structure for fa_user_token @@ -581,7 +581,7 @@ CREATE TABLE `fa_user_token` ( `createtime` bigint(16) DEFAULT NULL COMMENT '创建时间', `expiretime` bigint(16) DEFAULT NULL COMMENT '过期时间', PRIMARY KEY (`token`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='会员Token表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='会员Token表'; -- ---------------------------- -- Table structure for fa_version @@ -600,6 +600,6 @@ CREATE TABLE `fa_version` ( `weigh` int(10) NOT NULL DEFAULT 0 COMMENT '权重', `status` varchar(30) DEFAULT '' COMMENT '状态', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT='版本表'; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='版本表'; SET FOREIGN_KEY_CHECKS = 1; -- Gitee