郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 4180813e113b7a7f30554b18b8bc4d65143d8e03 1 个父辈 5b089b38
1 个管道 的构建 通过 耗费 1 秒

修改七牛云

内嵌 并排对比
正在显示 2 个修改的文件 包含 120 行增加 和 120 行删除
... ... @@ -2,12 +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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Pic.php" afterPath="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Video.php" afterPath="$PROJECT_DIR$/application/admin/controller/Video.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/pic.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
<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" />
... ... @@ -18,32 +13,66 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Pic.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="20" column="4" lean-forward="false" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Video.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="20" column="38" lean-forward="true" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Wonderful.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="19" column="38" lean-forward="true" selection-start-line="19" selection-start-column="38" selection-end-line="19" selection-end-column="38" />
<folding />
<state relative-caret-position="7">
<caret line="389" column="7" lean-forward="false" selection-start-line="389" selection-start-column="7" selection-end-line="389" selection-end-column="7" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4206#0#PHP" expanded="false" />
<element signature="e#4212#4619#0#PHP" expanded="false" />
<element signature="e#4624#4967#0#PHP" expanded="false" />
<element signature="e#4973#5810#0#PHP" expanded="false" />
<element signature="e#5815#8010#0#PHP" expanded="false" />
<element signature="e#8016#8661#0#PHP" expanded="false" />
<element signature="e#8666#9762#0#PHP" expanded="false" />
<element signature="e#9768#10470#0#PHP" expanded="false" />
<element signature="e#10475#11675#0#PHP" expanded="false" />
<element signature="e#11681#12257#0#PHP" expanded="false" />
<element signature="e#12262#12809#0#PHP" expanded="false" />
<element signature="e#12815#13499#0#PHP" expanded="false" />
<element signature="e#15318#16188#0#PHP" expanded="false" />
<element signature="e#16193#18401#0#PHP" expanded="false" />
<element signature="e#18407#18784#0#PHP" expanded="false" />
<element signature="e#18789#19053#0#PHP" expanded="false" />
<element signature="e#19059#19564#0#PHP" expanded="false" />
<element signature="e#19569#19820#0#PHP" expanded="false" />
<element signature="e#19826#20305#0#PHP" expanded="false" />
<element signature="e#20310#21067#0#PHP" expanded="false" />
<element signature="e#21073#21554#0#PHP" expanded="false" />
<element signature="e#21559#22329#0#PHP" expanded="false" />
<element signature="e#22335#22698#0#PHP" expanded="false" />
<element signature="e#22703#22894#0#PHP" expanded="false" />
<element signature="e#22900#23258#0#PHP" expanded="false" />
<element signature="e#23263#23453#0#PHP" expanded="false" />
<element signature="e#23459#24602#0#PHP" expanded="false" />
<element signature="e#24607#27272#0#PHP" expanded="false" />
<element signature="e#27278#27776#0#PHP" expanded="false" />
<element signature="e#27781#29527#0#PHP" expanded="false" />
<element signature="e#29533#29946#0#PHP" expanded="false" />
<element signature="e#29951#30430#0#PHP" expanded="false" />
<element signature="e#30436#30970#0#PHP" expanded="false" />
<element signature="e#30975#32360#0#PHP" expanded="false" />
<element signature="e#32366#33020#0#PHP" expanded="false" />
<element signature="e#33025#34978#0#PHP" expanded="false" />
<element signature="e#33179#33265#0#PHP" expanded="false" />
<element signature="e#33354#33442#0#PHP" expanded="false" />
<element signature="e#34984#35744#0#PHP" expanded="false" />
<element signature="e#35749#38458#0#PHP" expanded="false" />
<element signature="e#38484#39315#0#PHP" expanded="false" />
<element signature="e#39321#39741#0#PHP" expanded="false" />
<element signature="e#39746#40229#0#PHP" expanded="false" />
<element signature="e#40235#41041#0#PHP" expanded="false" />
<element signature="e#41046#44200#0#PHP" expanded="false" />
<element signature="e#44215#45543#0#PHP" expanded="false" />
<element signature="e#45559#46586#0#PHP" expanded="false" />
<element signature="e#46592#47350#0#PHP" expanded="false" />
<element signature="e#47355#49742#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -90,7 +119,6 @@
<option value="$PROJECT_DIR$/public/assets/js/backend/vip.js" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
<option value="$PROJECT_DIR$/application/extra/verify.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
... ... @@ -104,6 +132,7 @@
<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" />
</list>
</option>
</component>
... ... @@ -122,8 +151,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="87" />
<option name="y" value="72" />
<option name="x" value="-49" />
<option name="y" value="73" />
<option name="width" value="1806" />
<option name="height" value="972" />
</component>
... ... @@ -152,35 +181,7 @@
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<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="admin" 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="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" 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="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" 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="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="pic" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -192,7 +193,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../scrap1/scrap" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../project1/resource" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
... ... @@ -238,7 +239,7 @@
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="25235000" />
<workItem from="1574641631900" duration="3399000" />
<workItem from="1574641631900" duration="4271000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -251,7 +252,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="206444000" />
<option name="totallyTimeSpent" value="207316000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -263,10 +264,9 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="87" y="72" width="1806" height="972" extended-state="1" />
<editor active="true" />
<frame x="-49" y="73" width="1806" height="972" extended-state="1" />
<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.1517755" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1517755" 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" />
... ... @@ -544,13 +544,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="200">
<caret line="8" column="38" lean-forward="false" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
... ... @@ -632,10 +625,58 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="24" column="21" lean-forward="true" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
<caret line="43" column="83" lean-forward="true" selection-start-line="43" selection-start-column="83" selection-end-line="43" selection-end-column="83" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="19" column="38" lean-forward="true" selection-start-line="19" selection-start-column="38" selection-end-line="19" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="20" column="38" lean-forward="true" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="20" column="4" lean-forward="false" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/verify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="16" column="9" lean-forward="true" selection-start-line="16" selection-start-column="9" selection-end-line="16" selection-end-column="9" />
<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="-188">
<caret line="841" column="28" lean-forward="false" selection-start-line="841" selection-start-column="28" selection-end-line="841" selection-end-column="28" />
<state relative-caret-position="7">
<caret line="389" column="7" lean-forward="false" selection-start-line="389" selection-start-column="7" selection-end-line="389" selection-end-column="7" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -653,7 +694,6 @@
<element signature="e#11681#12257#0#PHP" expanded="false" />
<element signature="e#12262#12809#0#PHP" expanded="false" />
<element signature="e#12815#13499#0#PHP" expanded="false" />
<element signature="e#13504#15312#0#PHP" expanded="false" />
<element signature="e#15318#16188#0#PHP" expanded="false" />
<element signature="e#16193#18401#0#PHP" expanded="false" />
<element signature="e#18407#18784#0#PHP" expanded="false" />
... ... @@ -695,45 +735,5 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="24" column="21" lean-forward="true" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
<caret line="43" column="83" lean-forward="true" selection-start-line="43" selection-start-column="83" selection-end-line="43" selection-end-column="83" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="20" column="4" lean-forward="false" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="20" column="38" lean-forward="true" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="19" column="38" lean-forward="true" selection-start-line="19" selection-start-column="38" selection-end-line="19" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -16,7 +16,7 @@ return [
'avatar' => '头像不能为空',
]
],
'path'=>'http://q1anng3kj.bkt.clouddn.com',
'path'=>'http://q1i4mcfwv.bkt.clouddn.com',
//微信支付配置
'wx_pay' => [
'app_id' => '',
... ...