Merge pull request #95 from v2board/dev

Dev

app/Console/Commands/ResetTraffic.php

@@ -52,15 +52,17 @@ class ResetTraffic extends Command
         }
     }
 
-    private function resetByMonthFirstDay(User $user):void
+    private function resetByMonthFirstDay($user):void
     {
-        $user->update([
-            'u' => 0,
-            'd' => 0
-        ]);
+        if ((string)date('d') === '01') {
+            $user->update([
+                'u' => 0,
+                'd' => 0
+            ]);
+        }
     }
 
-    private function resetByExpireDay(User $user):void
+    private function resetByExpireDay($user):void
     {
         $date = date('Y-m-d', time());
         $startAt = strtotime((string)$date);

app/Http/Controllers/Guest/OrderController.php

@@ -15,7 +15,7 @@ class OrderController extends Controller
 {
     public function alipayNotify(Request $request)
     {
-        Log::info('alipayNotifyData: ' . json_encode($_POST));
+        // Log::info('alipayNotifyData: ' . json_encode($_POST));
         $gateway = Omnipay::create('Alipay_AopF2F');
         $gateway->setSignType('RSA2'); //RSA/RSA2
         $gateway->setAppId(config('v2board.alipay_appid'));
@@ -52,7 +52,7 @@ class OrderController extends Controller
 
     public function stripeNotify(Request $request)
     {
-        Log::info('stripeNotifyData: ' . json_encode($request->input()));
+        // Log::info('stripeNotifyData: ' . json_encode($request->input()));
 
         \Stripe\Stripe::setApiKey(config('v2board.stripe_sk_live'));
         try {
@@ -93,7 +93,7 @@ class OrderController extends Controller
     public function bitpayXNotify(Request $request)
     {
         $inputString = file_get_contents('php://input', 'r');
-        Log::info('bitpayXNotifyData: ' . $inputString);
+        // Log::info('bitpayXNotifyData: ' . $inputString);
         $inputStripped = str_replace(array("\r", "\n", "\t", "\v"), '', $inputString);
         $inputJSON = json_decode($inputStripped, true); //convert JSON into array
 
@@ -125,7 +125,7 @@ class OrderController extends Controller
 
     public function payTaroNotify(Request $request)
     {
-        Log::info('payTaroNotify: ' . json_encode($request->input()));
+        // Log::info('payTaroNotify: ' . json_encode($request->input()));
 
         $payTaro = new PayTaro(config('v2board.paytaro_app_id'), config('v2board.paytaro_app_secret'));
         if (!$payTaro->verify($request->input())) {

app/Http/Controllers/Server/DeepbworkController.php

@@ -59,7 +59,7 @@ class DeepbworkController extends Controller
     // 后端提交数据
     public function submit(Request $request)
     {
-        Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
+        // Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
         $server = Server::find($request->input('node_id'));
         if (!$server) {
             return response([

app/Http/Controllers/Server/PoseidonController.php

@@ -51,7 +51,7 @@ class PoseidonController extends Controller
     {
         if ($r = $this->verifyToken($request)) { return $r; }
 
-        Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
+        // Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
         $server = Server::find($request->input('node_id'));
         if (!$server) {
             return $this->error("server could not be found", 404);

app/Http/Controllers/User/OrderController.php

@@ -452,7 +452,7 @@ class OrderController extends Controller
                 'user_id' => $order->user_id,
                 'invoice_id' => $order->trade_no,
                 'identifier' => ''
-            ],            
+            ],
             'redirect' => [
                 'return_url' => config('v2board.app_url', env('APP_URL')) . '/#/order'
             ]
@@ -482,7 +482,7 @@ class OrderController extends Controller
         $strToSign = $bitpayX->prepareSignId($params['merchant_order_id']);
         $params['token'] = $bitpayX->sign($strToSign);
         $result = $bitpayX->mprequest($params);
-        Log::info('bitpayXSubmit: ' . json_encode($result));
+        // Log::info('bitpayXSubmit: ' . json_encode($result));
         return isset($result['payment_url']) ? $result['payment_url'] : false;
     }
 

config/app.php

@@ -236,5 +236,5 @@ return [
     | The only modification by laravel config
     |
     */
-    'version' => '1.2.1'
+    'version' => '1.2.2'
 ];

resources/rules/default.clash.yaml

@@ -1,5 +1,11 @@
 Rule:
   # Apple
+  - DOMAIN,safebrowsing.urlsec.qq.com,DIRECT # 如果您并不信任此服务提供商或防止其下载消耗过多带宽资源，可以进入 Safari 设置，关闭 Fraudulent Website Warning 功能，并使用 REJECT 策略。
+  - DOMAIN,safebrowsing.googleapis.com,DIRECT # 如果您并不信任此服务提供商或防止其下载消耗过多带宽资源，可以进入 Safari 设置，关闭 Fraudulent Website Warning 功能，并使用 REJECT 策略。
+  - DOMAIN,ocsp.apple.com,select
+  - DOMAIN-SUFFIX,digicert.com,select
+  - DOMAIN-SUFFIX,entrust.net,select
+  - DOMAIN,ocsp.verisign.net,select
   - DOMAIN-SUFFIX,apps.apple.com,select
   - DOMAIN-SUFFIX,itunes.apple.com,select
   - DOMAIN-SUFFIX,blobstore.apple.com,select
@@ -13,11 +19,11 @@ Rule:
   - DOMAIN-SUFFIX,cdn-apple.com,DIRECT
   - DOMAIN-SUFFIX,apple.com,DIRECT
   - DOMAIN-SUFFIX,apple-cloudkit.com,DIRECT
-  #- DOMAIN,e.crashlytics.com,REJECT //注释此选项有助于大多数App开发者分析崩溃信息；如果您拒绝一切崩溃数据统计、搜集，请取消 # 注释。
+  # - DOMAIN,e.crashlytics.com,REJECT //注释此选项有助于大多数App开发者分析崩溃信息；如果您拒绝一切崩溃数据统计、搜集，请取消 # 注释。
 
 
   # 自定义规则
-  ## 您可以在此处插入您补充的自定义规则
+  ## 您可以在此处插入您补充的自定义规则（请注意保持缩进）
 
   # 国内网站
   - DOMAIN-SUFFIX,cn,DIRECT
@@ -185,7 +191,6 @@ Rule:
   - DOMAIN-KEYWORD,partnerad,REJECT
   - DOMAIN-KEYWORD,pingfore,REJECT
   - DOMAIN-KEYWORD,supersonicads,REJECT
-  - DOMAIN-KEYWORD,tracking,REJECT
   - DOMAIN-KEYWORD,uedas,REJECT
   - DOMAIN-KEYWORD,umeng,REJECT
   - DOMAIN-KEYWORD,usage,REJECT
@@ -465,12 +470,15 @@ Rule:
   - DOMAIN-SUFFIX,telegra.ph,select
   - DOMAIN-SUFFIX,telegram.org,select
 
-  - IP-CIDR,91.108.56.0/22,select
-  - IP-CIDR,91.108.4.0/22,select
-  - IP-CIDR,91.108.8.0/22,select
-  - IP-CIDR,109.239.140.0/24,select
-  - IP-CIDR,149.154.160.0/20,select
-  - IP-CIDR,149.154.164.0/22,select
+  - IP-CIDR,91.108.4.0/22,select,no-resolve
+  - IP-CIDR,91.108.8.0/22,select,no-resolve
+  - IP-CIDR,91.108.12.0/22,select,no-resolve
+  - IP-CIDR,91.108.16.0/22,select,no-resolve
+  - IP-CIDR,91.108.56.0/22,select,no-resolve
+  - IP-CIDR,149.154.160.0/22,select,no-resolve
+  - IP-CIDR,149.154.164.0/22,select,no-resolve
+  - IP-CIDR,149.154.168.0/22,select,no-resolve
+  - IP-CIDR,149.154.172.0/22,select,no-resolve
 
   # LAN
   - DOMAIN-SUFFIX,local,DIRECT