mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0515 ljc

Browse Source
This commit is contained in:
HopeLi 2025-05-15 18:26:01 +08:00
parent c3d042144f
commit d2dfc0f0e1
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/spring-boot-starter-biz-tenant/src/main/java/cd/casic/framework/tenant/config/OpsTenantAutoConfiguration.java
View File

@ -51,7 +51,7 @@ public class OpsTenantAutoConfiguration {
// ========== DB ========== // ========== DB ==========
@Bean // @Bean
public TenantLineInnerInterceptor tenantLineInnerInterceptor(TenantProperties properties, public TenantLineInnerInterceptor tenantLineInnerInterceptor(TenantProperties properties,
MybatisPlusInterceptor interceptor) { MybatisPlusInterceptor interceptor) {
TenantLineInnerInterceptor inner = new TenantLineInnerInterceptor(new TenantDatabaseInterceptor(properties)); TenantLineInnerInterceptor inner = new TenantLineInnerInterceptor(new TenantDatabaseInterceptor(properties));

3
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java
View File

@ -1,5 +1,7 @@
package cd.casic.ci.process.process.dataObject.pipeline; package cd.casic.ci.process.process.dataObject.pipeline;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -9,6 +11,7 @@ public class PipPipeline {
/** /**
* 主键id * 主键id
*/ */
@TableId(type = IdType.ASSIGN_ID)
private String id; private String id;
/** /**

3
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/resource/PipResource.java
View File

@ -1,5 +1,7 @@
package cd.casic.ci.process.process.dataObject.resource; package cd.casic.ci.process.process.dataObject.resource;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -9,6 +11,7 @@ public class PipResource {
/** /**
* 主键id * 主键id
*/ */
@TableId(type = IdType.ASSIGN_ID)
private String id; private String id;
/** /**

2
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java
View File

@ -39,8 +39,6 @@ public class PipStage {
//@ApiProperty(name = "stageList",desc="阶段") //@ApiProperty(name = "stageList",desc="阶段")
@TableField(exist = false) @TableField(exist = false)
private List<PipStage> stageList; private List<PipStage> stageList;
// 执行实例id
private String instanceId;
private LocalDateTime updateTime; private LocalDateTime updateTime;
private Long createUserId; private Long createUserId;
private Long updateUserId; private Long updateUserId;

3
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/task/PipTask.java
View File

@ -1,5 +1,7 @@
package cd.casic.ci.process.process.dataObject.task; package cd.casic.ci.process.process.dataObject.task;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data; import lombok.Data;
import org.json.JSONObject; import org.json.JSONObject;
@ -8,6 +10,7 @@ import java.time.LocalDateTime;
@Data @Data
public class PipTask { public class PipTask {
//@ApiProperty(name="taskId",desc="配置id") //@ApiProperty(name="taskId",desc="配置id")
@TableId(type = IdType.ASSIGN_ID)
private String taskId; private String taskId;
//@ApiProperty(name="createTime",desc="创建时间") //@ApiProperty(name="createTime",desc="创建时间")