diff --git a/.gitignore b/.gitignore index 5ff6309..8bdf896 100644 --- a/.gitignore +++ b/.gitignore @@ -4,10 +4,7 @@ target/ !**/src/test/**/target/ ### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ +.idea *.iws *.iml *.ipr @@ -35,4 +32,5 @@ build/ .vscode/ ### Mac OS ### -.DS_Store \ No newline at end of file +.DS_Store +/.idea/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1742544 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +# |— home +# |— app.jar - 启动jar报 +# |— logs - 日志文件 +# |— uploadPath - 上传路径 +#指定构建镜像的起始镜像 +FROM anolis-registry.cn-zhangjiakou.cr.aliyuncs.com/openanolis/openjdk:17-8.6 + +#执行 一些必备的条件 + +#定义时区参数 +ENV TZ=Asia/Shanghai + +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone + +# 挂在工作目录 You,Moments ago · Uncommitted changes +VOLUME ["/home/logs/cloud-rule","/home/uploadPath"] + +#拷贝执行jar包文件 +COPY ./cloud-integration-server/target/cloud-rule.jar /home/app.jar + +#构建启动命令 +ENTRYPOINT ["java","-Dfile.encoding=utf-8","-jar"] +CMD ["/home/app.jar"] diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleData.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleData.java index 0a315d0..968faf6 100644 --- a/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleData.java +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleData.java @@ -22,7 +22,7 @@ public class RuleData extends BaseEntity { /** * 类型ID */ - private String ruleId; + private Integer ruleId; /** * 规则类型名称 */ @@ -31,41 +31,6 @@ public class RuleData extends BaseEntity { * 规则类型状态(是否启用) */ private String ruleClassify; - /** - * 创建人 - */ - private String ruleName; - /** - * 创建时间 - */ - private String ruleExplain; - /** - * 更新人 - */ - private String ruleRespond; - /** - * 更新时间 - */ - private String ruleStatus; - /** - * 创建人 - */ - private String createdBy; - /** - * 创建时间 - */ - private String createdTime; - /** - * 更新人 - */ - private String updateBy; - /** - * 更新时间 - */ - private String updatedTime; - /** - * 备份 - */ - private String remark; + } diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleDataClassify.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleDataClassify.java index f633233..f9dfb5a 100644 --- a/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleDataClassify.java +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleDataClassify.java @@ -22,34 +22,30 @@ public class RuleDataClassify extends BaseEntity { /** * 类型ID */ - private String id; + private Integer id; /** - * 规则类型名称 + * 规则分类 */ - private String classifyName; + private Integer ruleClassify; /** - * 规则类型状态(是否启用) + * 规则名称 */ - private String classifyStatus; + private String ruleName; /** - * 创建人 + * 规则代码 */ - private String createdBy; + private String ruleCode; /** - * 创建时间 + * 规则说明 */ - private String createdTime; + private String ruleExplain; /** - * 更新人 + * 响应示例 */ - private String updateBy; + private String ruleRespond; /** - * 更新时间 + * 规则状态 */ - private String updatedTime; - /** - * 备份 - */ - private String remark; + private Integer ruleStatus; } diff --git a/cloud-rule-server/pom.xml b/cloud-rule-server/pom.xml index 6a67f62..838f91a 100644 --- a/cloud-rule-server/pom.xml +++ b/cloud-rule-server/pom.xml @@ -84,7 +84,7 @@ - cloud-integration + cloud-rule org.springframework.boot diff --git a/cloud-rule-server/src/main/java/com/muyu/MuYuRuleDataApplication.java b/cloud-rule-server/src/main/java/com/muyu/MuYuRuleDataApplication.java new file mode 100644 index 0000000..5c76f40 --- /dev/null +++ b/cloud-rule-server/src/main/java/com/muyu/MuYuRuleDataApplication.java @@ -0,0 +1,18 @@ +package com.muyu; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @Author:蓬叁 + * @Package:com.muyu + * @Project:cloud-rule + * @name:MuYuRuleDataApplication + * @Date:2024/8/22 下午7:49 + */ +@SpringBootApplication +public class MuYuRuleDataApplication { + public static void main(String[] args) { + SpringApplication.run(MuYuRuleDataApplication.class, args); + } +}