通过
1 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using Shell executor...
Running on ecs-a18d-0014...
Fetching changes...
HEAD is now at bf9fd47 api更新
From http://114.215.101.231:8099/heshupeng/recruit
bf9fd47..ce5de36 master -> origin/master
Checking out ce5de365 as master...
Skipping Git submodules setup
$ cd /home/wwwroot/fast/recruit
$ git pull
From http://114.215.101.231:8099/heshupeng/recruit
bf9fd47..ce5de36 master -> origin/master
Updating bf9fd47..ce5de36
Fast-forward
application/admin/controller/Factory.php | 2 +-
application/admin/controller/user/Realname.php | 4 +
application/admin/controller/user/User.php | 7 +-
application/admin/lang/zh-cn/factory.php | 1 +
application/admin/model/User.php | 6 +
application/admin/view/factory/add.html | 6 +
application/admin/view/factory/edit.html | 6 +
application/api/controller/v2/FactoryAdmin.php | 67 +-
application/api/controller/v2/User.php | 253 ++-
application/api/model/FactoryAdmin.php | 16 +
application/api/model/UserRecruitSubsidyLog.php | 15 +
.../api/model/{WorkLog.php => UserSalary.php} | 3 +-
application/api/model/UserWorkLog.php | 15 +
application/api/model/UserWorkSubsidyLog.php | 15 +
public/api.html | 1868 +++++++++++---------
public/assets/js/backend/factory.js | 1 +
public/assets/js/backend/user/user.js | 6 +-
17 files changed, 1373 insertions(+), 918 deletions(-)
create mode 100644 application/api/model/FactoryAdmin.php
create mode 100644 application/api/model/UserRecruitSubsidyLog.php
rename application/api/model/{WorkLog.php => UserSalary.php} (74%)
create mode 100644 application/api/model/UserWorkLog.php
create mode 100644 application/api/model/UserWorkSubsidyLog.php
Build succeeded