diff --git a/.idea/shelf/在进行更新之前于_2024_8_11_18_39_取消提交了变更_[不提交]/shelved.patch b/.idea/shelf/在进行更新之前于_2024_8_11_18_39_取消提交了变更_[不提交]/shelved.patch new file mode 100644 index 00000000..aff2787a --- /dev/null +++ b/.idea/shelf/在进行更新之前于_2024_8_11_18_39_取消提交了变更_[不提交]/shelved.patch @@ -0,0 +1,374 @@ +Index: .idea/shelf/_2024_8_9_11_47____.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/shelf/_2024_8_9_11_47____.xml b/.idea/shelf/_2024_8_9_11_47____.xml +new file mode 100644 +--- /dev/null (date 1723372776647) ++++ b/.idea/shelf/_2024_8_9_11_47____.xml (date 1723372776647) +@@ -0,0 +1,4 @@ ++ ++ +\ No newline at end of file +Index: .idea/php.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/php.xml b/.idea/php.xml +new file mode 100644 +--- /dev/null (date 1723187733123) ++++ b/.idea/php.xml (date 1723187733123) +@@ -0,0 +1,56 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +Index: .idea/vcs.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/vcs.xml b/.idea/vcs.xml +new file mode 100644 +--- /dev/null (date 1723187733118) ++++ b/.idea/vcs.xml (date 1723187733118) +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +Index: .idea/webServers.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/webServers.xml b/.idea/webServers.xml +new file mode 100644 +--- /dev/null (date 1723187733110) ++++ b/.idea/webServers.xml (date 1723187733110) +@@ -0,0 +1,14 @@ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +Index: .idea/shelf/_2024_8_9_15_15____.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/shelf/_2024_8_9_15_15____.xml b/.idea/shelf/_2024_8_9_15_15____.xml +new file mode 100644 +--- /dev/null (date 1723372776661) ++++ b/.idea/shelf/_2024_8_9_15_15____.xml (date 1723372776661) +@@ -0,0 +1,4 @@ ++ ++ +\ No newline at end of file +Index: .idea/deployment.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/deployment.xml b/.idea/deployment.xml +new file mode 100644 +--- /dev/null (date 1723187733141) ++++ b/.idea/deployment.xml (date 1723187733141) +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +Index: .idea/shelf/_2024_8_9_11_47____2.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/shelf/_2024_8_9_11_47____2.xml b/.idea/shelf/_2024_8_9_11_47____2.xml +new file mode 100644 +--- /dev/null (date 1723372776656) ++++ b/.idea/shelf/_2024_8_9_11_47____2.xml (date 1723372776656) +@@ -0,0 +1,4 @@ ++ ++ +\ No newline at end of file +Index: .idea/workspace.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/workspace.xml b/.idea/workspace.xml +new file mode 100644 +--- /dev/null (date 1723298895308) ++++ b/.idea/workspace.xml (date 1723298895308) +@@ -0,0 +1,164 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ $PROJECT_DIR$/service/composer.json ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 1723000676026 ++ ++ ++ 1723169589056 ++ ++ ++ 1723173310717 ++ ++ ++ 1723173381482 ++ ++ ++ 1723188067027 ++ ++ ++ 1723189129537 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +Index: .idea/modules.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/modules.xml b/.idea/modules.xml +new file mode 100644 +--- /dev/null (date 1723187733090) ++++ b/.idea/modules.xml (date 1723187733090) +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file diff --git a/service/app/admin/controller/OrderController.php b/service/app/admin/controller/OrderController.php index fc1d7f18..f1fb0bea 100644 --- a/service/app/admin/controller/OrderController.php +++ b/service/app/admin/controller/OrderController.php @@ -146,7 +146,6 @@ class OrderController extends base } $_oss = []; - $_oss[] = []; foreach (Orders::OSS as $key=>$os) { $_oss[$key] = ['label' => $os,'value' => $key]; if($key == 1) { @@ -169,7 +168,7 @@ class OrderController extends base $_oss[$key]['children'] = $_ch; } - return $this->success($list,null,['timetype'=> Orders::timeType, 'oss' => $_oss]); + return $this->success($list,null,['timetype'=> Orders::timeType, 'oss' => array_values($_oss)]); } public function all(Request $request) { diff --git a/service/app/server/Douyin.php b/service/app/server/Douyin.php index 64fa7b3c..b4b7e143 100644 --- a/service/app/server/Douyin.php +++ b/service/app/server/Douyin.php @@ -501,9 +501,8 @@ class Douyin public function _token($token = '', $os = 3) { - $dyKey = sprintf('Douyin:token-%s', $os); - if ($token) Redis::set($dyKey, $token, 'ex', 3600 * 24 - 50); - $token = Redis::get($dyKey); + if ($token) Redis::set('Douyin:token', $token, 'ex', 3600 * 24 - 50); + $token = Redis::get('Douyin:token'); if (empty($token) && $this->_cookie()) { if ($this->_try > 3) { throw new Exception("cookie 失效"); @@ -511,10 +510,10 @@ class Douyin $id = $this->_curl('/life/gate/v1/user/detail', null, 'HEAD'); $this->_try++; if ($id) { - Redis::set($dyKey, $id, 'ex', 3600 * 24 - 50); + Redis::set('Douyin:token', $id, 'ex', 3600 * 24 - 50); } } - return Redis::get($dyKey); + return Redis::get('Douyin:token'); } public function _curl($url, $params, $method = 'GET')