Browse Source

fix: db initialization error & better exception handle

M1Screw 2 years ago
parent
commit
1427090b20

+ 0 - 1
db/migrations/2023060300-add_user_locale_and_update_data_type.php

@@ -41,7 +41,6 @@ return new class() implements MigrationInterface {
         ALTER TABLE user MODIFY COLUMN `node_group` smallint(6) unsigned NOT NULL DEFAULT 0 COMMENT '节点分组';
         ALTER TABLE user MODIFY COLUMN `is_banned` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT '是否封禁';
         ALTER TABLE user MODIFY COLUMN `banned_reason` varchar(255) NOT NULL DEFAULT '' COMMENT '封禁理由';
-        ALTER TABLE user MODIFY COLUMN `telegram_id` bigint(20) unsigned NOT NULL DEFAULT 0 COMMENT 'Telegram ID';
         ALTER TABLE user MODIFY COLUMN `expire_notified` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT '过期提醒';
         ALTER TABLE user MODIFY COLUMN `traffic_notified` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT '流量提醒';
         ALTER TABLE user MODIFY COLUMN `forbidden_ip` varchar(255) NOT NULL DEFAULT '' COMMENT '禁止访问IP';

+ 0 - 1
db/migrations/2023080900-update_user_im_type.php

@@ -10,7 +10,6 @@ return new class() implements MigrationInterface {
     {
         DB::getPdo()->exec("
             ALTER TABLE user MODIFY COLUMN `im_type` smallint(6) unsigned NOT NULL DEFAULT 0 COMMENT '联系方式类型';
-            UPDATE user SET `im_value` = `telegram_id` WHERE `im_type` = 4;
             UPDATE user SET `im_value` = '' WHERE `im_value` = '0';
         ");
 

+ 6 - 1
src/Controllers/UserController.php

@@ -65,7 +65,12 @@ final class UserController extends BaseController
 
         foreach ($logins as $login) {
             $login->datetime = Tools::toDateTime((int) $login->datetime);
-            $login->location = Tools::getIpLocation($login->ip);
+
+            try {
+                $login->location = Tools::getIpLocation($login->ip);
+            } catch (Exception) {
+                $login->location = '未知';
+            }
         }
 
         foreach ($ips as $ip) {