From 694dba1375de80876f6ded46641adb218dd6bb17 Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Wed, 27 Nov 2019 17:41:47 +0800
Subject: [PATCH] 文档
---
.idea/workspace.xml | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------
1 file changed, 52 insertions(+), 71 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5429046..a4b8cd0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,12 +1,7 @@
<?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="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/vip/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/vip/edit.html" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
- </list>
+ <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -19,8 +14,8 @@
<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="378">
- <caret line="785" column="7" lean-forward="true" selection-start-line="785" selection-start-column="7" selection-end-line="785" selection-end-column="7" />
+ <state relative-caret-position="302">
+ <caret line="768" column="5" lean-forward="true" selection-start-line="768" selection-start-column="5" selection-end-line="768" selection-end-column="5" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
@@ -52,6 +47,7 @@
<element signature="e#23830#24311#0#PHP" expanded="false" />
<element signature="e#24316#25086#0#PHP" expanded="false" />
<element signature="e#25092#25455#0#PHP" expanded="false" />
+ <element signature="e#25460#25651#0#PHP" expanded="false" />
<element signature="e#25657#26015#0#PHP" expanded="false" />
<element signature="e#26020#26211#0#PHP" expanded="false" />
<element signature="e#26217#27360#0#PHP" expanded="false" />
@@ -128,7 +124,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/application/extra/upload.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/index.html" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/index.html" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
@@ -179,6 +174,7 @@
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php" />
<option value="$PROJECT_DIR$/application/admin/view/vip/edit.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
+ <option value="$USER_HOME$/Desktop/1.html" />
</list>
</option>
</component>
@@ -196,9 +192,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
- <component name="ProjectFrameBounds">
- <option name="x" value="302" />
- <option name="y" value="31" />
+ <component name="ProjectFrameBounds" extendedState="1">
+ <option name="x" value="-6" />
+ <option name="y" value="93" />
<option name="width" value="1776" />
<option name="height" value="1081" />
</component>
@@ -225,50 +221,6 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" 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" />
- </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="public" type="2a2b976b:PhpTreeStructureProvider$1" />
- </path>
- <path>
- <item name="areial" type="b2602c69:ProjectViewProjectNode" />
- <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
- </path>
- <path>
- <item name="areial" type="b2602c69:ProjectViewProjectNode" />
- <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
- </path>
- <path>
- <item name="areial" type="b2602c69:ProjectViewProjectNode" />
- <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
- <item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
- </path>
</expand>
<select />
</subPane>
@@ -289,9 +241,9 @@
<recent name="D:\htdocs\areial\application\api\controller" />
</key>
<key name="MoveFile.RECENT_KEYS">
+ <recent name="D:\htdocs\areial\public\uploads" />
<recent name="D:\htdocs\areial\public\cert" />
<recent name="D:\htdocs\areial\public\uploads\20191118" />
- <recent name="D:\htdocs\areial\public\uploads" />
</key>
</component>
<component name="RunDashboard">
@@ -334,7 +286,7 @@
<workItem from="1574727687281" duration="17586000" />
<workItem from="1574759184313" duration="4793000" />
<workItem from="1574814989178" duration="1007000" />
- <workItem from="1574831367903" duration="14295000" />
+ <workItem from="1574831367903" duration="15841000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -347,7 +299,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="267952000" />
+ <option name="totallyTimeSpent" value="269498000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -359,10 +311,9 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="302" y="31" width="1776" height="1081" extended-state="0" />
- <editor active="true" />
+ <frame x="-6" y="93" width="1776" height="1081" 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.1462704" 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.1462704" 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" />
@@ -417,13 +368,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <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" />
- </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">
@@ -808,10 +752,46 @@
</state>
</provider>
</entry>
+ <entry file="file://$USER_HOME$/Desktop/1.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="80">
+ <caret line="5" column="114" lean-forward="true" selection-start-line="5" selection-start-column="114" selection-end-line="5" selection-end-column="114" />
+ <folding>
+ <element signature="n#style#0;n#span#0;n#p#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#1;n#p#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#0;n#p#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#1;n#p#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#2;n#p#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#0;n#p#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="e#1867#1873#1" expanded="true" />
+ <element signature="n#style#0;n#span#0;n#p#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#1;n#p#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#2;n#p#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#3;n#p#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#0;n#p#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#1;n#p#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#2;n#p#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#3;n#p#4;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#0;n#p#5;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#1;n#p#5;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#0;n#p#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#1;n#p#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#0;n#p#7;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#1;n#p#7;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#0;n#p#8;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="e#6264#6270#1" expanded="true" />
+ <element signature="n#style#0;n#span#0;n#p#9;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#1;n#p#9;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#0;n#p#10;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#1;n#p#10;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </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="378">
- <caret line="785" column="7" lean-forward="true" selection-start-line="785" selection-start-column="7" selection-end-line="785" selection-end-column="7" />
+ <state relative-caret-position="302">
+ <caret line="768" column="5" lean-forward="true" selection-start-line="768" selection-start-column="5" selection-end-line="768" selection-end-column="5" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
@@ -843,6 +823,7 @@
<element signature="e#23830#24311#0#PHP" expanded="false" />
<element signature="e#24316#25086#0#PHP" expanded="false" />
<element signature="e#25092#25455#0#PHP" expanded="false" />
+ <element signature="e#25460#25651#0#PHP" expanded="false" />
<element signature="e#25657#26015#0#PHP" expanded="false" />
<element signature="e#26020#26211#0#PHP" expanded="false" />
<element signature="e#26217#27360#0#PHP" expanded="false" />
--
libgit2 0.24.0