From 076cc8b94a5226eff5ca1ab30369a282f8f16b98 Mon Sep 17 00:00:00 2001
From: lichengjun <lichengjun@easycorp.ltd>
Date: Fri, 25 Jun 2021 15:10:32 +0800
Subject: [PATCH 1/2] *Add private field

---
 module/gitlab/lang/zh-cn.php | 1 +
 module/pipeline/model.php    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php
index 5cfdc0fbe3..24226ad028 100644
--- a/module/gitlab/lang/zh-cn.php
+++ b/module/gitlab/lang/zh-cn.php
@@ -21,6 +21,7 @@ $lang->gitlab->name           = '名称';
 $lang->gitlab->url            = '服务地址';
 $lang->gitlab->token          = 'Token';
 $lang->gitlab->defaultProject = '默认项目';
+$lang->gitlab->private        = 'MD5验证';
 
 $lang->gitlab->lblCreate  = '添加gitlab服务器';
 $lang->gitlab->desc       = '描述';
diff --git a/module/pipeline/model.php b/module/pipeline/model.php
index 0fb35d711d..5e7fdba12e 100644
--- a/module/pipeline/model.php
+++ b/module/pipeline/model.php
@@ -73,6 +73,7 @@ class pipelineModel extends model
     {
         $pipeline = fixer::input('post')
             ->add('type', $type)
+            ->add('private',md5(rand(10,113450)))
             ->add('createdBy', $this->app->user->account)
             ->add('createdDate', helper::now())
             ->skipSpecial('url,token,account,password')

From 8d7b7316705f98463adff5d0b33564f2e2b65537 Mon Sep 17 00:00:00 2001
From: Guan Xiying <guanxiying@easycorp.ltd>
Date: Fri, 25 Jun 2021 15:16:13 +0800
Subject: [PATCH 2/2] * Change zentaoApiWebhookUrl to webhookURL.

---
 module/gitlab/config.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/module/gitlab/config.php b/module/gitlab/config.php
index 6b56cb98b5..8843b49996 100644
--- a/module/gitlab/config.php
+++ b/module/gitlab/config.php
@@ -21,8 +21,7 @@ $config->gitlab->zentaoObjectLabel->storyColor  = '#69D100';
 $config->gitlab->zentaoObjectLabel->bugColor    = '#D10069';
 $config->gitlab->zentaoObjectLabel->priority    = "0";
 
-$config->gitlab->zentaoApiWebhookUrl    = "%s/api.php?m=gitlab&f=webhook&product=%s&gitlab=%s";
-$config->gitlab->zentaoApiWebhookToken  = "<access token>";
+$config->gitlab->webhookURL = "%s/api.php?m=gitlab&f=webhook&product=%s&gitlab=%s&token=%s";
 
 $config->gitlab->skippedFields = new stdclass;
 $config->gitlab->skippedFields->issueCreate = array();
@@ -84,9 +83,3 @@ $config->gitlab->bugStateMap = array();
 $config->gitlab->bugStateMap['active']   = 'reopen';
 $config->gitlab->bugStateMap['resolved'] = 'reopen';
 $config->gitlab->bugStateMap['closed']   = 'close';
-
-
-
-
-
-