Bläddra i källkod

fix: 修复错误,并增加commit中message属性

181250114 4 år sedan
förälder
incheckning
9f9747713f

+ 39 - 47
settings.xml

@@ -1,48 +1,40 @@
 <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
-                    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>
-        </mirror>
-    </mirrors>
-    <profiles>
-        <profile>
-            <id>nexus</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <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>
-            <properties>
-                <maven.compiler.source>1.8</maven.compiler.source>
-                <maven.compiler.target>1.8</maven.compiler.target>
-                <maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
-            </properties>
-        </profile>
-    </profiles>
-    <activeProfiles>
-        <activeProfile>nexus</activeProfile>
-    </activeProfiles>
-    <servers>
-        <server>
-            <id>nexus</id>
-            <username>admin</username>
-            <password>NJU67nexus</password>
-        </server>
-    </servers>
-</settings>
+		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>
+		</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>
+	<activeProfiles>
+			<activeProfile>nexus</activeProfile>
+	</activeProfiles>
+	<servers>
+		<server>
+			<id>nexus</id>
+			<username>admin</username>
+			<password>NJU67nexus</password>
+		</server>
+	</servers>
+</settings>

+ 14 - 14
web/src/main/java/cn/seecoder/web/service/impl/bug_list/BugListServiceImpl.java

@@ -119,13 +119,13 @@ public class BugListServiceImpl implements BugListService {
         //ANA 日志需要打出修改的基础信息
         try{
             JSONObject object = new JSONObject();
-            object.put("bug_id:",po.getId());
-            object.put("project_id:",po.getProjectId());
-            object.put("priority:",po.getPriority());
-            object.put("title:",po.getTitle());
-            object.put("description:",po.getDescription());
-            object.put("timeToTake:",po.getTimeToTake());
-            object.put("bug_state:",po.getState());
+            object.put("bug_id",po.getId());
+            object.put("project_id",po.getProjectId());
+            object.put("priority",po.getPriority());
+            object.put("title",po.getTitle());
+            object.put("description",po.getDescription());
+            object.put("timeToTake",po.getTimeToTake());
+            object.put("bug_state",po.getState());
 
             String data = com.alibaba.fastjson.JSONObject.toJSONString(object);
             LogTrackingUtil.log(data, OpType.MODIFY_BUGLIST);
@@ -150,13 +150,13 @@ public class BugListServiceImpl implements BugListService {
         //ANA 日志需要打出修改的状态信息
         try{
             JSONObject object = new JSONObject();
-            object.put("bug_id:",po.getId());
-            object.put("project_id:",po.getProjectId());
-            object.put("priority:",po.getPriority());
-            object.put("title:",po.getTitle());
-            object.put("description:",po.getDescription());
-            object.put("timeToTake:",po.getTimeToTake());
-            object.put("bug_state:",po.getState());
+            object.put("bug_id",po.getId());
+            object.put("project_id",po.getProjectId());
+            object.put("priority",po.getPriority());
+            object.put("title",po.getTitle());
+            object.put("description",po.getDescription());
+            object.put("timeToTake",po.getTimeToTake());
+            object.put("bug_state",po.getState());
 
             String data = com.alibaba.fastjson.JSONObject.toJSONString(object);
             LogTrackingUtil.log(data, OpType.MODIFY_BUGLIST);

+ 5 - 4
web/src/main/java/cn/seecoder/web/service/impl/project/CommitServiceImpl.java

@@ -40,10 +40,11 @@ public class CommitServiceImpl implements CommitService {
         //ANA 日志需要打出用户的commit信息
         try{
             JSONObject object = new JSONObject();
-            object.put("commit_id:",po.getId());
-            object.put("user_id:",userMapper.selectIdByEmail(po.getEmail()));
-            object.put("project_id:",po.getProjectId());
-            object.put("commit_date:",po.getTimestamp());
+            object.put("commit_id",po.getId());
+            object.put("user_id",userMapper.selectIdByEmail(po.getEmail()));
+            object.put("project_id",po.getProjectId());
+            object.put("commit_date",po.getTimestamp());
+            object.put("message",po.getMessage());
 
             String data = JSONObject.toJSONString(object);
             LogTrackingUtil.log(data, OpType.COMMIT);