作者 何书鹏

second commit

# stages
stages:
- pull
# job 华为测试服务添加自动部署
job1:
stage: pull
tags:
- huawei8
script:
- whoami
- cd /home/wwwroot/t/ant
- git pull
# job 华为正式服务器添加自动部署 两个job同时存在为同时向两个服务器推送
#job2:
# stage: pull
# tags:
# - huawei9
# script:
# - cd /home/wwwroot/fast/ant
# - git pull
\ No newline at end of file
... ...
<?php
namespace addons\shopro\controller;
namespace app\api\controller;
use addons\shopro\exception\Exception;
use addons\shopro\model\UserAddress;
... ... @@ -12,16 +12,44 @@ class Address extends Base
protected $noNeedLogin = ['area'];
protected $noNeedRight = ['*'];
/**
* @ApiWeigh (99)
* @ApiTitle (收货地址)
* @ApiSummary (收货地址)
* @ApiMethod (GET)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiReturn()
*/
public function index()
{
$this->success('收货地址', UserAddress::getUserAddress());
}
/**
* @ApiWeigh (97)
* @ApiTitle (默认收货地址)
* @ApiSummary (默认收货地址)
* @ApiMethod (GET)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiReturn()
*/
public function defaults()
{
$this->success('默认收货地址', UserAddress::getUserDefaultAddress());
}
/**
* @ApiWeigh (95)
* @ApiTitle (省市区)
* @ApiSummary (省市区)
* @ApiMethod (GET)
*
* @ApiReturn()
*/
public function area()
{
$data['provinceData'] = Area::where('level', 1)->order('id asc')->field('id as value, name as label, pid, level')->select();
... ... @@ -36,6 +64,21 @@ class Address extends Base
}
/**
* @ApiWeigh (93)
* @ApiTitle (编辑地址)
* @ApiSummary (编辑地址)
* @ApiMethod (POST)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name=area_id, type=inter, required=true, description="地区ID")
* @ApiParams (name=id, type=inter, required=false, description="收货地址ID:不填或填0是新增地址")
* @ApiParams (name=consignee, type=string, required=true, description="收货人")
* @ApiParams (name=phone, type=string, required=true, description="联系电话")
* @ApiParams (name=address, type=string, required=true, description="详细地址")
*
* @ApiReturn()
*/
public function edit()
{
$params = $this->request->post();
... ... @@ -46,16 +89,38 @@ class Address extends Base
$this->success('编辑地址', UserAddress::edit($params));
}
/**
* @ApiWeigh (91)
* @ApiTitle (地址详情)
* @ApiSummary (地址详情)
* @ApiMethod (GET)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name=id, type=inter, required=true, description="收货地址ID")
*
* @ApiReturn()
*/
public function info()
{
$params = $this->request->get();
$this->success('地址详情', UserAddress::info($params));
}
/**
* @ApiWeigh (89)
* @ApiTitle (删除地址)
* @ApiSummary (删除地址)
* @ApiMethod (POST)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name=id, type=inter, required=true, description="收货地址ID")
*
* @ApiReturn()
*/
public function del()
{
$params = $this->request->post();
$this->success('地址详情', UserAddress::del($params));
$this->success('删除地址', UserAddress::del($params));
}
... ...
... ... @@ -36,7 +36,7 @@ class Cart extends Base
* @ApiMethod (POST)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name=goods_list, type=inter, required=false, description="购买的商品:[{goods_id: 3, goods_num: 1, sku_price_id: 3, goods_price: 0.10}]")
* @ApiParams (name=goods_list, type=object, required=false, description="购买的商品:[{goods_id: 3, goods_num: 1, sku_price_id: 3, goods_price: 0.10}]")
*
* @ApiReturn()
*/
... ... @@ -59,7 +59,7 @@ class Cart extends Base
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name=act, type=string, required=true, description="操作类型:delete=删除,change=修改")
* @ApiParams (name=cart_list, type=object, required=true, description="购物车ID数组:[1775, 1776]")
* @ApiParams (name=cart_list, type=array, required=true, description="购物车ID数组:[1775, 1776]")
* @ApiParams (name=value, type=inter, required=false, description="act为change时必传")
*
* @ApiReturn()
... ...
<?php
namespace addons\shopro\controller;
namespace app\api\controller;
use addons\shopro\exception\Exception;
... ... @@ -71,6 +71,17 @@ class Goods extends Base
}
/**
* @ApiWeigh (97)
* @ApiTitle (商品详情)
* @ApiSummary (商品详情)
* @ApiMethod (GET)
*
* @ApiHeaders (name=token, type=string, required=false, description="请求的Token")
* @ApiParams (name=id, type=inter, required=true, description="商品ID")
*
* @ApiReturn()
*/
public function detail()
{
$id = $this->request->get('id');
... ... @@ -87,6 +98,19 @@ class Goods extends Base
$this->success('商品详情', $detail);
}
/**
* @ApiWeigh (99)
* @ApiTitle (商品列表)
* @ApiSummary (商品列表)
* @ApiMethod (GET)
*
* @ApiHeaders (name=token, type=string, required=false, description="请求的Token")
* @ApiParams (name=order, type=string, required=false, description="排序:{'defaultOrder':0,'priceOrder':0,'salesOrder':1,'newProdcutOrder':0},defaultOrder为1=默认,priceOrder为1=价格从低到高,priceOrder为2=从高到低,salesOrder为1=销量,newProdcutOrder为1=最新上架")
* @ApiParams (name=keyword, type=string, required=false, description="搜索关键字")
* @ApiParams (name=category_id, type=inter, required=false, description="分类ID")
*
* @ApiReturn()
*/
public function lists()
{
$params = $this->request->get();
... ... @@ -108,16 +132,34 @@ class Goods extends Base
$this->success('自提列表', $data);
}
// 秒杀列表
/**
* @ApiWeigh (95)
* @ApiTitle (秒杀列表)
* @ApiSummary (秒杀列表)
* @ApiMethod (GET)
*
* @ApiHeaders (name=token, type=string, required=false, description="请求的Token")
* @ApiParams (name=type, type=string, required=false, description="类型:all=全部,ing=进行中,nostart=未开始,ended=已结束")
*
* @ApiReturn()
*/
public function seckillList() {
$params = $this->request->get();
$this->success('秒杀商品列表', \addons\shopro\model\Goods::getSeckillGoodsList($params));
}
// 拼团列表
/**
* @ApiWeigh (93)
* @ApiTitle (拼团列表)
* @ApiSummary (拼团列表)
* @ApiMethod (GET)
*
* @ApiHeaders (name=token, type=string, required=false, description="请求的Token")
* @ApiParams (name=type, type=string, required=false, description="类型:all=全部,ing=进行中,nostart=未开始,ended=已结束")
*
* @ApiReturn()
*/
public function grouponList() {
$params = $this->request->get();
... ...
... ... @@ -201,7 +201,7 @@ class Order extends Base
* @ApiMethod (POST)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name=goods_list, type=inter, required=false, description="购买的商品:[{goods_id: 3, goods_num: 1, sku_price_id: 3, goods_price: 0.10}]")
* @ApiParams (name=goods_list, type=object, required=false, description="购买的商品:[{goods_id: 3, goods_num: 1, sku_price_id: 3, goods_price: 0.10}]")
* @ApiParams (name=from, type=string, required=false, description="来源:goods")
* @ApiParams (name=address_id, type=inter, required=false, description="收货地址ID")
* @ApiParams (name=coupons_id, type=inter, required=false, description="优惠券ID")
... ... @@ -230,7 +230,7 @@ class Order extends Base
* @ApiMethod (POST)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name=goods_list, type=inter, required=false, description="购买的商品:[{goods_id: 3, goods_num: 1, sku_price_id: 3, goods_price: 0.10}]")
* @ApiParams (name=goods_list, type=object, required=false, description="购买的商品:[{goods_id: 3, goods_num: 1, sku_price_id: 3, goods_price: 0.10}]")
* @ApiParams (name=from, type=string, required=false, description="来源:goods")
* @ApiParams (name=address_id, type=inter, required=false, description="收货地址ID")
* @ApiParams (name=coupons_id, type=inter, required=false, description="优惠券ID")
... ... @@ -259,7 +259,7 @@ class Order extends Base
* @ApiMethod (POST)
*
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name=goods_list, type=inter, required=false, description="购买的商品:[{goods_id: 3, goods_num: 1, sku_price_id: 3, goods_price: 0.10}]")
* @ApiParams (name=goods_list, type=object, required=false, description="购买的商品:[{goods_id: 3, goods_num: 1, sku_price_id: 3, goods_price: 0.10}]")
*
* @ApiReturn()
*/
... ...
... ... @@ -16,13 +16,13 @@ return [
// 数据库类型
'type' => Env::get('database.type', 'mysql'),
// 服务器地址
'hostname' => Env::get('database.hostname', '127.0.0.1'),
'hostname' => Env::get('database.hostname', '119.3.83.59'),
// 数据库名
'database' => Env::get('database.database', 'ant'),
// 用户名
'username' => Env::get('database.username', 'root'),
'username' => Env::get('database.username', 'heshupeng'),
// 密码
'password' => Env::get('database.password', 'root'),
'password' => Env::get('database.password', 'hsp2020!'),
// 端口
'hostport' => Env::get('database.hostport', ''),
// 连接dsn
... ...