From 649a6b17004986c8a2b4d6929d23d4c45cb53d6b Mon Sep 17 00:00:00 2001 From: guosheng <gs@bronet.cn> Date: Wed, 25 Sep 2019 15:44:11 +0800 Subject: [PATCH] 保存 --- .idea/workspace.xml | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------- api/index/controller/SendController.php | 44 +++++++++++++++++++++++++++----------------- 2 files changed, 111 insertions(+), 60 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 54637ae..7133ea6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,8 +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/ReleaseController.php" afterPath="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ResourceController.php" afterPath="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/SendController.php" afterPath="$PROJECT_DIR$/api/index/controller/SendController.php" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -15,15 +14,20 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="ReleaseController.php" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"> + <file leaf-file-name="SendController.php" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-263"> - <caret line="237" column="36" lean-forward="false" selection-start-line="237" selection-start-column="36" selection-end-line="237" selection-end-column="36" /> + <state relative-caret-position="275"> + <caret line="45" column="38" lean-forward="true" selection-start-line="45" selection-start-column="38" selection-end-line="45" selection-end-column="38" /> <folding> - <element signature="e#4202#4830#0#PHP" expanded="false" /> - <element signature="e#4835#5942#0#PHP" expanded="false" /> - <element signature="e#5948#6775#0#PHP" expanded="false" /> + <element signature="e#2747#2931#0#PHP" expanded="false" /> + <element signature="e#2936#3130#0#PHP" expanded="false" /> + <element signature="e#3136#4310#0#PHP" expanded="false" /> + <element signature="e#4315#5875#0#PHP" expanded="false" /> + <element signature="e#5881#6813#0#PHP" expanded="false" /> + <element signature="e#6818#8140#0#PHP" expanded="false" /> + <element signature="e#8146#8955#0#PHP" expanded="false" /> + <element signature="e#8960#10197#0#PHP" expanded="false" /> </folding> </state> </provider> @@ -88,9 +92,9 @@ <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/SendController.php" /> <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> + <option value="$PROJECT_DIR$/api/index/controller/SendController.php" /> </list> </option> </component> @@ -108,9 +112,9 @@ <sorting>DEFINITION_ORDER</sorting> </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> - <component name="ProjectFrameBounds"> - <option name="x" value="75" /> - <option name="y" value="41" /> + <component name="ProjectFrameBounds" extendedState="1"> + <option name="x" value="-57" /> + <option name="y" value="81" /> <option name="width" value="1935" /> <option name="height" value="952" /> </component> @@ -129,7 +133,6 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scratches" /> <pane id="ProjectPane"> <subPane> <expand> @@ -159,12 +162,13 @@ <select /> </subPane> </pane> + <pane id="Scratches" /> <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> <property name="WebServerToolWindowFactoryState" value="false" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" /> <property name="DefaultHtmlFileTemplate" value="HTML File" /> </component> <component name="RecentsManager"> @@ -224,18 +228,19 @@ <workItem from="1569284113019" duration="15405000" /> <workItem from="1569315557660" duration="58000" /> <workItem from="1569389764200" duration="1390000" /> - <workItem from="1569391173899" duration="477000" /> + <workItem from="1569391173899" duration="1945000" /> + <workItem from="1569397269236" duration="153000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="359351000" /> + <option name="totallyTimeSpent" value="360972000" /> </component> <component name="ToolWindowManager"> - <frame x="75" y="41" width="1935" height="952" extended-state="0" /> + <frame x="-57" y="81" width="1935" height="952" 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.1648" 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.1664" 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" /> @@ -564,25 +569,64 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> + <entry file="file://$PROJECT_DIR$/api/index/controller/MyinfoController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="25"> - <caret line="201" column="31" lean-forward="false" selection-start-line="201" selection-start-column="31" selection-end-line="201" selection-end-column="31" /> + <state relative-caret-position="-2335"> + <caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" /> + <folding /> + </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="665"> + <caret line="431" column="5" lean-forward="true" selection-start-line="431" selection-start-column="5" selection-end-line="431" selection-end-column="5" /> <folding> - <element signature="e#296#1102#0#PHP" expanded="false" /> - <element signature="e#1108#2382#0#PHP" expanded="false" /> - <element signature="e#2388#2572#0#PHP" expanded="false" /> - <element signature="e#2577#2771#0#PHP" expanded="false" /> - <element signature="e#3956#5516#0#PHP" expanded="false" /> + <element signature="e#330#805#0#PHP" expanded="false" /> + <element signature="e#810#1537#0#PHP" expanded="false" /> + <element signature="e#1543#2147#0#PHP" expanded="false" /> + <element signature="e#2152#3064#0#PHP" expanded="false" /> + <element signature="e#3070#3509#0#PHP" expanded="false" /> + <element signature="e#3514#4196#0#PHP" expanded="false" /> + <element signature="e#4202#4830#0#PHP" expanded="false" /> + <element signature="e#4835#5942#0#PHP" expanded="false" /> + <element signature="e#5948#6775#0#PHP" expanded="false" /> + <element signature="e#6780#8040#0#PHP" expanded="false" /> + <element signature="e#8046#8833#0#PHP" expanded="false" /> + <element signature="e#8838#10199#0#PHP" expanded="false" /> + <element signature="e#10205#11323#0#PHP" expanded="false" /> + <element signature="e#11328#12859#0#PHP" expanded="false" /> + <element signature="e#12865#13429#0#PHP" expanded="false" /> + <element signature="e#13434#14516#0#PHP" expanded="false" /> + <element signature="e#14522#15281#0#PHP" expanded="false" /> + <element signature="e#15286#16494#0#PHP" expanded="false" /> + <element signature="e#16500#17137#0#PHP" expanded="false" /> + <element signature="e#17142#17660#0#PHP" expanded="false" /> + <element signature="e#17666#18551#0#PHP" expanded="false" /> + <element signature="e#18556#19654#0#PHP" expanded="false" /> + <element signature="e#19660#20137#0#PHP" expanded="false" /> + <element signature="e#20142#20873#0#PHP" expanded="false" /> + <element signature="e#20879#21445#0#PHP" expanded="false" /> + <element signature="e#21450#22287#0#PHP" expanded="false" /> </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="-10"> - <caret line="267" column="7" lean-forward="true" selection-start-line="267" selection-start-column="7" selection-end-line="267" selection-end-column="7" /> + <state relative-caret-position="-9"> + <caret line="240" column="5" lean-forward="true" selection-start-line="240" selection-start-column="5" selection-end-line="240" selection-end-column="5" /> <folding> + <element signature="e#346#543#0#PHP" expanded="false" /> + <element signature="e#548#956#0#PHP" expanded="false" /> + <element signature="e#962#1253#0#PHP" expanded="false" /> + <element signature="e#1258#2915#0#PHP" expanded="false" /> + <element signature="e#2921#3173#0#PHP" expanded="false" /> + <element signature="e#3178#3633#0#PHP" expanded="false" /> + <element signature="e#3639#4194#0#PHP" expanded="false" /> + <element signature="e#4201#5476#0#PHP" expanded="false" /> + <element signature="e#5482#6202#0#PHP" expanded="false" /> + <element signature="e#6207#7625#0#PHP" expanded="false" /> <element signature="e#7631#8334#0#PHP" expanded="false" /> <element signature="e#8339#9976#0#PHP" expanded="false" /> <element signature="e#9982#10840#0#PHP" expanded="false" /> @@ -608,22 +652,19 @@ </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="-2335"> - <caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php"> + <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-263"> - <caret line="237" column="36" lean-forward="false" selection-start-line="237" selection-start-column="36" selection-end-line="237" selection-end-column="36" /> + <state relative-caret-position="275"> + <caret line="45" column="38" lean-forward="true" selection-start-line="45" selection-start-column="38" selection-end-line="45" selection-end-column="38" /> <folding> - <element signature="e#4202#4830#0#PHP" expanded="false" /> - <element signature="e#4835#5942#0#PHP" expanded="false" /> - <element signature="e#5948#6775#0#PHP" expanded="false" /> + <element signature="e#2747#2931#0#PHP" expanded="false" /> + <element signature="e#2936#3130#0#PHP" expanded="false" /> + <element signature="e#3136#4310#0#PHP" expanded="false" /> + <element signature="e#4315#5875#0#PHP" expanded="false" /> + <element signature="e#5881#6813#0#PHP" expanded="false" /> + <element signature="e#6818#8140#0#PHP" expanded="false" /> + <element signature="e#8146#8955#0#PHP" expanded="false" /> + <element signature="e#8960#10197#0#PHP" expanded="false" /> </folding> </state> </provider> diff --git a/api/index/controller/SendController.php b/api/index/controller/SendController.php index b189acd..105e7b8 100644 --- a/api/index/controller/SendController.php +++ b/api/index/controller/SendController.php @@ -56,24 +56,34 @@ class SendController extends RestBaseController $param['end_time'] = strtotime($param['end_time']); } } - $validate = new Validate([ - 'job_title' => 'require', - 'linkman' => 'require', - 'needpeople'=>'require', - 'city'=>'require', - 'linkman_tel'=>'require|number|max:11', - 'company_name'=>'require', - 'content'=>'require', - ]); - if (!$validate->check($param)) { - $this->error(['code'=>40005,'msg'=>$validate->getError()]); - } - $data = Db::name('job') - ->insert($param); - if(empty($data)){ - $this->error(['code'=>40006,'msg'=>'sql执行失败']); + + if($param['status'] == 0){ + $data = Db::name('job') + ->insert($param); + if(empty($data)){ + $this->error(['code'=>40006,'msg'=>'sql执行失败']); + } + $this->success('SUCCESS'); + }else{ + $validate = new Validate([ + 'job_title' => 'require', + 'linkman' => 'require', + 'needpeople'=>'require', + 'city'=>'require', + 'linkman_tel'=>'require|number|max:11', + 'company_name'=>'require', + 'content'=>'require', + ]); + if (!$validate->check($param)) { + $this->error(['code'=>40005,'msg'=>$validate->getError()]); + } + $data = Db::name('job') + ->insert($param); + if(empty($data)){ + $this->error(['code'=>40006,'msg'=>'sql执行失败']); + } + $this->success('SUCCESS'); } - $this->success('SUCCESS'); } /** -- libgit2 0.24.0