merged

lordlezehaf · lordlezehaf · commit c1002c5b67bf · 2018-12-19T12:01:37.000+08:00
diff --git a/.env.example b/.env.example
@@ -41,4 +41,4 @@ PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
 
-REDIRECT_HTTPS=true
+REDIRECT_HTTPS=false
diff --git a/app/Http/Controllers/ShopController.php b/app/Http/Controllers/ShopController.php
@@ -201,7 +201,6 @@ public function editGoods(Request $request)
                 $data = [
                     'name'     => $name,
                     'desc'     => $desc,
-                    'logo'     => $logo,
                     'price'    => $price * 100,
                     'sort'     => $sort,
                     'color'    => $color,
@@ -210,6 +209,10 @@ public function editGoods(Request $request)
                     'status'   => $status
                 ];
 
+                if ($logo) {
+                    $data['logo'] = $logo;
+                }
+
                 Goods::query()->where('id', $id)->update($data);
 
                 // 先删除该商品所有的标签
diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php
@@ -170,7 +170,7 @@ private function expireDate($user)
     {
         $text = '到期时间：' . $user->expire_time;
 
-        return 'ssr://' . base64url_encode('8.8.8.8:8888:origin:none:plain:' . base64url_encode('0000') . '/?obfsparam=&protoparam=&remarks=' . base64url_encode($text) . '&group=' . base64url_encode('VPN') . '&udpport=0&uot=0') . "\n";
+        return 'ssr://' . base64url_encode('8.8.8.8:8888:origin:none:plain:' . base64url_encode('0000') . '/?obfsparam=&protoparam=&remarks=' . base64url_encode($text) . '&group=' . base64url_encode('默认') . '&udpport=0&uot=0') . "\n";
     }
 
     /**
@@ -184,6 +184,6 @@ private function lastTraffic($user)
     {
         $text = '剩余流量：' . flowAutoShow($user->transfer_enable - $user->u - $user->d);
 
-        return 'ssr://' . base64url_encode('8.8.8.8:8888:origin:none:plain:' . base64url_encode('0000') . '/?obfsparam=&protoparam=&remarks=' . base64url_encode($text) . '&group=' . base64url_encode('VPN') . '&udpport=0&uot=0') . "\n";
+        return 'ssr://' . base64url_encode('9.9.9.9:8888:origin:none:plain:' . base64url_encode('0000') . '/?obfsparam=&protoparam=&remarks=' . base64url_encode($text) . '&group=' . base64url_encode('默认') . '&udpport=0&uot=0') . "\n";
     }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -13,6 +13,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        // 检测是否强制跳转https
         if (env('REDIRECT_HTTPS', false)) {
             \URL::forceScheme('https');
         }
diff --git a/resources/views/admin/system.blade.php b/resources/views/admin/system.blade.php
@@ -75,7 +75,7 @@
                                                                         <button class="btn btn-success" type="button" onclick="setWebsiteUrl()">修改</button>
                                                                     </span>
                                                                 </div>
-                                                                <span class="help-block"> 生成重置密码、有赞云支付必备，示例：https://www.ssrpanel.com </span>
+                                                                <span class="help-block"> 生成重置密码、有赞云支付、TrimePay支付必备，示例：https://www.ssrpanel.com </span>
                                                             </div>
                                                         </div>
                                                     </div>
diff --git a/resources/views/payment/detail.blade.php b/resources/views/payment/detail.blade.php
@@ -75,12 +75,14 @@ function getStatus () {
             });
         }
 
-    //qr自适应
-    var w=window.innerWidth;
-    var h=window.innerHeight;
-    x=document.getElementById("qr");
-    if (w<=h)
-      x.setAttribute("width", "75%");
-      else x.setAttribute("height", "75%");
+        // 付款二维码自适应
+        var w = window.innerWidth;
+        var h = window.innerHeight;
+        x = document.getElementById("qr");
+        if (w <= h) {
+            x.setAttribute("width", "75%");
+        } else {
+            x.setAttribute("height", "75%");
+        }
     </script>
 @endsection

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ private function expireDate($user)`
`170`	`170`	`{`
`171`	`171`	`$text = '到期时间：' . $user->expire_time;`
`172`	`172`
`173`		`- return 'ssr://' . base64url_encode('8.8.8.8:8888:origin:none:plain:' . base64url_encode('0000') . '/?obfsparam=&protoparam=&remarks=' . base64url_encode($text) . '&group=' . base64url_encode('VPN') . '&udpport=0&uot=0') . "\n";`
	`173`	`+ return 'ssr://' . base64url_encode('8.8.8.8:8888:origin:none:plain:' . base64url_encode('0000') . '/?obfsparam=&protoparam=&remarks=' . base64url_encode($text) . '&group=' . base64url_encode('默认') . '&udpport=0&uot=0') . "\n";`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`/**`
`@@ -184,6 +184,6 @@ private function lastTraffic($user)`
`184`	`184`	`{`
`185`	`185`	`$text = '剩余流量：' . flowAutoShow($user->transfer_enable - $user->u - $user->d);`
`186`	`186`
`187`		`- return 'ssr://' . base64url_encode('8.8.8.8:8888:origin:none:plain:' . base64url_encode('0000') . '/?obfsparam=&protoparam=&remarks=' . base64url_encode($text) . '&group=' . base64url_encode('VPN') . '&udpport=0&uot=0') . "\n";`
	`187`	`+ return 'ssr://' . base64url_encode('9.9.9.9:8888:origin:none:plain:' . base64url_encode('0000') . '/?obfsparam=&protoparam=&remarks=' . base64url_encode($text) . '&group=' . base64url_encode('默认') . '&udpport=0&uot=0') . "\n";`
`188`	`188`	`}`
`189`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ class AppServiceProvider extends ServiceProvider`
`13`	`13`	`*/`
`14`	`14`	`public function boot()`
`15`	`15`	`{`
	`16`	`+ // 检测是否强制跳转https`
`16`	`17`	`if (env('REDIRECT_HTTPS', false)) {`
`17`	`18`	`\URL::forceScheme('https');`
`18`	`19`	`}`