|
@@ -2,45 +2,9 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="52cc2ceb-e100-4a5f-a9e2-bb6b61bdbebd" name="Default Changelist" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/../BTS需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/../BTS需求.docx" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/adddata.sql" beforeDir="false" afterPath="$PROJECT_DIR$/adddata.sql" 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/Finance.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/Finance.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/common/controller/Upfile.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/common/controller/Upfile.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/app/web/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/web/controller/Index.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$/app/web/controller/My.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/web/controller/My.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$/app/web/model/Tripartite.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/web/model/Tripartite.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/app/worker/controller/User.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/worker/controller/User.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/app/worker/controller/Worker.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/worker/controller/Worker.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/config/worker.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/worker.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/log/202006/01.log" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/log/202006/02.log" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/01e433db5e5517b7a2c4587da42797aa.php" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/14d50cc59972e0ab82b71f4b5f381353.php" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/193b3c530962981d3a4dc850749aaa8b.php" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/42d182ba955a14984e138f63987ed1b0.php" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/a43dd06f39d809c109c800ec9d9d065a.php" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/a5b87fd77913dd9b0ad9dd783203b8ce.php" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/a8ba287c844b92a9904d92bc00486605.php" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/a8f8b134a87427ac15fa2ed97d90c5b0.php" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/admin/temp/b04ecd3398bf75dee5dd9dee974fadba.php" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/ap/log/202006/01.log" 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_3f972420e5bb26ed1e69c519f52d4119" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/runtime/session/sess_ab4726e650d984353a6b41b449abf891" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/vendor/workerman/workerman.log" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/workerman/workerman.log" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/view/admin/contents/about.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/contents/about.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/view/admin/contents/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/contents/add.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/view/admin/contents/feedback.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/contents/feedback.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/view/admin/contents/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/contents/index.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/view/admin/system/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/view/admin/system/index.html" 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$/../~$BTS需求.docx" beforeDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -54,43 +18,19 @@
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/admin/controller/Finance.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/admin/controller/Contents.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="207">
|
|
|
- <caret line="145" column="7" lean-forward="true" selection-start-line="145" selection-start-column="7" selection-end-line="167" selection-end-column="29" />
|
|
|
- <folding>
|
|
|
- <element signature="e#102#133#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/admin/controller/Order.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="451">
|
|
|
- <caret line="36" column="72" selection-start-line="36" selection-start-column="72" selection-end-line="36" selection-end-column="72" />
|
|
|
- <folding>
|
|
|
- <element signature="e#102#127#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="184">
|
|
|
+ <caret line="122" column="7" selection-start-line="122" selection-start-column="7" selection-end-line="148" selection-end-column="29" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/view/admin/order/buy.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="368">
|
|
|
- <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/view/admin/contents/hlep.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/admin/controller/Certificate.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="221">
|
|
|
- <caret line="49" selection-start-line="49" selection-end-line="52" selection-end-column="9" />
|
|
|
+ <state relative-caret-position="428">
|
|
|
+ <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -148,7 +88,6 @@
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
- <option value="$PROJECT_DIR$/app/common/model/GeneralFinance.php" />
|
|
|
<option value="$PROJECT_DIR$/app/common/model/GeneralTransfer.php" />
|
|
|
<option value="$PROJECT_DIR$/app/common/model/Mining.php" />
|
|
|
<option value="$PROJECT_DIR$/app/common/model/Notice.php" />
|
|
@@ -199,6 +138,7 @@
|
|
|
<option value="$PROJECT_DIR$/view/admin/order/daili.html" />
|
|
|
<option value="$PROJECT_DIR$/app/admin/controller/Order.php" />
|
|
|
<option value="$PROJECT_DIR$/view/admin/order/buy.html" />
|
|
|
+ <option value="$PROJECT_DIR$/app/admin/controller/Certificate.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -305,6 +245,7 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
+ <pane id="Scope" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
|
@@ -330,48 +271,10 @@
|
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
- <path>
|
|
|
- <item name="php" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="php" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="php" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="php" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="view" 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="admin" 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="admin" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="contents" 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="admin" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="finance" 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="admin" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="order" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
- <pane id="Scope" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
@@ -382,7 +285,7 @@
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
|
|
|
<property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../company/any_admin" />
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
|
|
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
|
|
<property name="nodejs_package_manager_path" value="npm" />
|
|
@@ -516,18 +419,19 @@
|
|
|
<workItem from="1591065028261" duration="19190000" />
|
|
|
<workItem from="1591146974136" duration="26205000" />
|
|
|
<workItem from="1591232554457" duration="31102000" />
|
|
|
- <workItem from="1591318731601" duration="30185000" />
|
|
|
+ <workItem from="1591318731601" duration="30668000" />
|
|
|
+ <workItem from="1591579052776" duration="431000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="788687000" />
|
|
|
+ <option name="totallyTimeSpent" value="789601000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22547974" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22761194" />
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
@@ -540,7 +444,7 @@
|
|
|
<window_info anchor="bottom" id="Docker" order="7" weight="0.329718" />
|
|
|
<window_info anchor="bottom" id="Database Changes" order="8" />
|
|
|
<window_info anchor="bottom" id="Version Control" order="9" weight="0.3290993" />
|
|
|
- <window_info anchor="bottom" id="Terminal" order="10" weight="0.28199565" />
|
|
|
+ <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.28199565" />
|
|
|
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="File Transfer" order="12" visible="true" weight="0.056399133" />
|
|
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
@@ -610,13 +514,6 @@
|
|
|
</breakpoint-manager>
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/admin/controller/Article.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="483">
|
|
|
- <caret line="37" column="76" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="76" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/vendor/topthink/think-orm/src/Model.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="612">
|
|
@@ -916,13 +813,6 @@
|
|
|
</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="138">
|
|
|
- <caret line="133" column="27" selection-start-line="133" selection-start-column="27" selection-end-line="133" selection-end-column="27" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/view/admin/finance/tongji.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="152">
|
|
@@ -975,10 +865,17 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/view/admin/contents/feedback.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="345">
|
|
|
+ <caret line="54" column="6" selection-end-line="140" selection-end-column="9" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/Finance.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="207">
|
|
|
- <caret line="145" column="7" lean-forward="true" selection-start-line="145" selection-start-column="7" selection-end-line="167" selection-end-column="29" />
|
|
|
+ <state relative-caret-position="3128">
|
|
|
+ <caret line="145" column="7" selection-start-line="145" selection-start-column="7" selection-end-line="167" selection-end-column="29" />
|
|
|
<folding>
|
|
|
<element signature="e#102#133#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
@@ -987,7 +884,7 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/Order.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="451">
|
|
|
+ <state relative-caret-position="690">
|
|
|
<caret line="36" column="72" selection-start-line="36" selection-start-column="72" selection-end-line="36" selection-end-column="72" />
|
|
|
<folding>
|
|
|
<element signature="e#102#127#0#PHP" expanded="true" />
|
|
@@ -995,24 +892,31 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/view/admin/contents/feedback.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/view/admin/contents/hlep.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="345">
|
|
|
- <caret line="54" column="6" selection-end-line="140" selection-end-column="9" />
|
|
|
+ <state relative-caret-position="1127">
|
|
|
+ <caret line="49" selection-start-line="49" selection-end-line="52" selection-end-column="9" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/view/admin/contents/hlep.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/view/admin/order/buy.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="221">
|
|
|
- <caret line="49" selection-start-line="49" selection-end-line="52" selection-end-column="9" />
|
|
|
+ <state relative-caret-position="115">
|
|
|
+ <caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/view/admin/order/buy.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/admin/controller/Contents.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="368">
|
|
|
- <caret line="52" column="9" lean-forward="true" selection-start-line="52" selection-start-column="9" selection-end-line="52" selection-end-column="9" />
|
|
|
+ <state relative-caret-position="184">
|
|
|
+ <caret line="122" column="7" selection-start-line="122" selection-start-column="7" selection-end-line="148" selection-end-column="29" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/admin/controller/Certificate.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="428">
|
|
|
+ <caret line="28" column="8" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="8" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|