切换导航条
此项目
正在载入...
登录
郭盛
/
resource
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
39f831063ef6b382c67aafe23d067aa3ad98affc
1 个父辈
af04d194
1 个管道 的构建
通过
耗费 3 秒
用户头像
变更
2
构建
1
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
138 行增加
和
141 行删除
.idea/workspace.xml
api/index/controller/OtherController.php
.idea/workspace.xml
查看文件 @
39f8310
...
...
@@ -2,8 +2,8 @@
<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/OtherController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/OtherController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/ReleaseController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/ReleaseController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -14,11 +14,11 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"OtherController.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"OtherController.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OtherController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"299"
>
<caret
line=
"325"
column=
"0"
lean-forward=
"false"
selection-start-line=
"325"
selection-start-column=
"0"
selection-end-line=
"325"
selection-end-column=
"0"
/>
<state
relative-caret-position=
"459"
>
<caret
line=
"327"
column=
"22"
lean-forward=
"false"
selection-start-line=
"327"
selection-start-column=
"22"
selection-end-line=
"327"
selection-end-column=
"22"
/>
<folding>
<element
signature=
"e#129#158#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#344#512#0#PHP"
expanded=
"false"
/>
...
...
@@ -37,26 +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#7656#8029#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11221#12085#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12112#12512#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12535#13108#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13114#14167#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10591#11382#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11402#12266#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12293#12693#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12717#13290#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13313#14123#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14130#15183#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=
"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>
</file>
</leaf>
</component>
<component
name=
"FileTemplateManagerImpl"
>
...
...
@@ -116,9 +107,9 @@
<option
value=
"$PROJECT_DIR$/api/index/controller/FinanceController.php"
/>
<option
value=
"$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ResourceController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OtherController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/SendController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/ReleaseController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OtherController.php"
/>
</list>
</option>
</component>
...
...
@@ -137,10 +128,10 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"99"
/>
<option
name=
"y"
value=
"108"
/>
<option
name=
"x"
value=
"-108"
/>
<option
name=
"y"
value=
"43"
/>
<option
name=
"width"
value=
"1868"
/>
<option
name=
"height"
value=
"10
61
"
/>
<option
name=
"height"
value=
"10
46
"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -169,24 +160,6 @@
<path>
<item
name=
"resource"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"resource"
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=
"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=
"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"
/>
</path>
<path>
...
...
@@ -202,12 +175,6 @@
<item
name=
"upload"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"qrcode"
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=
"uploads"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
<select
/>
</subPane>
...
...
@@ -287,15 +254,15 @@
<workItem
from=
"1569486627319"
duration=
"2740000"
/>
<workItem
from=
"1569494185536"
duration=
"1054000"
/>
<workItem
from=
"1569544728303"
duration=
"25104000"
/>
<workItem
from=
"1569716359574"
duration=
"
19845
000"
/>
<workItem
from=
"1569716359574"
duration=
"
26396
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"4
18836
000"
/>
<option
name=
"totallyTimeSpent"
value=
"4
25387
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
99"
y=
"108"
width=
"1868"
height=
"1061
"
extended-state=
"1"
/>
<frame
x=
"
-108"
y=
"43"
width=
"1868"
height=
"1046
"
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.18086283"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -325,33 +292,11 @@
</component>
<component
name=
"XDebuggerManager"
>
<breakpoint-manager>
<option
name=
"time"
value=
"
7
"
/>
<option
name=
"time"
value=
"
8
"
/>
</breakpoint-manager>
<watches-manager
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/attestation/edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"200"
>
<caret
line=
"29"
column=
"25"
lean-forward=
"true"
selection-start-line=
"29"
selection-start-column=
"25"
selection-end-line=
"29"
selection-end-column=
"25"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/approve.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"100"
>
<caret
line=
"4"
column=
"29"
lean-forward=
"false"
selection-start-line=
"4"
selection-start-column=
"29"
selection-end-line=
"4"
selection-end-column=
"29"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/user/controller/AdminIndexController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"25"
>
<caret
line=
"183"
column=
"21"
lean-forward=
"false"
selection-start-line=
"183"
selection-start-column=
"21"
selection-end-line=
"183"
selection-end-column=
"21"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/MessageController.php"
/>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/CommonController.php"
/>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
...
...
@@ -500,13 +445,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/ActiveController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"105"
column=
"14"
lean-forward=
"true"
selection-start-line=
"105"
selection-start-column=
"14"
selection-end-line=
"105"
selection-end-column=
"14"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/area.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"239"
>
...
...
@@ -543,31 +481,6 @@
</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=
"175"
>
<caret
line=
"602"
column=
"4"
lean-forward=
"false"
selection-start-line=
"602"
selection-start-column=
"4"
selection-end-line=
"614"
selection-end-column=
"5"
/>
<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/portal/20190831/d8585d9b898179f2871f8bd4c760c0ec.png"
>
<provider
selected=
"true"
editor-type-id=
"images"
>
<state
/>
...
...
@@ -600,11 +513,6 @@
</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/index.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
...
...
@@ -655,26 +563,11 @@
</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=
"125"
>
<caret
line=
"13"
column=
"4"
lean-forward=
"true"
selection-start-line=
"13"
selection-start-column=
"4"
selection-end-line=
"13"
selection-end-column=
"4"
/>
<folding>
<element
signature=
"e#616#660#0#PHP"
expanded=
"true"
/>
</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_11_22.jpg"
>
<provider
selected=
"true"
editor-type-id=
"images"
>
<state
/>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/SendController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"349"
>
...
...
@@ -716,10 +609,100 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"
>
<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>
<entry
file=
"file://$PROJECT_DIR$/simplewind/cmf/lib/Storage.php"
>
<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"
>
<caret
line=
"706"
column=
"34"
lean-forward=
"false"
selection-start-line=
"706"
selection-start-column=
"34"
selection-end-line=
"706"
selection-end-column=
"34"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/ActiveController.php"
>
<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>
<entry
file=
"jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/http/http.php"
>
<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>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ActiveController.php"
>
<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"
>
<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"
/>
<folding>
<element
signature=
"e#616#660#0#PHP"
expanded=
"true"
/>
</folding>
</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=
"299"
>
<caret
line=
"325"
column=
"0"
lean-forward=
"false"
selection-start-line=
"325"
selection-start-column=
"0"
selection-end-line=
"325"
selection-end-column=
"0"
/>
<state
relative-caret-position=
"459"
>
<caret
line=
"327"
column=
"22"
lean-forward=
"false"
selection-start-line=
"327"
selection-start-column=
"22"
selection-end-line=
"327"
selection-end-column=
"22"
/>
<folding>
<element
signature=
"e#129#158#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#344#512#0#PHP"
expanded=
"false"
/>
...
...
@@ -738,22 +721,15 @@
<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#7656#8029#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11221#12085#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12112#12512#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12535#13108#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13114#14167#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10591#11382#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11402#12266#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12293#12693#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12717#13290#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13313#14123#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14130#15183#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"
>
<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>
</component>
</project>
\ No newline at end of file
...
...
api/index/controller/OtherController.php
查看文件 @
39f8310
...
...
@@ -294,6 +294,7 @@ 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:海报地址
*
...
...
@@ -323,12 +324,14 @@ class OtherController extends RestBaseController
->
field
(
'avatar,user_nickname'
)
->
where
(
'id'
,
$job
[
'user_id'
])
->
find
();
$avatar
=
$this
->
request
->
param
(
'avatar'
);
dump
(
$avatar
);
$image
=
\think\Image
::
open
(
ROOT_PATH
.
"public/bg.png"
);
$text
=
"期待你的加入"
;
$remark
=
"长按识别二维码识别小程序"
;
$result
=
$image
->
water
(
ROOT_PATH
.
"public/upload/
$code
"
,[
456
,
590
],
100
)
->
water
(
$user
[
'avatar'
],
1
,
100
)
->
text
(
$remark
,
ROOT_PATH
.
'public/static/font-awesome/fonts/PingFang Medium.ttf'
,
14
,
'#FFFFFF'
,[
66
,
659
])
->
text
(
$text
,
ROOT_PATH
.
'public/static/font-awesome/fonts/PingFang Medium.ttf'
,
12
,
'#FFFFFF'
,[
132
,
100
])
->
text
(
$job
[
'job_title'
],
ROOT_PATH
.
'public/static/font-awesome/fonts/PingFang Medium.ttf'
,
20
,
'#FFFFFF'
,[
100
,
200
])
...
...
@@ -407,6 +410,7 @@ class OtherController extends RestBaseController
$token
=
$json_arr
[
'access_token'
];
return
$token
;
}
//curl get请求
public
function
http_get
(
$url
){
$curl
=
curl_init
();
//启动一个CURL会话
...
...
@@ -420,6 +424,23 @@ class OtherController extends RestBaseController
curl_close
(
$curl
);
return
$result
;
}
//curl post请求
public
function
http_post
(
$url
,
$data
){
$curl
=
curl_init
();
//启动一个CURL会话
curl_setopt
(
$curl
,
CURLOPT_URL
,
$url
);
// 要访问的地址
curl_setopt
(
$curl
,
CURLOPT_SSL_VERIFYPEER
,
false
);
// 对认证证书来源的检查
curl_setopt
(
$curl
,
CURLOPT_SSL_VERIFYHOST
,
false
);
// 从证书中检查SSL加密算法是否存在
curl_setopt
(
$curl
,
CURLOPT_POST
,
true
);
// 发送一个常规的Post请求
curl_setopt
(
$curl
,
CURLOPT_POSTFIELDS
,
http_build_query
(
$data
));
// Post提交的数据包
curl_setopt
(
$curl
,
CURLOPT_TIMEOUT
,
30
);
// 设置超时限制防止死循环
curl_setopt
(
$curl
,
CURLOPT_HEADER
,
false
);
// 开启header
//curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);//请求头部
curl_setopt
(
$curl
,
CURLOPT_RETURNTRANSFER
,
true
);
// 获取的信息以文件流的形式返回
$result
=
curl_exec
(
$curl
);
//执行操作
curl_close
(
$curl
);
return
$result
;
}
public
function
yuanjiao
(
$imgpath
){
$ext
=
pathinfo
(
$imgpath
);
...
...
请
注册
或
登录
后发表评论