Browse Source

删除domaincnname

yjp 1 year ago
parent
commit
659198dc93

+ 0 - 4
convenient/data_containers/query_rule/query_rule.yaml

@@ -16,10 +16,6 @@ spec:
         comment: 领域名
         not_null: true
         primary_key: true
-      - name: domain_cn_name
-        type: varchar(256)
-        comment: 领域中文名
-        not_null: true
       - name: rule
         type: text
         comment: 规则

+ 3 - 4
convenient/domain/query_rule/info.go

@@ -1,8 +1,7 @@
 package query_rule
 
 type Info struct {
-	Scope            string `json:"scope" sqlresult:"column:scope"`
-	RuleDomainName   string `json:"domainName" sqlresult:"column:domain_name"`
-	RuleDomainCNName string `json:"domainCNName" sqlresult:"column:domain_cn_name"`
-	Rule             string `json:"rule" sqlresult:"column:rule"`
+	Scope          string `json:"scope" sqlresult:"column:scope"`
+	RuleDomainName string `json:"domainName" sqlresult:"column:domain_name"`
+	Rule           string `json:"rule" sqlresult:"column:rule"`
 }

+ 3 - 4
convenient/domain/query_rule/request_params.go

@@ -2,10 +2,9 @@ package query_rule
 
 type (
 	AddQueryRuleJsonBody struct {
-		Scope        string `json:"scope" binding:"required" assign:"toField:Scope"`
-		DomainName   string `json:"domainName" binding:"required" assign:"toField:RuleDomainName"`
-		DomainCNName string `json:"domainCNName" binding:"required" assign:"toField:RuleDomainCNName"`
-		Rule         string `json:"rule" binding:"required" assign:"toField:Rule"`
+		Scope      string `json:"scope" binding:"required" assign:"toField:Scope"`
+		DomainName string `json:"domainName" binding:"required" assign:"toField:RuleDomainName"`
+		Rule       string `json:"rule" binding:"required" assign:"toField:Rule"`
 	}
 
 	RemoveQueryRuleJsonBody struct {

+ 12 - 21
convenient/domain/query_rule/value_object.go

@@ -7,32 +7,28 @@ import (
 )
 
 const (
-	FieldScope        = "Scope"
-	FieldDomainName   = "DomainName"
-	FieldDomainCNName = "DomainCNName"
-	FieldRule         = "Rule"
+	FieldScope      = "Scope"
+	FieldDomainName = "DomainName"
+	FieldRule       = "Rule"
 )
 
 var (
-	ColumnScope        = domain.ColumnName(FieldScope)
-	ColumnDomainName   = "domain_name"
-	ColumnDomainCNName = "domain_cn_name"
-	ColumnRule         = domain.ColumnName(FieldRule)
+	ColumnScope      = domain.ColumnName(FieldScope)
+	ColumnDomainName = "domain_name"
+	ColumnRule       = domain.ColumnName(FieldRule)
 )
 
 var fieldMap = map[string]string{
-	FieldScope:        "范围",
-	FieldDomainName:   "领域名",
-	FieldDomainCNName: "领域中文名",
-	FieldRule:         "规则",
+	FieldScope:      "范围",
+	FieldDomainName: "领域名",
+	FieldRule:       "规则",
 }
 
 type ValueObject struct {
 	value_object.Base
-	Scope            string `sqlmapping:"column:scope;key;notUpdate;" sqlresult:"column:scope;" check:"required,lte=256"`
-	RuleDomainName   string `sqlmapping:"column:domain_name;key;notUpdate;" sqlresult:"column:domain_name;" check:"required,lte=256"`
-	RuleDomainCNName string `sqlmapping:"column:domain_cn_name;key;notUpdate;" sqlresult:"column:domain_cn_name;" check:"required,lte=256"`
-	Rule             string `sqlmapping:"column:rule;notUpdate;" sqlresult:"column:rule;" check:"required"`
+	Scope          string `sqlmapping:"column:scope;key;notUpdate;" sqlresult:"column:scope;" check:"required,lte=256"`
+	RuleDomainName string `sqlmapping:"column:domain_name;key;notUpdate;" sqlresult:"column:domain_name;" check:"required,lte=256"`
+	Rule           string `sqlmapping:"column:rule;notUpdate;" sqlresult:"column:rule;" check:"required"`
 }
 
 func (valueObject *ValueObject) DomainCNName() string {
@@ -72,11 +68,6 @@ func (valueObject *ValueObject) ForCreate() error {
 		return err
 	}
 
-	err = domain.CheckField(checkResult, valueObject.DomainCNName(), FieldDomainCNName)
-	if err != nil {
-		return err
-	}
-
 	err = domain.CheckField(checkResult, valueObject.DomainCNName(), FieldRule)
 	if err != nil {
 		return err