1
0
Просмотр исходного кода

Merge branch 'zxr_third_party_login' of WengPuHong/seecoder-devcloud into master

ZhaoXingRui 4 лет назад
Родитель
Сommit
e64aea6a9d

+ 1 - 1
web/src/main/java/cn/seecoder/web/controller/gitlab/CommitController.java

@@ -93,7 +93,7 @@ public class CommitController {
             switch (rule.getType()){
                 case FEAT:
                     treeNodeService.updateNodeState(rule.getId(),rule.getState());
-                    commitService.save(new CommitPO(commit,projectId, CommitRelatedEnum.BUG_ID, rule.getId()));
+                    commitService.save(new CommitPO(commit,projectId, CommitRelatedEnum.TREE_ID, rule.getId()));
                     log.info("Commits 关联tree节点, id: {}", commit.getId());
                     break;
                 case FIX:

+ 2 - 2
web/src/main/resources/application-prod.yaml

@@ -32,8 +32,8 @@ seecoder:
     webhookProxy: http://environment-21-70.seec.svc.cluster.local:8080/hook
     token: wXDeETv2Kmt-JhiApJ9H
   git:
-    username: root
-    password: NJU67software
+    username: admin@example.com
+    password: NJU67gitlab
   docker:
     host: unix:///var/run/docker.sock
     registry: 172.19.51.6:8092