Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu

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();

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       = '描述';

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')