1.修正通过IPv6访问时异常

2.充值余额优化
3.更新纯真IP库

app/Console/Commands/AutoJob.php

@@ -4,9 +4,14 @@ namespace App\Console\Commands;
 
 use App\Components\Helpers;
 use App\Components\Yzy;
+use App\Http\Models\EmailLog;
 use App\Http\Models\Goods;
 use App\Http\Models\GoodsLabel;
 use App\Http\Models\ReferralLog;
+use App\Http\Models\SsNode;
+use App\Http\Models\SsNodeLabel;
+use App\Http\Models\UserBalanceLog;
+use App\Mail\sendUserInfo;
 use Illuminate\Console\Command;
 use App\Http\Models\Coupon;
 use App\Http\Models\CouponLog;
@@ -21,6 +26,7 @@ use App\Http\Models\UserSubscribeLog;
 use App\Http\Models\UserTrafficHourly;
 use Log;
 use DB;
+use Mail;
 
 class AutoJob extends Command
 {
@@ -328,83 +334,125 @@ class AutoJob extends Command
                         $order->status = 2;
                         $order->save();
 
-                        // 如果买的是套餐，则先将之前购买的所有套餐置都无效，并扣掉之前所有套餐的流量
                         $goods = Goods::query()->where('id', $order->goods_id)->first();
-                        if ($goods->type == 2) {
-                            $existOrderList = Order::query()
-                                ->with(['goods'])
-                                ->whereHas('goods', function ($q) {
-                                    $q->where('type', 2);
-                                })
-                                ->where('user_id', $order->user_id)
-                                ->where('oid', '<>', $order->oid)
-                                ->where('is_expire', 0)
-                                ->where('status', 2)
-                                ->get();
-
-                            foreach ($existOrderList as $vo) {
-                                Order::query()->where('oid', $vo->oid)->update(['is_expire' => 1]);
-                                User::query()->where('id', $order->user_id)->decrement('transfer_enable', $vo->goods->traffic * 1048576);
+
+                        // 商品为流量或者套餐
+                        if ($goods->type <= 2) {
+                            // 如果买的是套餐，则先将之前购买的所有套餐置都无效，并扣掉之前所有套餐的流量
+                            if ($goods->type == 2) {
+                                $existOrderList = Order::query()
+                                    ->with(['goods'])
+                                    ->whereHas('goods', function ($q) {
+                                        $q->where('type', 2);
+                                    })
+                                    ->where('user_id', $order->user_id)
+                                    ->where('oid', '<>', $order->oid)
+                                    ->where('is_expire', 0)
+                                    ->where('status', 2)
+                                    ->get();
+
+                                foreach ($existOrderList as $vo) {
+                                    Order::query()->where('oid', $vo->oid)->update(['is_expire' => 1]);
+                                    User::query()->where('id', $order->user_id)->decrement('transfer_enable', $vo->goods->traffic * 1048576);
+                                }
                             }
-                        }
 
-                        // 把商品的流量加到账号上
-                        User::query()->where('id', $order->user_id)->increment('transfer_enable', $goods->traffic * 1048576);
+                            // 把商品的流量加到账号上
+                            User::query()->where('id', $order->user_id)->increment('transfer_enable', $goods->traffic * 1048576);
 
-                        // 计算账号过期时间
-                        if ($order->user->expire_time < date('Y-m-d', strtotime("+" . $goods->days . " days"))) {
-                            $expireTime = date('Y-m-d', strtotime("+" . $goods->days . " days"));
-                        } else {
-                            $expireTime = $order->user->expire_time;
-                        }
+                            // 计算账号过期时间
+                            if ($order->user->expire_time < date('Y-m-d', strtotime("+" . $goods->days . " days"))) {
+                                $expireTime = date('Y-m-d', strtotime("+" . $goods->days . " days"));
+                            } else {
+                                $expireTime = $order->user->expire_time;
+                            }
 
-                        // 套餐就改流量重置日，流量包不改
-                        if ($goods->type == 2) {
-                            if (date('m') == 2 && date('d') == 29) {
-                                $traffic_reset_day = 28;
+                            // 套餐就改流量重置日，流量包不改
+                            if ($goods->type == 2) {
+                                if (date('m') == 2 && date('d') == 29) {
+                                    $traffic_reset_day = 28;
+                                } else {
+                                    $traffic_reset_day = date('d') == 31 ? 30 : abs(date('d'));
+                                }
+                                User::query()->where('id', $order->user_id)->update(['traffic_reset_day' => $traffic_reset_day, 'expire_time' => $expireTime, 'enable' => 1]);
                             } else {
-                                $traffic_reset_day = date('d') == 31 ? 30 : abs(date('d'));
+                                User::query()->where('id', $order->user_id)->update(['expire_time' => $expireTime, 'enable' => 1]);
                             }
-                            User::query()->where('id', $order->user_id)->update(['traffic_reset_day' => $traffic_reset_day, 'expire_time' => $expireTime, 'enable' => 1]);
-                        } else {
-                            User::query()->where('id', $order->user_id)->update(['expire_time' => $expireTime, 'enable' => 1]);
-                        }
 
-                        // 写入用户标签
-                        if ($goods->label) {
-                            // 用户默认标签
-                            $defaultLabels = [];
-                            if (self::$systemConfig['initial_labels_for_user']) {
-                                $defaultLabels = explode(',', self::$systemConfig['initial_labels_for_user']);
+                            // 写入用户标签
+                            if ($goods->label) {
+                                // 用户默认标签
+                                $defaultLabels = [];
+                                if (self::$systemConfig['initial_labels_for_user']) {
+                                    $defaultLabels = explode(',', self::$systemConfig['initial_labels_for_user']);
+                                }
+
+                                // 取出现有的标签
+                                $userLabels = UserLabel::query()->where('user_id', $order->user_id)->pluck('label_id')->toArray();
+                                $goodsLabels = GoodsLabel::query()->where('goods_id', $order->goods_id)->pluck('label_id')->toArray();
+
+                                // 标签去重
+                                $newUserLabels = array_values(array_unique(array_merge($userLabels, $goodsLabels, $defaultLabels)));
+
+                                // 删除用户所有标签
+                                UserLabel::query()->where('user_id', $order->user_id)->delete();
+
+                                // 生成标签
+                                foreach ($newUserLabels as $vo) {
+                                    $obj = new UserLabel();
+                                    $obj->user_id = $order->user_id;
+                                    $obj->label_id = $vo;
+                                    $obj->save();
+                                }
                             }
 
-                            // 取出现有的标签
-                            $userLabels = UserLabel::query()->where('user_id', $order->user_id)->pluck('label_id')->toArray();
-                            $goodsLabels = GoodsLabel::query()->where('goods_id', $order->goods_id)->pluck('label_id')->toArray();
+                            // 写入返利日志
+                            if ($order->user->referral_uid) {
+                                $this->addReferralLog($order->user_id, $order->user->referral_uid, $order->oid, $order->amount, $order->amount * self::$systemConfig['referral_percent']);
+                            }
 
-                            // 标签去重
-                            $newUserLabels = array_values(array_unique(array_merge($userLabels, $goodsLabels, $defaultLabels)));
+                            // 取消重复返利
+                            User::query()->where('id', $order->user_id)->update(['referral_uid' => 0]);
 
-                            // 删除用户所有标签
-                            UserLabel::query()->where('user_id', $order->user_id)->delete();
+                        } elseif ($goods->type == 3) { // 商品为在线充值
+                            User::query()->where('id', $order->user_id)->increment('balance', $goods->price * 100);
 
-                            // 生成标签
-                            foreach ($newUserLabels as $vo) {
-                                $obj = new UserLabel();
-                                $obj->user_id = $order->user_id;
-                                $obj->label_id = $vo;
-                                $obj->save();
-                            }
+                            // 余额变动记录日志
+                            $this->addUserBalanceLog($order->user_id, $order->oid, $order->user->balance, $order->user->balance + $goods->price, $goods->price, '用户在线充值');
                         }
 
-                        // 写入返利日志
-                        if ($order->user->referral_uid) {
-                            $this->addReferralLog($order->user_id, $order->user->referral_uid, $order->oid, $order->amount, $order->amount * self::$systemConfig['referral_percent']);
+                        // 自动提号机：如果order的email值不为空
+                        if ($order->email) {
+                            $title = '【' . self::$systemConfig['website_name'] . '】您的账号信息';
+                            $content = [
+                                'order_sn'      => $order->order_sn,
+                                'goods_name'    => $order->goods->name,
+                                'goods_traffic' => flowAutoShow($order->goods->traffic),
+                                'port'          => $order->user->port,
+                                'passwd'        => $order->user->passwd,
+                                'method'        => $order->user->method,
+                                //'protocol'       => $order->user->protocol,
+                                //'protocol_param' => $order->user->protocol_param,
+                                //'obfs'           => $order->user->obfs,
+                                //'obfs_param'     => $order->user->obfs_param,
+                                'created_at'    => $order->created_at->toDateTimeString(),
+                                'expire_at'     => $order->expire_at
+                            ];
+
+                            // 获取可用节点列表
+                            $labels = UserLabel::query()->where('user_id', $order->user_id)->get()->pluck('label_id');
+                            $nodeIds = SsNodeLabel::query()->whereIn('label_id', $labels)->get()->pluck('node_id');
+                            $nodeList = SsNode::query()->whereIn('id', $nodeIds)->orderBy('sort', 'desc')->orderBy('id', 'desc')->get();
+                            $content['serverList'] = $nodeList;
+
+                            try {
+                                Mail::to($order->email)->send(new sendUserInfo(self::$systemConfig['website_name'], $content));
+                                $this->sendEmailLog($order->user_id, $title, json_encode($content));
+                            } catch (\Exception $e) {
+                                $this->sendEmailLog($order->user_id, $title, json_encode($content), 0, $e->getMessage());
+                            }
                         }
 
-                        // 取消重复返利
-                        User::query()->where('id', $order->user_id)->update(['referral_uid' => 0]);
-
                         DB::commit();
                     } catch (\Exception $e) {
                         DB::rollBack();
@@ -485,10 +533,10 @@ class AutoJob extends Command
     /**
      * 添加返利日志
      *
-     * @param int $userId 用户ID
+     * @param int $userId    用户ID
      * @param int $refUserId 返利用户ID
-     * @param int $oid 订单ID
-     * @param int $amount 发生金额
+     * @param int $oid       订单ID
+     * @param int $amount    发生金额
      * @param int $refAmount 返利金额
      *
      * @return int
@@ -505,4 +553,51 @@ class AutoJob extends Command
 
         return $log->save();
     }
+
+    /**
+     * 记录余额操作日志
+     *
+     * @param int    $userId 用户ID
+     * @param string $oid    订单ID
+     * @param int    $before 记录前余额
+     * @param int    $after  记录后余额
+     * @param int    $amount 发生金额
+     * @param string $desc   描述
+     *
+     * @return int
+     */
+    public function addUserBalanceLog($userId, $oid, $before, $after, $amount, $desc = '')
+    {
+        $log = new UserBalanceLog();
+        $log->user_id = $userId;
+        $log->order_id = $oid;
+        $log->before = $before;
+        $log->after = $after;
+        $log->amount = $amount;
+        $log->desc = $desc;
+        $log->created_at = date('Y-m-d H:i:s');
+
+        return $log->save();
+    }
+
+    /**
+     * 添加邮件发送日志
+     *
+     * @param int    $userId  接收者用户ID
+     * @param string $title   标题
+     * @param string $content 内容
+     * @param int    $status  投递状态
+     * @param string $error   投递失败时记录的异常信息
+     */
+    private function sendEmailLog($userId, $title, $content, $status = 1, $error = '')
+    {
+        $emailLogObj = new EmailLog();
+        $emailLogObj->user_id = $userId;
+        $emailLogObj->title = $title;
+        $emailLogObj->content = $content;
+        $emailLogObj->status = $status;
+        $emailLogObj->error = $error;
+        $emailLogObj->created_at = date('Y-m-d H:i:s');
+        $emailLogObj->save();
+    }
 }

app/Http/Controllers/Api/YzyController.php

@@ -251,7 +251,7 @@ class YzyController extends Controller
                 User::query()->where('id', $order->user_id)->increment('balance', $goods->price * 100);
 
                 // 余额变动记录日志
-                $this->addUserBalanceLog($order->user_id, $order->oid, $order->user->balance, $order->user->balance + $goods->price, +$goods->price, '用户在线充值');
+                $this->addUserBalanceLog($order->user_id, $order->oid, $order->user->balance, $order->user->balance + $goods->price, $goods->price, '用户在线充值');
             }
 
             // 自动提号机：如果order的email值不为空

app/Http/Controllers/LoginController.php

@@ -146,7 +146,12 @@ class LoginController extends Controller
         // 解析IP信息
         $qqwry = new QQWry();
         $ipInfo = $qqwry->ip($ip);
-        if (!$ipInfo || !is_array($ipInfo)) {
+        if (isset($ipInfo['error'])) {
+            Log::info('无法识别IP，可能是IPv6，尝试解析：' . $ip);
+            $ipInfo = getIPv6($ip);
+        }
+
+        if (empty($ipInfo) || empty($ipInfo['country'])) {
             \Log::warning("获取IP地址信息异常：" . $ip);
         }
 
@@ -157,7 +162,7 @@ class LoginController extends Controller
         $log->province = $ipInfo['province'] ?? '';
         $log->city = $ipInfo['city'] ?? '';
         $log->county = $ipInfo['county'] ?? '';
-        $log->isp = $ipInfo['isp'] ?? '';
+        $log->isp = $ipInfo['isp'] ?? ($ipInfo['organization'] ?? '');
         $log->area = $ipInfo['area'] ?? '';
         $log->save();
     }

app/Http/Middleware/Forbidden.php

@@ -25,7 +25,7 @@ class Forbidden
         $config = Config::query()->where('name', 'is_forbid_robot')->first();
         if ($config && $config->value) {
             if (Agent::isRobot()) {
-                Log::info("识别到机器人访问(" . $request->getClientIp() . ")");
+                Log::info("识别到机器人访问(" . getClientIp() . ")");
 
                 return Response::view('403', [], 403);
             }
@@ -35,16 +35,25 @@ class Forbidden
         $ip = getClientIP();
         $qqwry = new QQWry();
         $ipInfo = $qqwry->ip($ip);
-        if (is_array($ipInfo) && $ipInfo['country'] != '本机地址' && $ipInfo['country'] != '局域网') {
+        if (isset($ipInfo['error'])) {
+            Log::info('无法识别IP，可能是IPv6，尝试解析：' . $ip);
+            $ipInfo = getIPv6($ip);
+        }
+
+        if (empty($ipInfo) || empty($ipInfo['country'])) {
+            return $next($request);
+        }
+
+        if ($ipInfo['country'] != '本机地址' && $ipInfo['country'] != '局域网') {
             $forbidChina = Config::query()->where('name', 'is_forbid_china')->first();
-            if ($forbidChina && $forbidChina->value && $ipInfo['country'] == '中国') {
+            if ($forbidChina && $forbidChina->value && ($ipInfo['country'] == '中国' || $ipInfo['country'] == 'China')) {
                 Log::info('识别到大陆IP，拒绝访问：' . $ip);
 
                 return Response::view('403', [], 403);
             }
 
             $forbidOversea = Config::query()->where('name', 'is_forbid_oversea')->first();
-            if ($forbidOversea && $forbidOversea->value && $ipInfo['country'] != '中国') {
+            if ($forbidOversea && $forbidOversea->value && ($ipInfo['country'] != '中国' || $ipInfo['country'] != 'China')) {
                 Log::info('识别到海外IP，拒绝访问：' . $ip . ' - ' . $ipInfo['country']);
 
                 return Response::view('403', [], 403);

app/helpers.php

@@ -140,4 +140,52 @@ if (!function_exists('getClientIP')) {
 
         return $ip;
     }
+}
+
+// 获取IPv6信息
+if (!function_exists('getIPv6')) {
+    /*
+     * {
+     *     "longitude": 105,
+     *     "latitude": 35,
+     *     "area_code": "0",
+     *     "dma_code": "0",
+     *     "organization": "AS23910 China Next Generation Internet CERNET2",
+     *     "country": "China",
+     *     "ip": "2001:da8:202:10::36",
+     *     "country_code3": "CHN",
+     *     "continent_code": "AS",
+     *     "country_code": "CN"
+     *  }
+     */
+    function getIPv6($ip)
+    {
+        $url = 'https://api.ip.sb/geoip/' . $ip;
+
+        try {
+            $ch = curl_init();
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($ch, CURLOPT_TIMEOUT, 500);
+            // 为保证第三方服务器与微信服务器之间数据传输的安全性，所有微信接口采用https方式调用，必须使用下面2行代码打开ssl安全校验。
+            // 如果在部署过程中代码在此处验证失败，请到 http://curl.haxx.se/ca/cacert.pem 下载新的证书判别文件。
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_POST, 0);
+
+            $result = curl_exec($ch);
+            curl_close($ch);
+
+            $result = json_decode($result, true);
+            if (!is_array($result) || isset($result['code'])) {
+                throw new Exception('解析IPv6信息异常：' . $ip);
+            }
+
+            return $result;
+        } catch (\Exception $e) {
+            \Log::error($e->getMessage());
+
+            return [];
+        }
+    }
 }

readme.md

@@ -282,4 +282,5 @@ ntpdate cn.pool.ntp.org
 - [@tonychanczm](https://github.com/tonychanczm)
 - [@ipcheck](https://ipcheck.need.sh)
 - [@cz88](http://www.cz88.net/index.shtml)
+- [@ip.sb](https://www.ip.sb)
 

resources/views/shop/addGoods.blade.php

@@ -68,7 +68,7 @@
                                     </div>
                                 </div>
                                 <!--
-                                <div class="form-group">
+                                <div class="form-group package-money">
                                     <label class="control-label col-md-3">LOGO</label>
                                     <div class="col-md-6">
                                         <div class="fileinput fileinput-new" data-provides="fileinput">
@@ -102,7 +102,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="form-group">
+                                <div class="form-group package-money">
                                     <label class="control-label col-md-3">内含流量</label>
                                     <div class="col-md-6">
                                         <div class="input-group">
@@ -112,7 +112,7 @@
                                         <span class="help-block"> 提交后不可修改 </span>
                                     </div>
                                 </div>
-                                <div class="form-group">
+                                <div class="form-group package-money">
                                     <label for="labels" class="col-md-3 control-label">标签</label>
                                     <div class="col-md-6">
                                         <select id="labels" class="form-control select2-multiple" name="labels[]" multiple>
@@ -124,7 +124,7 @@
                                     </div>
                                 </div>
                                 <!--
-                                <div class="form-group">
+                                <div class="form-group package-money">
                                     <label class="control-label col-md-3">所需积分</label>
                                     <div class="col-md-6">
                                         <input type="text" class="form-control" name="score" value="0" id="score" placeholder="" required>
@@ -132,7 +132,7 @@
                                     </div>
                                 </div>
                                 -->
-                                <div class="form-group">
+                                <div class="form-group package-money">
                                     <label class="control-label col-md-3">有效期</label>
                                     <div class="col-md-6">
                                         <div class="input-group">
@@ -142,14 +142,14 @@
                                         <span class="help-block"> 到期后会自动从总流量扣减对应的流量，添加后不可修改 </span>
                                     </div>
                                 </div>
-                                <div class="form-group">
+                                <div class="form-group package-money">
                                     <label for="sort" class="control-label col-md-3">排序</label>
                                     <div class="col-md-6">
                                         <input type="text" class="form-control" name="sort" value="{{Request::old('sort')}}" id="sort" placeholder="">
                                         <span class="help-block"> 值越大排越前 </span>
                                     </div>
                                 </div>
-                                <div class="form-group">
+                                <div class="form-group package-money">
                                     <label for="color" class="col-md-3 control-label">颜色</label>
                                     <div class="col-md-6">
                                         <select class="form-control" name="color" id="color">
@@ -162,7 +162,7 @@
                                         </select>
                                     </div>
                                 </div>
-                                <div class="form-group">
+                                <div class="form-group package-money">
                                     <label for="is_hot" class="col-md-3 control-label">热销</label>
                                     <div class="col-md-6">
                                         <div class="mt-radio-inline">
@@ -234,5 +234,15 @@
                 format: 'yyyy-mm-dd'
             });
         });
+
+        // 选择商品类型
+        $("input[name='type']").change(function(){
+            var type = $(this).val();
+            if (type == 3) {
+                $(".package-money").hide();
+            } else {
+                $(".package-money").show();
+            }
+        });
     </script>
 @endsection

resources/views/shop/editGoods.blade.php

@@ -106,6 +106,7 @@
                                         </div>
                                     </div>
                                 </div>
+                                @if($goods->type <= 2)
                                 <div class="form-group">
                                     <label class="control-label col-md-3">内含流量</label>
                                     <div class="col-md-6">
@@ -180,6 +181,7 @@
                                         </div>
                                     </div>
                                 </div>
+                                @endif
                                 <div class="form-group last">
                                     <label class="control-label col-md-3">状态</label>
                                     <div class="col-md-6">
@@ -195,7 +197,6 @@
                                         </div>
                                     </div>
                                 </div>
-
                             </div>
                             <div class="form-actions">
                                 <div class="row">

resources/views/shop/goodsList.blade.php

@@ -66,7 +66,7 @@
                                                 @endif
                                             </td>
                                             <!-- <td> @if($goods->logo) <a href="{{$goods->logo}}" class="fancybox"><img src="{{$goods->logo}}"/></a> @endif </td> -->
-                                            <td> {{$goods->traffic_label}} </td>
+                                            <td> {{$goods->type == 3 ? '' : $goods->traffic_label}} </td>
                                             <td> {{$goods->price}}元 </td>
                                             <!-- <td> {{$goods->score}} </td> -->
                                             <td> {{$goods->sort}} </td>
@@ -148,6 +148,6 @@
                 openEffect: 'elastic',
                 closeEffect: 'elastic'
             })
-        })
+        });
     </script>
 @endsection