通过
3 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at 1bdf9b0 增加qq在线联系
From http://114.215.101.231:8099/jinglong/xingqiu
1bdf9b0..f0df3c8 master -> origin/master
Checking out f0df3c88 as master...
Skipping Git submodules setup
$ cd /alidata/www/w/xingqiu
$ git pull
From http://114.215.101.231:8099/jinglong/xingqiu
1bdf9b0..f0df3c8 master -> origin/master
Updating 1bdf9b0..f0df3c8
Fast-forward
app/portal/controller/IndexController.php | 4 +-
app/portal/controller/LoginController.php | 3 +
app/portal/controller/ScoutController.php | 2 +-
app/portal/controller/StarController.php | 33 +++
.../portal/admin_enjoy_feast/add.html | 32 ++-
.../portal/admin_enjoy_feast/edit.html | 38 +++-
.../portal/admin_enjoy_own/add.html | 32 ++-
.../portal/admin_enjoy_own/edit.html | 37 +++-
.../portal/admin_enjoy_roam/add.html | 31 ++-
.../portal/admin_enjoy_roam/edit.html | 39 +++-
.../portal/admin_enjoy_sky/add.html | 31 ++-
.../portal/admin_enjoy_sky/edit.html | 38 +++-
.../portal/admin_scout_design/add.html | 32 ++-
.../portal/admin_scout_design/edit.html | 39 +++-
.../portal/admin_scout_like/add.html | 32 ++-
.../portal/admin_scout_like/edit.html | 39 +++-
.../portal/admin_scout_scenery/add.html | 32 ++-
.../portal/admin_scout_scenery/edit.html | 39 +++-
.../portal/admin_scout_travel/add.html | 32 ++-
.../portal/admin_scout_travel/edit.html | 39 +++-
.../portal/admin_star_scenery/add.html | 8 +
.../portal/admin_star_scenery/edit.html | 8 +
public/themes/simpleboot3/portal/enjoy/index.html | 22 +-
public/themes/simpleboot3/portal/index/index.html | 228 +++++++++++++++------
.../themes/simpleboot3/portal/login/edit_info.html | 6 +-
public/themes/simpleboot3/portal/login/info.html | 2 +-
.../portal/region/get_gallery_detail.html | 3 +
.../portal/region/get_more_gallery.html | 10 +-
.../simpleboot3/portal/region/get_more_story.html | 164 ++++++++++++++-
.../simpleboot3/portal/region/get_more_video.html | 40 +++-
public/themes/simpleboot3/portal/region/index.html | 12 +-
.../themes/simpleboot3/portal/scenery_detail.html | 2 +-
.../simpleboot3/portal/star/get_hotel_detail.html | 2 +-
.../simpleboot3/portal/star/get_more_scenery.html | 4 +-
.../simpleboot3/public/assets/css/Scout_index.css | 20 +-
.../simpleboot3/public/assets/css/enjoyment.css | 3 +-
.../public/assets/css/enjoyment_index.css | 1 +
.../themes/simpleboot3/public/assets/css/happy.css | 8 +-
.../simpleboot3/public/assets/css/happy_index.css | 3 +-
.../themes/simpleboot3/public/assets/css/index.css | 2 +-
.../themes/simpleboot3/public/assets/css/show.css | 4 +-
.../themes/simpleboot3/public/assets/js/public.js | 10 +
.../simpleboot3/public/assets/starImg/aicon_82.png | Bin 5725 -> 1479 bytes
.../simpleboot3/public/assets/starImg/nos.png | Bin 0 -> 866 bytes
public/themes/simpleboot3/public/footer.html | 7 +-
public/themes/simpleboot3/public/header.html | 2 +-
46 files changed, 1020 insertions(+), 155 deletions(-)
create mode 100644 public/themes/simpleboot3/public/assets/starImg/nos.png
Build succeeded