郭盛 / resource · 提交

转到一个项目

作者 郭盛
提交 1628ac4ad59965db4338ae9c4378d1d763bad528 1 个父辈 f502ba44
1 个管道 的构建 通过 耗费 2 秒

图片

内嵌 并排对比
正在显示 3 个修改的文件 包含 52 行增加 和 52 行删除
... ... @@ -2,6 +2,7 @@
<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/yuan.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>
... ... @@ -17,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="244">
<caret line="357" column="44" lean-forward="true" selection-start-line="357" selection-start-column="44" selection-end-line="357" selection-end-column="44" />
<state relative-caret-position="324">
<caret line="334" column="63" lean-forward="true" selection-start-line="334" selection-start-column="63" selection-end-line="334" selection-end-column="63" />
<folding>
<element signature="e#129#158#0#PHP" expanded="true" />
<element signature="e#344#512#0#PHP" expanded="false" />
... ... @@ -38,11 +39,11 @@
<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#8034#10202#0#PHP" expanded="false" />
<element signature="e#10208#10636#0#PHP" expanded="false" />
<element signature="e#12327#12727#0#PHP" expanded="false" />
<element signature="e#12751#13324#0#PHP" expanded="false" />
<element signature="e#13347#14157#0#PHP" expanded="false" />
<element signature="e#10473#10901#0#PHP" expanded="false" />
<element signature="e#11737#12601#0#PHP" expanded="false" />
<element signature="e#12628#13028#0#PHP" expanded="false" />
<element signature="e#13052#13625#0#PHP" expanded="false" />
<element signature="e#13648#14458#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -131,10 +132,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-122" />
<option name="y" value="153" />
<option name="x" value="48" />
<option name="y" value="56" />
<option name="width" value="1868" />
<option name="height" value="1087" />
<option name="height" value="1086" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -209,6 +210,7 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\htdocs\project1\resource\public" />
<recent name="D:\htdocs\project1\resource\public\static\font-awesome\fonts" />
<recent name="D:\htdocs\project1\resource\api\index\controller" />
</key>
... ... @@ -282,15 +284,15 @@
<workItem from="1570493724514" duration="1402000" />
<workItem from="1570498610111" duration="50000" />
<workItem from="1570523418252" duration="1729000" />
<workItem from="1570588094186" duration="7684000" />
<workItem from="1570588094186" duration="11803000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="456211000" />
<option name="totallyTimeSpent" value="460330000" />
</component>
<component name="ToolWindowManager">
<frame x="-122" y="153" width="1868" height="1087" extended-state="1" />
<frame x="48" y="56" width="1868" height="1086" 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.1465708" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -325,27 +327,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257">
<caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/PictureController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="26" column="65" lean-forward="false" selection-start-line="26" selection-start-column="65" selection-end-line="26" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="53" column="55" lean-forward="true" selection-start-line="53" selection-start-column="55" selection-end-line="53" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1316">
... ... @@ -535,11 +516,6 @@
</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" />
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/gd/gd.php">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -630,32 +606,37 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/favicon.ico">
<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/bg.png">
<entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_10_22.jpg">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/poster/poster_14_22.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_10_22.jpg">
<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$/public/upload/poster/poster_11_22.png">
<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/tou.11.jpg">
<entry file="file://$PROJECT_DIR$/public/favicon.ico">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/bg.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
... ... @@ -665,10 +646,25 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/qrcode/yuan.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/yuan.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/yuan1.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="244">
<caret line="357" column="44" lean-forward="true" selection-start-line="357" selection-start-column="44" selection-end-line="357" selection-end-column="44" />
<state relative-caret-position="324">
<caret line="334" column="63" lean-forward="true" selection-start-line="334" selection-start-column="63" selection-end-line="334" selection-end-column="63" />
<folding>
<element signature="e#129#158#0#PHP" expanded="true" />
<element signature="e#344#512#0#PHP" expanded="false" />
... ... @@ -688,11 +684,11 @@
<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#8034#10202#0#PHP" expanded="false" />
<element signature="e#10208#10636#0#PHP" expanded="false" />
<element signature="e#12327#12727#0#PHP" expanded="false" />
<element signature="e#12751#13324#0#PHP" expanded="false" />
<element signature="e#13347#14157#0#PHP" expanded="false" />
<element signature="e#10473#10901#0#PHP" expanded="false" />
<element signature="e#11737#12601#0#PHP" expanded="false" />
<element signature="e#12628#13028#0#PHP" expanded="false" />
<element signature="e#13052#13625#0#PHP" expanded="false" />
<element signature="e#13648#14458#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -328,10 +328,13 @@ class OtherController extends RestBaseController
$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");
$yuanImage = \think\Image::open(ROOT_PATH."public/yuan.png");
$yuan = $yuanImage->thumb(75,75,\think\Image::THUMB_CENTER)->save(ROOT_PATH."public/upload/qrcode/yuan.png");
$text = "期待你的加入";
$result = $image
->water(ROOT_PATH."public/upload/$tou",[35,48],100)
->water(ROOT_PATH."public/upload/$code",[212,700],100)
->water(ROOT_PATH."public/upload/qrcode/yuan.png",[270,757],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',25,'#FFFFFF',[55,200])
->text($user['user_nickname'],ROOT_PATH.'public/static/font-awesome/fonts/PingFang Medium.ttf',16,'#FFFFFF',[142,60]);
... ... @@ -354,6 +357,7 @@ class OtherController extends RestBaseController
$url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=".$access_token;
$post['path'] = $path;
$post['width'] = 280;
$post['is_hyaline'] = true;
$result = $this->curl($url, json_encode($post));
$array = json_decode($result, true);
if($array['errmsg']) {
... ...