From 56404736b925000910a591485fc257f2def4619a Mon Sep 17 00:00:00 2001
From: youda <youda@Server>
Date: Sat, 19 Apr 2025 02:48:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                          |  6 +++---
 app/api/controller/Config.php |  2 +-
 app/api/controller/Login.php  | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index d30629e..a15c551 100644
--- a/.env
+++ b/.env
@@ -6,9 +6,9 @@ DEFAULT_TIMEZONE = Asia/Shanghai
 [DATABASE]
 TYPE = mysql
 HOSTNAME = 127.0.0.1
-DATABASE = youda_test
-USERNAME = youda_test
-PASSWORD = youda_test
+DATABASE = youda
+USERNAME = youda
+PASSWORD = youda
 HOSTPORT = 3306
 CHARSET = utf8
 DEBUG = false
diff --git a/app/api/controller/Config.php b/app/api/controller/Config.php
index b58f4b5..e1e4c96 100755
--- a/app/api/controller/Config.php
+++ b/app/api/controller/Config.php
@@ -26,7 +26,7 @@ class Config extends Base
         return $this->renderSuccess('获取成功', [
             'good_type' => $goodsTypeList,
             'app_setting' => $app_setting,
-            'version' => '100'
+            'version' => '101'
         ]);
     }
  
diff --git a/app/api/controller/Login.php b/app/api/controller/Login.php
index 0907fec..ebc622f 100755
--- a/app/api/controller/Login.php
+++ b/app/api/controller/Login.php
@@ -258,7 +258,7 @@ class Login extends Base
                     $user['id'],
                     'wechat',
                     $last_login_ip1,
-                    $ip_province . $ip_city
+                    ''//$ip_province . $ip_city
                 );
 
                 return $this->renderSuccess("登录成功", $account_token);
@@ -380,7 +380,7 @@ class Login extends Base
                         $user_id,
                         'wechat:v1.0.0',
                         $last_login_ip1,
-                        $ip_province . $ip_city
+                        ''//$ip_province . $ip_city
                     );
 
                     Db::commit();
@@ -391,9 +391,9 @@ class Login extends Base
                 }
             }
         } catch (\Exception $e) {
-            Log::error('错误信息' . $e->getMessage());
-            Log::error('错误行数' . $e->getLine());
-
+            Log::error('登录失败->错误信息' . $e->getMessage());
+            Log::error('登录失败->错误行数' . $e->getLine());
+            return $this->renderError("登录失败");
         }
     }
 
@@ -748,7 +748,7 @@ class Login extends Base
                 $ip_province = $result['province'];
                 $ip_city = $result['city'];
                 $ip_adcode = $result['adcode'];
-                $location = $ip_province . $ip_city;
+                $location ="";// $ip_province . $ip_city;
             }
             $user_id = $user['id'];
             $isTest = \app\common\helper\ConfigHelper::getSystemTestKey("enable_test");