切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
3ff83540a55d9a7010759895a7b1aca4fbc434fc
1 个父辈
e22eee1a
1 个管道 的构建
通过
耗费 1 秒
上传图片接口
变更
6
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
190 行增加
和
180 行删除
.idea/workspace.xml
api/index/controller/ResourceController.php
app/admin/controller/AreaController.php
app/admin/controller/DemandController.php
app/admin/controller/ProvideController.php
public/themes/admin_simpleboot3/admin/demand/index.html
.idea/workspace.xml
查看文件 @
3ff8354
...
...
@@ -2,7 +2,12 @@
<project
version=
"4"
>
<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/ResourceController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/app/admin/controller/AreaController.php"
afterPath=
"$PROJECT_DIR$/app/admin/controller/AreaController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/app/admin/controller/DemandController.php"
afterPath=
"$PROJECT_DIR$/app/admin/controller/DemandController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/app/admin/controller/ProvideController.php"
afterPath=
"$PROJECT_DIR$/app/admin/controller/ProvideController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/index.html"
afterPath=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/index.html"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -13,29 +18,37 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"AreaController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/AreaController.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=
"519"
>
<caret
line=
"42"
column=
"8"
lean-forward=
"false"
selection-start-line=
"42"
selection-start-column=
"8"
selection-end-line=
"42"
selection-end-column=
"8"
/>
<state
relative-caret-position=
"100"
>
<caret
line=
"78"
column=
"44"
lean-forward=
"true"
selection-start-line=
"78"
selection-start-column=
"44"
selection-end-line=
"78"
selection-end-column=
"44"
/>
<folding>
<element
signature=
"e#129#168#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#6747#13480#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13497#15993#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"index.html"
pinned=
"false"
current-in-tab=
"false"
>
<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=
"344"
>
<caret
line=
"224"
column=
"28"
lean-forward=
"false"
selection-start-line=
"224"
selection-start-column=
"28"
selection-end-line=
"224"
selection-end-column=
"28"
/>
<folding>
<element
signature=
"n#div#1;n#body#0;n#!!top"
expanded=
"false"
/>
<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=
"e#127#156#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#2988#3443#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3449#4004#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4011#5286#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5292#5945#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5950#7096#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7102#7712#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7717#8875#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8881#9677#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9682#11012#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11018#11747#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11752#13292#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13298#13883#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13888#14896#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14902#15318#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15323#15845#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15850#16480#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16486#16881#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16886#17589#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17595#18101#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18106#19537#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19543#19822#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19827#20269#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20275#20509#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20514#20907#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -72,12 +85,15 @@
<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$/public/themes/admin_simpleboot3/admin/statistic/index.html"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/StatisticController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ReleaseController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ActiveController.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$/app/admin/controller/ProvideController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/index.html"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/DemandController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
</list>
</option>
</component>
...
...
@@ -96,10 +112,10 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"369"
/>
<option
name=
"y"
value=
"29"
/>
<option
name=
"x"
value=
"241"
/>
<option
name=
"y"
value=
"75"
/>
<option
name=
"width"
value=
"1382"
/>
<option
name=
"height"
value=
"94
1
"
/>
<option
name=
"height"
value=
"94
0
"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -128,51 +144,25 @@
<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=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"themes"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"themes"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin_simpleboot3"
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=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"themes"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin_simpleboot3"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"index"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"themes"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin_simpleboot3"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"area"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"index"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"public"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"themes"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin_simpleboot3"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"statistic"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
<select
/>
...
...
@@ -220,15 +210,15 @@
<workItem
from=
"1568442614180"
duration=
"3798000"
/>
<workItem
from=
"1568594548281"
duration=
"28629000"
/>
<workItem
from=
"1568629056199"
duration=
"4747000"
/>
<workItem
from=
"1568679207375"
duration=
"
6119
000"
/>
<workItem
from=
"1568679207375"
duration=
"
10033
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"1
69259
000"
/>
<option
name=
"totallyTimeSpent"
value=
"1
73173
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
369"
y=
"29"
width=
"1382"
height=
"941
"
extended-state=
"1"
/>
<frame
x=
"
241"
y=
"75"
width=
"1382"
height=
"940
"
extended-state=
"1"
/>
<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.21482602"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -263,34 +253,6 @@
<watches-manager
/>
</component>
<component
name=
"editorHistoryManager"
>
<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"
/>
</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=
"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"
/>
</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"
/>
</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=
"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"
/>
</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=
"1625"
>
...
...
@@ -403,13 +365,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"350"
>
<caret
line=
"14"
column=
"32"
lean-forward=
"true"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"212"
selection-end-column=
"0"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/active/edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-1150"
>
...
...
@@ -424,13 +379,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/DemandController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-2250"
>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-275"
>
...
...
@@ -567,98 +515,156 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/
Other
Controller.php"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/
Release
Controller.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-362"
>
<caret
line=
"0"
column=
"0"
lean-forward=
"false"
selection-start-line=
"0"
selection-start-column=
"0"
selection-end-line=
"0"
selection-end-column=
"0"
/>
<state
relative-caret-position=
"-12087"
>
<caret
line=
"133"
column=
"27"
lean-forward=
"true"
selection-start-line=
"133"
selection-start-column=
"27"
selection-end-line=
"133"
selection-end-column=
"27"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
api/index/controller/ReleaseController.php
"
>
<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=
"-12087"
>
<caret
line=
"133"
column=
"27"
lean-forward=
"true"
selection-start-line=
"133"
selection-start-column=
"27"
selection-end-line=
"133"
selection-end-column=
"27"
/>
<state
relative-caret-position=
"208"
>
<caret
line=
"133"
column=
"41"
lean-forward=
"true"
selection-start-line=
"133"
selection-start-column=
"41"
selection-end-line=
"133"
selection-end-column=
"41"
/>
</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=
"600"
>
<caret
line=
"29"
column=
"8"
lean-forward=
"false"
selection-start-line=
"29"
selection-start-column=
"8"
selection-end-line=
"29"
selection-end-column=
"8"
/>
<folding>
<element
signature=
"e#129#168#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6740#13473#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13490#15986#0#PHP"
expanded=
"false"
/>
</folding>
</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=
"344"
>
<caret
line=
"224"
column=
"28"
lean-forward=
"false"
selection-start-line=
"224"
selection-start-column=
"28"
selection-end-line=
"224"
selection-end-column=
"28"
/>
<folding>
<element
signature=
"n#div#1;n#body#0;n#!!top"
expanded=
"false"
/>
<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"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-1361"
>
<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/SendController.php"
>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/ProvideController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"850"
>
<caret
line=
"68"
column=
"12"
lean-forward=
"true"
selection-start-line=
"68"
selection-start-column=
"12"
selection-end-line=
"70"
selection-end-column=
"13"
/>
<folding>
<element
signature=
"e#4077#4930#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4945#5281#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5296#5737#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5752#6690#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6707#7527#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7544#8275#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/comment.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
-5698
"
>
<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$/public/themes/admin_simpleboot3/admin/
statistic/index
.html"
>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/
demand/edit
.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"208"
>
<caret
line=
"133"
column=
"41"
lean-forward=
"true"
selection-start-line=
"133"
selection-start-column=
"41"
selection-end-line=
"133"
selection-end-column=
"41"
/>
<state
relative-caret-position=
"50"
>
<caret
line=
"17"
column=
"52"
lean-forward=
"true"
selection-start-line=
"17"
selection-start-column=
"52"
selection-end-line=
"17"
selection-end-column=
"52"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
api/index/controller/ActiveController.php
"
>
<entry
file=
"file://$PROJECT_DIR$/
public/themes/admin_simpleboot3/admin/demand/index.html
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"53"
column=
"31"
lean-forward=
"true"
selection-start-line=
"53"
selection-start-column=
"31"
selection-end-line=
"53"
selection-end-column=
"31"
/>
<state
relative-caret-position=
"1700"
>
<caret
line=
"71"
column=
"48"
lean-forward=
"true"
selection-start-line=
"71"
selection-start-column=
"48"
selection-end-line=
"71"
selection-end-column=
"48"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/ap
i/index/controller/Resource
Controller.php"
>
<entry
file=
"file://$PROJECT_DIR$/ap
p/admin/controller/Demand
Controller.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"444"
>
<caret
line=
"281"
column=
"0"
lean-forward=
"false"
selection-start-line=
"281"
selection-start-column=
"0"
selection-end-line=
"281"
selection-end-column=
"0"
/>
<state
relative-caret-position=
"425"
>
<caret
line=
"68"
column=
"13"
lean-forward=
"true"
selection-start-line=
"68"
selection-start-column=
"13"
selection-end-line=
"68"
selection-end-column=
"13"
/>
<folding>
<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"
/>
<element
signature=
"e#261#1919#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
public/themes/admin_simpleboot3/admin/area/index.html
"
>
<entry
file=
"file://$PROJECT_DIR$/
api/index/controller/SendController.php
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"344"
>
<caret
line=
"224"
column=
"28"
lean-forward=
"false"
selection-start-line=
"224"
selection-start-column=
"28"
selection-end-line=
"224"
selection-end-column=
"28"
/>
<folding>
<element
signature=
"n#div#1;n#body#0;n#!!top"
expanded=
"false"
/>
<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"
/>
</folding>
<state
relative-caret-position=
"-5397"
>
<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/AreaController.php"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OtherController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-347"
>
<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/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1150"
>
<caret
line=
"53"
column=
"31"
lean-forward=
"true"
selection-start-line=
"53"
selection-start-column=
"31"
selection-end-line=
"53"
selection-end-column=
"31"
/>
<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=
"519"
>
<caret
line=
"42"
column=
"8"
lean-forward=
"false"
selection-start-line=
"42"
selection-start-column=
"8"
selection-end-line=
"42"
selection-end-column=
"8"
/>
<state
relative-caret-position=
"100"
>
<caret
line=
"78"
column=
"44"
lean-forward=
"true"
selection-start-line=
"78"
selection-start-column=
"44"
selection-end-line=
"78"
selection-end-column=
"44"
/>
<folding>
<element
signature=
"e#129#168#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#6747#13480#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13497#15993#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#127#156#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#2988#3443#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3449#4004#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4011#5286#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5292#5945#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5950#7096#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7102#7712#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7717#8875#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8881#9677#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9682#11012#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11018#11747#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11752#13292#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13298#13883#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13888#14896#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14902#15318#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15323#15845#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15850#16480#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16486#16881#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16886#17589#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17595#18101#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18106#19537#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19543#19822#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19827#20269#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20275#20509#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20514#20907#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ResourceController.php
查看文件 @
3ff8354
...
...
@@ -53,9 +53,11 @@ class ResourceController extends RestBaseController
* @url /index/Resource/uploadFile
* @method POST
* @header name:XX-Token require:1 default: desc:token
*
* @param name:source[] type:file require:1 default: other: desc:文件
* @return data:文件路径+日期@
* @data image_url:图片路径 file_time:时间
*
* @return image_url:图片路径
* @return file_time:时间
*/
public
function
uploadFile
(){
$files
=
request
()
->
file
(
'source'
);
...
...
@@ -74,19 +76,20 @@ class ResourceController extends RestBaseController
//允许文件大小200k
$info
=
$file
->
validate
([
'size'
=>
2048000
,
'ext'
=>
'jpg,png,gif,mp3,pcm,wma,wav,mp4,avi,wmv,rm,rmvb,mkv,mov'
])
->
move
(
$moveUrl
);
if
(
$info
){
//上传至七牛云
$url
=
str_replace
(
'//'
,
'/'
,
str_replace
(
'\\'
,
'/'
,
$info
->
getSaveName
()));
//20190602/1214564654.jpg目录
$filePath
=
$moveUrl
.
DS
.
$url
;
//本地磁盘路径
//上传至七牛云文件路径
$qiniu_file
=
'uploads/'
.
$url
;
$storage
=
new
Storage
();
$qi_res
=
$storage
->
upload
(
$qiniu_file
,
$filePath
,
'image'
);
if
(
$qi_res
){
$arr
[
$k
][
'image_url'
]
=
$host
.
DS
.
$qiniu_file
;
}
else
{
$this
->
error
(
'上传七牛云出错!'
);
}
$arr
=
$info
->
getSaveName
();
// //上传至七牛云
// $url = str_replace('//', '/', str_replace('\\', '/', $info->getSaveName())); //20190602/1214564654.jpg目录
// $filePath = $moveUrl.DS.$url;//本地磁盘路径
// //上传至七牛云文件路径
// $qiniu_file = 'uploads/'.$url;
// $storage = new Storage();
// $qi_res = $storage->upload($qiniu_file, $filePath, 'image');
// if($qi_res){
// $arr[$k]['image_url'] = $host.DS.$qiniu_file;
//
// }else{
// $this->error('上传七牛云出错!');
// }
}
else
{
// 上传失败获取错误信息
...
...
app/admin/controller/AreaController.php
查看文件 @
3ff8354
...
...
@@ -27,6 +27,7 @@ class AreaController extends AdminBaseController
->
field
(
'id,name'
)
->
paginate
(
10
,
false
,[
'query'
=>
request
()
->
param
()]);
$area
=
$area_name
->
toArray
();
// print_r($area['data']);die;
$param
=
$this
->
request
->
param
();
$startTime
=
empty
(
$param
[
'start_time'
])
?
''
:
strtotime
(
$param
[
'start_time'
]);
...
...
@@ -40,7 +41,7 @@ class AreaController extends AdminBaseController
$where
[
'create_time'
]
=
[[
'>='
,
$beginToday
],[
'<='
,
$endToday
]];
$t
[
'end_time'
]
=
[
'>='
,
time
()];
}
//总发布量 总供给 总需求 总活动 总招商
foreach
(
$area
[
'data'
]
as
&
$v
){
$num
=
0
;
...
...
app/admin/controller/DemandController.php
查看文件 @
3ff8354
...
...
@@ -67,6 +67,9 @@ class DemandController extends AdminBaseController
if
(
$param
[
'create_time'
]
>
$param
[
'end_time'
]){
$this
->
error
(
'发布日期不能大于有效日期'
);
}
if
(
$param
[
'end_time'
]
<
$param
[
'create_time'
]){
$this
->
error
(
'有效日期不能小于发布日期'
);
}
//验证器内容
$validate
=
new
Validate
([
...
...
app/admin/controller/ProvideController.php
查看文件 @
3ff8354
...
...
@@ -66,8 +66,8 @@ class ProvideController extends AdminBaseController
$param
[
'create_time'
]
=
strtotime
(
$param
[
'create_time'
]);
$param
[
'end_time'
]
=
strtotime
(
$param
[
'end_time'
]);
$param
[
'update_time'
]
=
time
();
if
(
$param
[
'create_time'
]
>
$param
[
'end_time'
]){
$this
->
error
(
'发布日期不能大于有效日期'
);
if
(
$param
[
'end_time'
]
<
$param
[
'start_time'
]){
$this
->
error
(
'有效日期不能小于发布日期'
);
}
$validate
=
new
Validate
([
'job_title'
=>
'require'
,
...
...
@@ -178,6 +178,7 @@ class ProvideController extends AdminBaseController
if
(
!
empty
(
$keyword
))
{
$where
[
'd.content'
]
=
[
'like'
,
"%
$keyword
%"
];
}
$where
[
'd.to_user_id'
]
=
[
'eq'
,
0
];
$id
=
$this
->
request
->
param
(
'id'
,
0
,
'intval'
);
$where
[
'd.job_id'
]
=
[
'eq'
,
$id
];
$data
=
Db
::
name
(
'discuss'
)
...
...
public/themes/admin_simpleboot3/admin/demand/index.html
查看文件 @
3ff8354
...
...
@@ -66,11 +66,7 @@
</td>
<td>
{$vo.id}
</td>
<td>
{$vo.job_title}
</td>
<if
condition =
"$vo['update_time'] eq 0"
>
<td>
{:date('Y-m-d H:i',$vo['create_time'])}
</td>
<else
/>
<td>
{:date('Y-m-d H:i',$vo['update_time'])}
</td>
</if>
<td>
{:date('Y-m-d H:i',$vo['create_time'])}
</td>
<td>
{:date('Y-m-d H:i',$vo['end_time'])}
</td>
<td>
{$vo.user_id}
</td>
<td>
{$vo.user_nickname}
</td>
...
...
请
注册
或
登录
后发表评论