切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
620543ce5edc71b260f4f72ad73a296c4db28215
1 个父辈
72e21ec7
1 个管道 的构建
通过
耗费 1 秒
用户头像
变更
2
构建
1
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
66 行增加
和
138 行删除
.idea/workspace.xml
api/index/controller/OtherController.php
.idea/workspace.xml
查看文件 @
620543c
...
...
@@ -2,7 +2,6 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"73de7205-e736-4b59-941a-a54ab4506a41"
name=
"Default"
comment=
""
>
<change
type=
"NEW"
beforePath=
""
afterPath=
"$PROJECT_DIR$/public/tou.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>
...
...
@@ -18,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=
"257"
>
<caret
line=
"328"
column=
"62"
lean-forward=
"true"
selection-start-line=
"328"
selection-start-column=
"62"
selection-end-line=
"328"
selection-end-column=
"62"
/>
<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"
/>
<folding>
<element
signature=
"e#129#158#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#344#512#0#PHP"
expanded=
"false"
/>
...
...
@@ -38,16 +37,24 @@
<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#10737#11528#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11548#12412#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12439#12839#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12863#13436#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13459#14269#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"
/>
</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"
>
...
...
@@ -127,9 +134,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"-60"
/>
<option
name=
"y"
value=
"86"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"97"
/>
<option
name=
"y"
value=
"76"
/>
<option
name=
"width"
value=
"1868"
/>
<option
name=
"height"
value=
"1019"
/>
</component>
...
...
@@ -148,8 +155,8 @@
<foldersAlwaysOnTop
value=
"true"
/>
</navigator>
<panes>
<pane
id=
"Scope"
/>
<pane
id=
"Scratches"
/>
<pane
id=
"Scope"
/>
<pane
id=
"ProjectPane"
>
<subPane>
<expand>
...
...
@@ -255,26 +262,27 @@
<workItem
from=
"1569494185536"
duration=
"1054000"
/>
<workItem
from=
"1569544728303"
duration=
"25104000"
/>
<workItem
from=
"1569716359574"
duration=
"28303000"
/>
<workItem
from=
"1569751435531"
duration=
"2736000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"4
27294
000"
/>
<option
name=
"totallyTimeSpent"
value=
"4
30030
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
-60"
y=
"86"
width=
"1868"
height=
"1019"
extended-state=
"0
"
/>
<frame
x=
"
97"
y=
"76"
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
086283
"
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
252212
"
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"
/>
...
...
@@ -297,20 +305,6 @@
<watches-manager
/>
</component>
<component
name=
"editorHistoryManager"
>
<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=
"126"
>
<caret
line=
"131"
column=
"0"
lean-forward=
"false"
selection-start-line=
"131"
selection-start-column=
"0"
selection-end-line=
"209"
selection-end-column=
"9"
/>
</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=
"153"
>
<caret
line=
"20"
column=
"27"
lean-forward=
"false"
selection-start-line=
"20"
selection-start-column=
"27"
selection-end-line=
"20"
selection-end-column=
"27"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/FinancsendController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"725"
>
...
...
@@ -494,7 +488,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"274"
>
<caret
line=
"248"
column=
"6"
lean-forward=
"true"
selection-start-line=
"248"
selection-start-column=
"6"
selection-end-line=
"248"
selection-end-column=
"6"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -524,60 +517,14 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"224"
>
<caret
line=
"60"
column=
"8"
lean-forward=
"true"
selection-start-line=
"60"
selection-start-column=
"8"
selection-end-line=
"73"
selection-end-column=
"9"
/>
<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#4216#4690#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4697#5696#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5702#6355#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6360#7517#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7523#8226#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8231#9868#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9874#10732#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10737#12675#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12681#13521#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13526#15631#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15637#16284#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16289#17904#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17910#18326#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18331#19150#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19155#19833#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#19839#20293#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20298#21156#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21162#21668#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21673#23104#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23110#23389#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23394#23836#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23842#24076#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24081#24474#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24480#24711#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24716#25074#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/upload/qrcode/code_14_22.jpg"
>
<provider
selected=
"true"
editor-type-id=
"images"
>
<state
/>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/upload/qrcode/code_14_22.jpg"
/>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/SendController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"349"
>
<caret
line=
"21"
column=
"7"
lean-forward=
"false"
selection-start-line=
"21"
selection-start-column=
"7"
selection-end-line=
"21"
selection-end-column=
"7"
/>
<folding>
<element
signature=
"e#296#1102#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1108#2740#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2746#2930#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2935#3427#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3433#4607#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4612#6545#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6551#7483#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7488#9131#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9137#9946#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9951#11545#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
...
...
@@ -585,13 +532,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"174"
>
<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#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>
...
...
@@ -599,7 +539,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-176"
>
<caret
line=
"43"
column=
"27"
lean-forward=
"false"
selection-start-line=
"43"
selection-start-column=
"27"
selection-end-line=
"43"
selection-end-column=
"27"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -607,7 +546,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"275"
>
<caret
line=
"219"
column=
"16"
lean-forward=
"true"
selection-start-line=
"219"
selection-start-column=
"16"
selection-end-line=
"219"
selection-end-column=
"16"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -615,20 +553,9 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"499"
>
<caret
line=
"123"
column=
"20"
lean-forward=
"true"
selection-start-line=
"123"
selection-start-column=
"20"
selection-end-line=
"123"
selection-end-column=
"20"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/upload/poster/poster_11_22.png"
>
<provider
selected=
"true"
editor-type-id=
"images"
>
<state
/>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/upload/poster/poster_14_22.png"
>
<provider
selected=
"true"
editor-type-id=
"images"
>
<state
/>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/simplewind/cmf/common.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"10231"
>
...
...
@@ -641,7 +568,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1300"
>
<caret
line=
"69"
column=
"13"
lean-forward=
"true"
selection-start-line=
"69"
selection-start-column=
"13"
selection-end-line=
"69"
selection-end-column=
"13"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -649,7 +575,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"294"
>
<caret
line=
"2549"
column=
"9"
lean-forward=
"false"
selection-start-line=
"2549"
selection-start-column=
"9"
selection-end-line=
"2549"
selection-end-column=
"9"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -657,56 +582,58 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"684"
>
<caret
line=
"633"
column=
"0"
lean-forward=
"true"
selection-start-line=
"633"
selection-start-column=
"0"
selection-end-line=
"633"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#330#916#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#921#1852#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1858#2458#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2463#4046#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4052#5044#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5049#6284#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6290#6899#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6904#8090#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8096#8619#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8624#9157#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9163#9683#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9688#10261#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10267#10534#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10539#15152#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15158#15422#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15427#20222#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/upload/qrcode/code_11_22.jpg"
>
<entry
file=
"file://$PROJECT_DIR$/public/bg.png"
>
<provider
selected=
"true"
editor-type-id=
"images"
>
<state
/>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/tou.png"
>
<provider
selected=
"true"
editor-type-id=
"images"
>
<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$/simplewind/vendor/topthink/think-image/src/Image.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"684"
>
<caret
line=
"384"
column=
"20"
lean-forward=
"false"
selection-start-line=
"384"
selection-start-column=
"20"
selection-end-line=
"384"
selection-end-column=
"20"
/>
<state
relative-caret-position=
"610"
>
<caret
line=
"306"
column=
"22"
lean-forward=
"true"
selection-start-line=
"306"
selection-start-column=
"22"
selection-end-line=
"306"
selection-end-column=
"22"
/>
<folding>
<element
signature=
"e#616#660#0#PHP"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/
bg
.png"
>
<entry
file=
"file://$PROJECT_DIR$/public/
upload/poster/poster_14_22
.png"
>
<provider
selected=
"true"
editor-type-id=
"images"
>
<state
/>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/tou.png"
>
<entry
file=
"file://$PROJECT_DIR$/public/upload/poster/poster_11_22.png"
>
<provider
selected=
"true"
editor-type-id=
"images"
>
<state
/>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/upload/qrcode/code_11_22.jpg"
>
<provider
selected=
"true"
editor-type-id=
"images"
>
<state
/>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/upload/qrcode/tou.11.jpg"
>
<provider
selected=
"true"
editor-type-id=
"images"
>
<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=
"257"
>
<caret
line=
"328"
column=
"62"
lean-forward=
"true"
selection-start-line=
"328"
selection-start-column=
"62"
selection-end-line=
"328"
selection-end-column=
"62"
/>
<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"
/>
<folding>
<element
signature=
"e#129#158#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#344#512#0#PHP"
expanded=
"false"
/>
...
...
@@ -725,11 +652,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#10737#11528#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11548#12412#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12439#12839#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12863#13436#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13459#14269#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"
/>
</folding>
</state>
</provider>
...
...
api/index/controller/OtherController.php
查看文件 @
620543c
...
...
@@ -294,7 +294,6 @@ class OtherController extends RestBaseController
*
* @param name:job_id type:int require:1 other: desc:信息id
* @param name:route type:string require:1 other: desc:页面路径与参数
* @param name:avatar type:string require:1 other: desc:用户头像
*
* @return url:海报地址
*
...
...
@@ -324,19 +323,20 @@ class OtherController extends RestBaseController
->
field
(
'avatar,user_nickname'
)
->
where
(
'id'
,
$job
[
'user_id'
])
->
find
();
$avatar
=
$this
->
request
->
param
(
'avatar'
);
$avatar
Url
=
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
=
\think\Image
::
open
(
ROOT_PATH
.
"public/tou.png"
);
$tou
->
thumb
(
90
,
90
,
\think\Image
::
THUMB_CENTER
)
->
save
(
ROOT_PATH
.
"public/tou.png"
);
$tou
=
"qrcode/tou.
$user_id
.jpg"
;
$touImage
=
\think\Image
::
open
(
ROOT_PATH
.
"public/upload/
$tou
"
);
$touImage
->
thumb
(
90
,
90
,
\think\Image
::
THUMB_CENTER
)
->
save
(
ROOT_PATH
.
"public/upload/
$tou
"
);
$text
=
"期待你的加入"
;
$remark
=
"长按识别二维码识别小程序"
;
$result
=
$image
->
water
(
ROOT_PATH
.
"public/
tou.png
"
,[
35
,
48
],
100
)
->
water
(
ROOT_PATH
.
"public/
upload/
$tou
"
,[
35
,
48
],
100
)
->
water
(
ROOT_PATH
.
"public/upload/
$code
"
,[
456
,
590
],
100
)
->
text
(
$remark
,
ROOT_PATH
.
'public/static/font-awesome/fonts/PingFang Medium.ttf'
,
16
,
'#FFFFFF'
,[
66
,
659
])
->
text
(
$text
,
ROOT_PATH
.
'public/static/font-awesome/fonts/PingFang Medium.ttf'
,
14
,
'#FFFFFF'
,[
1
3
2
,
100
])
->
text
(
$text
,
ROOT_PATH
.
'public/static/font-awesome/fonts/PingFang Medium.ttf'
,
14
,
'#FFFFFF'
,[
1
4
2
,
100
])
->
text
(
$job
[
'job_title'
],
ROOT_PATH
.
'public/static/font-awesome/fonts/PingFang Medium.ttf'
,
22
,
'#FFFFFF'
,[
100
,
200
])
->
text
(
$user
[
'user_nickname'
],
ROOT_PATH
.
'public/static/font-awesome/fonts/PingFang Medium.ttf'
,
16
,
'#FFFFFF'
,[
1
3
2
,
60
]);
->
text
(
$user
[
'user_nickname'
],
ROOT_PATH
.
'public/static/font-awesome/fonts/PingFang Medium.ttf'
,
16
,
'#FFFFFF'
,[
1
4
2
,
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"
)]);
}
...
...
请
注册
或
登录
后发表评论