diff --git a/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemController.java b/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemController.java index d74e778b48e4c219d5ae41cad3e97c0816036973..5e0718c48d5c6c35dd47c1df212e37f511689887 100644 --- a/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemController.java +++ b/apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemController.java @@ -90,14 +90,16 @@ public class ItemController { builder.updateItem(beforeUpdateItem, entity); itemDTO = BeanUtils.transfrom(ItemDTO.class, entity); - Commit commit = new Commit(); - commit.setAppId(appId); - commit.setClusterName(clusterName); - commit.setNamespaceName(namespaceName); - commit.setChangeSets(builder.build()); - commit.setDataChangeCreatedBy(itemDTO.getDataChangeLastModifiedBy()); - commit.setDataChangeLastModifiedBy(itemDTO.getDataChangeLastModifiedBy()); - commitService.save(commit); + if (builder.hasContent()) { + Commit commit = new Commit(); + commit.setAppId(appId); + commit.setClusterName(clusterName); + commit.setNamespaceName(namespaceName); + commit.setChangeSets(builder.build()); + commit.setDataChangeCreatedBy(itemDTO.getDataChangeLastModifiedBy()); + commit.setDataChangeLastModifiedBy(itemDTO.getDataChangeLastModifiedBy()); + commitService.save(commit); + } return itemDTO; } diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Commit.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Commit.java index 1d700dffe86ddc90008a5f9fc242129cb276b545..73776343a468fca9c662046ebf54e35d3fca1413 100644 --- a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Commit.java +++ b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Commit.java @@ -7,6 +7,7 @@ import org.hibernate.annotations.Where; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; @Entity @@ -15,7 +16,8 @@ import javax.persistence.Table; @Where(clause = "isDeleted = 0") public class Commit extends BaseEntity { - @Column(name = "ChangeSets", length = 4048, nullable = false) + @Lob + @Column(name = "ChangeSets", nullable = false) private String changeSets; @Column(name = "AppId", nullable = false)