Merge branch 'jihu'

2021-07-14 09:48:58 +08:00
parent 6255a862c7 be054d1c2b
commit 1c802f2a36
84 changed files with 3798 additions and 225 deletions
@@ -31,7 +31,7 @@ class ciModel extends model
        $compiles = $this->dao->select('t1.*, t2.jkJob, t3.name as jenkinsName,t3.url,t3.account,t3.token,t3.password')
            ->from(TABLE_COMPILE)->alias('t1')
            ->leftJoin(TABLE_JOB)->alias('t2')->on('t1.job=t2.id')
-            ->leftJoin(TABLE_JENKINS)->alias('t3')->on('t2.jkHost=t3.id')
+            ->leftJoin(TABLE_PIPELINE)->alias('t3')->on('t2.jkHost=t3.id')
            ->where('t1.status')->ne('success')
            ->andWhere('t1.status')->ne('failure')
            ->andWhere('t1.status')->ne('create_fail')