diff --git a/.gitignore b/.gitignore index ff69c22..1c3d575 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,51 @@ -### STS ### +###################################################################### +# Build Tools + +.gradle +/build/ +!gradle/wrapper/gradle-wrapper.jar + +target/ +!.mvn/wrapper/maven-wrapper.jar + +###################################################################### +# IDE + +### eclipse ### .apt_generated .classpath .factorypath .project .settings .springBeans -.sts4-cache - ### IntelliJ IDEA ### -*/target/ -.idea/ +.idea *.iws *.iml *.ipr ### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ +nbproject/private/ +build/* +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ -### VS Code ### -.vscode/ +###################################################################### +# Others +*.log +*.xml.versionsBackup +*.swp +.DS_Store + +!*/build/*.java +!*/build/*.html +!*/build/*.xml + +### JRebel ### rebel.xml -.flattened-pom.xml -**/target -/.idea/ -/.idea/ -/.idea/libraries/ + + +.flattened-pom.xml \ No newline at end of file diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotTagReq.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotTagReq.java index dc068b9..cd321b8 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotTagReq.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotTagReq.java @@ -1,12 +1,15 @@ package cn.axzo.im.center.api.vo.req; -import lombok.*; +import javax.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - /** * 机器人标签创建请求 * @@ -50,4 +53,9 @@ public class RobotTagReq { */ @NotNull(message = "机器人标签颜色不能为空") private String color; + + /** + * 标签文字颜色 + */ + private String bodyColor; } diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/UpdateRobotTagReq.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/UpdateRobotTagReq.java index 1d3be99..a2c9c08 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/UpdateRobotTagReq.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/UpdateRobotTagReq.java @@ -1,10 +1,13 @@ package cn.axzo.im.center.api.vo.req; -import lombok.*; -import lombok.experimental.Accessors; -import org.hibernate.validator.constraints.Length; - import javax.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; /** * 机器人标签更新 @@ -52,4 +55,9 @@ public class UpdateRobotTagReq { * 机器人Tag颜色 */ private String color; + + /** + * 标签文字颜色 + */ + private String bodyColor; } diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/RobotTagResp.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/RobotTagResp.java index b82e5ef..4da2d16 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/RobotTagResp.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/resp/RobotTagResp.java @@ -39,6 +39,11 @@ public class RobotTagResp { */ private String color; + /** + * 标签文字颜色 + */ + private String bodyColor; + /** * 被机器人使用数量 diff --git a/im-center-server/src/main/java/cn/axzo/im/entity/RobotTag.java b/im-center-server/src/main/java/cn/axzo/im/entity/RobotTag.java index 4c970be..443a29d 100644 --- a/im-center-server/src/main/java/cn/axzo/im/entity/RobotTag.java +++ b/im-center-server/src/main/java/cn/axzo/im/entity/RobotTag.java @@ -51,5 +51,9 @@ public class RobotTag extends BaseEntity implements Serializable { @TableField("color") private String color; - + /** + * 标签文字颜色 + */ + @TableField("body_color") + private String bodyColor; }