切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
3dfafa368274836ad40bda6ec39bc44fe3ef64f8
1 个父辈
69fdc6a6
1 个管道 的构建
通过
耗费 0 秒
字体大小
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
7 行增加
和
9 行删除
.idea/workspace.xml
api/index/controller/OtherController.php
.idea/workspace.xml
查看文件 @
3dfafa3
...
...
@@ -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$/public/bg.png"
afterPath=
"$PROJECT_DIR$/public/bg.png"
/>
<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"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -18,8 +16,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=
"282"
>
<caret
line=
"323"
column=
"34"
lean-forward=
"true"
selection-start-line=
"323"
selection-start-column=
"34"
selection-end-line=
"323"
selection-end-column=
"34"
/>
<state
relative-caret-position=
"582"
>
<caret
line=
"335"
column=
"104"
lean-forward=
"false"
selection-start-line=
"335"
selection-start-column=
"104"
selection-end-line=
"335"
selection-end-column=
"104"
/>
<folding>
<element
signature=
"e#129#158#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#344#512#0#PHP"
expanded=
"false"
/>
...
...
@@ -247,12 +245,12 @@
<workItem
from=
"1569544728303"
duration=
"25104000"
/>
<workItem
from=
"1569716359574"
duration=
"28303000"
/>
<workItem
from=
"1569751435531"
duration=
"3201000"
/>
<workItem
from=
"1569803523139"
duration=
"
4947
000"
/>
<workItem
from=
"1569803523139"
duration=
"
5126
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"435
442
000"
/>
<option
name=
"totallyTimeSpent"
value=
"435
621
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"63"
y=
"139"
width=
"1868"
height=
"1019"
extended-state=
"1"
/>
...
...
@@ -614,8 +612,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OtherController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"282"
>
<caret
line=
"323"
column=
"34"
lean-forward=
"true"
selection-start-line=
"323"
selection-start-column=
"34"
selection-end-line=
"323"
selection-end-column=
"34"
/>
<state
relative-caret-position=
"582"
>
<caret
line=
"335"
column=
"104"
lean-forward=
"false"
selection-start-line=
"335"
selection-start-column=
"104"
selection-end-line=
"335"
selection-end-column=
"104"
/>
<folding>
<element
signature=
"e#129#158#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#344#512#0#PHP"
expanded=
"false"
/>
...
...
api/index/controller/OtherController.php
查看文件 @
3dfafa3
...
...
@@ -333,7 +333,7 @@ class OtherController extends RestBaseController
->
water
(
ROOT_PATH
.
"public/upload/
$tou
"
,[
35
,
48
],
100
)
->
water
(
ROOT_PATH
.
"public/upload/
$code
"
,[
212
,
700
],
100
)
->
text
(
$text
,
ROOT_PATH
.
'public/static/font-awesome/fonts/PingFang Medium.ttf'
,
14
,
'#FFFFFF'
,[
142
,
100
])
->
text
(
$job
[
'job_title'
],
ROOT_PATH
.
'public/static/font-awesome/fonts/PingFang Medium.ttf'
,
2
2
,
'#FFFFFF'
,[
100
,
200
])
->
text
(
$job
[
'job_title'
],
ROOT_PATH
.
'public/static/font-awesome/fonts/PingFang Medium.ttf'
,
2
5
,
'#FFFFFF'
,[
100
,
200
])
->
text
(
$user
[
'user_nickname'
],
ROOT_PATH
.
'public/static/font-awesome/fonts/PingFang Medium.ttf'
,
16
,
'#FFFFFF'
,[
142
,
60
]);
$result
->
save
(
$savePath
.
"poster_"
.
$user_id
.
"_
$job_id
.png"
);
$this
->
success
(
'SUCCESS'
,[
'url'
=>
cmf_get_image_url
(
"poster/poster_"
.
$user_id
.
"_
$job_id
.png"
)]);
...
...
请
注册
或
登录
后发表评论