郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 90de0c4ebc26ecc768ca9b972ef1f69bff0af4ac 1 个父辈 72fa1e2f
1 个管道 的构建 通过 耗费 3 秒

修改权限

内嵌 并排对比
正在显示 3 个修改的文件 包含 140 行增加 和 121 行删除
... ... @@ -17,57 +17,57 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-66">
<caret line="1169" column="56" lean-forward="false" selection-start-line="1169" selection-start-column="56" selection-end-line="1169" selection-end-column="56" />
<state relative-caret-position="200">
<caret line="17" column="64" lean-forward="false" selection-start-line="17" selection-start-column="64" selection-end-line="17" selection-end-column="64" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
<element signature="e#462#1200#0#PHP" expanded="false" />
<element signature="e#1205#2868#0#PHP" expanded="false" />
<element signature="e#2874#3402#0#PHP" expanded="false" />
<element signature="e#3407#4178#0#PHP" expanded="false" />
<element signature="e#4184#4591#0#PHP" expanded="false" />
<element signature="e#4596#4939#0#PHP" expanded="false" />
<element signature="e#4945#5782#0#PHP" expanded="false" />
<element signature="e#5787#7982#0#PHP" expanded="false" />
<element signature="e#7988#8633#0#PHP" expanded="false" />
<element signature="e#8638#9722#0#PHP" expanded="false" />
<element signature="e#9728#10430#0#PHP" expanded="false" />
<element signature="e#10435#11635#0#PHP" expanded="false" />
<element signature="e#11641#12217#0#PHP" expanded="false" />
<element signature="e#12222#12769#0#PHP" expanded="false" />
<element signature="e#12775#13459#0#PHP" expanded="false" />
<element signature="e#13464#15254#0#PHP" expanded="false" />
<element signature="e#15260#16130#0#PHP" expanded="false" />
<element signature="e#16135#18283#0#PHP" expanded="false" />
<element signature="e#18289#18666#0#PHP" expanded="false" />
<element signature="e#18671#18935#0#PHP" expanded="false" />
<element signature="e#18941#19446#0#PHP" expanded="false" />
<element signature="e#19451#19702#0#PHP" expanded="false" />
<element signature="e#19708#20187#0#PHP" expanded="false" />
<element signature="e#20192#20949#0#PHP" expanded="false" />
<element signature="e#20955#21436#0#PHP" expanded="false" />
<element signature="e#21441#22211#0#PHP" expanded="false" />
<element signature="e#22217#22580#0#PHP" expanded="false" />
<element signature="e#22585#22776#0#PHP" expanded="false" />
<element signature="e#22782#23140#0#PHP" expanded="false" />
<element signature="e#23145#23335#0#PHP" expanded="false" />
<element signature="e#23341#24484#0#PHP" expanded="false" />
<element signature="e#24489#27154#0#PHP" expanded="false" />
<element signature="e#27160#27658#0#PHP" expanded="false" />
<element signature="e#27663#28750#0#PHP" expanded="false" />
<element signature="e#28756#29169#0#PHP" expanded="false" />
<element signature="e#29174#29653#0#PHP" expanded="false" />
<element signature="e#29659#30193#0#PHP" expanded="false" />
<element signature="e#30198#31112#0#PHP" expanded="false" />
<element signature="e#31118#31649#0#PHP" expanded="false" />
<element signature="e#31654#32573#0#PHP" expanded="false" />
<element signature="e#32579#33228#0#PHP" expanded="false" />
<element signature="e#33233#34106#0#PHP" expanded="false" />
<element signature="e#34112#34532#0#PHP" expanded="false" />
<element signature="e#34537#35020#0#PHP" expanded="false" />
<element signature="e#40766#41524#0#PHP" expanded="false" />
<element signature="e#41529#43793#0#PHP" expanded="false" />
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4206#0#PHP" expanded="false" />
<element signature="e#4212#4619#0#PHP" expanded="false" />
<element signature="e#4624#4967#0#PHP" expanded="false" />
<element signature="e#4973#5810#0#PHP" expanded="false" />
<element signature="e#5815#8010#0#PHP" expanded="false" />
<element signature="e#8016#8661#0#PHP" expanded="false" />
<element signature="e#8666#9750#0#PHP" expanded="false" />
<element signature="e#9756#10458#0#PHP" expanded="false" />
<element signature="e#10463#11663#0#PHP" expanded="false" />
<element signature="e#11669#12245#0#PHP" expanded="false" />
<element signature="e#12250#12797#0#PHP" expanded="false" />
<element signature="e#12803#13487#0#PHP" expanded="false" />
<element signature="e#13492#15282#0#PHP" expanded="false" />
<element signature="e#15288#16158#0#PHP" expanded="false" />
<element signature="e#16163#18311#0#PHP" expanded="false" />
<element signature="e#18317#18694#0#PHP" expanded="false" />
<element signature="e#18699#18963#0#PHP" expanded="false" />
<element signature="e#18969#19474#0#PHP" expanded="false" />
<element signature="e#19479#19730#0#PHP" expanded="false" />
<element signature="e#19736#20215#0#PHP" expanded="false" />
<element signature="e#20220#20977#0#PHP" expanded="false" />
<element signature="e#20983#21464#0#PHP" expanded="false" />
<element signature="e#21469#22239#0#PHP" expanded="false" />
<element signature="e#22245#22608#0#PHP" expanded="false" />
<element signature="e#22613#22804#0#PHP" expanded="false" />
<element signature="e#22810#23168#0#PHP" expanded="false" />
<element signature="e#23173#23363#0#PHP" expanded="false" />
<element signature="e#23369#24512#0#PHP" expanded="false" />
<element signature="e#24517#27182#0#PHP" expanded="false" />
<element signature="e#27188#27686#0#PHP" expanded="false" />
<element signature="e#27691#28778#0#PHP" expanded="false" />
<element signature="e#28784#29197#0#PHP" expanded="false" />
<element signature="e#29202#29681#0#PHP" expanded="false" />
<element signature="e#29687#30221#0#PHP" expanded="false" />
<element signature="e#30226#31140#0#PHP" expanded="false" />
<element signature="e#33033#33682#0#PHP" expanded="false" />
<element signature="e#33687#34560#0#PHP" expanded="false" />
<element signature="e#34566#34986#0#PHP" expanded="false" />
<element signature="e#34991#35474#0#PHP" expanded="false" />
<element signature="e#35480#36286#0#PHP" expanded="false" />
<element signature="e#36291#41214#0#PHP" expanded="false" />
<element signature="e#41220#41978#0#PHP" expanded="false" />
<element signature="e#41983#44247#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -172,8 +172,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="389" />
<option name="y" value="23" />
<option name="x" value="370" />
<option name="y" value="57" />
<option name="width" value="1699" />
<option name="height" value="970" />
</component>
... ... @@ -270,7 +270,7 @@
<workItem from="1574252363848" duration="8841000" />
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="5604000" />
<workItem from="1574382087071" duration="7846000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -283,7 +283,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="145544000" />
<option name="totallyTimeSpent" value="147786000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -295,7 +295,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="389" y="23" width="1699" height="970" extended-state="0" />
<frame x="370" y="57" width="1699" height="970" extended-state="0" />
<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.1561928" sideWeight="0.5" order="1" 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.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
... ... @@ -701,57 +701,57 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-66">
<caret line="1169" column="56" lean-forward="false" selection-start-line="1169" selection-start-column="56" selection-end-line="1169" selection-end-column="56" />
<state relative-caret-position="200">
<caret line="17" column="64" lean-forward="false" selection-start-line="17" selection-start-column="64" selection-end-line="17" selection-end-column="64" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
<element signature="e#462#1200#0#PHP" expanded="false" />
<element signature="e#1205#2868#0#PHP" expanded="false" />
<element signature="e#2874#3402#0#PHP" expanded="false" />
<element signature="e#3407#4178#0#PHP" expanded="false" />
<element signature="e#4184#4591#0#PHP" expanded="false" />
<element signature="e#4596#4939#0#PHP" expanded="false" />
<element signature="e#4945#5782#0#PHP" expanded="false" />
<element signature="e#5787#7982#0#PHP" expanded="false" />
<element signature="e#7988#8633#0#PHP" expanded="false" />
<element signature="e#8638#9722#0#PHP" expanded="false" />
<element signature="e#9728#10430#0#PHP" expanded="false" />
<element signature="e#10435#11635#0#PHP" expanded="false" />
<element signature="e#11641#12217#0#PHP" expanded="false" />
<element signature="e#12222#12769#0#PHP" expanded="false" />
<element signature="e#12775#13459#0#PHP" expanded="false" />
<element signature="e#13464#15254#0#PHP" expanded="false" />
<element signature="e#15260#16130#0#PHP" expanded="false" />
<element signature="e#16135#18283#0#PHP" expanded="false" />
<element signature="e#18289#18666#0#PHP" expanded="false" />
<element signature="e#18671#18935#0#PHP" expanded="false" />
<element signature="e#18941#19446#0#PHP" expanded="false" />
<element signature="e#19451#19702#0#PHP" expanded="false" />
<element signature="e#19708#20187#0#PHP" expanded="false" />
<element signature="e#20192#20949#0#PHP" expanded="false" />
<element signature="e#20955#21436#0#PHP" expanded="false" />
<element signature="e#21441#22211#0#PHP" expanded="false" />
<element signature="e#22217#22580#0#PHP" expanded="false" />
<element signature="e#22585#22776#0#PHP" expanded="false" />
<element signature="e#22782#23140#0#PHP" expanded="false" />
<element signature="e#23145#23335#0#PHP" expanded="false" />
<element signature="e#23341#24484#0#PHP" expanded="false" />
<element signature="e#24489#27154#0#PHP" expanded="false" />
<element signature="e#27160#27658#0#PHP" expanded="false" />
<element signature="e#27663#28750#0#PHP" expanded="false" />
<element signature="e#28756#29169#0#PHP" expanded="false" />
<element signature="e#29174#29653#0#PHP" expanded="false" />
<element signature="e#29659#30193#0#PHP" expanded="false" />
<element signature="e#30198#31112#0#PHP" expanded="false" />
<element signature="e#31118#31649#0#PHP" expanded="false" />
<element signature="e#31654#32573#0#PHP" expanded="false" />
<element signature="e#32579#33228#0#PHP" expanded="false" />
<element signature="e#33233#34106#0#PHP" expanded="false" />
<element signature="e#34112#34532#0#PHP" expanded="false" />
<element signature="e#34537#35020#0#PHP" expanded="false" />
<element signature="e#40766#41524#0#PHP" expanded="false" />
<element signature="e#41529#43793#0#PHP" expanded="false" />
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4206#0#PHP" expanded="false" />
<element signature="e#4212#4619#0#PHP" expanded="false" />
<element signature="e#4624#4967#0#PHP" expanded="false" />
<element signature="e#4973#5810#0#PHP" expanded="false" />
<element signature="e#5815#8010#0#PHP" expanded="false" />
<element signature="e#8016#8661#0#PHP" expanded="false" />
<element signature="e#8666#9750#0#PHP" expanded="false" />
<element signature="e#9756#10458#0#PHP" expanded="false" />
<element signature="e#10463#11663#0#PHP" expanded="false" />
<element signature="e#11669#12245#0#PHP" expanded="false" />
<element signature="e#12250#12797#0#PHP" expanded="false" />
<element signature="e#12803#13487#0#PHP" expanded="false" />
<element signature="e#13492#15282#0#PHP" expanded="false" />
<element signature="e#15288#16158#0#PHP" expanded="false" />
<element signature="e#16163#18311#0#PHP" expanded="false" />
<element signature="e#18317#18694#0#PHP" expanded="false" />
<element signature="e#18699#18963#0#PHP" expanded="false" />
<element signature="e#18969#19474#0#PHP" expanded="false" />
<element signature="e#19479#19730#0#PHP" expanded="false" />
<element signature="e#19736#20215#0#PHP" expanded="false" />
<element signature="e#20220#20977#0#PHP" expanded="false" />
<element signature="e#20983#21464#0#PHP" expanded="false" />
<element signature="e#21469#22239#0#PHP" expanded="false" />
<element signature="e#22245#22608#0#PHP" expanded="false" />
<element signature="e#22613#22804#0#PHP" expanded="false" />
<element signature="e#22810#23168#0#PHP" expanded="false" />
<element signature="e#23173#23363#0#PHP" expanded="false" />
<element signature="e#23369#24512#0#PHP" expanded="false" />
<element signature="e#24517#27182#0#PHP" expanded="false" />
<element signature="e#27188#27686#0#PHP" expanded="false" />
<element signature="e#27691#28778#0#PHP" expanded="false" />
<element signature="e#28784#29197#0#PHP" expanded="false" />
<element signature="e#29202#29681#0#PHP" expanded="false" />
<element signature="e#29687#30221#0#PHP" expanded="false" />
<element signature="e#30226#31140#0#PHP" expanded="false" />
<element signature="e#33033#33682#0#PHP" expanded="false" />
<element signature="e#33687#34560#0#PHP" expanded="false" />
<element signature="e#34566#34986#0#PHP" expanded="false" />
<element signature="e#34991#35474#0#PHP" expanded="false" />
<element signature="e#35480#36286#0#PHP" expanded="false" />
<element signature="e#36291#41214#0#PHP" expanded="false" />
<element signature="e#41220#41978#0#PHP" expanded="false" />
<element signature="e#41983#44247#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -15,7 +15,7 @@ use fast\Http;
*/
class User extends Api
{
protected $noNeedLogin = ['login'];
protected $noNeedLogin = ['login','index','type','mine','car'];
protected $noNeedRight = '*';
protected $uid = '';
... ... @@ -958,30 +958,39 @@ class User extends Api
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="video_id", type="inter", required=true, description="视频ID")
* @ApiParams (name="video_attr", type="inter", required=true, description="视频品质属性")
* @ApiParams (name="total", type="float", required=true, description="价格")
*
* @ApiReturn({
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"order_id"://订单ID
}
})
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"order_id"://订单ID
}
})
*/
public function v_order()
{
$param['user_id'] = $this->uid;
$param['video_id'] = $this->request->post('video_id');
if(empty($param['video_id'])){
//接受视频ID并判断
$video_id = $this->request->post('video_id');
if(empty($video_id)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
//接受视频品质属性并判断
$video_attr = $this->request->post('video_attr');
if(empty($video_attr)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
//接受视频价格并判断
$param['total'] = $this->request->post('total');
if(empty( $param['total'])){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}elseif ( $param['total']<=0){
$this->error(['code'=>3,'msg'=>'非法操作']);
}else{
$param['video_id'] = serialize(explode(',',$video_id.','.$video_attr.','.$param['total']));
$param['createtime'] = time();
$param['num'] = date('Ymd').substr(implode(NULL, array_map('ord', str_split(substr(uniqid(), 7, 13), 1))), 0, 8);
$data = Db::name('order')
... ...
... ... @@ -2462,6 +2462,12 @@
<td>视频ID</td>
</tr>
<tr>
<td>video_attr</td>
<td>inter</td>
<td>是</td>
<td>视频品质属性</td>
</tr>
<tr>
<td>total</td>
<td>float</td>
<td>是</td>
... ... @@ -2501,6 +2507,10 @@
<input type="inter" class="form-control input-sm" id="video_id" required placeholder="视频ID" name="video_id">
</div>
<div class="form-group">
<label class="control-label" for="video_attr">video_attr</label>
<input type="inter" class="form-control input-sm" id="video_attr" required placeholder="视频品质属性" name="video_attr">
</div>
<div class="form-group">
<label class="control-label" for="total">total</label>
<input type="float" class="form-control input-sm" id="total" required placeholder="价格" name="total">
</div>
... ... @@ -2536,13 +2546,13 @@
<div class="row">
<div class="col-md-12">
<pre id="sample_response32">{
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"order_id"://订单ID
}
}</pre>
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"order_id"://订单ID
}
}</pre>
</div>
</div>
</div><!-- #sample -->
... ... @@ -5230,7 +5240,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-22 10:04:45 </div>
Generated on 2019-11-22 10:52:38 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...