From 487988894f187f758d8988c2f27a4cb9d0faa576 Mon Sep 17 00:00:00 2001 From: guosheng <gs@bronet.cn> Date: Tue, 26 Nov 2019 10:09:33 +0800 Subject: [PATCH] 修改客户appid --- .idea/workspace.xml | 44 +++++++++++++++++++++++++++----------------- application/extra/verify.php | 4 ++-- public/api.html | 2 +- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 69cf0f7..466c6fc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,7 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/extra/verify.php" afterPath="$PROJECT_DIR$/application/extra/verify.php" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -13,7 +13,7 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> + <file leaf-file-name="User.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="198"> @@ -82,6 +82,16 @@ </provider> </entry> </file> + <file leaf-file-name="verify.php" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="100"> + <caret line="4" column="55" lean-forward="true" selection-start-line="4" selection-start-column="55" selection-end-line="4" selection-end-column="55" /> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindInProjectRecents"> @@ -134,7 +144,6 @@ <option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" /> <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" /> <option value="$PROJECT_DIR$/application/admin/controller/Video.php" /> - <option value="$PROJECT_DIR$/application/extra/verify.php" /> <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> <option value="$PROJECT_DIR$/application/admin/view/order/index.html" /> <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" /> @@ -144,6 +153,7 @@ <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" /> <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> <option value="$PROJECT_DIR$/application/api/controller/User.php" /> + <option value="$PROJECT_DIR$/application/extra/verify.php" /> </list> </option> </component> @@ -161,9 +171,9 @@ <sorting>DEFINITION_ORDER</sorting> </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> - <component name="ProjectFrameBounds" extendedState="1"> - <option name="x" value="-101" /> - <option name="y" value="57" /> + <component name="ProjectFrameBounds"> + <option name="x" value="437" /> + <option name="y" value="83" /> <option name="width" value="1776" /> <option name="height" value="974" /> </component> @@ -275,7 +285,7 @@ <workItem from="1574469667436" duration="25235000" /> <workItem from="1574641631900" duration="15479000" /> <workItem from="1574669596135" duration="11747000" /> - <workItem from="1574727687281" duration="5519000" /> + <workItem from="1574727687281" duration="5792000" /> </task> <task id="LOCAL-00001" summary="调试"> <created>1574145133364</created> @@ -288,7 +298,7 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="235790000" /> + <option name="totallyTimeSpent" value="236063000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -300,7 +310,7 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="-101" y="57" width="1776" height="974" extended-state="1" /> + <frame x="437" y="83" width="1776" height="974" extended-state="0" /> <layout> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15792541" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> @@ -715,14 +725,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="50"> - <caret line="2" column="8" lean-forward="false" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="8" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="198"> @@ -790,5 +792,13 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="100"> + <caret line="4" column="55" lean-forward="true" selection-start-line="4" selection-start-column="55" selection-end-line="4" selection-end-column="55" /> + <folding /> + </state> + </provider> + </entry> </component> </project> \ No newline at end of file diff --git a/application/extra/verify.php b/application/extra/verify.php index f5e5d2c..e92ea6e 100644 --- a/application/extra/verify.php +++ b/application/extra/verify.php @@ -1,8 +1,8 @@ <?php return [ 'raw' => [ - 'app_id' => 'wx1f51f42105b63343', - 'secret' => 'e7f2d59e21fff6f503744c584d2d6f26', + 'app_id' => 'wx4300d933e5abd5ba', + 'secret' => '7b64a08d75fd3c62d1702081b8e95b63', ], 'user' => [ 'rule' => [ diff --git a/public/api.html b/public/api.html index f66765d..70bef36 100644 --- a/public/api.html +++ b/public/api.html @@ -6055,7 +6055,7 @@ <div class="row mt0 footer"> <div class="col-md-6" align="left"> - Generated on 2019-11-26 10:04:48 </div> + Generated on 2019-11-26 10:09:22 </div> <div class="col-md-6" align="right"> <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> </div> -- libgit2 0.24.0