郭盛 / resource · 提交

转到一个项目

作者 郭盛
提交 f502ba44775ba850e8456808816a4a777a5b6a1f 1 个父辈 199b2991
1 个管道 的构建 通过 耗费 9 秒

圆形图

内嵌 并排对比
正在显示 2 个修改的文件 包含 139 行增加 和 66 行删除
... ... @@ -3,7 +3,7 @@
<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/FinanceController.php" afterPath="$PROJECT_DIR$/api/index/controller/FinanceController.php" />
<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,7 +13,42 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
<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="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" />
<folding>
<element signature="e#129#158#0#PHP" expanded="true" />
<element signature="e#344#512#0#PHP" expanded="false" />
<element signature="e#517#826#0#PHP" expanded="false" />
<element signature="e#832#998#0#PHP" expanded="false" />
<element signature="e#1003#1306#0#PHP" expanded="false" />
<element signature="e#1312#1953#0#PHP" expanded="false" />
<element signature="e#1958#3042#0#PHP" expanded="false" />
<element signature="e#3048#3412#0#PHP" expanded="false" />
<element signature="e#3417#3891#0#PHP" expanded="false" />
<element signature="e#3897#4168#0#PHP" expanded="false" />
<element signature="e#4173#5106#0#PHP" expanded="false" />
<element signature="e#5112#5421#0#PHP" expanded="false" />
<element signature="e#5426#5726#0#PHP" expanded="false" />
<element signature="e#5736#6015#0#PHP" expanded="false" />
<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#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" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
... ... @@ -76,8 +111,8 @@
<option value="$PROJECT_DIR$/api/index/controller/SendController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" />
<option value="$PROJECT_DIR$/simplewind/vendor/topthink/think-image/src/Image.php" />
<option value="$PROJECT_DIR$/api/index/controller/OtherController.php" />
<option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" />
<option value="$PROJECT_DIR$/api/index/controller/OtherController.php" />
</list>
</option>
</component>
... ... @@ -96,10 +131,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="7" />
<option name="y" value="118" />
<option name="x" value="-122" />
<option name="y" value="153" />
<option name="width" value="1868" />
<option name="height" value="1056" />
<option name="height" value="1087" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -128,6 +163,37 @@
<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>
<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>
... ... @@ -142,13 +208,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">
... ... @@ -216,17 +282,18 @@
<workItem from="1570493724514" duration="1402000" />
<workItem from="1570498610111" duration="50000" />
<workItem from="1570523418252" duration="1729000" />
<workItem from="1570588094186" duration="1910000" />
<workItem from="1570588094186" duration="7684000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="450437000" />
<option name="totallyTimeSpent" value="456211000" />
</component>
<component name="ToolWindowManager">
<frame x="7" y="118" width="1868" height="1056" extended-state="1" />
<frame x="-122" y="153" width="1868" height="1087" extended-state="1" />
<editor active="true" />
<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.1465708" 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="true" show_stripe_button="true" weight="0.1465708" 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" />
... ... @@ -258,13 +325,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/financsend/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="628">
<caret line="73" column="31" lean-forward="true" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257">
... ... @@ -437,12 +497,6 @@
</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/cmf/controller/RestBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
... ... @@ -474,13 +528,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="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" />
</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">
... ... @@ -494,26 +541,6 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/qrcode/1569753725.jpg" />
<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/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_11_22.jpg">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/qrcode/tou.11.jpg">
<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">
... ... @@ -521,11 +548,6 @@
</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$/simplewind/vendor/topthink/think-image/src/Image.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
... ... @@ -590,10 +612,63 @@
</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="250">
<caret line="18" column="28" lean-forward="false" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
<folding>
<element signature="e#282#1940#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/hello.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<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>
</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$/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_11_22.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<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/qrcode/code_11_22.jpg">
<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="1020">
<caret line="300" column="32" lean-forward="false" selection-start-line="300" selection-start-column="32" selection-end-line="300" selection-end-column="32" />
<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" />
<folding>
<element signature="e#129#158#0#PHP" expanded="true" />
<element signature="e#344#512#0#PHP" expanded="false" />
... ... @@ -615,11 +690,9 @@
<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#10641#11432#0#PHP" expanded="false" />
<element signature="e#11452#12316#0#PHP" expanded="false" />
<element signature="e#12343#12743#0#PHP" expanded="false" />
<element signature="e#12767#13340#0#PHP" expanded="false" />
<element signature="e#13363#14173#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" />
</folding>
</state>
</provider>
... ...
... ... @@ -351,7 +351,7 @@ class OtherController extends RestBaseController
return $qrcode;
}
public function imgShare($user_id,$job_id,$access_token,$path){
$url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=".$access_token;
$url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=".$access_token;
$post['path'] = $path;
$post['width'] = 280;
$result = $this->curl($url, json_encode($post));
... ...