作者 郭盛
1 个管道 的构建 通过 耗费 9 秒

修改接口

... ... @@ -2,20 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/admin/controller/AreaController.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ResourceController.php" afterPath="$PROJECT_DIR$/api/index/controller/ResourceController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/StatisticController.php" afterPath="$PROJECT_DIR$/app/admin/controller/StatisticController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/composer.json" afterPath="$PROJECT_DIR$/composer.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/vendor/autoload.php" afterPath="$PROJECT_DIR$/simplewind/vendor/autoload.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/vendor/composer/ClassLoader.php" afterPath="$PROJECT_DIR$/simplewind/vendor/composer/ClassLoader.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/vendor/composer/LICENSE" afterPath="$PROJECT_DIR$/simplewind/vendor/composer/LICENSE" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/vendor/composer/autoload_classmap.php" afterPath="$PROJECT_DIR$/simplewind/vendor/composer/autoload_classmap.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/vendor/composer/autoload_files.php" afterPath="$PROJECT_DIR$/simplewind/vendor/composer/autoload_files.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/vendor/composer/autoload_namespaces.php" afterPath="$PROJECT_DIR$/simplewind/vendor/composer/autoload_namespaces.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/vendor/composer/autoload_psr4.php" afterPath="$PROJECT_DIR$/simplewind/vendor/composer/autoload_psr4.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/vendor/composer/autoload_real.php" afterPath="$PROJECT_DIR$/simplewind/vendor/composer/autoload_real.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/vendor/composer/autoload_static.php" afterPath="$PROJECT_DIR$/simplewind/vendor/composer/autoload_static.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/vendor/composer/installed.json" afterPath="$PROJECT_DIR$/simplewind/vendor/composer/installed.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" afterPath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -26,38 +18,36 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="StatisticController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/admin/controller/StatisticController.php">
<file leaf-file-name="ResourceController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="444">
<caret line="173" column="53" lean-forward="true" selection-start-line="173" selection-start-column="53" selection-end-line="173" selection-end-column="53" />
<state relative-caret-position="172">
<caret line="281" column="0" lean-forward="true" selection-start-line="281" selection-start-column="0" selection-end-line="281" selection-end-column="0" />
<folding>
<element signature="e#129#168#0#PHP" expanded="true" />
<element signature="e#3855#4918#0#PHP" expanded="false" />
<element signature="e#5518#5792#0#PHP" expanded="false" />
<element signature="e#5809#6112#0#PHP" expanded="false" />
<element signature="e#6139#6570#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
<folding>
<element signature="n#div#0;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#input#0;n#form#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#1;n#form#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#div#2;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#form#1;n#div#2;n#body#0;n#!!top" expanded="true" />
<element signature="n#div#3;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#form#1;n#div#3;n#body#0;n#!!top" expanded="true" />
<element signature="n#script#0;n#!!top" expanded="false" />
<element signature="n#script#2;n#!!top" expanded="false" />
<element signature="e#7561#7894#0" expanded="false" />
<element signature="e#2915#3370#0#PHP" expanded="false" />
<element signature="e#3376#3931#0#PHP" expanded="false" />
<element signature="e#3938#5213#0#PHP" expanded="false" />
<element signature="e#5219#5872#0#PHP" expanded="false" />
<element signature="e#5877#7023#0#PHP" expanded="false" />
<element signature="e#7029#7639#0#PHP" expanded="false" />
<element signature="e#7644#8802#0#PHP" expanded="false" />
<element signature="e#8808#9604#0#PHP" expanded="false" />
<element signature="e#9609#10939#0#PHP" expanded="false" />
<element signature="e#10945#11674#0#PHP" expanded="false" />
<element signature="e#11679#13219#0#PHP" expanded="false" />
<element signature="e#13225#13810#0#PHP" expanded="false" />
<element signature="e#13815#14823#0#PHP" expanded="false" />
<element signature="e#14829#15245#0#PHP" expanded="false" />
<element signature="e#15250#15772#0#PHP" expanded="false" />
<element signature="e#15777#16407#0#PHP" expanded="false" />
<element signature="e#16413#16808#0#PHP" expanded="false" />
<element signature="e#16813#17516#0#PHP" expanded="false" />
<element signature="e#17522#18028#0#PHP" expanded="false" />
<element signature="e#18033#19464#0#PHP" expanded="false" />
<element signature="e#19470#19749#0#PHP" expanded="false" />
<element signature="e#19754#20196#0#PHP" expanded="false" />
<element signature="e#20202#20436#0#PHP" expanded="false" />
<element signature="e#20441#20834#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -93,9 +83,11 @@
<option value="$PROJECT_DIR$/app/admin/controller/FinancsendController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/financsend/index.html" />
<option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/StatisticController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/AreaController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" />
</list>
</option>
</component>
... ... @@ -113,11 +105,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="330" />
<option name="y" value="62" />
<component name="ProjectFrameBounds">
<option name="x" value="297" />
<option name="y" value="29" />
<option name="width" value="1410" />
<option name="height" value="976" />
<option name="height" value="948" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -135,7 +127,6 @@
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -146,25 +137,31 @@
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="phpoffice" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -202,16 +199,20 @@
<workItem from="1568160847626" duration="15036000" />
<workItem from="1568180913957" duration="22865000" />
<workItem from="1568247570186" duration="32736000" />
<workItem from="1568425201663" duration="10436000" />
<workItem from="1568437133047" duration="5218000" />
<workItem from="1568442614180" duration="3798000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="110312000" />
<option name="totallyTimeSpent" value="129764000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<frame x="297" y="29" width="1410" height="948" extended-state="0" />
<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.2595949" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23037037" sideWeight="0.5" order="0" 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.33" sideWeight="0.5" order="6" 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.34076828" sideWeight="0.50296295" order="7" 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="3" side_tool="false" content_ui="tabs" />
... ... @@ -243,16 +244,24 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1425">
<caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/StatisticController.php">
<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>
<element signature="e#129#168#0#PHP" expanded="true" />
<element signature="e#3855#4918#0#PHP" expanded="false" />
<element signature="e#129#168#0#PHP" expanded="false" />
<element signature="e#5518#5792#0#PHP" expanded="false" />
<element signature="e#5809#6112#0#PHP" expanded="false" />
<element signature="e#6139#6570#0#PHP" expanded="false" />
<element signature="e#6587#10851#0#PHP" expanded="false" />
<element signature="e#10868#13364#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -261,18 +270,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1725">
<caret line="69" column="19" lean-forward="true" selection-start-line="69" selection-start-column="19" selection-end-line="69" selection-end-column="19" />
<folding>
<element signature="n#div#0;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#input#0;n#form#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#1;n#form#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#div#2;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#form#1;n#div#2;n#body#0;n#!!top" expanded="true" />
<element signature="n#div#3;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#form#1;n#div#3;n#body#0;n#!!top" expanded="true" />
<element signature="n#script#0;n#!!top" expanded="false" />
<element signature="n#script#2;n#!!top" expanded="false" />
<element signature="e#7561#7894#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -281,11 +278,12 @@
<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>
<element signature="e#129#168#0#PHP" expanded="true" />
<element signature="e#3855#4918#0#PHP" expanded="false" />
<element signature="e#129#168#0#PHP" expanded="false" />
<element signature="e#5518#5792#0#PHP" expanded="false" />
<element signature="e#5809#6112#0#PHP" expanded="false" />
<element signature="e#6139#6570#0#PHP" expanded="false" />
<element signature="e#6587#10851#0#PHP" expanded="false" />
<element signature="e#10868#13364#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -294,30 +292,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3375">
<caret line="323" column="28" lean-forward="false" selection-start-line="323" selection-start-column="28" selection-end-line="323" selection-end-column="28" />
<folding>
<element signature="e#127#156#0#PHP" expanded="false" />
<element signature="e#529#905#0#PHP" expanded="false" />
<element signature="e#912#1246#0#PHP" expanded="false" />
<element signature="e#1251#2652#0#PHP" expanded="false" />
<element signature="e#2915#3370#0#PHP" expanded="false" />
<element signature="e#3376#3931#0#PHP" expanded="false" />
<element signature="e#3938#5213#0#PHP" expanded="false" />
<element signature="e#5219#5872#0#PHP" expanded="false" />
<element signature="e#5877#7023#0#PHP" expanded="false" />
<element signature="e#7029#7639#0#PHP" expanded="false" />
<element signature="e#7644#8802#0#PHP" expanded="false" />
<element signature="e#8808#9604#0#PHP" expanded="false" />
<element signature="e#9609#10939#0#PHP" expanded="false" />
<element signature="e#10945#11674#0#PHP" expanded="false" />
<element signature="e#11679#13219#0#PHP" expanded="false" />
<element signature="e#13225#13810#0#PHP" expanded="false" />
<element signature="e#13815#14823#0#PHP" expanded="false" />
<element signature="e#14829#15245#0#PHP" expanded="false" />
<element signature="e#15250#15846#0#PHP" expanded="false" />
<element signature="e#15851#16481#0#PHP" expanded="false" />
<element signature="e#16487#16993#0#PHP" expanded="false" />
<element signature="e#16998#18429#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -325,18 +299,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1625">
<caret line="65" column="29" lean-forward="true" selection-start-line="65" selection-start-column="29" selection-end-line="65" selection-end-column="29" />
<folding>
<element signature="n#div#0;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#input#0;n#form#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#1;n#form#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#div#2;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#form#1;n#div#2;n#body#0;n#!!top" expanded="true" />
<element signature="n#div#3;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#form#1;n#div#3;n#body#0;n#!!top" expanded="true" />
<element signature="n#script#0;n#!!top" expanded="false" />
<element signature="n#script#2;n#!!top" expanded="false" />
<element signature="e#7561#7894#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -345,11 +307,12 @@
<state relative-caret-position="2875">
<caret line="121" column="41" lean-forward="false" selection-start-line="121" selection-start-column="30" selection-end-line="121" selection-end-column="41" />
<folding>
<element signature="e#129#168#0#PHP" expanded="true" />
<element signature="e#3855#4918#0#PHP" expanded="false" />
<element signature="e#129#168#0#PHP" expanded="false" />
<element signature="e#5518#5792#0#PHP" expanded="false" />
<element signature="e#5809#6112#0#PHP" expanded="false" />
<element signature="e#6139#6570#0#PHP" expanded="false" />
<element signature="e#6587#10851#0#PHP" expanded="false" />
<element signature="e#10868#13364#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -358,18 +321,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1600">
<caret line="64" column="41" lean-forward="true" selection-start-line="64" selection-start-column="41" selection-end-line="64" selection-end-column="41" />
<folding>
<element signature="n#div#0;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#input#0;n#form#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#1;n#form#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#div#2;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#form#1;n#div#2;n#body#0;n#!!top" expanded="true" />
<element signature="n#div#3;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#form#1;n#div#3;n#body#0;n#!!top" expanded="true" />
<element signature="n#script#0;n#!!top" expanded="false" />
<element signature="n#script#2;n#!!top" expanded="false" />
<element signature="e#7561#7894#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -378,11 +329,12 @@
<state relative-caret-position="850">
<caret line="40" column="46" lean-forward="false" selection-start-line="40" selection-start-column="46" selection-end-line="40" selection-end-column="46" />
<folding>
<element signature="e#129#168#0#PHP" expanded="true" />
<element signature="e#3855#4918#0#PHP" expanded="false" />
<element signature="e#129#168#0#PHP" expanded="false" />
<element signature="e#5518#5792#0#PHP" expanded="false" />
<element signature="e#5809#6112#0#PHP" expanded="false" />
<element signature="e#6139#6570#0#PHP" expanded="false" />
<element signature="e#6587#10851#0#PHP" expanded="false" />
<element signature="e#10868#13364#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -391,18 +343,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="8" lean-forward="true" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
<folding>
<element signature="n#div#0;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#input#0;n#form#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#1;n#form#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#div#2;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#form#1;n#div#2;n#body#0;n#!!top" expanded="true" />
<element signature="n#div#3;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#form#1;n#div#3;n#body#0;n#!!top" expanded="true" />
<element signature="n#script#0;n#!!top" expanded="false" />
<element signature="n#script#2;n#!!top" expanded="false" />
<element signature="e#7561#7894#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -452,7 +392,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="32" lean-forward="true" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
... ... @@ -460,7 +399,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="32" lean-forward="false" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
... ... @@ -559,15 +497,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-8250">
<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$/api/index/controller/OtherController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-525">
<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>
... ... @@ -575,7 +504,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2668">
<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>
... ... @@ -590,7 +518,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="332">
<caret line="52" column="37" lean-forward="true" selection-start-line="52" selection-start-column="37" selection-end-line="52" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
... ... @@ -598,7 +525,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3150">
<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>
... ... @@ -623,37 +549,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382">
<caret line="97" column="4" lean-forward="false" selection-start-line="97" selection-start-column="4" selection-end-line="97" selection-end-column="4" />
<folding>
<element signature="e#127#156#0#PHP" expanded="false" />
<element signature="e#529#905#0#PHP" expanded="false" />
<element signature="e#912#1246#0#PHP" expanded="false" />
<element signature="e#1251#2652#0#PHP" expanded="false" />
<element signature="e#2915#3370#0#PHP" expanded="false" />
<element signature="e#3376#3931#0#PHP" expanded="false" />
<element signature="e#3938#5213#0#PHP" expanded="false" />
<element signature="e#5219#5872#0#PHP" expanded="false" />
<element signature="e#5877#7023#0#PHP" expanded="false" />
<element signature="e#7029#7639#0#PHP" expanded="false" />
<element signature="e#7644#8802#0#PHP" expanded="false" />
<element signature="e#8808#9604#0#PHP" expanded="false" />
<element signature="e#9609#10939#0#PHP" expanded="false" />
<element signature="e#10945#11674#0#PHP" expanded="false" />
<element signature="e#11679#13219#0#PHP" expanded="false" />
<element signature="e#13225#13810#0#PHP" expanded="false" />
<element signature="e#13815#14823#0#PHP" expanded="false" />
<element signature="e#14829#15245#0#PHP" expanded="false" />
<element signature="e#15250#15846#0#PHP" expanded="false" />
<element signature="e#15851#16481#0#PHP" expanded="false" />
<element signature="e#16487#16993#0#PHP" expanded="false" />
<element signature="e#16998#18429#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296">
... ... @@ -666,7 +561,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1731">
<caret line="120" column="0" lean-forward="false" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -674,7 +568,6 @@
<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>
... ... @@ -682,7 +575,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="356" column="20" lean-forward="false" selection-start-line="356" selection-start-column="20" selection-end-line="356" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
... ... @@ -690,39 +582,96 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1225">
<caret line="73" column="12" lean-forward="false" selection-start-line="73" selection-start-column="9" selection-end-line="73" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="35" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="298" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="68" lean-forward="false" selection-start-line="13" selection-start-column="68" selection-end-line="13" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/StatisticController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="444">
<caret line="173" column="53" lean-forward="true" selection-start-line="173" selection-start-column="53" selection-end-line="173" selection-end-column="53" />
<state relative-caret-position="464">
<caret line="92" column="16" lean-forward="true" selection-start-line="92" selection-start-column="16" selection-end-line="92" selection-end-column="16" />
<folding>
<element signature="e#129#168#0#PHP" expanded="true" />
<element signature="e#3855#4918#0#PHP" expanded="false" />
<element signature="e#129#168#0#PHP" expanded="false" />
<element signature="e#5518#5792#0#PHP" expanded="false" />
<element signature="e#5809#6112#0#PHP" expanded="false" />
<element signature="e#6139#6570#0#PHP" expanded="false" />
<element signature="e#6587#10851#0#PHP" expanded="false" />
<element signature="e#10868#13364#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html">
<entry file="file://$PROJECT_DIR$/app/admin/controller/AreaController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="57" column="25" lean-forward="true" selection-start-line="57" selection-start-column="25" selection-end-line="57" selection-end-column="25" />
<state relative-caret-position="925">
<caret line="42" column="31" lean-forward="false" selection-start-line="42" selection-start-column="31" selection-end-line="42" selection-end-column="31" />
<folding>
<element signature="e#129#168#0#PHP" expanded="false" />
<element signature="e#1617#1891#0#PHP" expanded="false" />
<element signature="e#2238#2569#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php">
<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$/app/admin/controller/OtherController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="700">
<caret line="35" column="33" lean-forward="true" selection-start-line="35" selection-start-column="33" selection-end-line="35" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="172">
<caret line="281" column="0" lean-forward="true" selection-start-line="281" selection-start-column="0" selection-end-line="281" selection-end-column="0" />
<folding>
<element signature="n#div#0;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#input#0;n#form#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#1;n#form#0;n#div#1;n#body#0;n#!!top" expanded="true" />
<element signature="n#div#2;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#form#1;n#div#2;n#body#0;n#!!top" expanded="true" />
<element signature="n#div#3;n#body#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#form#1;n#div#3;n#body#0;n#!!top" expanded="true" />
<element signature="n#script#0;n#!!top" expanded="false" />
<element signature="n#script#2;n#!!top" expanded="false" />
<element signature="e#7561#7894#0" expanded="false" />
<element signature="e#2915#3370#0#PHP" expanded="false" />
<element signature="e#3376#3931#0#PHP" expanded="false" />
<element signature="e#3938#5213#0#PHP" expanded="false" />
<element signature="e#5219#5872#0#PHP" expanded="false" />
<element signature="e#5877#7023#0#PHP" expanded="false" />
<element signature="e#7029#7639#0#PHP" expanded="false" />
<element signature="e#7644#8802#0#PHP" expanded="false" />
<element signature="e#8808#9604#0#PHP" expanded="false" />
<element signature="e#9609#10939#0#PHP" expanded="false" />
<element signature="e#10945#11674#0#PHP" expanded="false" />
<element signature="e#11679#13219#0#PHP" expanded="false" />
<element signature="e#13225#13810#0#PHP" expanded="false" />
<element signature="e#13815#14823#0#PHP" expanded="false" />
<element signature="e#14829#15245#0#PHP" expanded="false" />
<element signature="e#15250#15772#0#PHP" expanded="false" />
<element signature="e#15777#16407#0#PHP" expanded="false" />
<element signature="e#16413#16808#0#PHP" expanded="false" />
<element signature="e#16813#17516#0#PHP" expanded="false" />
<element signature="e#17522#18028#0#PHP" expanded="false" />
<element signature="e#18033#19464#0#PHP" expanded="false" />
<element signature="e#19470#19749#0#PHP" expanded="false" />
<element signature="e#19754#20196#0#PHP" expanded="false" />
<element signature="e#20202#20436#0#PHP" expanded="false" />
<element signature="e#20441#20834#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -480,8 +480,7 @@ class ResourceController extends RestBaseController
$data = Db::name('discuss')
->alias('d')
->join('user u','u.id=d.user_id')
->join('user r','r.id=d.to_user_id')
->field('d.*,u.user_nickname,u.avatar,r.user_nickname,r.avatar')
->field('d.*,u.user_nickname,u.avatar')
->where('job_id',$id)
->select();
$list = $this->discuss($data);
... ... @@ -509,6 +508,44 @@ class ResourceController extends RestBaseController
}
/**
* @title 评论
* @description 评论
* @author GuoSheng
* @url /index/Resource/ping
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:id type:int require:1 other: desc:信息ID
* @param name:content type:text require:1 other:desc 评论内容
* @param name:to_user_id type:int require:0 other:desc 被评论人id
*
*/
public function ping()
{
$user_id = $this->getUserId();
$data = $this->request->param();
if(empty($data['id'])){
$this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
}
if(empty($data['to_user_id'])){
$data['to_user_id'] = 0;
}
$param['to_user_id'] = $data['to_user_id'];
$param['job_id'] = $data['id'];
$param['user_id'] = $user_id;
$param['content'] = $data['content'];
$param['create_time'] = time();
$data = Db::name('discuss')
->insert($param);
if($data){
$this->success('添加成功!');
}else{
$this->error('sql执行错误');
}
}
/**
* @title 我要报名
* @description 报名接口
* @author GuoSheng
... ... @@ -570,4 +607,55 @@ class ResourceController extends RestBaseController
$this->success('SUCCESS',$res);
}
/**
* @title 获取form_id
* @description
* @author GuoSheng
* @url /index/Resource/getForm
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:form_id type:int require:1 other: desc:formid
*
*/
public function getForm()
{
$data['user_id'] = $this->getUserId();
$data['form_id'] = $this->request->param('form_id');
if($data['form_id'] == "the formId is a mock one"){
$this->error(['code'=>40002,'msg'=>'form_id格式错误']);
}
$data['create_time'] = time();
$data['past_time'] = time()+7*24*60*60;
Db::name('form')->insert($data);
$this->success('SUCCESS');
}
/**
* @title 是否拉黑
* @description
* @author GuoSheng
* @url /index/Resource/init
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @return user_status:1正常 0拉黑
*/
public function init()
{
$user_id = $this->getUserId();
$user_status = Db::name('user')
->where('id',$user_id)
->field('user_status')
->find();
if($user_status['user_status'] == 1){
$data['user_status'] = 1;
}else{
$data['user_status'] = 0;
}
$this->success('SUCCESS',$data);
}
}
\ No newline at end of file
... ...
<?php
/**
* Created by PhpStorm.
* User: Administrator
* Date: 2019/9/14
* Time: 9:47
*/
namespace app\admin\controller;
use cmf\controller\AdminBaseController;
use think\Db;
class AreaController extends AdminBaseController
{
//地区统计
public function index()
{
//查出省份信息以及省份下面所有城市的ID
$area_name = Db::name('area')
->where('level',1)
->field('id,name')
->paginate(10,false,['query'=>request()->param()]);
$area = $area_name->toArray();
foreach ($area['data'] as $k=>$v){
$area['data'][$k]['child'] = Db::name('area')
->where('pid',$v['id'])
->column('id');
}
//统计全部地区全部类型某一天发布总数量
$param = $this->request->param();
$startTime = empty($param['start_time']) ? '' : strtotime($param['start_time']);
if(!empty($startTime)){
$where['create_time'] = [['>=',$startTime],['<=',$startTime+86400]];
}else{
$where['create_time'] = ['eq','today'];
}
foreach ($area['data'] as &$v){
$res = Db::name('job')
->where($where)
->where('delete_time',0)
->where('status',1)
->where('city','like',"%$v%")
->field('id,job_type,city,create_time')
->select()
->toArray();
}
$this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
$this->assign(['list'=>$area, 'page'=>$area_name->render()]);
return $this->fetch();
}
//循环
public function cycle($time,$arr4,$v_4){
$num = 0;
foreach($arr4 as $value4){
$date4 = date('Y-m-d',$value4['create_time']);
if($time == $date4){
$num = $value4[$v_4];
}
}
return $num;
}
//统计数量
public function getCount($where,$field){
$res = Db::name('job')
->where($where)
->field($field)
->group("FROM_UNIXTIME(create_time,'%Y-%m-%d')")
->order('create_time desc')
->select()
->toArray();
return $res;
}
//获取指定日期段内每一天的日期
public static function getDateFromRange($start, $end){
if($end<$start) return [];
// 计算日期段内有多少天
$days = (int)ceil(($end-$start)/86400);
// 保存每天日期
$date = array();
for($i=0; $i<$days; $i++){
$date[] = date('Y-m-d', $start+(86400*$i));
}
return $date;
}
}
\ No newline at end of file
... ...
... ... @@ -163,7 +163,6 @@ class StatisticController extends AdminBaseController
//导出
public function explode_post(){
/*--------------开始从数据库提取信息插入Excel表中------------------*/
... ...
<?php
return array (
'ADMIN_ACTIVE_INDEX' => '同城活动',
'ADMIN_AREA_INDEX' => '地区统计',
'ADMIN_ATTESTATION_INDEX' => '身份认证',
'ADMIN_ATTRACT_INDEX' => '招商加盟',
'ADMIN_DEMAND_INDEX' => '需求信息',
... ...
<include file="public@header" />
</head>
<style>
th,td{
text-align: center;
}
</style>
<body>
<div class="wrap js-check-wrap">
<form class="well form-inline margin-top-20" method="post" action="{:url('Area/index')}">
时间:
<input type="text" class="form-control js-bootstrap-date" name="start_time" value="{$start_time|default=''}" id="start_time" style="width: 140px;" autocomplete="off">
<input type="submit" class="btn btn-primary" value="搜索" />
<a class="btn btn-danger" href="{:url('Area/index')}">清空</a>
</form>
<form action="{:url('Area/explode_post')}" method="post" id="form1">
<input type="hidden" value="0" id="start1_time" name="start1_time">
<input type="hidden" value="0" id="end1_time" name="end1_time">
<button class="btn btn-success" id="export">导出数据</button>
</form>
<table class="table table-hover table-bordered">
<thead>
<tr>
<th>省市</th>
<th>发布数量</th>
<th>供给发布</th>
<th>需求发布</th>
<th>活动发布</th>
<th>招商发布</th>
<th>在线信息数量</th>
<th>供给信息</th>
<th>需求信息</th>
<th>同城活动</th>
<th>招商信息</th>
</tr>
</thead>
<foreach name="list.data" item="vo">
<tbody>
<tr>
<td>{$vo.name}</td>
</tr>
</tbody>
</foreach>
</table>
<div class="pagination">{$page}</div>
</div>
<script src="__STATIC__/js/admin.js"></script>
<script src="__STATIC__/js/echarts/echarts.min.js"></script>
</body>
</html>
\ No newline at end of file
... ...