senyao
/
travel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

token获取回滚

This commit is contained in:
jianghanbo 2024-08-16 21:46:15 +08:00
parent 6fcb9ef860
commit ad81522f1e
3 changed files with 379 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

374
.idea/shelf/在进行更新之前于_2024_8_11_18_39_取消提交了变更_[不提交]/shelved.patch Normal file
View File

@ -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 @@
+<changelist name="在进行更新之前于_2024_8_9_11_47_取消提交了变更_[变更]" date="1723175222171" recycled="true" deleted="true">
+ <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2024_8_9_11_47_取消提交了变更_[变更]/shelved.patch" />
+ <option name="DESCRIPTION" value="在进行更新之前于 2024/8/9 11:47 取消提交了变更 [变更]" />
+</changelist>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="PhpIncludePathManager">
+ <include_path>
+ <path value="$PROJECT_DIR$/service/vendor/composer" />
+ <path value="$PROJECT_DIR$/service/vendor/carbonphp/carbon-doctrine-types" />
+ <path value="$PROJECT_DIR$/service/vendor/firebase/php-jwt" />
+ <path value="$PROJECT_DIR$/service/vendor/doctrine/inflector" />
+ <path value="$PROJECT_DIR$/service/vendor/psr/simple-cache" />
+ <path value="$PROJECT_DIR$/service/vendor/psr/clock" />
+ <path value="$PROJECT_DIR$/service/vendor/topthink/think-orm" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/bus" />
+ <path value="$PROJECT_DIR$/service/vendor/nesbot/carbon" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/container" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/support" />
+ <path value="$PROJECT_DIR$/service/vendor/psr/log" />
+ <path value="$PROJECT_DIR$/service/vendor/topthink/think-helper" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/collections" />
+ <path value="$PROJECT_DIR$/service/vendor/psr/container" />
+ <path value="$PROJECT_DIR$/service/vendor/phpoption/phpoption" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/macroable" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/contracts" />
+ <path value="$PROJECT_DIR$/service/vendor/voku/portable-ascii" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/pipeline" />
+ <path value="$PROJECT_DIR$/service/vendor/qiniu/php-sdk" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/redis" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/events" />
+ <path value="$PROJECT_DIR$/service/vendor/workerman/workerman" />
+ <path value="$PROJECT_DIR$/service/vendor/monolog/monolog" />
+ <path value="$PROJECT_DIR$/service/vendor/workerman/crontab" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/conditionable" />
+ <path value="$PROJECT_DIR$/service/vendor/myclabs/php-enum" />
+ <path value="$PROJECT_DIR$/service/vendor/workerman/webman-framework" />
+ <path value="$PROJECT_DIR$/service/vendor/nikic/fast-route" />
+ <path value="$PROJECT_DIR$/service/vendor/webman/think-orm" />
+ <path value="$PROJECT_DIR$/service/vendor/webman/console" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/polyfill-mbstring" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/deprecation-contracts" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/string" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/service-contracts" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/console" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/translation-contracts" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/translation" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/polyfill-intl-normalizer" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/polyfill-ctype" />
+ <path value="$PROJECT_DIR$/service/vendor/vlucas/phpdotenv" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/polyfill-intl-grapheme" />
+ <path value="$PROJECT_DIR$/service/vendor/mk-j/php_xlsxwriter" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/polyfill-php80" />
+ <path value="$PROJECT_DIR$/service/vendor/graham-campbell/result-type" />
+ </include_path>
+ </component>
+ <component name="PhpProjectSharedConfiguration" php_language_level="7.1">
+ <option name="suggestChangeDefaultLanguageLevel" value="false" />
+ </component>
+</project>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
+</project>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="WebServers">
+ <option name="servers">
+ <webServer id="7dcffc19-08e3-4ce6-9876-ce71b679e5fb" name="hexiao">
+ <fileTransfer accessType="SFTP" host="192.168.1.4" port="22" sshConfigId="eba8a6a1-1feb-472d-8d92-5e943dcfdb74" sshConfig="root@192.168.1.4:22 password">
+ <advancedOptions>
+ <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
+ </advancedOptions>
+ </fileTransfer>
+ </webServer>
+ </option>
+ </component>
+</project>
\ 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 @@
+<changelist name="在进行更新之前于_2024_8_9_15_15_取消提交了变更_[变更]" date="1723187735120" recycled="true" deleted="true">
+ <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2024_8_9_15_15_取消提交了变更_[变更]/shelved.patch" />
+ <option name="DESCRIPTION" value="在进行更新之前于 2024/8/9 15:15 取消提交了变更 [变更]" />
+</changelist>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="PublishConfigData" autoUpload="Always" serverName="hexiao" remoteFilesAllowedToDisappearOnAutoupload="false">
+ <serverData>
+ <paths name="hexiao">
+ <serverdata>
+ <mappings>
+ <mapping deploy="/www/wwwroot/travel" local="$PROJECT_DIR$" web="/" />
+ </mappings>
+ </serverdata>
+ </paths>
+ </serverData>
+ <option name="myAutoUpload" value="ALWAYS" />
+ </component>
+</project>
\ 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 @@
+<changelist name="在进行更新之前于_2024_8_9_11_47_取消提交了变更_[不提交]" date="1723175229539" recycled="true" deleted="true">
+ <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2024_8_9_11_47_取消提交了变更_[不提交]/shelved.patch" />
+ <option name="DESCRIPTION" value="在进行更新之前于 2024/8/9 11:47 取消提交了变更 [不提交]" />
+</changelist>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ChangeListManager">
+ <list default="true" id="fc24b0ab-b0b5-46b0-b6b7-4a6f9e5fd11b" name="变更" comment="" />
+ <list id="2a35ef8e-6b60-406c-9837-f421c207526e" name="不提交" comment="">
+ <change afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.idea/shelf/_2024_8_9_11_47____.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.idea/shelf/_2024_8_9_11_47____2.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.idea/shelf/_2024_8_9_15_15____.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.idea/webServers.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ </list>
+ <option name="SHOW_DIALOG" value="false" />
+ <option name="HIGHLIGHT_CONFLICTS" value="true" />
+ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+ <option name="LAST_RESOLUTION" value="IGNORE" />
+ </component>
+ <component name="ComposerSettings" doNotAsk="true">
+ <pharConfigPath>$PROJECT_DIR$/service/composer.json</pharConfigPath>
+ <execution />
+ </component>
+ <component name="Git.Settings">
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+ </component>
+ <component name="PhpWorkspaceProjectConfiguration">
+ <include_path>
+ <path value="$PROJECT_DIR$/service/vendor/composer" />
+ <path value="$PROJECT_DIR$/service/vendor/carbonphp/carbon-doctrine-types" />
+ <path value="$PROJECT_DIR$/service/vendor/firebase/php-jwt" />
+ <path value="$PROJECT_DIR$/service/vendor/doctrine/inflector" />
+ <path value="$PROJECT_DIR$/service/vendor/psr/simple-cache" />
+ <path value="$PROJECT_DIR$/service/vendor/psr/clock" />
+ <path value="$PROJECT_DIR$/service/vendor/topthink/think-orm" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/bus" />
+ <path value="$PROJECT_DIR$/service/vendor/nesbot/carbon" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/container" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/support" />
+ <path value="$PROJECT_DIR$/service/vendor/psr/log" />
+ <path value="$PROJECT_DIR$/service/vendor/topthink/think-helper" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/collections" />
+ <path value="$PROJECT_DIR$/service/vendor/psr/container" />
+ <path value="$PROJECT_DIR$/service/vendor/phpoption/phpoption" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/macroable" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/contracts" />
+ <path value="$PROJECT_DIR$/service/vendor/voku/portable-ascii" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/pipeline" />
+ <path value="$PROJECT_DIR$/service/vendor/qiniu/php-sdk" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/redis" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/events" />
+ <path value="$PROJECT_DIR$/service/vendor/workerman/workerman" />
+ <path value="$PROJECT_DIR$/service/vendor/monolog/monolog" />
+ <path value="$PROJECT_DIR$/service/vendor/workerman/crontab" />
+ <path value="$PROJECT_DIR$/service/vendor/illuminate/conditionable" />
+ <path value="$PROJECT_DIR$/service/vendor/myclabs/php-enum" />
+ <path value="$PROJECT_DIR$/service/vendor/workerman/webman-framework" />
+ <path value="$PROJECT_DIR$/service/vendor/nikic/fast-route" />
+ <path value="$PROJECT_DIR$/service/vendor/webman/think-orm" />
+ <path value="$PROJECT_DIR$/service/vendor/webman/console" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/polyfill-mbstring" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/deprecation-contracts" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/string" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/service-contracts" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/console" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/translation-contracts" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/translation" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/polyfill-intl-normalizer" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/polyfill-ctype" />
+ <path value="$PROJECT_DIR$/service/vendor/vlucas/phpdotenv" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/polyfill-intl-grapheme" />
+ <path value="$PROJECT_DIR$/service/vendor/mk-j/php_xlsxwriter" />
+ <path value="$PROJECT_DIR$/service/vendor/symfony/polyfill-php80" />
+ <path value="$PROJECT_DIR$/service/vendor/graham-campbell/result-type" />
+ </include_path>
+ </component>
+ <component name="ProjectId" id="2kJTRyoq3QlUmC0wGfuxyZvqmUX" />
+ <component name="ProjectViewState">
+ <option name="hideEmptyMiddlePackages" value="true" />
+ <option name="showLibraryContents" value="true" />
+ </component>
+ <component name="PropertiesComponent">
+ <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+ <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+ <property name="WebServerToolWindowFactoryState" value="false" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/service" />
+ <property name="node.js.detected.package.eslint" value="true" />
+ <property name="node.js.selected.package.eslint" value="(autodetect)" />
+ <property name="nodejs_package_manager_path" value="npm" />
+ <property name="vue.rearranger.settings.migration" value="true" />
+ </component>
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
+ <component name="TaskManager">
+ <task active="true" id="Default" summary="默认任务">
+ <changelist id="fc24b0ab-b0b5-46b0-b6b7-4a6f9e5fd11b" name="变更" comment="" />
+ <changelist id="2a35ef8e-6b60-406c-9837-f421c207526e" name="不提交" comment="" />
+ <created>1723000676026</created>
+ <option name="number" value="Default" />
+ <option name="presentableId" value="Default" />
+ <updated>1723000676026</updated>
+ <workItem from="1723000677216" duration="3152000" />
+ <workItem from="1723088923991" duration="3661000" />
+ <workItem from="1723115334807" duration="12060000" />
+ </task>
+ <task id="LOCAL-00001" summary="所有的导出先隐藏">
+ <created>1723169589056</created>
+ <option name="number" value="00001" />
+ <option name="presentableId" value="LOCAL-00001" />
+ <option name="project" value="LOCAL" />
+ <updated>1723169589056</updated>
+ </task>
+ <task id="LOCAL-00002" summary="调整">
+ <created>1723173310717</created>
+ <option name="number" value="00002" />
+ <option name="presentableId" value="LOCAL-00002" />
+ <option name="project" value="LOCAL" />
+ <updated>1723173310717</updated>
+ </task>
+ <task id="LOCAL-00003" summary="调整">
+ <created>1723173381482</created>
+ <option name="number" value="00003" />
+ <option name="presentableId" value="LOCAL-00003" />
+ <option name="project" value="LOCAL" />
+ <updated>1723173381482</updated>
+ </task>
+ <task id="LOCAL-00004" summary="QA调整">
+ <created>1723188067027</created>
+ <option name="number" value="00004" />
+ <option name="presentableId" value="LOCAL-00004" />
+ <option name="project" value="LOCAL" />
+ <updated>1723188067027</updated>
+ </task>
+ <task id="LOCAL-00005" summary="QA调整">
+ <created>1723189129537</created>
+ <option name="number" value="00005" />
+ <option name="presentableId" value="LOCAL-00005" />
+ <option name="project" value="LOCAL" />
+ <updated>1723189129537</updated>
+ </task>
+ <option name="localTasksCounter" value="6" />
+ <servers />
+ </component>
+ <component name="TypeScriptGeneratedFilesManager">
+ <option name="version" value="3" />
+ </component>
+ <component name="Vcs.Log.Tabs.Properties">
+ <option name="TAB_STATES">
+ <map>
+ <entry key="MAIN">
+ <value>
+ <State />
+ </value>
+ </entry>
+ </map>
+ </option>
+ </component>
+ <component name="VcsManagerConfiguration">
+ <MESSAGE value="所有的导出先隐藏" />
+ <MESSAGE value="调整" />
+ <MESSAGE value="QA调整" />
+ <option name="LAST_COMMIT_MESSAGE" value="QA调整" />
+ </component>
+</project>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/.idea/travel.iml" filepath="$PROJECT_DIR$/.idea/travel.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file

3
service/app/admin/controller/OrderController.php
View File

@ -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) {

9
service/app/server/Douyin.php
View File

@ -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')