Browse Source

reset: back to 2022.11.25

181250114 3 years ago
parent
commit
b0c4c75be7

+ 0 - 21
seecoder-portal-server/pom.xml

@@ -151,27 +151,6 @@
             <artifactId>postgresql</artifactId>
             <version>42.3.6</version>
         </dependency>
-
-        <!--日志相关-->
-        <dependency>
-            <groupId>com.nju.edu</groupId>
-            <artifactId>seecoder-logTracking-client</artifactId>
-            <version>0.1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.47</version>
-        </dependency>
-
-
     </dependencies>
 
 </project>

+ 0 - 17
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/UserService.java

@@ -5,10 +5,7 @@ import cn.seecoder.seecoderportalcommon.vo.UserVO;
 import cn.seecoder.seecoderportalserver.domain.User;
 import cn.seecoder.seecoderportalserver.mapper.UserMapper;
 import cn.seecoder.seecoderportalserver.repository.UserRepository;
-import cn.seecoder.seecoderportalserver.utility.LogTrackingUtil;
-import cn.seecoder.seecoderportalserver.utility.OpType;
 import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
-import com.alibaba.fastjson.JSONObject;
 import com.nju.edu.gitlab.SeecoderGitlabApi;
 import com.nju.edu.gitlab.SeecoderGitlabException;
 import com.nju.edu.gitlab.vo.GitlabUserVO;
@@ -128,20 +125,6 @@ public class UserService {
             throw new CustomErrorException("用户名或邮箱已存在,请联系管理人员!");
         }
         log.debug("Created Information for User: {}", savedUser);
-
-        //ANA 日志需要打出用户注册的基础信息
-        try{
-            JSONObject object = new JSONObject();
-            object.put("user_id",user.getId());
-            object.put("username",user.getUsername());
-            object.put("role",user.getRole());
-            object.put("email",user.getEmail());
-            object.put("phone",user.getPhone());
-
-            String data = JSONObject.toJSONString(object);
-            LogTrackingUtil.log(data, OpType.CREATE_USER);
-        }catch (Exception e){}
-
         return savedUser;
     }
 

+ 0 - 34
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/utility/LogTrackingUtil.java

@@ -1,34 +0,0 @@
-package cn.seecoder.seecoderportalserver.utility;
-
-import Utils.LogBuilder;
-import client.LogTrackingClient;
-import com.nju.edu.logTracking.enums.SeecSystem;
-import org.slf4j.Logger;
-
-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);
-    }
-
-    public static void main(String[] args) {
-        try {
-            String data = "构造好的数据";
-            LogTrackingUtil.log(data, OpType.CREATE_OR_MODIFY_BUGLIST);
-        } catch (Exception ignore) {}
-    }
-}

+ 0 - 42
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/utility/LoggerUtil.java

@@ -1,42 +0,0 @@
-package cn.seecoder.seecoderportalserver.utility;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * author: rale
- * createdAt: 12/22/18
- * 日志工具
- */
-public class LoggerUtil {
-
-    public static Logger getLogger(Class<?> className){
-        return LoggerFactory.getLogger(className);
-    }
-
-    public static void info(Logger logger, String info, Object... parameters){
-        logger.info(info, parameters);
-    }
-
-    public static void warn(Logger logger, String info, Object... parameters){
-        logger.warn(info, parameters);
-    }
-
-    public static void warn(Logger logger, Exception e, String info, Object... parameters) {
-        logger.warn("", e);
-        logger.warn(info, parameters);
-    }
-
-    public static void  error(Logger logger, String info, Object... parameters) {
-        logger.error(info, parameters);
-    }
-
-    public static void error(Logger logger, Exception e, String info, Object... parameters) {
-        logger.error("", e);
-        logger.error(info, parameters);
-    }
-
-    public static void debug(Logger logger, String info, Object... parameters) {
-        logger.debug(info, parameters);
-    }
-}

+ 0 - 37
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/utility/OpType.java

@@ -1,37 +0,0 @@
-package cn.seecoder.seecoderportalserver.utility;
-
-public enum OpType {
-
-    CREATE_OR_MODIFY_BUGLIST(100, "创建/修改缺陷信息"),
-    COMMIT(101, "用户进行commit"),
-    INTERFACE_TEST(102, "用户创建并执行接口测试"),
-    CREATE_PIPELINE(103, "用户创建流水线"),
-    DELETE_PIPELINE(104, "用户删除流水线"),
-    DEPLOY_PIPELINE(105, "用户部署流水线"),
-    MODIFY_REQUIREMENT_TREENODE(106, "用户插入/更新需求树节点"),
-    DELETE_REQUIREMENT_TREENODE(107, "用户删除需求树节点"),
-    ADD_MEMBER(108,"将成员加入项目中"),
-    RELATE_PROJECT(109,"将项目A与项目B关联"),
-    CREATE_PROJECT(110,"创建项目并存储信息"),
-    CREATE_USER(111,"用户注册并存储信息"),
-    //试一下新日志
-    CREATE_TEST(1000,"用户创建新的接口测试");
-
-
-
-    int num;
-    String name;
-
-    OpType(int num, String name) {
-        this.num = num;
-        this.name = name;
-    }
-
-    public int getNum() {
-        return this.num;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-}

+ 1 - 5
seecoder-portal-server/src/main/resources/application.yml

@@ -30,9 +30,5 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
 
-logging:
-  file:
-    name: /log/portal.log
-  level:
-    root: info
+