5 Commits df3e6e48a0 ... 50208732b4

Author SHA1 Message Date
  aokunsang 50208732b4 测试推送代码 2 weeks ago
  aokunsang 292b03373d 添加注释 2 weeks ago
  aokunsang 2e8d3460a5 删除jenkinsfile中sonar代码质量检测 2 weeks ago
  xipengqiang 890c4da999 feat(pom): 版本升级为4.0.6-20241230 1 month ago
  xipengqiang a5b8c63653 feat(任务实例): bug修复 版本升级为4.0.5-20241230 1 month ago

+ 0 - 22
Jenkinsfile

@@ -86,28 +86,6 @@ pipeline{
 				bat "${env.MAVEN_HOME}\\bin\\mvn clean package -e -U -Dmaven.test.skip=true"
 				bat "${env.MAVEN_HOME}\\bin\\mvn clean package -e -U -Dmaven.test.skip=true"
 			}
 			}
 		}
 		}
-
-		stage("代码质量检测"){
-            when {
-                environment name: 'mode',value: 'deploy'
-            }
-            steps {
-                withSonarQubeEnv(installationName: 'sonar-scanner') {
-                    bat "${env.MAVEN_HOME}\\bin\\mvn sonar:sonar -DskipTests"
-                }
-            }
-        }
-
-        stage("代码质量结果"){
-            when {
-                environment name: 'mode',value: 'deploy'
-            }
-            steps {
-                timeout(time: 1, unit: 'HOURS') {
-                    waitForQualityGate abortPipeline: true
-                }
-            }
-        }
 		
 		
 		stage("停止服务"){
 		stage("停止服务"){
 			steps {
 			steps {

+ 2 - 2
pom.xml

@@ -5,11 +5,11 @@
 	<parent>
 	<parent>
 		<groupId>com.platomix</groupId>
 		<groupId>com.platomix</groupId>
 		<artifactId>platomix-pom</artifactId>
 		<artifactId>platomix-pom</artifactId>
-		<version>1.2.1</version>
+		<version>1.2.2</version>
 		<relativePath />
 		<relativePath />
 	</parent>
 	</parent>
 	<artifactId>platomix-gmetry-etl</artifactId>
 	<artifactId>platomix-gmetry-etl</artifactId>
-	<version>4.0.4</version>
+	<version>4.0.6-20241230</version>
 
 
 	<properties>
 	<properties>
 		<flink.version>1.15.4</flink.version>
 		<flink.version>1.15.4</flink.version>

+ 10 - 0
src/main/java/org/springblade/Application.java

@@ -1,8 +1,18 @@
+/*
+ * Copyright (c) 2018-2028, AoKunSang All rights reserved.
+ * 我问青山何时老,青山问我几时闲,
+ * 不是闲人闲不得,能闲必非等闲人。
+ */
 package org.springblade;
 package org.springblade;
 
 
 import org.springblade.core.boot.core.PlatomixApplication;
 import org.springblade.core.boot.core.PlatomixApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 
+/**
+ * <p>启动入口类</p>
+ * @author  Aokunsang
+ * @datetime 2025-01-22 12:37:45
+ */
 @SpringBootApplication
 @SpringBootApplication
 public class Application {
 public class Application {
 
 

+ 4 - 1
src/main/java/org/springblade/etl/controller/JobController.java

@@ -236,7 +236,10 @@ public class JobController extends BladeController {
 				log.info("ETL任务流程:暂停任务|jobId={},xxljobId={},ret={}", jobId, job.getXxlJobId(), jobStop);
 				log.info("ETL任务流程:暂停任务|jobId={},xxljobId={},ret={}", jobId, job.getXxlJobId(), jobStop);
 			}
 			}
 		}
 		}
-		return doUpdate(entity);
+		entity.setUpdateBy(AuthUtil.getNickName());
+		entity.setUpdateUserId(AuthUtil.getUserId());
+		entity.setUpdateTime(LocalDateTime.now());
+		return R.status(jobService.updateById(entity));
 	}
 	}
 	
 	
 	/**
 	/**