郭盛 / resource · 提交

转到一个项目

作者 郭盛
提交 d6a58be28b10977515ab505f396a21e449828610 1 个父辈 d9c3ed54
1 个管道 的构建 通过 耗费 11 秒

图片

内嵌 并排对比
正在显示 59 个修改的文件 包含 78 行增加 和 85 行删除
... ... @@ -2,9 +2,9 @@
<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/bg.png" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/font-awesome/fonts/PingFang Medium.ttf" />
<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" />
... ... @@ -13,13 +13,33 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DockManager">
<window id="1">
<content type="file-editors">
<state>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Image.php" pinned="false" current-in-tab="true">
<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="371">
<caret line="485" column="51" lean-forward="false" selection-start-line="485" selection-start-column="51" selection-end-line="485" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</state>
</content>
</window>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="400">
<caret line="329" column="46" lean-forward="true" selection-start-line="329" selection-start-column="46" selection-end-line="329" selection-end-column="46" />
<state relative-caret-position="247">
<caret line="323" column="25" lean-forward="false" selection-start-line="323" selection-start-column="25" selection-end-line="323" selection-end-column="25" />
<folding>
<element signature="e#129#158#0#PHP" expanded="true" />
<element signature="e#325#493#0#PHP" expanded="false" />
... ... @@ -37,25 +57,14 @@
<element signature="e#5717#5996#0#PHP" expanded="false" />
<element signature="e#6001#6927#0#PHP" expanded="false" />
<element signature="e#7242#7631#0#PHP" expanded="false" />
<element signature="e#9644#10495#0#PHP" expanded="false" />
<element signature="e#10515#11379#0#PHP" expanded="false" />
<element signature="e#11406#11806#0#PHP" expanded="false" />
<element signature="e#11829#12402#0#PHP" expanded="false" />
<element signature="e#10958#11822#0#PHP" expanded="false" />
<element signature="e#11849#12249#0#PHP" expanded="false" />
<element signature="e#12272#12845#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RestBaseController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3775">
<caret line="106" column="9" lean-forward="false" selection-start-line="106" selection-start-column="9" selection-end-line="106" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -135,11 +144,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="194" />
<option name="y" value="110" />
<option name="width" value="1657" />
<option name="height" value="921" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="51" />
<option name="y" value="80" />
<option name="width" value="1868" />
<option name="height" value="959" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -157,6 +166,7 @@
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -182,29 +192,10 @@
<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>
<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>
</expand>
<select />
</subPane>
</pane>
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -213,13 +204,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">
... ... @@ -279,17 +270,18 @@
<workItem from="1569484124771" duration="560000" />
<workItem from="1569486627319" duration="2740000" />
<workItem from="1569494185536" duration="1054000" />
<workItem from="1569544728303" duration="21472000" />
<workItem from="1569544728303" duration="25104000" />
<workItem from="1569716359574" duration="8561000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="395359000" />
<option name="totallyTimeSpent" value="407552000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<frame x="51" y="80" width="1868" height="959" extended-state="1" />
<layout>
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17430703" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" 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" />
<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" />
... ... @@ -316,23 +308,11 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="6" />
<option name="time" value="7" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/user/controller/AssetController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="92" column="0" lean-forward="false" selection-start-line="92" selection-start-column="0" selection-end-line="92" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/admin/20190919/3299fccc46d4f1c2e664fac7256960f2.jpg">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-8003">
... ... @@ -645,14 +625,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3775">
<caret line="106" column="9" lean-forward="false" selection-start-line="106" selection-start-column="9" selection-end-line="106" 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="175">
... ... @@ -696,20 +668,21 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_10_22.jpg" />
<entry file="file://$PROJECT_DIR$/public/favicon.ico">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258">
<caret line="95" column="27" lean-forward="false" selection-start-line="95" selection-start-column="27" selection-end-line="95" selection-end-column="27" />
<state relative-caret-position="25">
<caret line="106" column="9" lean-forward="false" selection-start-line="106" selection-start-column="9" selection-end-line="106" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_10_22.jpg">
<entry file="file://$PROJECT_DIR$/public/upload/poster/poster_11_22.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
... ... @@ -719,10 +692,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="400">
<caret line="329" column="46" lean-forward="true" selection-start-line="329" selection-start-column="46" selection-end-line="329" selection-end-column="46" />
<state relative-caret-position="247">
<caret line="323" column="25" lean-forward="false" selection-start-line="323" selection-start-column="25" selection-end-line="323" selection-end-column="25" />
<folding>
<element signature="e#129#158#0#PHP" expanded="true" />
<element signature="e#325#493#0#PHP" expanded="false" />
... ... @@ -740,13 +718,20 @@
<element signature="e#5717#5996#0#PHP" expanded="false" />
<element signature="e#6001#6927#0#PHP" expanded="false" />
<element signature="e#7242#7631#0#PHP" expanded="false" />
<element signature="e#9644#10495#0#PHP" expanded="false" />
<element signature="e#10515#11379#0#PHP" expanded="false" />
<element signature="e#11406#11806#0#PHP" expanded="false" />
<element signature="e#11829#12402#0#PHP" expanded="false" />
<element signature="e#10958#11822#0#PHP" expanded="false" />
<element signature="e#11849#12249#0#PHP" expanded="false" />
<element signature="e#12272#12845#0#PHP" expanded="false" />
</folding>
</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="371">
<caret line="485" column="51" lean-forward="false" selection-start-line="485" selection-start-column="51" selection-end-line="485" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -316,10 +316,18 @@ class OtherController extends RestBaseController
$jobModel = new JobModel();
$where['id'] = ['eq',$job_id];
$job = $jobModel->getOne($where);
$user = Db::name('user')
->field('avatar,user_nickname')
->where('id',$job['user_id'])
->find();
$image = \think\Image::open(ROOT_PATH."public/bg.png");
$result = $image->water(ROOT_PATH."public/upload/$code",[360,1420],100)
->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',45,'#070C1D',[100,1100]);
$text = "期待你的加入";
$remark = "长按识别二维码识别小程序";
$result = $image
->text($remark,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[54,434])
->text($text,ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',12,'#FFFFFF',[112,167])
->text($job['job_title'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',20,'#FFFFFF',[60,212])
->text($user['user_nickname'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',14,'#FFFFFF',[112,145]);
$result->save($savePath."poster_".$user_id."_$job_id.png");
$this->success('SUCCESS',['url'=>cmf_get_image_url("poster/poster_".$user_id."_$job_id.png")]);
}
... ... @@ -337,8 +345,8 @@ class OtherController extends RestBaseController
}
public function imgShare($user_id,$job_id,$access_token,$path){
$url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=".$access_token;
$post['path'] = $path;//'pages/begin/begin?share_id='.$user_id.'&job_id='.$job_id;
$post['width'] = 400;
$post['path'] = $path;
$post['width'] = 280;
$result = $this->curl($url, json_encode($post));
$array = json_decode($result, true);
if($array['errmsg']) {
... ...

107.2 KB | 宽: | 高:

31.5 KB | 宽: | 高:

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