切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
cef503cc08fb895b912360de7a500d5c06b62bb9
1 个父辈
2f19055c
1 个管道 的构建
通过
耗费 7 秒
分享
变更
3
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
219 行增加
和
275 行删除
.idea/workspace.xml
api/index/controller/OtherController.php
app/admin/controller/AreaController.php
.idea/workspace.xml
查看文件 @
cef503c
...
...
@@ -3,6 +3,8 @@
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"73de7205-e736-4b59-941a-a54ab4506a41"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/OtherController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/OtherController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/app/admin/controller/AreaController.php"
afterPath=
"$PROJECT_DIR$/app/admin/controller/AreaController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -12,39 +14,29 @@
<option
name=
"LAST_RESOLUTION"
value=
"IGNORE"
/>
</component>
<component
name=
"FileEditorManager"
>
<leaf>
<file
leaf-file-name=
"ResourceController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"OtherController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OtherController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"163"
>
<caret
line=
"38"
column=
"36"
lean-forward=
"true"
selection-start-line=
"38"
selection-start-column=
"36"
selection-end-line=
"38"
selection-end-column=
"36"
/>
<state
relative-caret-position=
"444"
>
<caret
line=
"223"
column=
"7"
lean-forward=
"true"
selection-start-line=
"223"
selection-start-column=
"7"
selection-end-line=
"223"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#962#1253#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1258#2915#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2921#3173#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3178#3633#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3639#4194#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4201#5476#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5482#6202#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6207#7625#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7631#8303#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9900#10758#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10763#12524#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15486#16133#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16138#17576#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17582#17998#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18003#18822#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18827#19505#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19511#19965#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19970#20744#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20750#21256#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21261#22692#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22698#22977#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23430#23664#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23669#24062#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24068#24299#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24304#24662#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#295#463#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#468#777#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#783#949#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#954#1257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1263#1904#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1909#2993#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2999#3363#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3368#3842#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3848#4119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4124#5057#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5063#5372#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5377#5677#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5687#5966#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5971#6897#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6903#7207#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7212#7601#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -90,7 +82,6 @@
<option
value=
"$PROJECT_DIR$/api/index/controller/ReleaseController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/add.html"
/>
<option
value=
"$PROJECT_DIR$/app/user/controller/AssetController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OtherController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/approve.html"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/attestation/edit.html"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/MessageController.php"
/>
...
...
@@ -103,10 +94,11 @@
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/finance/edit.html"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/FinanceController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/ActiveController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/AreaController.php"
/>
<option
value=
"$PROJECT_DIR$/api/config.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ActiveController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/AreaController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OtherController.php"
/>
</list>
</option>
</component>
...
...
@@ -125,8 +117,8 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"78"
/>
<option
name=
"y"
value=
"118"
/>
<option
name=
"x"
value=
"192"
/>
<option
name=
"y"
value=
"76"
/>
<option
name=
"width"
value=
"1717"
/>
<option
name=
"height"
value=
"906"
/>
</component>
...
...
@@ -146,6 +138,7 @@
</navigator>
<panes>
<pane
id=
"Scope"
/>
<pane
id=
"Scratches"
/>
<pane
id=
"ProjectPane"
>
<subPane>
<expand>
...
...
@@ -175,12 +168,11 @@
<select
/>
</subPane>
</pane>
<pane
id=
"Scratches"
/>
</panes>
</component>
<component
name=
"PropertiesComponent"
>
<property
name=
"WebServerToolWindowFactoryState"
value=
"false"
/>
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$"
/>
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$
/../../project/competition
"
/>
<property
name=
"DefaultHtmlFileTemplate"
value=
"HTML File"
/>
</component>
<component
name=
"RecentsManager"
>
...
...
@@ -234,27 +226,28 @@
<workItem
from=
"1568938332139"
duration=
"12331000"
/>
<workItem
from=
"1568958569115"
duration=
"14347000"
/>
<workItem
from=
"1569025438791"
duration=
"15935000"
/>
<workItem
from=
"1569053326084"
duration=
"1367000"
/>
<workItem
from=
"1569053326084"
duration=
"3343000"
/>
<workItem
from=
"1569197707712"
duration=
"8347000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"3
07183
000"
/>
<option
name=
"totallyTimeSpent"
value=
"3
17506
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
78"
y=
"118
"
width=
"1717"
height=
"906"
extended-state=
"0"
/>
<frame
x=
"
192"
y=
"76
"
width=
"1717"
height=
"906"
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.17
501509
"
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.17
682558
"
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"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Version Control"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.2992383"
sideWeight=
"0.49703702"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Favorites"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"2"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Cvs"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"4"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Message"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Commander"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -321,13 +314,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/config/doc.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"750"
>
<caret
line=
"30"
column=
"2"
lean-forward=
"true"
selection-start-line=
"30"
selection-start-column=
"2"
selection-end-line=
"30"
selection-end-column=
"2"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/config.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"346"
>
...
...
@@ -335,25 +321,17 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"375"
>
<caret
line=
"22"
column=
"7"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"7"
selection-end-line=
"22"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#299#762#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#767#1496#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1502#2191#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2196#4102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4108#4373#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4378#4728#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/AttractController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-71"
>
<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#264#1922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1937#4063#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4078#4931#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4946#5282#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5297#5738#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -388,6 +366,7 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-8003"
>
<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>
...
...
@@ -458,6 +437,7 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"725"
>
<caret
line=
"38"
column=
"63"
lean-forward=
"true"
selection-start-line=
"38"
selection-start-column=
"63"
selection-end-line=
"45"
selection-end-column=
"87"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -500,38 +480,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/FinanceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"375"
>
<caret
line=
"68"
column=
"5"
lean-forward=
"true"
selection-start-line=
"68"
selection-start-column=
"5"
selection-end-line=
"68"
selection-end-column=
"5"
/>
<folding>
<element
signature=
"e#300#1179#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1184#2062#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=
"1575"
>
<caret
line=
"104"
column=
"33"
lean-forward=
"true"
selection-start-line=
"104"
selection-start-column=
"33"
selection-end-line=
"104"
selection-end-column=
"33"
/>
<folding>
<element
signature=
"e#295#463#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#468#777#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#783#949#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#954#1257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2999#3363#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3368#3842#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3848#4119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4124#5057#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5063#5372#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5377#5677#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5687#5966#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5971#6897#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=
"257"
>
...
...
@@ -544,6 +492,16 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"625"
>
<caret
line=
"172"
column=
"8"
lean-forward=
"true"
selection-start-line=
"172"
selection-start-column=
"8"
selection-end-line=
"172"
selection-end-column=
"8"
/>
<folding>
<element
signature=
"e#263#1922#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1937#4063#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4078#4931#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4946#5282#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5297#5738#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5753#6691#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6708#7528#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7545#8276#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -558,6 +516,10 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"26"
column=
"65"
lean-forward=
"false"
selection-start-line=
"26"
selection-start-column=
"65"
selection-end-line=
"26"
selection-end-column=
"65"
/>
<folding>
<element
signature=
"e#774#1850#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2598#3453#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -593,6 +555,9 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"675"
>
<caret
line=
"94"
column=
"13"
lean-forward=
"false"
selection-start-line=
"94"
selection-start-column=
"13"
selection-end-line=
"94"
selection-end-column=
"13"
/>
<folding>
<element
signature=
"e#263#1739#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -600,6 +565,7 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"75"
>
<caret
line=
"12"
column=
"1"
lean-forward=
"true"
selection-start-line=
"12"
selection-start-column=
"1"
selection-end-line=
"12"
selection-end-column=
"1"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -607,20 +573,80 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"500"
>
<caret
line=
"100"
column=
"13"
lean-forward=
"false"
selection-start-line=
"100"
selection-start-column=
"13"
selection-end-line=
"100"
selection-end-column=
"13"
/>
<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=
"125"
>
<caret
line=
"58"
column=
"7"
lean-forward=
"true"
selection-start-line=
"58"
selection-start-column=
"7"
selection-end-line=
"58"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#548#956#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#962#1253#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1258#2915#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2921#3173#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3178#3633#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3639#4194#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4201#5476#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5482#6202#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6207#7625#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7631#8303#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8308#9894#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9900#10758#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10763#12524#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12530#13370#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13375#15480#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15486#16133#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16138#17576#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17582#17998#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18003#18822#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18827#19505#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19511#19965#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19970#20744#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20750#21256#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21261#22692#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22698#22977#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22982#23424#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23430#23664#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23669#24062#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24068#24299#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24304#24662#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/config/doc.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"750"
>
<caret
line=
"30"
column=
"2"
lean-forward=
"true"
selection-start-line=
"30"
selection-start-column=
"2"
selection-end-line=
"30"
selection-end-column=
"2"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/AreaController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"700"
>
<caret
line=
"64"
column=
"9"
lean-forward=
"true"
selection-start-line=
"64"
selection-start-column=
"9"
selection-end-line=
"64"
selection-end-column=
"9"
/>
<state
relative-caret-position=
"1525"
>
<caret
line=
"72"
column=
"43"
lean-forward=
"true"
selection-start-line=
"72"
selection-start-column=
"43"
selection-end-line=
"72"
selection-end-column=
"43"
/>
<folding>
<element
signature=
"e#1665#1757#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/config.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"394"
>
<caret
line=
"255"
column=
"49"
lean-forward=
"true"
selection-start-line=
"255"
selection-start-column=
"49"
selection-end-line=
"255"
selection-end-column=
"49"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1200"
>
<caret
line=
"363"
column=
"62"
lean-forward=
"true"
selection-start-line=
"363"
selection-start-column=
"62"
selection-end-line=
"363"
selection-end-column=
"62"
/>
<state
relative-caret-position=
"775"
>
<caret
line=
"290"
column=
"7"
lean-forward=
"true"
selection-start-line=
"290"
selection-start-column=
"7"
selection-end-line=
"290"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#921#1812#0#PHP"
expanded=
"false"
/>
...
...
@@ -635,7 +661,9 @@
<element
signature=
"e#8683#9203#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9208#9741#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9747#10014#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10019#15512#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15518#15782#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15787#21254#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21260#21660#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21665#22099#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22104#22364#0#PHP"
expanded=
"false"
/>
...
...
@@ -646,45 +674,53 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/
config
.php"
>
<entry
file=
"file://$PROJECT_DIR$/api/
index/controller/FinanceController
.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"918"
>
<caret
line=
"257"
column=
"0"
lean-forward=
"true"
selection-start-line=
"257"
selection-start-column=
"0"
selection-end-line=
"257"
selection-end-column=
"0"
/>
<folding
/>
<state
relative-caret-position=
"375"
>
<caret
line=
"68"
column=
"5"
lean-forward=
"true"
selection-start-line=
"68"
selection-start-column=
"5"
selection-end-line=
"68"
selection-end-column=
"5"
/>
<folding>
<element
signature=
"e#300#1179#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1184#2062#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/
Resource
Controller.php"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/
Myinfo
Controller.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"163"
>
<caret
line=
"38"
column=
"36"
lean-forward=
"true"
selection-start-line=
"38"
selection-start-column=
"36"
selection-end-line=
"38"
selection-end-column=
"36"
/>
<state
relative-caret-position=
"344"
>
<caret
line=
"22"
column=
"7"
lean-forward=
"false"
selection-start-line=
"22"
selection-start-column=
"7"
selection-end-line=
"22"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#962#1253#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1258#2915#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2921#3173#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3178#3633#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3639#4194#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4201#5476#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5482#6202#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6207#7625#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7631#8303#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9900#10758#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10763#12524#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15486#16133#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16138#17576#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17582#17998#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18003#18822#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18827#19505#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19511#19965#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19970#20744#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20750#21256#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21261#22692#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22698#22977#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23430#23664#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23669#24062#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24068#24299#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24304#24662#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#299#762#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#767#1496#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1502#2191#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2196#4102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4108#4373#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4378#4728#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=
"444"
>
<caret
line=
"223"
column=
"7"
lean-forward=
"true"
selection-start-line=
"223"
selection-start-column=
"7"
selection-end-line=
"223"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#295#463#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#468#777#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#783#949#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#954#1257#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1263#1904#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1909#2993#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2999#3363#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3368#3842#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3848#4119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4124#5057#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5063#5372#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5377#5677#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5687#5966#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5971#6897#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6903#7207#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7212#7601#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/OtherController.php
查看文件 @
cef503c
...
...
@@ -252,4 +252,32 @@ class OtherController extends RestBaseController
$this
->
error
([
'code'
=>
40001
,
'msg'
=>
'您已经取消过了'
]);
}
}
/**
* @title 分享
* @description 分享
* @author GuoSheng
* @url /index/Other/share
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:job_id type:int require:1 other: desc:信息ID
*
* @return share_num:分享数量
*
*/
public
function
share
()
{
$user_id
=
$this
->
getUserId
();
$job_id
=
$this
->
request
->
param
(
'job_id'
);
$res
=
Db
::
name
(
'job'
)
->
where
(
'id'
,
$job_id
)
->
find
();
$data
[
'share_num'
]
=
$res
[
'share_num'
]
+
1
;
Db
::
name
(
'job'
)
->
where
(
'id'
,
$job_id
)
->
update
(
$data
);
$this
->
success
(
'SUCCESS'
,
$data
);
}
}
\ No newline at end of file
...
...
app/admin/controller/AreaController.php
查看文件 @
cef503c
...
...
@@ -27,6 +27,13 @@ class AreaController extends AdminBaseController
->
field
(
'id,name'
)
->
paginate
(
10
,
false
,[
'query'
=>
request
()
->
param
()]);
$area
=
$area_name
->
toArray
();
//查出市信息
$city_name
=
Db
::
name
(
'area'
)
->
where
(
'level'
,
2
)
->
field
(
'id,pid,name'
)
->
select
()
->
toArray
();
//接收查询条件
$param
=
$this
->
request
->
param
();
$startTime
=
empty
(
$param
[
'start_time'
])
?
''
:
strtotime
(
$param
[
'start_time'
]);
...
...
@@ -40,8 +47,10 @@ class AreaController extends AdminBaseController
$where
[
'create_time'
]
=
[[
'>='
,
$beginToday
],[
'<='
,
$endToday
]];
$t
[
'end_time'
]
=
[
'>='
,
time
()];
}
//查出当天发布全部信息
$job
=
Db
::
name
(
'job'
)
->
where
(
$where
)
//
->where($where)
->
where
(
'status'
,
1
)
->
where
(
'delete_time'
,
0
)
->
field
(
'id,city'
)
...
...
@@ -50,158 +59,29 @@ class AreaController extends AdminBaseController
foreach
(
$job
as
&
$j
){
$j
[
'city'
]
=
explode
(
','
,
trim
(
$j
[
'city'
],
','
));
}
//每个省份下的市区id
foreach
(
$area
[
'data'
]
as
&
$v
){
$v
[
'num'
]
=
0
;
$v
[
'city_id'
]
=
Db
::
name
(
'area'
)
->
where
(
'pid'
,
$v
[
'id'
])
->
column
(
'id'
);
$k
=
0
;
foreach
(
$city_name
as
$c_value
){
if
(
$v
[
'id'
]
==
$c_value
[
'pid'
]){
$v
[
'city_id'
][
$k
]
=
$c_value
[
'id'
];
$k
++
;
}
}
foreach
(
$job
as
$k_j
=>
$v_j
){
foreach
(
$v_j
[
'city'
]
as
$c_id
){
if
(
in_array
(
$c_id
,
$v
[
'city_id'
])){
$v
[
'num'
]
++
;
}
}
}
}
print_r
(
$area
[
'data'
]);
die
;
//总发布量 总供给 总需求 总活动 总招商
foreach
(
$area
[
'data'
]
as
&
$v
){
$num
=
0
;
$provide
=
0
;
$demand
=
0
;
$active
=
0
;
$attract_num
=
0
;
//在线发布量
$is_num
=
0
;
$is_provide
=
0
;
$is_demand
=
0
;
$is_active
=
0
;
$is_attract
=
0
;
$city_ids
=
Db
::
name
(
'area'
)
->
where
(
'pid'
,
$v
[
'id'
])
->
column
(
'id'
);
$job_ids
=
[];
$job_ids1
=
[];
$job_ids2
=
[];
$job_ids3
=
[];
$job_ids4
=
[];
//在线发布量
$job_ids5
=
[];
$job_ids6
=
[];
$job_ids7
=
[];
$job_ids8
=
[];
$job_ids9
=
[];
foreach
(
$city_ids
as
$key
=>
$city_id
){
//总发布量
$job_ids
=
Db
::
name
(
'job'
)
->
where
(
'status'
,
1
)
->
where
(
'delete_time'
,
0
)
->
where
(
$where
)
->
where
([
'city'
=>
[
'like'
,
'%,'
.
$city_id
.
',%'
],
'id'
=>
[
'not in'
,
$job_ids
]])
->
column
(
'id'
);
$num
+=
count
(
$job_ids
);
//供给发布
$job_ids1
=
Db
::
name
(
'job'
)
->
where
(
'status'
,
1
)
->
where
(
'delete_time'
,
0
)
->
where
(
'job_type'
,
1
)
->
where
(
$where
)
->
where
([
'city'
=>
[
'like'
,
'%,'
.
$city_id
.
',%'
],
'id'
=>
[
'not in'
,
$job_ids1
]])
->
column
(
'id'
);
$provide
+=
count
(
$job_ids1
);
//需求发布
$job_ids2
=
Db
::
name
(
'job'
)
->
where
(
'status'
,
1
)
->
where
(
'delete_time'
,
0
)
->
where
(
'job_type'
,
2
)
->
where
(
$where
)
->
where
([
'city'
=>
[
'like'
,
'%,'
.
$city_id
.
',%'
],
'id'
=>
[
'not in'
,
$job_ids2
]])
->
column
(
'id'
);
$demand
+=
count
(
$job_ids2
);
//活动发布
$job_ids3
=
Db
::
name
(
'job'
)
->
where
(
'status'
,
1
)
->
where
(
'delete_time'
,
0
)
->
where
(
'job_type'
,
3
)
->
where
(
$where
)
->
where
([
'city'
=>
[
'like'
,
'%,'
.
$city_id
.
',%'
],
'id'
=>
[
'not in'
,
$job_ids3
]])
->
column
(
'id'
);
$active
+=
count
(
$job_ids3
);
//招商发布
$job_ids4
=
Db
::
name
(
'job'
)
->
where
(
'status'
,
1
)
->
where
(
'delete_time'
,
0
)
->
where
(
'job_type'
,
4
)
->
where
(
$where
)
->
where
([
'city'
=>
[
'like'
,
'%,'
.
$city_id
.
',%'
],
'id'
=>
[
'not in'
,
$job_ids4
]])
->
column
(
'id'
);
$attract_num
+=
count
(
$job_ids4
);
var_dump
(
$area
[
'data'
]);
exit
;
//在线总发布量
$job_ids5
=
Db
::
name
(
'job'
)
->
where
(
'status'
,
1
)
->
where
(
'delete_time'
,
0
)
->
where
(
$t
)
->
where
([
'city'
=>
[
'like'
,
'%,'
.
$city_id
.
',%'
],
'id'
=>
[
'not in'
,
$job_ids5
]])
->
column
(
'id'
);
$is_num
+=
count
(
$job_ids5
);
//在线供给发布
$job_ids6
=
Db
::
name
(
'job'
)
->
where
(
'status'
,
1
)
->
where
(
'delete_time'
,
0
)
->
where
(
'job_type'
,
1
)
->
where
(
$t
)
->
where
([
'city'
=>
[
'like'
,
'%,'
.
$city_id
.
',%'
],
'id'
=>
[
'not in'
,
$job_ids6
]])
->
column
(
'id'
);
$is_provide
+=
count
(
$job_ids6
);
//在线需求发布
$job_ids7
=
Db
::
name
(
'job'
)
->
where
(
'status'
,
1
)
->
where
(
'delete_time'
,
0
)
->
where
(
'job_type'
,
2
)
->
where
(
$t
)
->
where
([
'city'
=>
[
'like'
,
'%,'
.
$city_id
.
',%'
],
'id'
=>
[
'not in'
,
$job_ids7
]])
->
column
(
'id'
);
$is_demand
+=
count
(
$job_ids7
);
//在线活动发布
$job_ids8
=
Db
::
name
(
'job'
)
->
where
(
'status'
,
1
)
->
where
(
'delete_time'
,
0
)
->
where
(
'job_type'
,
3
)
->
where
(
$t
)
->
where
([
'city'
=>
[
'like'
,
'%,'
.
$city_id
.
',%'
],
'id'
=>
[
'not in'
,
$job_ids8
]])
->
column
(
'id'
);
$is_active
+=
count
(
$job_ids8
);
//在线供给发布
$job_ids9
=
Db
::
name
(
'job'
)
->
where
(
'status'
,
1
)
->
where
(
'delete_time'
,
0
)
->
where
(
'job_type'
,
4
)
->
where
(
$t
)
->
where
([
'city'
=>
[
'like'
,
'%,'
.
$city_id
.
',%'
],
'id'
=>
[
'not in'
,
$job_ids9
]])
->
column
(
'id'
);
$is_attract
+=
count
(
$job_ids9
);
}
$v
[
'num'
]
=
$num
;
$v
[
'provide_num'
]
=
$provide
;
$v
[
'demand_num'
]
=
$demand
;
$v
[
'active_num'
]
=
$active
;
$v
[
'attract_num'
]
=
$attract_num
;
$v
[
'is_num'
]
=
$is_num
;
$v
[
'is_provide'
]
=
$is_provide
;
$v
[
'is_demand'
]
=
$is_demand
;
$v
[
'is_active'
]
=
$is_active
;
$v
[
'is_attract'
]
=
$is_attract
;
}
$this
->
assign
(
'start_time'
,
isset
(
$param
[
'start_time'
])
?
$param
[
'start_time'
]
:
''
);
$this
->
assign
([
'list'
=>
$area
,
'page'
=>
$area_name
->
render
()]);
return
$this
->
fetch
();
...
...
请
注册
或
登录
后发表评论