作者 郭盛
1 个管道 的构建 通过 耗费 1 秒

修改我的招商

... ... @@ -3,6 +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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -14,44 +15,64 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ResourceController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="ResourceController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="73" column="9" lean-forward="false" selection-start-line="73" selection-start-column="9" selection-end-line="73" selection-end-column="9" />
<state relative-caret-position="327">
<caret line="416" column="35" lean-forward="true" selection-start-line="416" selection-start-column="35" selection-end-line="416" selection-end-column="35" />
<folding>
<element signature="e#127#156#0#PHP" expanded="true" />
<element signature="e#327#524#0#PHP" expanded="false" />
<element signature="e#529#905#0#PHP" expanded="false" />
<element signature="e#3404#3859#0#PHP" expanded="false" />
<element signature="e#3865#4420#0#PHP" expanded="false" />
<element signature="e#4427#5702#0#PHP" expanded="false" />
<element signature="e#5708#6361#0#PHP" expanded="false" />
<element signature="e#6366#7512#0#PHP" expanded="false" />
<element signature="e#7518#8128#0#PHP" expanded="false" />
<element signature="e#8133#9291#0#PHP" expanded="false" />
<element signature="e#9297#10093#0#PHP" expanded="false" />
<element signature="e#10098#11428#0#PHP" expanded="false" />
<element signature="e#11434#12163#0#PHP" expanded="false" />
<element signature="e#12168#13708#0#PHP" expanded="false" />
<element signature="e#13714#14299#0#PHP" expanded="false" />
<element signature="e#14304#15312#0#PHP" expanded="false" />
<element signature="e#15318#15734#0#PHP" expanded="false" />
<element signature="e#15739#16261#0#PHP" expanded="false" />
<element signature="e#16266#16896#0#PHP" expanded="false" />
<element signature="e#16902#17297#0#PHP" expanded="false" />
<element signature="e#17302#18005#0#PHP" expanded="false" />
<element signature="e#18011#18517#0#PHP" expanded="false" />
<element signature="e#18522#19953#0#PHP" expanded="false" />
<element signature="e#19959#20238#0#PHP" expanded="false" />
<element signature="e#20243#20685#0#PHP" expanded="false" />
<element signature="e#20691#20925#0#PHP" expanded="false" />
<element signature="e#20930#21323#0#PHP" expanded="false" />
<element signature="e#3061#3516#0#PHP" expanded="false" />
<element signature="e#3522#4077#0#PHP" expanded="false" />
<element signature="e#4084#5359#0#PHP" expanded="false" />
<element signature="e#5365#6018#0#PHP" expanded="false" />
<element signature="e#6023#7169#0#PHP" expanded="false" />
<element signature="e#7175#7785#0#PHP" expanded="false" />
<element signature="e#7790#8948#0#PHP" expanded="false" />
<element signature="e#8954#9750#0#PHP" expanded="false" />
<element signature="e#9755#11085#0#PHP" expanded="false" />
<element signature="e#11091#11820#0#PHP" expanded="false" />
<element signature="e#11825#13365#0#PHP" expanded="false" />
<element signature="e#14975#15391#0#PHP" expanded="false" />
<element signature="e#15396#15918#0#PHP" expanded="false" />
<element signature="e#15923#16553#0#PHP" expanded="false" />
<element signature="e#16559#16954#0#PHP" expanded="false" />
<element signature="e#16959#17662#0#PHP" expanded="false" />
<element signature="e#17668#18174#0#PHP" expanded="false" />
<element signature="e#18179#19610#0#PHP" expanded="false" />
<element signature="e#19616#19895#0#PHP" expanded="false" />
<element signature="e#19900#20342#0#PHP" expanded="false" />
<element signature="e#20348#20582#0#PHP" expanded="false" />
<element signature="e#20587#20980#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ReleaseController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="573">
<caret line="402" column="34" lean-forward="true" selection-start-line="402" selection-start-column="34" selection-end-line="402" selection-end-column="34" />
<folding>
<element signature="e#4750#5735#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SendController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5175">
<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>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -84,7 +105,6 @@
<option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/StatisticController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ActiveController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/AreaController.php" />
... ... @@ -92,6 +112,7 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/DemandController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" />
</list>
</option>
</component>
... ... @@ -109,11 +130,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="586" />
<option name="y" value="44" />
<option name="width" value="1382" />
<option name="height" value="940" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="34" />
<option name="y" value="101" />
<option name="width" value="1907" />
<option name="height" value="958" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -214,18 +235,18 @@
<workItem from="1568442614180" duration="3798000" />
<workItem from="1568594548281" duration="28629000" />
<workItem from="1568629056199" duration="4747000" />
<workItem from="1568679207375" duration="14909000" />
<workItem from="1568679207375" duration="19588000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="178049000" />
<option name="totallyTimeSpent" value="182728000" />
</component>
<component name="ToolWindowManager">
<frame x="586" y="44" width="1382" height="940" extended-state="0" />
<frame x="34" y="101" width="1907" height="958" 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.21482602" 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.15376286" 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" />
... ... @@ -257,20 +278,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/admin/controller/StatisticController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="850">
<caret line="40" column="46" lean-forward="false" selection-start-line="40" selection-start-column="46" selection-end-line="40" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="8" lean-forward="true" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/AdminIndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2550">
... ... @@ -425,13 +432,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/base.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="15" column="24" lean-forward="false" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296">
... ... @@ -475,14 +475,6 @@
</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="182">
<caret line="52" column="37" lean-forward="true" selection-start-line="52" selection-start-column="37" selection-end-line="52" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/StatisticController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="518">
... ... @@ -490,22 +482,6 @@
</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="-1873">
<caret line="27" column="18" lean-forward="true" selection-start-line="27" selection-start-column="18" selection-end-line="27" selection-end-column="18" />
<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="-12087">
<caret line="133" column="27" lean-forward="true" selection-start-line="133" selection-start-column="27" selection-end-line="133" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208">
... ... @@ -594,14 +570,6 @@
</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="-5397">
<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/OtherController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-347">
... ... @@ -610,14 +578,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="1150">
<caret line="53" column="31" lean-forward="true" selection-start-line="53" selection-start-column="31" selection-end-line="53" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20190917/9f2daafe189fc8e30fc7e915eb0ac8fa.png">
<provider selected="true" editor-type-id="images">
<state />
... ... @@ -633,38 +593,101 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20190917/0f68383cc878c09c85de9e9ab275ce5f.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/database.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="7" column="15" lean-forward="false" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/base.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259">
<caret line="21" column="38" lean-forward="true" selection-start-line="21" selection-start-column="38" selection-end-line="21" selection-end-column="38" />
<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="-1379">
<caret line="27" column="18" lean-forward="true" selection-start-line="27" selection-start-column="18" selection-end-line="27" selection-end-column="18" />
<folding>
<element signature="e#767#1496#0#PHP" expanded="false" />
</folding>
</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="1125">
<caret line="52" column="37" lean-forward="true" selection-start-line="52" selection-start-column="37" selection-end-line="52" selection-end-column="37" />
<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="-4004">
<caret line="53" column="31" lean-forward="true" selection-start-line="53" selection-start-column="31" selection-end-line="53" selection-end-column="31" />
<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="425">
<caret line="73" column="9" lean-forward="false" selection-start-line="73" selection-start-column="9" selection-end-line="73" selection-end-column="9" />
<state relative-caret-position="327">
<caret line="416" column="35" lean-forward="true" selection-start-line="416" selection-start-column="35" selection-end-line="416" selection-end-column="35" />
<folding>
<element signature="e#127#156#0#PHP" expanded="true" />
<element signature="e#327#524#0#PHP" expanded="false" />
<element signature="e#529#905#0#PHP" expanded="false" />
<element signature="e#3404#3859#0#PHP" expanded="false" />
<element signature="e#3865#4420#0#PHP" expanded="false" />
<element signature="e#4427#5702#0#PHP" expanded="false" />
<element signature="e#5708#6361#0#PHP" expanded="false" />
<element signature="e#6366#7512#0#PHP" expanded="false" />
<element signature="e#7518#8128#0#PHP" expanded="false" />
<element signature="e#8133#9291#0#PHP" expanded="false" />
<element signature="e#9297#10093#0#PHP" expanded="false" />
<element signature="e#10098#11428#0#PHP" expanded="false" />
<element signature="e#11434#12163#0#PHP" expanded="false" />
<element signature="e#12168#13708#0#PHP" expanded="false" />
<element signature="e#13714#14299#0#PHP" expanded="false" />
<element signature="e#14304#15312#0#PHP" expanded="false" />
<element signature="e#15318#15734#0#PHP" expanded="false" />
<element signature="e#15739#16261#0#PHP" expanded="false" />
<element signature="e#16266#16896#0#PHP" expanded="false" />
<element signature="e#16902#17297#0#PHP" expanded="false" />
<element signature="e#17302#18005#0#PHP" expanded="false" />
<element signature="e#18011#18517#0#PHP" expanded="false" />
<element signature="e#18522#19953#0#PHP" expanded="false" />
<element signature="e#19959#20238#0#PHP" expanded="false" />
<element signature="e#20243#20685#0#PHP" expanded="false" />
<element signature="e#20691#20925#0#PHP" expanded="false" />
<element signature="e#20930#21323#0#PHP" expanded="false" />
<element signature="e#3061#3516#0#PHP" expanded="false" />
<element signature="e#3522#4077#0#PHP" expanded="false" />
<element signature="e#4084#5359#0#PHP" expanded="false" />
<element signature="e#5365#6018#0#PHP" expanded="false" />
<element signature="e#6023#7169#0#PHP" expanded="false" />
<element signature="e#7175#7785#0#PHP" expanded="false" />
<element signature="e#7790#8948#0#PHP" expanded="false" />
<element signature="e#8954#9750#0#PHP" expanded="false" />
<element signature="e#9755#11085#0#PHP" expanded="false" />
<element signature="e#11091#11820#0#PHP" expanded="false" />
<element signature="e#11825#13365#0#PHP" expanded="false" />
<element signature="e#14975#15391#0#PHP" expanded="false" />
<element signature="e#15396#15918#0#PHP" expanded="false" />
<element signature="e#15923#16553#0#PHP" expanded="false" />
<element signature="e#16559#16954#0#PHP" expanded="false" />
<element signature="e#16959#17662#0#PHP" expanded="false" />
<element signature="e#17668#18174#0#PHP" expanded="false" />
<element signature="e#18179#19610#0#PHP" expanded="false" />
<element signature="e#19616#19895#0#PHP" expanded="false" />
<element signature="e#19900#20342#0#PHP" expanded="false" />
<element signature="e#20348#20582#0#PHP" expanded="false" />
<element signature="e#20587#20980#0#PHP" expanded="false" />
</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="-5175">
<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/ReleaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="573">
<caret line="402" column="34" lean-forward="true" selection-start-line="402" selection-start-column="34" selection-end-line="402" selection-end-column="34" />
<folding>
<element signature="e#4750#5735#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -388,6 +388,7 @@ class ReleaseController extends RestBaseController
* @return company_name:公司名称
* @return content:项目详情
* @return status:是否提交(0未提交 1已提交)
* @return adress:公司地址
*/
public function myAttract()
{
... ... @@ -405,6 +406,7 @@ class ReleaseController extends RestBaseController
$data['linkman'] = $info['linkman'];
$data['linkman_tel'] = $info['linkman_tel'];
$data['company_name'] = $info['company_name'];
$data['adress'] = $info['adress'];
$data['content'] = strip_tags(cmf_replace_content_file_url(htmlspecialchars_decode($info['content'])));
$data['status'] = $info['status'];
$this->success('SUCCESS',$data);
... ... @@ -414,7 +416,7 @@ class ReleaseController extends RestBaseController
* @title 修改我的招商详情
* @description 修改我的招商详情
* @author GuoSheng
* @url /index/Resource/updAttract
* @url /index/Release/updAttract
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
... ... @@ -425,7 +427,7 @@ class ReleaseController extends RestBaseController
* @param name:linkman type:string require:1 desc:联系人
* @param name:linkman_tel type:string require:1 desc:手机号码
* @param name:company_name type:string require:1 desc:公司名称不能为空
* @param name:adress type:string require:1 desc:地址
* @param name:adress type:string require:0 desc:地址
* @param name:content type:text require:1 desc:项目详情
* @param name:status type:int require:1 desc:保存为0 发布为1
*/
... ...
... ... @@ -53,31 +53,26 @@ class ResourceController extends RestBaseController
* @url /index/Resource/uploadFile
* @method POST
* @header name:XX-Token require:1 default: desc:token
* @param name:source type:file require:1 default: other: desc:文件
* @param name:image type:file require:1 default: other: desc:文件
* @return image_url:图片路径
*/
public function uploadFile(){
$files = request()->file('source');
$files = request()->file('image');
if (empty($files)) {
$this->error('未检出文件上传');
}
//移动到框架应用根目录/public/uploads/ 目录下
$moveUrl = ROOT_PATH . 'public' . DS . 'uploads';
//允许文件大小200k
$info = $files->validate(['size'=>2048000,'ext'=>'jpg,png,gif,mp3,pcm,wma,wav,mp4,avi,wmv,rm,rmvb,mkv,mov'])->move($moveUrl);
if($info){
$image_url = $info->getSaveName();
$this->success('SUCCESS',$image_url);
}else{
// 上传失败获取错误信息
$this->error($files->getError());
if($files){
$info = $files->move(ROOT_PATH . 'public' . DS . 'uploads');
if($info){
$a = '__FILE__'.$files->getSaveName();
$this->success('SUCCESS',$a);
}else{
$this->error($files->getError());
}
}
// $countFile = count($files);
// if($countFile > 9){
// $this->error('最多上传9张图片');
// }
// $host = config('site.host');
// $arr = [];
// foreach($files as $k=>$file){
// //移动到框架应用根目录/public/uploads/ 目录下
// $moveUrl = ROOT_PATH . 'public' . DS . 'uploads';
... ... @@ -93,11 +88,9 @@ class ResourceController extends RestBaseController
// $qi_res = $storage->upload($qiniu_file, $filePath, 'image');
// if($qi_res){
// $arr[$k]['image_url'] = $host.DS.$qiniu_file;
//
// }else{
// $this->error('上传七牛云出错!');
// }
//
// }else{
// // 上传失败获取错误信息
// $this->error($file->getError());
... ...