From 019e946496603527eeb48802ac3a208ef7eaca43 Mon Sep 17 00:00:00 2001
From: Guan Xiying <guanxiying@easycorp.ltd>
Date: Fri, 18 Jun 2021 10:41:15 +0800
Subject: [PATCH] * Fix gitlab api hook url.

---
 module/gitlab/config.php | 2 +-
 module/gitlab/model.php  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/gitlab/config.php b/module/gitlab/config.php
index 2f66c83ed7..275bf96a15 100644
--- a/module/gitlab/config.php
+++ b/module/gitlab/config.php
@@ -17,7 +17,7 @@ $config->gitlab->bugLabel->description  = "bug label from zentao";
 $config->gitlab->bugLabel->color        = "#D10069";
 $config->gitlab->bugLabel->priority     = "0";
 
-$config->gitlab->zentaoApiWebhookUrl    = "https://zentao/api/v1/webhook/callback";
+$config->gitlab->zentaoApiWebhookUrl    = "%s/api.php?m=gitlab&f=webhook&product=%s&gitlab=%s&project=%s";
 $config->gitlab->zentaoApiWebhookToken  = "<access token>";
 
 
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 8358d2b929..3e2375e6d1 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -235,10 +235,10 @@ class gitlabModel extends model
      * @access public
      * @return void
      */
-    public function createWebhook($gitlabID, $projectID)
+    public function createWebhook($products, $gitlabID, $projectID)
     {
-        // TODO(dingguodong) add more robust code here.
-        $response = $this->apiCreateHook($gitlabID, $projectID, $this->config->gitlab->zentaoApiWebhookUrl, $this->config->gitlab->zentaoApiWebhookToken);
+        $webhook  = sprintf($this->config->gitlab->zentaoApiWebhookUrl, commonModel::getSysURL(), $gitlabID);
+        $response = $this->apiCreateHook($gitlabID, $projectID, $webhook, $this->config->gitlab->zentaoApiWebhookToken);
         return $response;
     }