通过
6 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at e3d66d8 增加确认收货接口
From http://114.215.101.231:8099/jinglong/feifangu
e3d66d8..cfa5b04 master -> origin/master
Checking out cfa5b043 as master...
Skipping Git submodules setup
$ cd /alidata/www/fast/feifangu
$ git pull
From http://114.215.101.231:8099/jinglong/feifangu
e3d66d8..cfa5b04 master -> origin/master
Updating e3d66d8..cfa5b04
Fast-forward
application/admin/controller/Bcoupon.php | 2 +
application/admin/controller/Coupon.php | 3 +-
application/admin/controller/Gcoupon.php | 2 +
application/admin/lang/zh-cn/bcoupon.php | 1 +
application/admin/lang/zh-cn/coupon.php | 1 +
application/admin/lang/zh-cn/gcoupon.php | 1 +
application/admin/lang/zh-cn/ggoods.php | 3 +
application/admin/lang/zh-cn/goods.php | 3 +
application/admin/view/bcoupon/add.html | 6 ++
application/admin/view/bcoupon/edit.html | 6 ++
application/admin/view/coupon/add.html | 6 ++
application/admin/view/coupon/edit.html | 6 ++
application/admin/view/gcoupon/add.html | 6 ++
application/admin/view/gcoupon/edit.html | 6 ++
application/admin/view/ggoods/add.html | 6 --
application/admin/view/ggoods/edit.html | 6 --
application/admin/view/goods/add.html | 6 --
application/admin/view/goods/edit.html | 6 --
application/api/controller/Common.php | 15 ++++
application/api/controller/Pay.php | 12 +--
application/api/controller/User.php | 66 ++++++++++++++
application/extra/verify.php | 14 ++-
public/api.html | 146 ++++++++++++++++++++++++++++++-
public/assets/js/backend/bcoupon.js | 1 +
public/assets/js/backend/coupon.js | 1 +
public/assets/js/backend/gcoupon.js | 1 +
public/assets/js/backend/ggoods.js | 4 +
public/assets/js/backend/goods.js | 3 +
28 files changed, 303 insertions(+), 36 deletions(-)
Build succeeded