diff --git a/cloud-rule-common/pom.xml b/cloud-rule-common/pom.xml
index a98061b..474420d 100644
--- a/cloud-rule-common/pom.xml
+++ b/cloud-rule-common/pom.xml
@@ -20,6 +20,7 @@
com.muyu
cloud-common-core
+ 3.6.3
diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataUpdReq.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataUpdReq.java
index 336d0da..439c860 100644
--- a/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataUpdReq.java
+++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataUpdReq.java
@@ -2,6 +2,8 @@ package com.muyu.common.domain.req;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.common.core.validation.custom.IsSysRuleRegion;
+import com.muyu.common.core.validation.custom.IsSysRuleZM;
import com.muyu.common.core.validation.custom.IsSystemYesNo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
@@ -38,12 +40,16 @@ public class RuleDataUpdReq {
/**
* 规则类型
*/
- @Schema(description = "规则类型",defaultValue = "sql",type = "String")
+ @NotEmpty(message = "规则类型不可为空")
+ @IsSysRuleZM //判断 Z 自定义规则 M 模板规则
+ @Schema(description = "规则类型",defaultValue = "Z",type = "String")
private String ruleType;
/**
* 规则作用域
*/
- @Schema(description = "规则作用域",defaultValue = "说明123",type = "String")
+ @NotEmpty(message = "规则作用域不可为空")
+ @IsSysRuleRegion
+ @Schema(description = "规则作用域",defaultValue = "数据字段",type = "String")
private String ruleRegion;
/**
* 规则状态
diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/resp/RuleDataResp.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/resp/RuleDataResp.java
index 677f1e0..b9dfc85 100644
--- a/cloud-rule-common/src/main/java/com/muyu/common/domain/resp/RuleDataResp.java
+++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/resp/RuleDataResp.java
@@ -42,12 +42,12 @@ public class RuleDataResp {
/**
* 规则类型
*/
- @Schema(description = "规则类型",defaultValue = "唯一校验",type = "String")
+ @Schema(description = "规则类型",defaultValue = "邮箱校验",type = "String")
private String ruleType;
/**
* 规则作用域
*/
- @Schema(description = "规则作用域",defaultValue = "",type = "String")
+ @Schema(description = "规则作用域",defaultValue = "数据字段",type = "String")
private String ruleRegion;
/**
* 规则状态
diff --git a/cloud-rule-server/src/main/java/com/muyu/controller/RuleDataController.java b/cloud-rule-server/src/main/java/com/muyu/controller/RuleDataController.java
index 6124ea5..d099525 100644
--- a/cloud-rule-server/src/main/java/com/muyu/controller/RuleDataController.java
+++ b/cloud-rule-server/src/main/java/com/muyu/controller/RuleDataController.java
@@ -45,7 +45,7 @@ public class RuleDataController {
}
// @PostMapping("/add")
-// @Operation(summary = "添加",description = "根据")
+// @Operation(summary = "添加",description = "根据用户")
/**
* 修改接口规则
diff --git a/cloud-rule-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-rule-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/cloud-rule-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+
diff --git a/cloud-rule-server/src/main/resources/banner.txt b/cloud-rule-server/src/main/resources/banner.txt
new file mode 100644
index 0000000..0dd5eee
--- /dev/null
+++ b/cloud-rule-server/src/main/resources/banner.txt
@@ -0,0 +1,2 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
diff --git a/cloud-rule-server/src/main/resources/bootstrap.yml b/cloud-rule-server/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..4a477fd
--- /dev/null
+++ b/cloud-rule-server/src/main/resources/bootstrap.yml
@@ -0,0 +1,56 @@
+# Tomcat
+server:
+ port: 9709
+
+# nacos线上地址
+nacos:
+ addr: 21.12.0.8:8848
+ user-name: nacos
+ password: nacos
+ namespace: ec66ecf1-f28e-43bc-aa86-625f1bc53bf8
+
+# Spring
+spring:
+ main:
+ allow-bean-definition-overriding: true
+ application:
+ # 应用名称
+ name: cloud-rule
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: ${nacos.addr}
+ # nacos用户名
+ username: ${nacos.user-name}
+ # nacos密码
+ password: ${nacos.password}
+ # 命名空间
+ namespace: ${nacos.namespace}
+ config:
+ # 服务注册地址
+ server-addr: ${nacos.addr}
+ # nacos用户名
+ username: ${nacos.user-name}
+ # nacos密码
+ password: ${nacos.password}
+ # 命名空间
+ namespace: ${nacos.namespace}
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ # 系统共享配置
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ # 系统环境Config共享配置
+ - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ # xxl-job 配置文件
+ - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ # rabbitMQ 配置文件
+ - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+logging:
+ level:
+ com.muyu.system.mapper: DEBUG
diff --git a/cloud-rule-server/src/main/resources/logback/dev.xml b/cloud-rule-server/src/main/resources/logback/dev.xml
new file mode 100644
index 0000000..410491a
--- /dev/null
+++ b/cloud-rule-server/src/main/resources/logback/dev.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+ ${log.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cloud-rule-server/src/main/resources/logback/prod.xml b/cloud-rule-server/src/main/resources/logback/prod.xml
new file mode 100644
index 0000000..e3a72a0
--- /dev/null
+++ b/cloud-rule-server/src/main/resources/logback/prod.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+ ${log.sky.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+ ${log.sky.pattern}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cloud-rule-server/src/main/resources/logback/test.xml b/cloud-rule-server/src/main/resources/logback/test.xml
new file mode 100644
index 0000000..e3a72a0
--- /dev/null
+++ b/cloud-rule-server/src/main/resources/logback/test.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+ ${log.sky.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+ ${log.sky.pattern}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+