通过
1 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at c0f8606 合并分支 'wangxiaogang' 到 'master'
From http://114.215.101.231:8099/anyv/xkeasy
c0f8606..aaac422 master -> origin/master
Checking out aaac4221 as master...
Skipping Git submodules setup
$ cd /alidata/www/w/xkeasy
$ git pull
From http://114.215.101.231:8099/anyv/xkeasy
c0f8606..aaac422 master -> origin/master
Updating c0f8606..aaac422
Fast-forward
app/portal/controller/GoodsdetailsController.php | 25 ++++++++---
app/portal/controller/PersonalcenterController.php | 3 +-
app/portal/controller/SalesmangoodsController.php | 6 ++-
.../simpleboot3/portal/classify/classify.html | 14 +++---
.../portal/goodsdetails/goods_details.html | 49 +++++++++++++++++----
.../simpleboot3/portal/orderpage/order_page.html | 6 +--
.../portal/orderpage/order_salesman_kd.html | 6 +--
.../portal/personalcenter/add_shop_address.html | 2 +-
.../portal/personalcenter/personal_center.html | 2 -
.../simpleboot3/portal/shopcart/shop_cart.html | 4 ++
.../simpleboot3/public/assets/images/xin (1).png | Bin 0 -> 2685 bytes
.../simpleboot3/public/assets/images/xin.png | Bin 0 -> 2192 bytes
.../public/assets/images/xinheart118.png | Bin 0 -> 1366 bytes
.../20190613/96265a2cb00359a253b96138077b5589.png | Bin 0 -> 1245 bytes
.../20190613/a56c7c91c4149605c31abc50ee82d4bd.png | Bin 0 -> 1516 bytes
.../20190613/e26e3d33839e31cd362b939709f5da59.png | Bin 0 -> 852 bytes
16 files changed, 86 insertions(+), 31 deletions(-)
create mode 100644 public/themes/simpleboot3/public/assets/images/xin (1).png
create mode 100644 public/themes/simpleboot3/public/assets/images/xin.png
create mode 100644 public/themes/simpleboot3/public/assets/images/xinheart118.png
create mode 100644 public/uploads/20190613/96265a2cb00359a253b96138077b5589.png
create mode 100644 public/uploads/20190613/a56c7c91c4149605c31abc50ee82d4bd.png
create mode 100644 public/uploads/20190613/e26e3d33839e31cd362b939709f5da59.png
Build succeeded