切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
0ccfeae2f88580bbcd463f726f92f47dff05a889
1 个父辈
e20f01e1
1 个管道 的构建
通过
耗费 1 秒
图片上传
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
69 行增加
和
94 行删除
.idea/workspace.xml
api/index/controller/ResourceController.php
.idea/workspace.xml
查看文件 @
0ccfeae
...
...
@@ -2,8 +2,6 @@
<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/ReleaseController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ReleaseController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -15,64 +13,42 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"ResourceController.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"ResourceController.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ResourceController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"327"
>
<caret
line=
"416"
column=
"35"
lean-forward=
"true"
selection-start-line=
"416"
selection-start-column=
"35"
selection-end-line=
"416"
selection-end-column=
"35"
/>
<state
relative-caret-position=
"-200"
>
<caret
line=
"72"
column=
"13"
lean-forward=
"true"
selection-start-line=
"72"
selection-start-column=
"13"
selection-end-line=
"72"
selection-end-column=
"13"
/>
<folding>
<element
signature=
"e#127#156#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#327#524#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#529#905#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3061#3516#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3522#4077#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4084#5359#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5365#6018#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6023#7169#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7175#7785#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7790#8948#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8954#9750#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9755#11085#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11091#11820#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11825#13365#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14975#15391#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15396#15918#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15923#16553#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16559#16954#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16959#17662#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17668#18174#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18179#19610#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19616#19895#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19900#20342#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20348#20582#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20587#20980#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#548#924#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3147#3602#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3608#4163#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4170#5445#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5451#6104#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6109#7255#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7261#7871#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7876#9034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9040#9836#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9841#11171#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11177#11906#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11911#13451#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15061#15477#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15482#16004#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16009#16639#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16645#17040#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17045#17748#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17754#18260#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18265#19696#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19702#19981#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19986#20428#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20434#20668#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20673#21066#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"ReleaseController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"573"
>
<caret
line=
"402"
column=
"34"
lean-forward=
"true"
selection-start-line=
"402"
selection-start-column=
"34"
selection-end-line=
"402"
selection-end-column=
"34"
/>
<folding>
<element
signature=
"e#4750#5735#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"SendController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/SendController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-5175"
>
<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>
</file>
</leaf>
</component>
<component
name=
"FileTemplateManagerImpl"
>
...
...
@@ -111,8 +87,8 @@
<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"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ReleaseController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
</list>
</option>
</component>
...
...
@@ -130,9 +106,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"34"
/>
<option
name=
"y"
value=
"101"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"241"
/>
<option
name=
"y"
value=
"79"
/>
<option
name=
"width"
value=
"1907"
/>
<option
name=
"height"
value=
"958"
/>
</component>
...
...
@@ -235,15 +211,15 @@
<workItem
from=
"1568442614180"
duration=
"3798000"
/>
<workItem
from=
"1568594548281"
duration=
"28629000"
/>
<workItem
from=
"1568629056199"
duration=
"4747000"
/>
<workItem
from=
"1568679207375"
duration=
"
19588
000"
/>
<workItem
from=
"1568679207375"
duration=
"
20121
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"18
2728
000"
/>
<option
name=
"totallyTimeSpent"
value=
"18
3261
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
34"
y=
"101"
width=
"1907"
height=
"958"
extended-state=
"1
"
/>
<frame
x=
"
241"
y=
"79"
width=
"1907"
height=
"958"
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.15376286"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -640,36 +616,12 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/Re
sourc
eController.php"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/Re
leas
eController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"327"
>
<caret
line=
"416"
column=
"35"
lean-forward=
"true"
selection-start-line=
"416"
selection-start-column=
"35"
selection-end-line=
"416"
selection-end-column=
"35"
/>
<state
relative-caret-position=
"573"
>
<caret
line=
"402"
column=
"34"
lean-forward=
"true"
selection-start-line=
"402"
selection-start-column=
"34"
selection-end-line=
"402"
selection-end-column=
"34"
/>
<folding>
<element
signature=
"e#127#156#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#327#524#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#529#905#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3061#3516#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3522#4077#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4084#5359#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5365#6018#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6023#7169#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7175#7785#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7790#8948#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8954#9750#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9755#11085#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11091#11820#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11825#13365#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14975#15391#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15396#15918#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15923#16553#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16559#16954#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16959#17662#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17668#18174#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18179#19610#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19616#19895#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19900#20342#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20348#20582#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20587#20980#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4750#5735#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -682,12 +634,36 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/Re
leas
eController.php"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/Re
sourc
eController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"573"
>
<caret
line=
"402"
column=
"34"
lean-forward=
"true"
selection-start-line=
"402"
selection-start-column=
"34"
selection-end-line=
"402"
selection-end-column=
"34"
/>
<state
relative-caret-position=
"-200"
>
<caret
line=
"72"
column=
"13"
lean-forward=
"true"
selection-start-line=
"72"
selection-start-column=
"13"
selection-end-line=
"72"
selection-end-column=
"13"
/>
<folding>
<element
signature=
"e#4750#5735#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#127#156#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#346#543#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#548#924#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3147#3602#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3608#4163#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4170#5445#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5451#6104#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6109#7255#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7261#7871#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7876#9034#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9040#9836#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9841#11171#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11177#11906#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11911#13451#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15061#15477#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15482#16004#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16009#16639#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16645#17040#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17045#17748#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17754#18260#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18265#19696#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19702#19981#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19986#20428#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20434#20668#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20673#21066#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/ResourceController.php
查看文件 @
0ccfeae
...
...
@@ -11,6 +11,7 @@ namespace api\index\controller;
use
api\index\model\JobModel
;
use
cmf\controller\RestBaseController
;
use
think\Db
;
use
think\Request
;
use
think\Validate
;
...
...
@@ -64,15 +65,13 @@ class ResourceController extends RestBaseController
if
(
$files
){
$info
=
$files
->
move
(
ROOT_PATH
.
'public'
.
DS
.
'uploads'
);
if
(
$info
){
$a
=
'__FILE__'
.
$files
->
getSaveName
();
$request
=
Request
::
instance
();
$a
=
$request
->
domain
()
.
'/'
.
'uploads/'
.
$info
->
getSaveName
();
$this
->
success
(
'SUCCESS'
,
$a
);
}
else
{
$this
->
error
(
$files
->
getError
());
}
}
// foreach($files as $k=>$file){
// //移动到框架应用根目录/public/uploads/ 目录下
// $moveUrl = ROOT_PATH . 'public' . DS . 'uploads';
...
...
请
注册
或
登录
后发表评论