郭盛 / resource · 提交

转到一个项目

作者 郭盛
提交 199b2991d7dc6899f640a3eb6dc9eb1e96511e3e 1 个父辈 dd4f0f6b
1 个管道 的构建 通过 耗费 12 秒

融资

内嵌 并排对比
正在显示 2 个修改的文件 包含 81 行增加 和 121 行删除
... ... @@ -2,7 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OtherController.php" afterPath="$PROJECT_DIR$/api/index/controller/OtherController.php" />
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -11,65 +12,8 @@
<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>
<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="1210">
<caret line="518" column="5" lean-forward="true" selection-start-line="518" selection-start-column="5" selection-end-line="518" selection-end-column="5" />
<folding>
<element signature="e#616#660#0#PHP" expanded="true" />
</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="432">
<caret line="335" column="118" lean-forward="false" selection-start-line="335" selection-start-column="118" selection-end-line="335" selection-end-column="118" />
<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#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" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
... ... @@ -127,13 +71,13 @@
<option value="$PROJECT_DIR$/api/index/controller/ActiveController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" />
<option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
<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$/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" />
</list>
</option>
</component>
... ... @@ -152,8 +96,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-115" />
<option name="y" value="71" />
<option name="x" value="7" />
<option name="y" value="118" />
<option name="width" value="1868" />
<option name="height" value="1056" />
</component>
... ... @@ -182,7 +126,7 @@
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -194,7 +138,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/zhaozhao" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
... ... @@ -267,27 +211,31 @@
<workItem from="1569544728303" duration="25104000" />
<workItem from="1569716359574" duration="28303000" />
<workItem from="1569751435531" duration="3201000" />
<workItem from="1569803523139" duration="5731000" />
<workItem from="1569803523139" duration="11631000" />
<workItem from="1569832039024" duration="3220000" />
<workItem from="1570493724514" duration="1402000" />
<workItem from="1570498610111" duration="50000" />
<workItem from="1570523418252" duration="1729000" />
<workItem from="1570588094186" duration="1910000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="436226000" />
<option name="totallyTimeSpent" value="450437000" />
</component>
<component name="ToolWindowManager">
<frame x="-115" y="71" width="1868" height="1056" extended-state="1" />
<editor active="true" />
<frame x="7" y="118" width="1868" height="1056" extended-state="1" />
<layout>
<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="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="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" />
<window_info id="Version Control" 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="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" 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="7" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2992383" sideWeight="0.49703702" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
... ... @@ -305,7 +253,7 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="8" />
<option name="time" value="9" />
</breakpoint-manager>
<watches-manager />
</component>
... ... @@ -507,46 +455,10 @@
<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$/api/index/controller/ResourceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224">
<caret line="60" column="8" lean-forward="true" selection-start-line="60" selection-start-column="8" selection-end-line="73" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_14_22.jpg" />
<entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="349">
<caret line="21" column="7" lean-forward="false" selection-start-line="21" selection-start-column="7" selection-end-line="21" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/MyinfoController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="174">
<caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/FinanceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-176">
<caret line="43" column="27" lean-forward="false" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="219" column="16" lean-forward="true" selection-start-line="219" selection-start-column="16" selection-end-line="219" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/lib/Storage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="499">
... ... @@ -576,13 +488,6 @@
</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="684">
<caret line="633" column="0" lean-forward="true" selection-start-line="633" selection-start-column="0" selection-end-line="633" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/tou.png">
<provider selected="true" editor-type-id="images">
<state />
... ... @@ -613,7 +518,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="714" column="9" lean-forward="false" selection-start-line="714" selection-start-column="9" selection-end-line="714" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
... ... @@ -624,18 +528,72 @@
</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="1210">
<caret line="518" column="5" lean-forward="true" selection-start-line="518" selection-start-column="5" selection-end-line="518" selection-end-column="5" />
<state relative-caret-position="260">
<caret line="480" column="6" lean-forward="true" selection-start-line="480" selection-start-column="6" selection-end-line="480" selection-end-column="6" />
<folding>
<element signature="e#616#660#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/MyinfoController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" />
</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="15625">
<caret line="633" column="0" lean-forward="true" selection-start-line="633" selection-start-column="0" selection-end-line="633" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2227">
<caret line="216" column="32" lean-forward="false" selection-start-line="216" selection-start-column="32" selection-end-line="216" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2406">
<caret line="59" column="33" lean-forward="false" selection-start-line="59" selection-start-column="33" selection-end-line="59" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/FinanceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="994">
<caret line="51" column="37" lean-forward="true" selection-start-line="51" selection-start-column="37" selection-end-line="51" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-181">
<caret line="222" column="28" lean-forward="true" selection-start-line="222" selection-start-column="28" selection-end-line="222" selection-end-column="28" />
<folding>
<element signature="e#296#1102#0#PHP" expanded="false" />
<element signature="e#1108#2740#0#PHP" expanded="false" />
<element signature="e#2746#2930#0#PHP" expanded="false" />
<element signature="e#2935#3427#0#PHP" expanded="false" />
<element signature="e#3433#4607#0#PHP" expanded="false" />
<element signature="e#4612#6545#0#PHP" expanded="false" />
<element signature="e#6551#7483#0#PHP" expanded="false" />
<element signature="e#9137#9946#0#PHP" expanded="false" />
<element signature="e#9951#11545#0#PHP" expanded="false" />
</folding>
</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="432">
<caret line="335" column="118" lean-forward="false" selection-start-line="335" selection-start-column="118" selection-end-line="335" selection-end-column="118" />
<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" />
<folding>
<element signature="e#129#158#0#PHP" expanded="true" />
<element signature="e#344#512#0#PHP" expanded="false" />
... ... @@ -654,6 +612,8 @@
<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#10641#11432#0#PHP" expanded="false" />
<element signature="e#11452#12316#0#PHP" expanded="false" />
... ...
... ... @@ -31,7 +31,7 @@ class FinanceController extends RestBaseController
* @param name:company_name type:string require:1 desc:公司名称
* @param name:content type:text require:0 desc:公司简介
* @param name:employing type:text require:1 desc:用工单位
* @param name:money type:int require:1 desc:融资金额 （int型）
* @param name:money type:float require:1 desc:融资金额 （float型）
* @param name:money_purpose type:string require:1 desc:资金用途
* @param name:work_adress type:string require:1 desc:办公地址
* @param name:user_name type:string require:1 desc:联系人
... ...