Forráskód Böngészése

feat:更换maven仓库

zhangyi 1 éve
szülő
commit
21d7e731ae

+ 1 - 1
api/pom.xml

@@ -49,7 +49,7 @@
                     <artifactId>log4j-slf4j-impl</artifactId>
                 </exclusion>
             </exclusions>
-            <version>0.1.2</version>
+            <version>0.1.8</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit -->
         <dependency>

+ 1 - 12
common/pom.xml

@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.4</version>
+            <version>1.18.22</version>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
@@ -104,17 +104,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </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>
     </dependencies>
 
     <dependencyManagement>

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

@@ -1,29 +1,14 @@
 package cn.seecoder.common.util;
 
-import Utils.LogBuilder;
-import client.LogTrackingClient;
-import com.nju.edu.logTracking.enums.SeecSystem;
+
 import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
 
 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);
+        //TODO 旧日志client已经弃用,这里先删除,后续删除相关调用
     }
 
     public static void main(String[] args) {

+ 22 - 26
settings.xml

@@ -1,40 +1,36 @@
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+		  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
 					http://maven.apache.org/xsd/settings-1.0.0.xsd">
 	<mirrors>
 		<mirror>
-			<id>aliyunmaven</id>
-			<mirrorOf>central</mirrorOf>
-			<name>阿里云公共仓库</name>
-			<url>https://maven.aliyun.com/repository/public</url>
+			<id>mirror</id>
+			<mirrorOf>central,jcenter,!repo-fxdgg</mirrorOf>
+			<name>mirror</name>
+			<url>https://maven.aliyun.com/nexus/content/groups/public</url>
 		</mirror>
 	</mirrors>
-	<profiles> 
-		<profile> 
-			<id>nexus</id>  
-			<repositories> 
-				<repository> 
-					<id>public</id>  
-					<name>Public Repositories</name>  
-					<url>http://nexus.seecoder.cn/repository/maven-public</url> 
-				</repository> 
-				<repository> 
-					<id>releases</id>  
-					<name>Public Repositories</name>  
-					<url>http://nexus.seecoder.cn/repository/maven-releases</url> 
-				</repository> 
-			</repositories>
-		</profile> 
+
+	<profiles>
+		<profile>
+			<id>rdc</id>
+			<properties>
+				<altReleaseDeploymentRepository>
+					repo-fxdgg::default::https://packages.aliyun.com/684e93660dc52b6c963b1c3f/maven/repo-fxdgg
+				</altReleaseDeploymentRepository>
+			</properties>
+		</profile>
 	</profiles>
+
 	<activeProfiles>
-			<activeProfile>nexus</activeProfile>
+		<activeProfile>rdc</activeProfile>
 	</activeProfiles>
+
 	<servers>
 		<server>
-			<id>nexus</id>
-			<username>admin</username>
-			<password>NJU67nexus</password>
+			<id>repo-fxdgg</id>
+			<username>684e7f864731dac66480b3c1</username>
+			<password>q81aGqq-sc_G</password>
 		</server>
 	</servers>
 </settings>

+ 1 - 1
web/pom.xml

@@ -130,7 +130,7 @@
         <dependency>
             <groupId>com.nju.edu</groupId>
             <artifactId>seecoder-gitlab-client</artifactId>
-            <version>0.1.2</version>
+            <version>0.1.8</version>
         </dependency>
     </dependencies>
 

+ 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);
+            // TODO 软工二没有userName与examId,这里先传null
+            Integer newProjectId = gitlabApi.forkProject(forkVO.getProjectId(), userId, null, null);
             allProjects = gitlabApi.getAllProjectsByUserId(userId);
             // 拿 Fork 出来的项目的对象,主要是要拿到它的 Web URL
             com.nju.edu.gitlab.vo.ProjectVO newProject = null;