update: 适配v2rayN订阅ss,trojan,vmess/易支付回调显示success/套餐折算判断usedd

BobCoderS9 · May 22, 2023 · 5dfac2c · 5dfac2c
1 parent dc41b30
commit 5dfac2c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/Controllers/LinkController.php b/src/Controllers/LinkController.php
@@ -927,6 +927,10 @@ public static function getSub($user, $sub, $opts, $Rule)
             case 3: // V2
                 $Rule['type'] = 'vmess';
                 $return_url .= URL::get_NewAllUrl($user, $Rule);
+                $Rule['type'] = 'ss';
+                $return_url .= URL::get_NewAllUrl($user, $Rule);
+                $Rule['type'] = 'trojan';
+                $return_url .= URL::get_NewAllUrl($user, $Rule);
                 $getListExtend = $Rule['extend'] ? self::getListExtend($user, 'v2rayn') : [];
                 break;
             case 4: // Trojan

diff --git a/src/Controllers/MetronController.php b/src/Controllers/MetronController.php
@@ -390,11 +390,6 @@ public function formCheck($request, $response, $args)
      */
     public function PackageConversion($request, $response, $args)
     {
-        $mt = MtAuth::Auth();
-        if (!$mt['ret']) {
-            return $response->getBody()->write(json_encode($mt, JSON_UNESCAPED_UNICODE));
-        }
-
         if (!MetronSetting::get('shop_conversion')) {
             $res = ['ret' => 0, 'msg' => '管理员设置不允许折算'];
             return $response->getBody()->write(json_encode($res, JSON_UNESCAPED_UNICODE));

diff --git a/src/Metron/Metron.php b/src/Metron/Metron.php
@@ -117,10 +117,10 @@ public function getConversionInfo($user, $bought)
                 ],
             ];
         } else {                                    /* 是常规套餐 */
-            /*if ($bought->usedd === 0 ){
+            if ($bought->usedd === 0 ){
                 $res = ['ret' => 0, 'msg' => '该套餐已失效, 不能折算余额'];
                 return $res;
-            }*/
+            }
             /* 用户等级和套餐的不一样, 可能被管理修改过 */
             if ( $shopinfo['class'] != $user->class) {
                 $res = ['ret' => 0, 'msg' => '您的等级和套餐等级不符,请联系管理处理'];

diff --git a/src/Services/Gateway/Epay.php b/src/Services/Gateway/Epay.php
@@ -120,9 +120,9 @@ public function notify($request, $response, $args)
             $trade_status = $_GET['trade_status'];
             if ($trade_status == 'TRADE_SUCCESS') {
                 $this->postPayment($out_trade_no, $type);
-                return json_encode(['state' => 'success', 'msg' => '支付成功']);
+                die('SUCCESS');
             }else{
-                return json_encode(['state' => 'fail', 'msg' => '支付失败']);
+                die('FAIL');
             }
         } else {
             return '非法请求';