...
|
...
|
@@ -2,9 +2,8 @@ |
|
|
<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/admin/lang/zh-cn/video.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
|
|
|
<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/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -91,8 +90,8 @@ |
|
|
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="44">
|
|
|
<caret line="408" column="58" lean-forward="true" selection-start-line="408" selection-start-column="58" selection-end-line="408" selection-end-column="58" />
|
|
|
<state relative-caret-position="525">
|
|
|
<caret line="312" column="27" lean-forward="true" selection-start-line="312" selection-start-column="27" selection-end-line="312" selection-end-column="27" />
|
|
|
<folding>
|
|
|
<element signature="e#574#693#0#PHP" expanded="false" />
|
|
|
<element signature="e#699#1012#0#PHP" expanded="false" />
|
...
|
...
|
@@ -102,11 +101,12 @@ |
|
|
<element signature="e#5512#5930#0#PHP" expanded="false" />
|
|
|
<element signature="e#6179#6269#0#PHP" expanded="false" />
|
|
|
<element signature="e#6347#6443#0#PHP" expanded="false" />
|
|
|
<element signature="e#6806#15962#0#PHP" expanded="false" />
|
|
|
<element signature="e#7772#9181#0#PHP" expanded="false" />
|
|
|
<element signature="e#11546#11997#0#PHP" expanded="false" />
|
|
|
<element signature="e#13212#13330#0#PHP" expanded="false" />
|
|
|
<element signature="e#14187#15962#0#PHP" expanded="false" />
|
|
|
<element signature="e#16035#16455#0#PHP" expanded="false" />
|
|
|
<element signature="e#16460#26484#0#PHP" expanded="false" />
|
|
|
<element signature="e#18227#19634#0#PHP" expanded="false" />
|
|
|
<element signature="e#23664#23782#0#PHP" expanded="false" />
|
|
|
<element signature="e#24230#24461#0#PHP" expanded="false" />
|
...
|
...
|
@@ -115,17 +115,27 @@ |
|
|
<element signature="e#26803#27196#0#PHP" expanded="false" />
|
|
|
<element signature="e#27223#30701#0#PHP" expanded="false" />
|
|
|
<element signature="e#30730#33635#0#PHP" expanded="false" />
|
|
|
<element signature="e#33664#37727#0#PHP" expanded="false" />
|
|
|
<element signature="e#35779#37216#0#PHP" expanded="false" />
|
|
|
<element signature="e#37264#37366#0#PHP" expanded="false" />
|
|
|
<element signature="e#37756#42219#0#PHP" expanded="false" />
|
|
|
<element signature="e#39986#41734#0#PHP" expanded="false" />
|
|
|
<element signature="e#42242#42459#0#PHP" expanded="false" />
|
|
|
<element signature="e#36003#39724#0#PHP" expanded="false" />
|
|
|
<element signature="e#40902#48074#0#PHP" expanded="false" />
|
|
|
<element signature="e#43168#46889#0#PHP" expanded="false" />
|
|
|
<element signature="e#46945#47055#0#PHP" expanded="false" />
|
|
|
<element signature="e#47331#47400#0#PHP" expanded="false" />
|
|
|
<element signature="e#48097#48314#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="07.log" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/runtime/log/201912/07.log">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
...
|
...
|
@@ -133,6 +143,7 @@ |
|
|
<find>image</find>
|
|
|
<find>init($token)</find>
|
|
|
<find>BaseCli</find>
|
|
|
<find>picpay</find>
|
|
|
</findStrings>
|
|
|
<dirStrings>
|
|
|
<dir>D:\htdocs\areial</dir>
|
...
|
...
|
@@ -144,7 +155,6 @@ |
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/application/admin/model/Pic.php" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/model/Type.php" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/pic/index.html" />
|
|
|
<option value="$PROJECT_DIR$/application/index/controller/User.php" />
|
...
|
...
|
@@ -195,6 +205,7 @@ |
|
|
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
|
|
|
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
|
|
|
<option value="$PROJECT_DIR$/runtime/log/201912/07.log" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -213,10 +224,10 @@ |
|
|
</component>
|
|
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
|
|
<component name="ProjectFrameBounds" extendedState="7">
|
|
|
<option name="x" value="221" />
|
|
|
<option name="y" value="64" />
|
|
|
<option name="width" value="1700" />
|
|
|
<option name="height" value="1100" />
|
|
|
<option name="x" value="-60" />
|
|
|
<option name="y" value="56" />
|
|
|
<option name="width" value="1871" />
|
|
|
<option name="height" value="1007" />
|
|
|
</component>
|
|
|
<component name="ProjectView">
|
|
|
<navigator currentView="ProjectPane" proportions="" version="1">
|
...
|
...
|
@@ -243,33 +254,20 @@ |
|
|
<path>
|
|
|
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="runtime" 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="runtime" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="log" 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="api" 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="api" 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="api" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="lang" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="runtime" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="log" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="201912" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
...
|
...
|
@@ -357,7 +355,7 @@ |
|
|
<workItem from="1575541798312" duration="2359000" />
|
|
|
<workItem from="1575592025964" duration="640000" />
|
|
|
<workItem from="1575599624364" duration="95000" />
|
|
|
<workItem from="1575680867057" duration="15315000" />
|
|
|
<workItem from="1575680867057" duration="21155000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="调试">
|
|
|
<created>1574145133364</created>
|
...
|
...
|
@@ -370,7 +368,7 @@ |
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="325214000" />
|
|
|
<option name="totallyTimeSpent" value="331054000" />
|
|
|
</component>
|
|
|
<component name="TodoView">
|
|
|
<todo-panel id="selected-file">
|
...
|
...
|
@@ -383,6 +381,7 @@ |
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
|
|
|
<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.1705757" 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" />
|
...
|
...
|
@@ -391,7 +390,7 @@ |
|
|
<window_info id="Run" 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="5" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Version Control" 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="1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16648531" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15886833" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Favorites" active="false" anchor="left" 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="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
...
|
...
|
@@ -439,13 +438,6 @@ |
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="568">
|
|
|
<caret line="25" column="5" lean-forward="true" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="200">
|
...
|
...
|
@@ -879,10 +871,18 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/runtime/log/201912/07.log">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="44">
|
|
|
<caret line="408" column="58" lean-forward="true" selection-start-line="408" selection-start-column="58" selection-end-line="408" selection-end-column="58" />
|
|
|
<state relative-caret-position="525">
|
|
|
<caret line="312" column="27" lean-forward="true" selection-start-line="312" selection-start-column="27" selection-end-line="312" selection-end-column="27" />
|
|
|
<folding>
|
|
|
<element signature="e#574#693#0#PHP" expanded="false" />
|
|
|
<element signature="e#699#1012#0#PHP" expanded="false" />
|
...
|
...
|
@@ -892,11 +892,12 @@ |
|
|
<element signature="e#5512#5930#0#PHP" expanded="false" />
|
|
|
<element signature="e#6179#6269#0#PHP" expanded="false" />
|
|
|
<element signature="e#6347#6443#0#PHP" expanded="false" />
|
|
|
<element signature="e#6806#15962#0#PHP" expanded="false" />
|
|
|
<element signature="e#7772#9181#0#PHP" expanded="false" />
|
|
|
<element signature="e#11546#11997#0#PHP" expanded="false" />
|
|
|
<element signature="e#13212#13330#0#PHP" expanded="false" />
|
|
|
<element signature="e#14187#15962#0#PHP" expanded="false" />
|
|
|
<element signature="e#16035#16455#0#PHP" expanded="false" />
|
|
|
<element signature="e#16460#26484#0#PHP" expanded="false" />
|
|
|
<element signature="e#18227#19634#0#PHP" expanded="false" />
|
|
|
<element signature="e#23664#23782#0#PHP" expanded="false" />
|
|
|
<element signature="e#24230#24461#0#PHP" expanded="false" />
|
...
|
...
|
@@ -905,12 +906,12 @@ |
|
|
<element signature="e#26803#27196#0#PHP" expanded="false" />
|
|
|
<element signature="e#27223#30701#0#PHP" expanded="false" />
|
|
|
<element signature="e#30730#33635#0#PHP" expanded="false" />
|
|
|
<element signature="e#33664#37727#0#PHP" expanded="false" />
|
|
|
<element signature="e#35779#37216#0#PHP" expanded="false" />
|
|
|
<element signature="e#37264#37366#0#PHP" expanded="false" />
|
|
|
<element signature="e#37756#42219#0#PHP" expanded="false" />
|
|
|
<element signature="e#39986#41734#0#PHP" expanded="false" />
|
|
|
<element signature="e#42242#42459#0#PHP" expanded="false" />
|
|
|
<element signature="e#36003#39724#0#PHP" expanded="false" />
|
|
|
<element signature="e#40902#48074#0#PHP" expanded="false" />
|
|
|
<element signature="e#43168#46889#0#PHP" expanded="false" />
|
|
|
<element signature="e#46945#47055#0#PHP" expanded="false" />
|
|
|
<element signature="e#47331#47400#0#PHP" expanded="false" />
|
|
|
<element signature="e#48097#48314#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
|