From 9a9a1d08c533c27e1fba1e6a89fd7eba4a413d12 Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Mon, 29 Apr 2024 10:52:11 +0800
Subject: [PATCH 1/4] 1

---
 webapp/controller/BaseAuthedController.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp/controller/BaseAuthedController.class.php b/webapp/controller/BaseAuthedController.class.php
index baf5accb..54c72507 100644
--- a/webapp/controller/BaseAuthedController.class.php
+++ b/webapp/controller/BaseAuthedController.class.php
@@ -633,7 +633,8 @@ class BaseAuthedController extends BaseController {
         if (SERVER_ENV != _ONLINE) {
             return "${itemMeta['name']} Not enough stock:${lackItem['inventory']} need:${lackItem['item_num']}";
         } else {
-            return "${itemMeta['name']} Not enough";
+//            return "${itemMeta['name']} Not enough";
+            return "item Not enough";
         }
     }
 

From 2b0759ca437950b5e622515d6c28a3dc096efc66 Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Mon, 29 Apr 2024 11:17:47 +0800
Subject: [PATCH 2/4] 1

---
 webapp/models/Gun.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php
index 72a1bdf4..6bd637c2 100644
--- a/webapp/models/Gun.php
+++ b/webapp/models/Gun.php
@@ -259,7 +259,7 @@ class Gun extends BaseModel {
                 }
             }
         }
-
+        error_log('callstack:' . json_encode(debug_backtrace(), JSON_PRETTY_PRINT));
 
         $dto = array(
             'idx' => $row['idx'],

From a18bc42a28a533da18783c6acf68625e1c7589f2 Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Mon, 29 Apr 2024 11:27:59 +0800
Subject: [PATCH 3/4] 1

---
 webapp/models/Gun.php        | 12 +-----------
 webapp/models/HeroPreset.php | 14 --------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php
index 6bd637c2..444df564 100644
--- a/webapp/models/Gun.php
+++ b/webapp/models/Gun.php
@@ -248,18 +248,8 @@ class Gun extends BaseModel {
             $lockType = $row['lock_type'];
             $unlockTime = $row['unlock_time'];
         }
+        $heroIds =array();
 
-        {
-            $heroIds =array();
-            $list = HeroPreset::getByGunUid($row['idx']);
-            if ($list){
-                foreach ($list as $value){
-                    $heroDb = Hero::find($value['hero_uid']);
-                    array_push($heroIds,$heroDb['hero_id']);
-                }
-            }
-        }
-        error_log('callstack:' . json_encode(debug_backtrace(), JSON_PRETTY_PRINT));
 
         $dto = array(
             'idx' => $row['idx'],
diff --git a/webapp/models/HeroPreset.php b/webapp/models/HeroPreset.php
index a148c9c2..33159320 100644
--- a/webapp/models/HeroPreset.php
+++ b/webapp/models/HeroPreset.php
@@ -7,20 +7,6 @@ use phpcommon;
 use phpcommon\SqlHelper;
 
 class HeroPreset extends BaseModel {
-    public static function getByGunUid($weapon_uid){
-        $rows = SqlHelper::ormSelect(
-            myself()->_getSelfMysql(),
-            't_hero_preset',
-            array(
-                'account_id' => myself()->_getAccountId(),
-                'weapon_uid1' => $weapon_uid,
-            )
-        );
-        if (!$rows){
-            return null;
-        }
-        return  $rows;
-    }
 
     public static function getHeroPreset($heroUid){
         $row = SqlHelper::ormSelectOne(

From 510ff1f81d91987daadac7bd9c8791394b76f3e8 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 29 Apr 2024 11:31:12 +0800
Subject: [PATCH 4/4] 1

---
 webapp/controller/MailController.class.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/webapp/controller/MailController.class.php b/webapp/controller/MailController.class.php
index 7b9934a9..df06b363 100644
--- a/webapp/controller/MailController.class.php
+++ b/webapp/controller/MailController.class.php
@@ -118,11 +118,7 @@ class MailController extends BaseAuthedController {
 
     private static function getMailServerUrl()
     {
-        if (SERVER_ENV != _ONLINE) {
-            return "https://gamemail-test.kingsome.cn/webapp/index.php";
-        } else {
-            return "https://gamemail-test.cebggame.com/webapp/index.php";
-        }
+        return MAIL_URL;
     }
 
 }