通过
4 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at ddcaec5 修改样式及图片尺寸
From http://114.215.101.231:8099/jinglong/xingqiu
ddcaec5..bdfcf48 master -> origin/master
Checking out bdfcf48a as master...
Skipping Git submodules setup
$ cd /alidata/www/w/xingqiu
$ git pull
From http://114.215.101.231:8099/jinglong/xingqiu
ddcaec5..bdfcf48 master -> origin/master
Updating ddcaec5..bdfcf48
Fast-forward
app/portal/controller/IndexController.php | 1 +
app/portal/controller/RegionController.php | 28 ++++--
app/portal/controller/StarController.php | 15 ++-
app/portal/model/CityCategoryModel.php | 1 +
.../admin_simpleboot3/admin/about_us/edit.html | 3 +
.../portal/admin_star_story/add.html | 3 +
.../portal/admin_star_story/edit.html | 3 +
public/themes/simpleboot3/portal/enjoy/index.html | 51 ++++++++--
public/themes/simpleboot3/portal/index/index.html | 21 ++--
.../simpleboot3/portal/region/get_more_story.html | 56 +++++++++++
.../simpleboot3/portal/region/get_more_video.html | 111 ++++++++-------------
public/themes/simpleboot3/portal/region/index.html | 4 +-
.../public/assets/css/enjoyment_index.css | 55 ++++++++++
.../themes/simpleboot3/public/assets/css/index.css | 30 ++++--
.../themes/simpleboot3/public/assets/css/show.css | 32 ++++--
.../simpleboot3/public/assets/starImg/banner/1.jpg | Bin 0 -> 613143 bytes
.../simpleboot3/public/assets/starImg/banner/2.jpg | Bin 0 -> 1890815 bytes
.../simpleboot3/public/assets/starImg/banner/3.jpg | Bin 0 -> 1396597 bytes
.../simpleboot3/public/assets/starImg/banner/4.jpg | Bin 0 -> 2581671 bytes
.../public/assets/starImg/enjoy_banner.jpg | Bin 0 -> 1495388 bytes
.../public/assets/starImg/monthCover/1.jpg | Bin 0 -> 167158 bytes
.../public/assets/starImg/monthCover/11.jpg | Bin 0 -> 111202 bytes
.../public/assets/starImg/monthCover/3.jpg | Bin 0 -> 146622 bytes
.../public/assets/starImg/monthCover/5.jpg | Bin 0 -> 131270 bytes
.../public/assets/starImg/monthCover/7.jpg | Bin 0 -> 107654 bytes
.../public/assets/starImg/monthCover/9.jpg | Bin 0 -> 124296 bytes
public/themes/simpleboot3/public/comment.html | 2 +-
27 files changed, 299 insertions(+), 117 deletions(-)
create mode 100644 public/themes/simpleboot3/portal/region/get_more_story.html
create mode 100644 public/themes/simpleboot3/public/assets/starImg/banner/1.jpg
create mode 100644 public/themes/simpleboot3/public/assets/starImg/banner/2.jpg
create mode 100644 public/themes/simpleboot3/public/assets/starImg/banner/3.jpg
create mode 100644 public/themes/simpleboot3/public/assets/starImg/banner/4.jpg
create mode 100644 public/themes/simpleboot3/public/assets/starImg/enjoy_banner.jpg
create mode 100644 public/themes/simpleboot3/public/assets/starImg/monthCover/1.jpg
create mode 100644 public/themes/simpleboot3/public/assets/starImg/monthCover/11.jpg
create mode 100644 public/themes/simpleboot3/public/assets/starImg/monthCover/3.jpg
create mode 100644 public/themes/simpleboot3/public/assets/starImg/monthCover/5.jpg
create mode 100644 public/themes/simpleboot3/public/assets/starImg/monthCover/7.jpg
create mode 100644 public/themes/simpleboot3/public/assets/starImg/monthCover/9.jpg
Build succeeded