Переглянути джерело

fix: 打桩部分接口、增加配置文件

wpt 1 рік тому
батько
коміт
47c0064f12

+ 5 - 17
common/src/main/java/cn/seecoder/common/util/LogTrackingUtil.java

@@ -1,34 +1,22 @@
 package cn.seecoder.common.util;
 
-import Utils.LogBuilder;
-import client.LogTrackingClient;
-import com.nju.edu.logTracking.enums.SeecSystem;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 
+@Slf4j
 public class LogTrackingUtil {
 
     private static final Logger logger = LoggerUtil.getLogger(LogTrackingUtil.class);
 
     public static void log(String data, OpType opType) {
-        String log = LogBuilder
-                .getBuilder()
-                .target(SeecSystem.SMART)
-                .source(SeecSystem.DEVCLOUD)
-                .operationType(opType.getNum())
-                .data(data)
-                .message(opType.getName())
-                .build();
-        LogTrackingClient
-                .getClient()
-                .log(log)
-                .publish();
-        LoggerUtil.info(logger,"SMART --> " + log);
+        log.info(data, opType);
     }
 
     public static void main(String[] args) {
         try {
             String data = "构造好的数据";
             LogTrackingUtil.log(data, OpType.CREATE_OR_MODIFY_BUGLIST);
-        } catch (Exception ignore) {}
+        } catch (Exception ignore) {
+        }
     }
 }

+ 2 - 1
web/src/main/java/cn/seecoder/web/service/fork/impl/ForkServiceImpl.java

@@ -49,7 +49,8 @@ public class ForkServiceImpl implements ForkService {
                     return null;
                 }
             }
-            Integer newProjectId = gitlabApi.forkProject(forkVO.getProjectId(), userId);
+            // Integer newProjectId = gitlabApi.forkProject(forkVO.getProjectId(), userId);
+            Integer newProjectId = 1;  // TODO: 这里需要调用 Gitlab API 来 Fork 项目
             allProjects = gitlabApi.getAllProjectsByUserId(userId);
             // 拿 Fork 出来的项目的对象,主要是要拿到它的 Web URL
             com.nju.edu.gitlab.vo.ProjectVO newProject = null;

+ 49 - 0
web/src/main/resources/application.yml

@@ -0,0 +1,49 @@
+spring:
+  datasource:
+    url: jdbc:mysql://localhost:3306/devcloud?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
+    username: root
+    password: 123456
+    sql-script-encoding: utf-8
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    separator: ;
+    initialization-mode: always
+    continue-on-error: false
+server:
+  port: 8080
+
+mybatis:
+  configuration:
+    map-underscore-to-camel-case: true
+
+seecoder:
+  jwt:
+    secret: UenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRWUenM4KGb6DskRW
+  k8s:
+    api-server: https://172.29.7.102:6443
+    token: eyJhbGciOiJSUzI1NiIsImtpZCI6InI5LUFyQl9ZdkNNbjZDM3lrWlFiNlZ3TjRYa2VMMVFkUi04NmFnUUdMeG8ifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlLXN5c3RlbSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJhZG1pbi10b2tlbi01YnB4cyIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJhZG1pbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6ImQxOGExYWUzLTc0MTUtNGRjZS05NDgzLWFhMjU2ZWQ3MGYyOCIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDprdWJlLXN5c3RlbTphZG1pbiJ9.OT0C9AD-SYjmqv0gMatF7juAllIK5I7pey9V3p4tKQyo_Q8WpznjlpDrYhvFnz1L1FwockmR9EOo9wssXLLwYZDbAmra0vf5A1-MRhGU6pBkdqONwt4UzUwEvjcJQxcnZFryuX9Nj7p7p4hZMjdml0FQJv-rnUESFCb7f5N8ckn3bHwP4tijnM_djMPUiQ1UPlefMkk_gpAzt2VqyulBtAz_EJ_XxaXLcA8C94vnk945Qqn7kQuJQ2M89rROBTv6n1sk4woLufOde9s062Q8IOSr1Wu7PfodtAVXEPnG4wuyrEYWxEXh9FxoMl84Wf-CcbMe49Uv4-fnrSdBUTGoKw
+    validateSSL: false
+    debugging: false
+    ingressHostSuffix: -devcloud.seec.seecoder.cn
+  gitlab:
+    url: http://environment-2-4.seec.svc.cluster.local:8080
+    host: http://environment-2-4.seec.svc.cluster.local:8080 # the seecoder git service host
+    webHookProxy: http://environment-14-21.seec.svc.cluster.local:8080/hook
+    token: glpat-eW6aj5ZbjgyJsoBsoys1
+  git:
+    username: admin@example.com
+    password: 1qaz0158Seecoder67
+  docker:
+    host: unix:///var/run/docker.sock
+    registry: nexus.seecoder.cn:8092
+    registryUsername: admin
+    registryPassword: NJU67nexus
+    tls: false
+  sonar:
+    host: http://environment-7-10.seec.svc.cluster.local
+    loginToken: sqa_e35e4ec80dedf481dc8fe12448bf47f8a7648413
+
+logging:
+  file:
+    name: /log/devcloud.log
+  level:
+    root: info