郭盛 / resource · 提交

转到一个项目

作者 郭盛
提交 69fdc6a6fcd6b799337855253b16448d9449ac57 1 个父辈 99a1263b
1 个管道 的构建 通过 耗费 1 秒

分享海报

内嵌 并排对比
正在显示 3 个修改的文件 包含 35 行增加 和 83 行删除
... ... @@ -2,7 +2,9 @@
<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" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -16,8 +18,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="450">
<caret line="316" column="31" lean-forward="true" selection-start-line="316" selection-start-column="31" selection-end-line="316" selection-end-column="31" />
<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" />
<folding>
<element signature="e#129#158#0#PHP" expanded="true" />
<element signature="e#344#512#0#PHP" expanded="false" />
... ... @@ -36,12 +38,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#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" />
<element signature="e#10209#10637#0#PHP" expanded="false" />
<element signature="e#10642#11433#0#PHP" expanded="false" />
<element signature="e#11453#12317#0#PHP" expanded="false" />
<element signature="e#12344#12744#0#PHP" expanded="false" />
<element signature="e#12768#13341#0#PHP" expanded="false" />
<element signature="e#13364#14174#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -110,8 +112,8 @@
<option value="$PROJECT_DIR$/api/index/controller/ResourceController.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" />
<option value="$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php" />
<option value="$PROJECT_DIR$/api/index/controller/OtherController.php" />
</list>
</option>
</component>
... ... @@ -130,8 +132,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="17" />
<option name="y" value="46" />
<option name="x" value="63" />
<option name="y" value="139" />
<option name="width" value="1868" />
<option name="height" value="1019" />
</component>
... ... @@ -162,54 +164,6 @@
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" 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="upload" 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="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="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="topthink" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="topthink" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="think-image" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="topthink" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="think-image" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -224,13 +178,13 @@
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\htdocs\project1\resource\public" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\htdocs\project1\resource\public\static\font-awesome\fonts" />
<recent name="D:\htdocs\project1\resource\api\index\controller" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\htdocs\project1\resource\public" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
... ... @@ -293,18 +247,18 @@
<workItem from="1569544728303" duration="25104000" />
<workItem from="1569716359574" duration="28303000" />
<workItem from="1569751435531" duration="3201000" />
<workItem from="1569803523139" duration="4053000" />
<workItem from="1569803523139" duration="4947000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="434548000" />
<option name="totallyTimeSpent" value="435442000" />
</component>
<component name="ToolWindowManager">
<frame x="17" y="46" width="1868" height="1019" extended-state="1" />
<frame x="63" y="139" 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.18473451" 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="false" show_stripe_button="true" weight="0.18473451" 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" />
... ... @@ -635,11 +589,6 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/bg.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/gd/gd.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
... ... @@ -658,10 +607,15 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/bg.png">
<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="450">
<caret line="316" column="31" lean-forward="true" selection-start-line="316" selection-start-column="31" selection-end-line="316" selection-end-column="31" />
<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" />
<folding>
<element signature="e#129#158#0#PHP" expanded="true" />
<element signature="e#344#512#0#PHP" expanded="false" />
... ... @@ -680,12 +634,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#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" />
<element signature="e#10209#10637#0#PHP" expanded="false" />
<element signature="e#10642#11433#0#PHP" expanded="false" />
<element signature="e#11453#12317#0#PHP" expanded="false" />
<element signature="e#12344#12744#0#PHP" expanded="false" />
<element signature="e#12768#13341#0#PHP" expanded="false" />
<element signature="e#13364#14174#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -315,7 +315,7 @@ class OtherController extends RestBaseController
$code = "qrcode/code_$user_id.jpg";
}
$codeImage = \think\Image::open(ROOT_PATH."public/upload/$code");
$codeImage->thumb(120,120,\think\Image::THUMB_CENTER)->save(ROOT_PATH."public/upload/$code");
$codeImage->thumb(190,190,\think\Image::THUMB_CENTER)->save(ROOT_PATH."public/upload/$code");
$jobModel = new JobModel();
$where['id'] = ['eq',$job_id];
$job = $jobModel->getOne($where);
... ... @@ -329,11 +329,9 @@ class OtherController extends RestBaseController
$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/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])
->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',22,'#FFFFFF',[100,200])
->text($user['user_nickname'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',16,'#FFFFFF',[142,60]);
... ...

84.1 KB | 宽: | 高:

94.8 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖