Merge branch 'pre' into pro

app/Http/Controllers/Web/Api2021Controller.php

@@ -377,10 +377,9 @@ class Api2021Controller extends Controller
             return response()->json(["succ" => false, "err" => '測試點數不能再打了']);
         }
 
-        \Log::debug($rlimitkey);
-        \Log::debug($redis::get($rlimitkey));
-
-        return response()->json(["succ" => true, "err" => 'okok']);
+//        \Log::debug($rlimitkey);
+//        \Log::debug($redis::get($rlimitkey));
+//        return response()->json(["succ" => true, "err" => 'okok']);
 
         // 業務驗證(防重)
         // 作用範圍: 以人為單位
@@ -393,8 +392,6 @@ class Api2021Controller extends Controller
             return response()->json(["succ" => false, "err" => '您操作過快，請稍後再試']);
         }
 
-//        return response()->json(["succ" => true, "err" => 'okok']);
-
         // 業務驗證(是否加入LINE帳號的好友)
         if (!$this->aSv->lineFriendCheck($lineId)) {
             $this->sisLog['memoIn'] = json_encode(['error' => 'logical'], JSON_UNESCAPED_UNICODE);

app/Http/Services/Web/Api2021Service.php

@@ -809,7 +809,7 @@ class Api2021Service
                         'Accept'       => '*/*',
                     ]
                 ];
-                if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.16.196', '172.31.1.169', '172.31.9.46'])) $req['proxy'] = env('CCH_PROXY');
+                if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
                 $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/linepoint/issue', $req);
                 $resA = json_decode($response->getBody());
                 $data['memoIn'] = json_encode(array_merge($param, $logdata), JSON_UNESCAPED_UNICODE);
@@ -880,7 +880,7 @@ class Api2021Service
                         'Accept'       => '*/*',
                     ]
                 ];
-                if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.16.196', '172.31.1.169', '172.31.9.46'])) $req['proxy'] = env('CCH_PROXY');
+                if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
                 $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/linepoint/query', $req);
                 $resB = json_decode($response->getBody());
                 $data['memoIn'] = json_encode(array_merge($param, $logdata), JSON_UNESCAPED_UNICODE);
@@ -1185,7 +1185,7 @@ class Api2021Service
                     'Accept'       => '*/*',
                 ]
             ];
-            if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.16.196', '172.31.1.169', '172.31.9.46'])) $req['proxy'] = env('CCH_PROXY');
+            if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
             $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/tag/Tagging', $req);
             $res = $response->getBody();
         } catch (Exception $ex) {
@@ -1280,7 +1280,7 @@ class Api2021Service
                 'Accept'       => '*/*',
             ]
         ];
-        if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.16.196', '172.31.1.169', '172.31.9.46'])) $req['proxy'] = env('CCH_PROXY');
+        if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
         $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/tag/Update', $req);
         $res = $response->getBody();
         // 直通紀錄
@@ -1374,7 +1374,7 @@ class Api2021Service
                 'Accept'       => '*/*',
             ]
         ];
-        if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.16.196', '172.31.1.169', '172.31.9.46'])) $req['proxy'] = env('CCH_PROXY');
+        if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
         $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/tag/Tagging', $req);
         $res = $response->getBody();
         // 直通紀錄
@@ -1458,7 +1458,7 @@ class Api2021Service
                 'Accept'       => '*/*',
             ]
         ];
-        if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.16.196', '172.31.1.169', '172.31.9.46'])) $req['proxy'] = env('CCH_PROXY');
+        if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
         $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/tag/Insert', $req);
         $res = $response->getBody();
         // 直通紀錄
@@ -1548,7 +1548,7 @@ class Api2021Service
                 'Accept'       => '*/*',
             ]
         ];
-        if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.16.196', '172.31.1.169', '172.31.9.46'])) $req['proxy'] = env('CCH_PROXY');
+        if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
         $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/linepoint/issue', $req);
         $resA = json_decode($response->getBody());
         $data['memoIn'] = json_encode(array_merge($param, $logdata), JSON_UNESCAPED_UNICODE);
@@ -1621,7 +1621,7 @@ class Api2021Service
                 'Accept'       => '*/*',
             ]
         ];
-        if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.16.196', '172.31.1.169', '172.31.9.46'])) $req['proxy'] = env('CCH_PROXY');
+        if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
         $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/contact/QueryQualification', $req);
         $res = $response->getBody();
         // 直通紀錄
@@ -2130,7 +2130,7 @@ class Api2021Service
                         'Accept'       => '*/*',
                     ]
                 ];
-                if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.16.196', '172.31.1.169', '172.31.9.46'])) $req['proxy'] = env('CCH_PROXY');
+                if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
                 $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/linepoint/issue', $req);
                 $resA = json_decode($response->getBody());
                 $data['memoIn'] = json_encode(array_merge($param, $logdata), JSON_UNESCAPED_UNICODE);
@@ -2202,7 +2202,7 @@ class Api2021Service
                         'Accept'       => '*/*',
                     ]
                 ];
-                if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.16.196', '172.31.1.169', '172.31.9.46'])) $req['proxy'] = env('CCH_PROXY');
+                if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
                 $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/linepoint/query', $req);
                 $resB = json_decode($response->getBody());
                 $data['memoIn'] = json_encode(array_merge($param, $logdata), JSON_UNESCAPED_UNICODE);
@@ -2395,7 +2395,7 @@ class Api2021Service
                     'Accept'       => '*/*',
                 ]
             ];
-            if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.16.196', '172.31.1.169', '172.31.9.46'])) $req['proxy'] = env('CCH_PROXY');
+            if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
             $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/tag/Tagging', $req);
             $res = $response->getBody();
             // 經由計算取得的完整 request JSON
@@ -2910,7 +2910,7 @@ class Api2021Service
                         'Accept'       => '*/*',
                     ]
                 ];
-                if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.16.196', '172.31.1.169', '172.31.9.46'])) $req['proxy'] = env('CCH_PROXY');
+                if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
                 $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/linepoint/issue', $req);
                 $resA = json_decode($response->getBody());
                 $data['memoIn'] = json_encode(array_merge($param, $logdata), JSON_UNESCAPED_UNICODE);
@@ -2982,7 +2982,7 @@ class Api2021Service
                         'Accept'       => '*/*',
                     ]
                 ];
-                if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.16.196', '172.31.1.169', '172.31.9.46'])) $req['proxy'] = env('CCH_PROXY');
+                if (!in_array($_SERVER['SERVER_ADDR'], ['172.31.30.167', '172.31.9.233', '172.31.42.197', '172.31.34.163'])) $req['proxy'] = env('CCH_PROXY');
                 $response = $this->c->request('POST', env('API_BASE') . '/line/api/twpapi/linepoint/query', $req);
                 $resB = json_decode($response->getBody());
                 $data['memoIn'] = json_encode(array_merge($param, $logdata), JSON_UNESCAPED_UNICODE);