切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
9eefe0de4e2058bc27ebf94d61a96eff637888fe
1 个父辈
620543ce
1 个管道 的构建
通过
耗费 10 秒
头像
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
28 行增加
和
39 行删除
.idea/workspace.xml
api/index/controller/OtherController.php
.idea/workspace.xml
查看文件 @
9eefe0d
...
...
@@ -17,8 +17,8 @@
<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=
"82"
>
<caret
line=
"312"
column=
"58"
lean-forward=
"true"
selection-start-line=
"312"
selection-start-column=
"58"
selection-end-line=
"312"
selection-end-column=
"58"
/>
<state
relative-caret-position=
"608"
>
<caret
line=
"320"
column=
"41"
lean-forward=
"true"
selection-start-line=
"320"
selection-start-column=
"41"
selection-end-line=
"320"
selection-end-column=
"41"
/>
<folding>
<element
signature=
"e#129#158#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#344#512#0#PHP"
expanded=
"false"
/>
...
...
@@ -37,24 +37,17 @@
<element
signature=
"e#6020#6946#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6952#7256#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7261#7650#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10378#10806#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10811#11602#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11622#12486#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12513#12913#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12937#13510#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13533#14343#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10358#10786#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10791#11582#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11602#12466#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12493#12893#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12917#13490#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13513#14323#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"poster_14_22.png"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/public/upload/poster/poster_14_22.png"
>
<provider
selected=
"true"
editor-type-id=
"images"
>
<state
/>
</provider>
</entry>
</file>
</leaf>
</component>
<component
name=
"FileTemplateManagerImpl"
>
...
...
@@ -135,8 +128,8 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"97"
/>
<option
name=
"y"
value=
"76"
/>
<option
name=
"x"
value=
"-152"
/>
<option
name=
"y"
value=
"64"
/>
<option
name=
"width"
value=
"1868"
/>
<option
name=
"height"
value=
"1019"
/>
</component>
...
...
@@ -155,8 +148,6 @@
<foldersAlwaysOnTop
value=
"true"
/>
</navigator>
<panes>
<pane
id=
"Scratches"
/>
<pane
id=
"Scope"
/>
<pane
id=
"ProjectPane"
>
<subPane>
<expand>
...
...
@@ -186,6 +177,8 @@
<select
/>
</subPane>
</pane>
<pane
id=
"Scratches"
/>
<pane
id=
"Scope"
/>
</panes>
</component>
<component
name=
"PropertiesComponent"
>
...
...
@@ -262,18 +255,19 @@
<workItem
from=
"1569494185536"
duration=
"1054000"
/>
<workItem
from=
"1569544728303"
duration=
"25104000"
/>
<workItem
from=
"1569716359574"
duration=
"28303000"
/>
<workItem
from=
"1569751435531"
duration=
"2736000"
/>
<workItem
from=
"1569751435531"
duration=
"3201000"
/>
<workItem
from=
"1569803523139"
duration=
"728000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"43
0030
000"
/>
<option
name=
"totallyTimeSpent"
value=
"43
1223
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
97"
y=
"76
"
width=
"1868"
height=
"1019"
extended-state=
"1"
/>
<frame
x=
"
-152"
y=
"64
"
width=
"1868"
height=
"1019"
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.18
252212
"
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.18
473451
"
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"
/>
...
...
@@ -595,11 +589,7 @@
<state
/>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/upload/qrcode/1569753725.jpg"
>
<provider
selected=
"true"
editor-type-id=
"images"
>
<state
/>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/upload/qrcode/1569753725.jpg"
/>
<entry
file=
"file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"610"
>
...
...
@@ -632,8 +622,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OtherController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"82"
>
<caret
line=
"312"
column=
"58"
lean-forward=
"true"
selection-start-line=
"312"
selection-start-column=
"58"
selection-end-line=
"312"
selection-end-column=
"58"
/>
<state
relative-caret-position=
"608"
>
<caret
line=
"320"
column=
"41"
lean-forward=
"true"
selection-start-line=
"320"
selection-start-column=
"41"
selection-end-line=
"320"
selection-end-column=
"41"
/>
<folding>
<element
signature=
"e#129#158#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#344#512#0#PHP"
expanded=
"false"
/>
...
...
@@ -652,12 +642,12 @@
<element
signature=
"e#6020#6946#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6952#7256#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7261#7650#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10378#10806#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10811#11602#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11622#12486#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12513#12913#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12937#13510#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13533#14343#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10358#10786#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10791#11582#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11602#12466#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12493#12893#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12917#13490#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13513#14323#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/OtherController.php
查看文件 @
9eefe0d
...
...
@@ -321,9 +321,9 @@ class OtherController extends RestBaseController
$job
=
$jobModel
->
getOne
(
$where
);
$user
=
Db
::
name
(
'user'
)
->
field
(
'avatar,user_nickname'
)
->
where
(
'id'
,
$
job
[
'user_id'
]
)
->
where
(
'id'
,
$
user_id
)
->
find
();
$avatarUrl
=
file_put_contents
(
ROOT_PATH
.
"public/upload/qrcode/tou.
$user_id
.jpg"
,
file_get_contents
(
$user
[
'avatar'
]));
file_put_contents
(
ROOT_PATH
.
"public/upload/qrcode/tou.
$user_id
.jpg"
,
file_get_contents
(
$user
[
'avatar'
]));
$image
=
\think\Image
::
open
(
ROOT_PATH
.
"public/bg.png"
);
$tou
=
"qrcode/tou.
$user_id
.jpg"
;
$touImage
=
\think\Image
::
open
(
ROOT_PATH
.
"public/upload/
$tou
"
);
...
...
@@ -441,5 +441,4 @@ class OtherController extends RestBaseController
curl_close
(
$curl
);
return
$result
;
}
}
\ No newline at end of file
...
...
请
注册
或
登录
后发表评论