正在显示
2 个修改的文件
包含
7 行增加
和
9 行删除
@@ -2,8 +2,6 @@ | @@ -2,8 +2,6 @@ | ||
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment=""> | 4 | <list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment=""> |
5 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/bg.png" afterPath="$PROJECT_DIR$/public/bg.png" /> | ||
6 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
7 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OtherController.php" afterPath="$PROJECT_DIR$/api/index/controller/OtherController.php" /> | 5 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OtherController.php" afterPath="$PROJECT_DIR$/api/index/controller/OtherController.php" /> |
8 | </list> | 6 | </list> |
9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 7 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
@@ -18,8 +16,8 @@ | @@ -18,8 +16,8 @@ | ||
18 | <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true"> | 16 | <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true"> |
19 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | 17 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> |
20 | <provider selected="true" editor-type-id="text-editor"> | 18 | <provider selected="true" editor-type-id="text-editor"> |
21 | - <state relative-caret-position="282"> | ||
22 | - <caret line="323" column="34" lean-forward="true" selection-start-line="323" selection-start-column="34" selection-end-line="323" selection-end-column="34" /> | 19 | + <state relative-caret-position="582"> |
20 | + <caret line="335" column="104" lean-forward="false" selection-start-line="335" selection-start-column="104" selection-end-line="335" selection-end-column="104" /> | ||
23 | <folding> | 21 | <folding> |
24 | <element signature="e#129#158#0#PHP" expanded="true" /> | 22 | <element signature="e#129#158#0#PHP" expanded="true" /> |
25 | <element signature="e#344#512#0#PHP" expanded="false" /> | 23 | <element signature="e#344#512#0#PHP" expanded="false" /> |
@@ -247,12 +245,12 @@ | @@ -247,12 +245,12 @@ | ||
247 | <workItem from="1569544728303" duration="25104000" /> | 245 | <workItem from="1569544728303" duration="25104000" /> |
248 | <workItem from="1569716359574" duration="28303000" /> | 246 | <workItem from="1569716359574" duration="28303000" /> |
249 | <workItem from="1569751435531" duration="3201000" /> | 247 | <workItem from="1569751435531" duration="3201000" /> |
250 | - <workItem from="1569803523139" duration="4947000" /> | 248 | + <workItem from="1569803523139" duration="5126000" /> |
251 | </task> | 249 | </task> |
252 | <servers /> | 250 | <servers /> |
253 | </component> | 251 | </component> |
254 | <component name="TimeTrackingManager"> | 252 | <component name="TimeTrackingManager"> |
255 | - <option name="totallyTimeSpent" value="435442000" /> | 253 | + <option name="totallyTimeSpent" value="435621000" /> |
256 | </component> | 254 | </component> |
257 | <component name="ToolWindowManager"> | 255 | <component name="ToolWindowManager"> |
258 | <frame x="63" y="139" width="1868" height="1019" extended-state="1" /> | 256 | <frame x="63" y="139" width="1868" height="1019" extended-state="1" /> |
@@ -614,8 +612,8 @@ | @@ -614,8 +612,8 @@ | ||
614 | </entry> | 612 | </entry> |
615 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | 613 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> |
616 | <provider selected="true" editor-type-id="text-editor"> | 614 | <provider selected="true" editor-type-id="text-editor"> |
617 | - <state relative-caret-position="282"> | ||
618 | - <caret line="323" column="34" lean-forward="true" selection-start-line="323" selection-start-column="34" selection-end-line="323" selection-end-column="34" /> | 615 | + <state relative-caret-position="582"> |
616 | + <caret line="335" column="104" lean-forward="false" selection-start-line="335" selection-start-column="104" selection-end-line="335" selection-end-column="104" /> | ||
619 | <folding> | 617 | <folding> |
620 | <element signature="e#129#158#0#PHP" expanded="true" /> | 618 | <element signature="e#129#158#0#PHP" expanded="true" /> |
621 | <element signature="e#344#512#0#PHP" expanded="false" /> | 619 | <element signature="e#344#512#0#PHP" expanded="false" /> |
@@ -333,7 +333,7 @@ class OtherController extends RestBaseController | @@ -333,7 +333,7 @@ class OtherController extends RestBaseController | ||
333 | ->water(ROOT_PATH."public/upload/$tou",[35,48],100) | 333 | ->water(ROOT_PATH."public/upload/$tou",[35,48],100) |
334 | ->water(ROOT_PATH."public/upload/$code",[212,700],100) | 334 | ->water(ROOT_PATH."public/upload/$code",[212,700],100) |
335 | ->text($text,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[142,100]) | 335 | ->text($text,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[142,100]) |
336 | - ->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',22,'#FFFFFF',[100,200]) | 336 | + ->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',25,'#FFFFFF',[100,200]) |
337 | ->text($user['user_nickname'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',16,'#FFFFFF',[142,60]); | 337 | ->text($user['user_nickname'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',16,'#FFFFFF',[142,60]); |
338 | $result->save($savePath."poster_".$user_id."_$job_id.png"); | 338 | $result->save($savePath."poster_".$user_id."_$job_id.png"); |
339 | $this->success('SUCCESS',['url'=>cmf_get_image_url("poster/poster_".$user_id."_$job_id.png")]); | 339 | $this->success('SUCCESS',['url'=>cmf_get_image_url("poster/poster_".$user_id."_$job_id.png")]); |
-
请 注册 或 登录 后发表评论