|
@@ -3,48 +3,16 @@
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="6c0b7e36-47c6-4066-b96b-afd3eeb21cad" name="Default Changelist" comment="">
|
|
<list default="true" id="6c0b7e36-47c6-4066-b96b-afd3eeb21cad" name="Default Changelist" comment="">
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
- <change beforePath="$PROJECT_DIR$/app/BaseController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/BaseController.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/app/admin/controller/Agent.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Agent.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/app/admin/controller/Certificate.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Certificate.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/app/admin/controller/Finance.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Finance.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/app/admin/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Index.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/app/admin/controller/Login.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Login.php" afterDir="false" />
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/admin/controller/Contents.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Contents.php" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/app/admin/controller/Order.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Order.php" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/app/admin/controller/Order.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Order.php" afterDir="false" />
|
|
- <change beforePath="$PROJECT_DIR$/app/admin/controller/Uploads.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Uploads.php" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/app/admin/controller/Usermanage.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Usermanage.php" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/app/admin/controller/Usermanage.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Usermanage.php" afterDir="false" />
|
|
- <change beforePath="$PROJECT_DIR$/app/common/controller/Backend.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/common/controller/Backend.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/app/web/controller/Login.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/web/controller/Login.php" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/log/202006/06.log" beforeDir="false" />
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/common/controller/Orde.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/common/controller/Orde.php" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/web/controller/Base.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/web/controller/Base.php" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/app/web/model/Orders.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/web/model/Orders.php" afterDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/lm_admin.sql" beforeDir="false" afterPath="$PROJECT_DIR$/lm_admin.sql" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/runtime/admin/log/202006/08.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/admin/log/202006/08.log" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/runtime/admin/log/202006/08.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/admin/log/202006/08.log" afterDir="false" />
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/14d50cc59972e0ab82b71f4b5f381353.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/1884f03459cf6a2bd8367d4372b7430f.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/193b3c530962981d3a4dc850749aaa8b.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/1cb5cb0f2bcd9523210fce1e0782c8b8.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/27c627fb9583e5c252a25d23c5420a91.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/33d146d6ac456ef212137e796ae3e332.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/35171583bca6ad4d67f55adf437b098a.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/4a69c5053cc75acd9f20b688d4b5203f.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/54c62c80793775da65d6a733526c2b2f.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/57701a2f9bf5eca2d779936b9b1453ae.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/62ef37f9efcd223baf5a1fe163d79229.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/671c38fd00b1e51063798ff4b8aff463.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/700fb5f408751af5497681515c859de6.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/a5b87fd77913dd9b0ad9dd783203b8ce.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/b7eebf4d17da292020e3e037ce40d039.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/ddb6e4a26b85726c174911078de05097.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/ee651861c15f43b886820383123b6fd9.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/fd3382e0c1e6539206f1c35861056032.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/fe4af39cf9f4c4f81bb0748bcee2f14b.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/cache/0b/dc60c1eb9bd2792cd1fa7f85d9c865.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/cache/b5/0db2208db974a3bc060e4d7255aa98.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/cache/ca/361393b5a02e8a62e8dd6d5373a473.php" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/session/sess_07ce22ac32d8547a3d9d24464ada30f3" beforeDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/session/sess_29698f1ed04f37c36876e58b4f77d476" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/session/sess_29698f1ed04f37c36876e58b4f77d476" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/view/admin/Agent/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/Agent/index.html" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/view/admin/Usermanage/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/Usermanage/index.html" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/view/admin/auth/group.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/auth/group.html" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/view/admin/finance/shenhe.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/finance/shenhe.html" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/view/admin/login/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/login/index.html" afterDir="false" />
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/admin/temp/8cf06704c557cf682440809f194660c0.php" beforeDir="false" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/runtime/session/sess_704f72601738fb3cc6160a8139fa9ef3" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/session/sess_704f72601738fb3cc6160a8139fa9ef3" afterDir="false" />
|
|
</list>
|
|
</list>
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -57,58 +25,32 @@
|
|
</component>
|
|
</component>
|
|
<component name="FileEditorManager">
|
|
<component name="FileEditorManager">
|
|
<leaf>
|
|
<leaf>
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/app/admin/controller/Usermanage.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="274">
|
|
|
|
- <caret line="126" lean-forward="true" selection-start-line="126" selection-end-line="126" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="e#102#136#0#PHP" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
<file pinned="false" current-in-tab="true">
|
|
<file pinned="false" current-in-tab="true">
|
|
- <entry file="file://$PROJECT_DIR$/view/admin/Usermanage/index.html">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/admin/controller/Order.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="529">
|
|
|
|
- <caret line="26" column="41" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
|
|
|
|
|
|
+ <state relative-caret-position="297">
|
|
|
|
+ <caret line="129" column="16" lean-forward="true" selection-start-line="129" selection-start-column="16" selection-end-line="129" selection-end-column="16" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
|
|
|
|
- <element signature="n#div#1;n#!!top" />
|
|
|
|
- <element signature="n#style#0;n#div#1;n#div#1;n#!!top" expanded="true" />
|
|
|
|
- <element signature="n#style#0;n#div#2;n#div#1;n#!!top" expanded="true" />
|
|
|
|
- <element signature="n#style#0;n#div#0;n#div#2;n#div#1;n#!!top" expanded="true" />
|
|
|
|
- <element signature="n#style#0;n#div#1;n#div#2;n#div#1;n#!!top" expanded="true" />
|
|
|
|
- <element signature="n#style#0;n#div#2;n#div#2;n#div#1;n#!!top" expanded="true" />
|
|
|
|
- <element signature="n#style#0;n#div#3;n#div#2;n#div#1;n#!!top" expanded="true" />
|
|
|
|
|
|
+ <element signature="e#102#129#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/app/admin/controller/Usersys.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/web/model/Orders.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="136">
|
|
|
|
- <caret line="91" column="5" lean-forward="true" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="e#101#135#0#PHP" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
|
|
+ <state relative-caret-position="713">
|
|
|
|
+ <caret line="176" column="22" selection-start-line="176" selection-start-column="22" selection-end-line="176" selection-end-column="22" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/view/admin/Usermanage/usermessage.html">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/common/controller/Orde.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="184">
|
|
|
|
- <caret line="8" selection-start-line="8" selection-end-line="8" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
|
- <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
|
|
+ <state relative-caret-position="505">
|
|
|
|
+ <caret line="44" column="44" selection-start-line="44" selection-start-column="31" selection-end-line="44" selection-end-column="44" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -128,7 +70,6 @@
|
|
<find>list</find>
|
|
<find>list</find>
|
|
<find>czcg</find>
|
|
<find>czcg</find>
|
|
<find>tongxingzheng</find>
|
|
<find>tongxingzheng</find>
|
|
- <find>fenhao</find>
|
|
|
|
<find>user_money</find>
|
|
<find>user_money</find>
|
|
<find>update_leve</find>
|
|
<find>update_leve</find>
|
|
<find>is_admin</find>
|
|
<find>is_admin</find>
|
|
@@ -137,6 +78,10 @@
|
|
<find>uploadInst</find>
|
|
<find>uploadInst</find>
|
|
<find>lay-verify="required"</find>
|
|
<find>lay-verify="required"</find>
|
|
<find>site_logos</find>
|
|
<find>site_logos</find>
|
|
|
|
+ <find>vip</find>
|
|
|
|
+ <find>update_user_admin</find>
|
|
|
|
+ <find>fenhao</find>
|
|
|
|
+ <find>update_pwd</find>
|
|
</findStrings>
|
|
</findStrings>
|
|
</component>
|
|
</component>
|
|
<component name="Git.Settings">
|
|
<component name="Git.Settings">
|
|
@@ -156,7 +101,6 @@
|
|
<option value="$PROJECT_DIR$/app/web/controller/Login.php" />
|
|
<option value="$PROJECT_DIR$/app/web/controller/Login.php" />
|
|
<option value="$PROJECT_DIR$/view/admin/auth/group.html" />
|
|
<option value="$PROJECT_DIR$/view/admin/auth/group.html" />
|
|
<option value="$PROJECT_DIR$/app/admin/controller/Finance.php" />
|
|
<option value="$PROJECT_DIR$/app/admin/controller/Finance.php" />
|
|
- <option value="$PROJECT_DIR$/app/admin/controller/Order.php" />
|
|
|
|
<option value="$PROJECT_DIR$/app/admin/controller/Certificate.php" />
|
|
<option value="$PROJECT_DIR$/app/admin/controller/Certificate.php" />
|
|
<option value="$PROJECT_DIR$/app/admin/controller/Login.php" />
|
|
<option value="$PROJECT_DIR$/app/admin/controller/Login.php" />
|
|
<option value="$PROJECT_DIR$/app/common/controller/Backend.php" />
|
|
<option value="$PROJECT_DIR$/app/common/controller/Backend.php" />
|
|
@@ -166,9 +110,21 @@
|
|
<option value="$PROJECT_DIR$/view/admin/usersys/message.html" />
|
|
<option value="$PROJECT_DIR$/view/admin/usersys/message.html" />
|
|
<option value="$PROJECT_DIR$/view/admin/usersys/account.html" />
|
|
<option value="$PROJECT_DIR$/view/admin/usersys/account.html" />
|
|
<option value="$PROJECT_DIR$/app/admin/controller/Usersys.php" />
|
|
<option value="$PROJECT_DIR$/app/admin/controller/Usersys.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/view/admin/Usermanage/usermessage.html" />
|
|
<option value="$PROJECT_DIR$/view/admin/Usermanage/index.html" />
|
|
<option value="$PROJECT_DIR$/view/admin/Usermanage/index.html" />
|
|
|
|
+ <option value="$PROJECT_DIR$/app/web/controller/Base.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/view/admin/contents/opens.html" />
|
|
|
|
+ <option value="$PROJECT_DIR$/app/web/model/Orders.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/view/admin/adminaccount/show.html" />
|
|
|
|
+ <option value="$PROJECT_DIR$/view/admin/adminaccount/index.html" />
|
|
|
|
+ <option value="$PROJECT_DIR$/app/admin/controller/Adminaccount.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/app/admin/controller/Account.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/view/admin/contents/showuser.html" />
|
|
<option value="$PROJECT_DIR$/app/admin/controller/Usermanage.php" />
|
|
<option value="$PROJECT_DIR$/app/admin/controller/Usermanage.php" />
|
|
- <option value="$PROJECT_DIR$/view/admin/Usermanage/usermessage.html" />
|
|
|
|
|
|
+ <option value="$PROJECT_DIR$/app/admin/controller/Contents.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/view/admin/contents/adminuser.html" />
|
|
|
|
+ <option value="$PROJECT_DIR$/app/common/controller/Orde.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/app/admin/controller/Order.php" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -308,6 +264,13 @@
|
|
<path>
|
|
<path>
|
|
<item name="php" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="php" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="php" type="462c0819:PsiDirectoryNode" />
|
|
<item name="php" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="app" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="web" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="model" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ </path>
|
|
|
|
+ <path>
|
|
|
|
+ <item name="php" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
+ <item name="php" type="462c0819:PsiDirectoryNode" />
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
</path>
|
|
</path>
|
|
<path>
|
|
<path>
|
|
@@ -321,21 +284,21 @@
|
|
<item name="php" type="462c0819:PsiDirectoryNode" />
|
|
<item name="php" type="462c0819:PsiDirectoryNode" />
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
- <item name="user" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
+ <item name="contents" type="462c0819:PsiDirectoryNode" />
|
|
</path>
|
|
</path>
|
|
<path>
|
|
<path>
|
|
<item name="php" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="php" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="php" type="462c0819:PsiDirectoryNode" />
|
|
<item name="php" type="462c0819:PsiDirectoryNode" />
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
- <item name="Usermanage" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
+ <item name="login" type="462c0819:PsiDirectoryNode" />
|
|
</path>
|
|
</path>
|
|
<path>
|
|
<path>
|
|
<item name="php" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="php" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="php" type="462c0819:PsiDirectoryNode" />
|
|
<item name="php" type="462c0819:PsiDirectoryNode" />
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
- <item name="usersys" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
|
+ <item name="Usermanage" type="462c0819:PsiDirectoryNode" />
|
|
</path>
|
|
</path>
|
|
</expand>
|
|
</expand>
|
|
<select />
|
|
<select />
|
|
@@ -354,6 +317,7 @@
|
|
</component>
|
|
</component>
|
|
<component name="RecentsManager">
|
|
<component name="RecentsManager">
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
|
+ <recent name="D:\phpstudy_pro\WWW\cxy\bts\php\view\admin\contents" />
|
|
<recent name="D:\phpstudy_pro\WWW\cxy\bts\php\view\admin\Usermanage" />
|
|
<recent name="D:\phpstudy_pro\WWW\cxy\bts\php\view\admin\Usermanage" />
|
|
</key>
|
|
</key>
|
|
</component>
|
|
</component>
|
|
@@ -379,12 +343,12 @@
|
|
<option name="number" value="Default" />
|
|
<option name="number" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
<updated>1591579855742</updated>
|
|
<updated>1591579855742</updated>
|
|
- <workItem from="1591579857139" duration="19741000" />
|
|
|
|
|
|
+ <workItem from="1591579857139" duration="28400000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="19741000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="28400000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -399,7 +363,7 @@
|
|
<window_info anchor="bottom" id="Terminal" weight="0.329718" />
|
|
<window_info anchor="bottom" id="Terminal" weight="0.329718" />
|
|
<window_info anchor="bottom" id="Event Log" side_tool="true" />
|
|
<window_info anchor="bottom" id="Event Log" side_tool="true" />
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
- <window_info anchor="bottom" id="Find" order="1" />
|
|
|
|
|
|
+ <window_info anchor="bottom" id="Find" order="1" weight="0.329718" />
|
|
<window_info anchor="bottom" id="Run" order="2" />
|
|
<window_info anchor="bottom" id="Run" order="2" />
|
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
@@ -455,13 +419,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/app/common/controller/Orde.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="74">
|
|
|
|
- <caret line="321" selection-start-line="321" selection-end-line="321" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/view/admin/contents/add.html">
|
|
<entry file="file://$PROJECT_DIR$/view/admin/contents/add.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="345">
|
|
<state relative-caret-position="345">
|
|
@@ -544,13 +501,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/view/admin/login/index.html">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="551">
|
|
|
|
- <caret line="70" column="22" selection-start-line="70" selection-start-column="22" selection-end-line="70" selection-end-column="22" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/view/admin/auth/group.html">
|
|
<entry file="file://$PROJECT_DIR$/view/admin/auth/group.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="437">
|
|
<state relative-caret-position="437">
|
|
@@ -558,16 +508,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/app/admin/controller/Order.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="230">
|
|
|
|
- <caret line="15" column="27" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="e#102#129#0#PHP" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/Article.php">
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/Article.php">
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
</entry>
|
|
</entry>
|
|
@@ -615,13 +555,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/app/admin/controller/Contents.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="138">
|
|
|
|
- <caret line="221" column="8" selection-start-line="221" selection-start-column="8" selection-end-line="239" selection-end-column="29" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/common/controller/Backend.php">
|
|
<entry file="file://$PROJECT_DIR$/app/common/controller/Backend.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="1127">
|
|
<state relative-caret-position="1127">
|
|
@@ -643,16 +576,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/view/admin/contents/push.html">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="138">
|
|
|
|
- <caret line="81" column="6" selection-start-line="81" selection-start-column="6" selection-end-line="108" selection-end-column="11" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/Uploads.php">
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/Uploads.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="-1058">
|
|
<state relative-caret-position="-1058">
|
|
@@ -708,30 +631,65 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/app/admin/controller/Usermanage.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/web/controller/Base.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="274">
|
|
|
|
- <caret line="126" lean-forward="true" selection-start-line="126" selection-end-line="126" />
|
|
|
|
- <folding>
|
|
|
|
- <element signature="e#102#136#0#PHP" expanded="true" />
|
|
|
|
- </folding>
|
|
|
|
|
|
+ <state relative-caret-position="598">
|
|
|
|
+ <caret line="31" column="9" selection-start-line="31" selection-start-column="9" selection-end-line="31" selection-end-column="9" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/view/admin/contents/push.html">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="414">
|
|
|
|
+ <caret line="93" column="31" selection-end-line="110" selection-end-column="9" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/view/admin/login/index.html">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="528">
|
|
|
|
+ <caret line="69" column="103" selection-start-line="69" selection-start-column="20" selection-end-line="69" selection-end-column="103" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/view/admin/contents/opens.html">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="276">
|
|
|
|
+ <caret line="12" column="53" selection-start-line="12" selection-start-column="49" selection-end-line="12" selection-end-column="53" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/Usersys.php">
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/Usersys.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="136">
|
|
|
|
- <caret line="91" column="5" lean-forward="true" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
|
|
|
|
|
|
+ <state relative-caret-position="-47">
|
|
|
|
+ <caret line="16" column="31" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="31" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="e#101#135#0#PHP" expanded="true" />
|
|
<element signature="e#101#135#0#PHP" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/view/admin/Usermanage/usermessage.html">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/view/admin/Usermanage/index.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="184">
|
|
|
|
- <caret line="8" selection-start-line="8" selection-end-line="8" />
|
|
|
|
|
|
+ <state relative-caret-position="552">
|
|
|
|
+ <caret line="60" selection-end-line="285" selection-end-column="9" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
|
|
|
|
+ <element signature="n#div#1;n#!!top" />
|
|
|
|
+ <element signature="n#style#0;n#div#1;n#div#1;n#!!top" expanded="true" />
|
|
|
|
+ <element signature="n#style#0;n#div#2;n#div#1;n#!!top" expanded="true" />
|
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#2;n#div#1;n#!!top" expanded="true" />
|
|
|
|
+ <element signature="n#style#0;n#div#1;n#div#2;n#div#1;n#!!top" expanded="true" />
|
|
|
|
+ <element signature="n#style#0;n#div#2;n#div#2;n#div#1;n#!!top" expanded="true" />
|
|
|
|
+ <element signature="n#style#0;n#div#3;n#div#2;n#div#1;n#!!top" expanded="true" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/view/admin/adminaccount/showuser.html">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="1447">
|
|
|
|
+ <caret line="212" column="9" selection-start-line="212" selection-start-column="9" selection-end-line="212" selection-end-column="9" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
@@ -739,10 +697,10 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/view/admin/Usermanage/index.html">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/view/admin/adminaccount/adminuser.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="529">
|
|
|
|
- <caret line="26" column="41" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
|
|
|
|
|
|
+ <state relative-caret-position="92">
|
|
|
|
+ <caret line="85" column="33" selection-start-line="85" selection-start-column="33" selection-end-line="85" selection-end-column="33" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
|
|
<element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
|
|
<element signature="n#div#1;n#!!top" />
|
|
<element signature="n#div#1;n#!!top" />
|
|
@@ -756,5 +714,84 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/admin/controller/Account.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="414">
|
|
|
|
+ <caret line="23" column="6" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="e#102#136#0#PHP" expanded="true" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/view/admin/Usermanage/usermessage.html">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="161">
|
|
|
|
+ <caret line="67" lean-forward="true" selection-start-line="67" selection-end-line="67" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/view/admin/contents/showuser.html">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="-2691">
|
|
|
|
+ <caret line="6" column="25" lean-forward="true" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
|
+ <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/admin/controller/Usermanage.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="441">
|
|
|
|
+ <caret line="34" column="30" lean-forward="true" selection-start-line="34" selection-start-column="30" selection-end-line="34" selection-end-column="30" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="e#102#136#0#PHP" expanded="true" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/admin/controller/Contents.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="657">
|
|
|
|
+ <caret line="452" column="5" lean-forward="true" selection-start-line="452" selection-start-column="5" selection-end-line="452" selection-end-column="5" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="e#69#103#0#PHP" expanded="true" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/view/admin/contents/adminuser.html">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="372">
|
|
|
|
+ <caret line="99" column="22" lean-forward="true" selection-start-line="99" selection-start-column="22" selection-end-line="99" selection-end-column="22" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/common/controller/Orde.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="505">
|
|
|
|
+ <caret line="44" column="44" selection-start-line="44" selection-start-column="31" selection-end-line="44" selection-end-column="44" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/web/model/Orders.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="713">
|
|
|
|
+ <caret line="176" column="22" selection-start-line="176" selection-start-column="22" selection-end-line="176" selection-end-column="22" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/admin/controller/Order.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="297">
|
|
|
|
+ <caret line="129" column="16" lean-forward="true" selection-start-line="129" selection-start-column="16" selection-end-line="129" selection-end-column="16" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="e#102#129#0#PHP" expanded="true" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
</component>
|
|
</component>
|
|
</project>
|
|
</project>
|