diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 843ebf5..0660bd6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="" /> + <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> + <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" /> <option name="SHOW_DIALOG" value="false" /> @@ -14,8 +16,8 @@ <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="208"> - <caret line="1124" column="0" lean-forward="true" selection-start-line="1124" selection-start-column="0" selection-end-line="1124" selection-end-column="0" /> + <state relative-caret-position="1975"> + <caret line="1124" column="0" lean-forward="false" selection-start-line="1124" selection-start-column="0" selection-end-line="1124" selection-end-column="0" /> <folding> <element signature="e#365#484#0#PHP" expanded="false" /> <element signature="e#490#1228#0#PHP" expanded="false" /> @@ -85,7 +87,7 @@ </provider> </entry> </file> - <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> + <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="381"> @@ -125,6 +127,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="425"> + <caret line="17" column="6" lean-forward="true" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" /> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindInProjectRecents"> @@ -184,7 +196,6 @@ <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" /> <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/extra/verify.php" /> <option value="$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Kernel/BaseClient.php" /> <option value="$PROJECT_DIR$/application/admin/view/vip/add.html" /> <option value="$PROJECT_DIR$/application/api/controller/Notify.php" /> @@ -194,6 +205,7 @@ <option value="$PROJECT_DIR$/application/nsms/nsms.php" /> <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> <option value="$PROJECT_DIR$/application/api/controller/User.php" /> + <option value="$PROJECT_DIR$/application/extra/verify.php" /> </list> </option> </component> @@ -211,7 +223,7 @@ <sorting>DEFINITION_ORDER</sorting> </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> - <component name="ProjectFrameBounds"> + <component name="ProjectFrameBounds" extendedState="1"> <option name="x" value="67" /> <option name="y" value="109" /> <option name="width" value="1696" /> @@ -232,8 +244,8 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scope" /> <pane id="Scratches" /> + <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <expand> @@ -246,6 +258,12 @@ <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> </path> + <path> + <item name="areial" type="b2602c69:ProjectViewProjectNode" /> + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="extra" type="2a2b976b:PhpTreeStructureProvider$1" /> + </path> </expand> <select /> </subPane> @@ -316,6 +334,7 @@ <workItem from="1574904867625" duration="793000" /> <workItem from="1574908494078" duration="8000" /> <workItem from="1574908927190" duration="2693000" /> + <workItem from="1574917615987" duration="13000" /> </task> <task id="LOCAL-00001" summary="调试"> <created>1574145133364</created> @@ -328,7 +347,7 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="285820000" /> + <option name="totallyTimeSpent" value="285833000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -340,10 +359,10 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="67" y="109" width="1696" height="945" extended-state="0" /> + <frame x="67" y="109" width="1696" height="945" extended-state="1" /> <editor active="true" /> <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.16503668" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16687042" 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" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> @@ -721,18 +740,10 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="500"> - <caret line="20" column="17" lean-forward="true" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" /> - <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="208"> - <caret line="1124" column="0" lean-forward="true" selection-start-line="1124" selection-start-column="0" selection-end-line="1124" selection-end-column="0" /> + <state relative-caret-position="1975"> + <caret line="1124" column="0" lean-forward="false" selection-start-line="1124" selection-start-column="0" selection-end-line="1124" selection-end-column="0" /> <folding> <element signature="e#365#484#0#PHP" expanded="false" /> <element signature="e#490#1228#0#PHP" expanded="false" /> @@ -839,5 +850,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="425"> + <caret line="17" column="6" lean-forward="true" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" /> + <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 323c8e5..519add2 100644 --- a/application/extra/verify.php +++ b/application/extra/verify.php @@ -16,7 +16,7 @@ return [ 'avatar' => '头像不能为空', ] ], - 'path'=>'http://q1i4mcfwv.bkt.clouddn.com', + 'path'=>'http://qiniuareial.w.broing.cn', //微信支付配置 'wx_pay' => [ 'app_id' => 'wx4300d933e5abd5ba',