From 7b1b75e7a96af630eae1b4f708032acf95ff0a84 Mon Sep 17 00:00:00 2001 From: liangzai <2440983361@qq.com> Date: Sat, 20 Sep 2025 19:05:07 +0800 Subject: [PATCH] fix --- internal/app/app.go | 1 + internal/domains/api/dto/api_request_dto.go | 4 +- .../shared/validator/custom_validators.go | 12 ++ .../shared/validator/enterprise_name_test.go | 135 ------------------ 4 files changed, 15 insertions(+), 137 deletions(-) delete mode 100644 internal/shared/validator/enterprise_name_test.go diff --git a/internal/app/app.go b/internal/app/app.go index e4ef9aa..5b29ae9 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -102,6 +102,7 @@ func (a *Application) Run() error { // RunMigrations 运行数据库迁移 func (a *Application) RunMigrations() error { + return nil a.logger.Info("Running database migrations...") // 创建数据库连接 diff --git a/internal/domains/api/dto/api_request_dto.go b/internal/domains/api/dto/api_request_dto.go index 99b6980..f8830cb 100644 --- a/internal/domains/api/dto/api_request_dto.go +++ b/internal/domains/api/dto/api_request_dto.go @@ -97,7 +97,7 @@ type JRZQDBCEReq struct { Name string `json:"name" validate:"required,min=1,validName"` } type QYGL2ACDReq struct { - EntName string `json:"ent_name" validate:"required,min=1,validName"` + EntName string `json:"ent_name" validate:"required,min=1,validEnterpriseName"` LegalPerson string `json:"legal_person" validate:"required,min=1,validName"` EntCode string `json:"ent_code" validate:"required,validUSCI"` } @@ -123,7 +123,7 @@ type QYGLB4C0Req struct { } type QYGL23T7Req struct { - EntName string `json:"ent_name" validate:"required,min=1,validName"` + EntName string `json:"ent_name" validate:"required,min=1,validEnterpriseName"` LegalPerson string `json:"legal_person" validate:"required,min=1,validName"` EntCode string `json:"ent_code" validate:"required,validUSCI"` IDCard string `json:"id_card" validate:"required,validIDCard"` diff --git a/internal/shared/validator/custom_validators.go b/internal/shared/validator/custom_validators.go index d9790cb..54b8489 100644 --- a/internal/shared/validator/custom_validators.go +++ b/internal/shared/validator/custom_validators.go @@ -532,6 +532,7 @@ func validateEnterpriseName(fl validator.FieldLevel) bool { "有限公司", "有限责任公司", "股份有限公司", "股份公司", "工作室", "个体工商户", "个人独资企业", "合伙企业", "集团有限公司", "集团股份有限公司", + "分公司", "子公司", "办事处", "代表处", "Co.,Ltd", "Co., Ltd", "Ltd", "LLC", "Inc", "Corp", "Company", "Studio", "Workshop", "Enterprise", } @@ -544,6 +545,11 @@ func validateEnterpriseName(fl validator.FieldLevel) bool { hasValidSuffix = true break } + // 同时检查括号内的企业类型，如：（个体工商户）、（分公司） + if strings.HasSuffix(trimmedName, "（"+suffix+"）") { + hasValidSuffix = true + break + } } // 如果名称中包含常见的企业类型关键词，则必须是合法的后缀 @@ -811,6 +817,7 @@ func ValidateEnterpriseName(enterpriseName string) error { "有限公司", "有限责任公司", "股份有限公司", "股份公司", "工作室", "个体工商户", "个人独资企业", "合伙企业", "集团有限公司", "集团股份有限公司", + "分公司", "子公司", "办事处", "代表处", "Co.,Ltd", "Co., Ltd", "Ltd", "LLC", "Inc", "Corp", "Company", "Studio", "Workshop", "Enterprise", } @@ -822,6 +829,11 @@ func ValidateEnterpriseName(enterpriseName string) error { hasValidSuffix = true break } + // 同时检查括号内的企业类型，如：（个体工商户）、（分公司） + if strings.HasSuffix(trimmedName, "（"+suffix+"）") { + hasValidSuffix = true + break + } } // 如果名称中包含常见的企业类型关键词，则必须是合法的后缀 diff --git a/internal/shared/validator/enterprise_name_test.go b/internal/shared/validator/enterprise_name_test.go deleted file mode 100644 index be083a5..0000000 --- a/internal/shared/validator/enterprise_name_test.go +++ /dev/null @@ -1,135 +0,0 @@ -package validator - -import ( - "testing" -) - -func TestValidateEnterpriseName(t *testing.T) { - tests := []struct { - name string - input string - expectError bool - errorMsg string - }{ - { - name: "有效的有限公司名称", - input: "北京天远数据科技有限公司", - expectError: false, - }, - { - name: "有效的工作室名称", - input: "张三设计工作室", - expectError: false, - }, - { - name: "有效的英文公司名称", - input: "Apple Inc", - expectError: false, - }, - { - name: "有效的英文有限公司", - input: "Google LLC", - expectError: false, - }, - { - name: "有效的股份有限公司", - input: "中国移动股份有限公司", - expectError: false, - }, - { - name: "有效的个体工商户", - input: "李四个体工商户", - expectError: false, - }, - { - name: "空字符串", - input: "", - expectError: true, - errorMsg: "企业名称不能为空", - }, - { - name: "只有空格", - input: " ", - expectError: true, - errorMsg: "企业名称不能为空", - }, - { - name: "长度过短", - input: "A", - expectError: true, - errorMsg: "企业名称长度不能少于2个字符", - }, - { - name: "包含非法字符", - input: "测试公司@#$", - expectError: true, - errorMsg: "企业名称不能包含特殊字符", - }, - { - name: "包含公司关键词但后缀不合法", - input: "测试公司123", - expectError: true, - errorMsg: "企业名称格式不正确，请使用标准的企业类型后缀", - }, - { - name: "包含工作室关键词但后缀不合法", - input: "设计工作室ABC", - expectError: true, - errorMsg: "企业名称格式不正确，请使用标准的企业类型后缀", - }, - { - name: "只包含数字和特殊字符", - input: "12345-67890", - expectError: true, - errorMsg: "企业名称必须包含中文字符或英文字母", - }, - { - name: "没有企业类型关键词的个人名称", - input: "张三理发店", - expectError: false, // 没有企业关键词，所以不强制要求后缀 - }, - { - name: "包含括号的企业名称", - input: "北京天远数据科技有限公司（分公司）", - expectError: false, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - err := ValidateEnterpriseName(tt.input) - - if tt.expectError { - if err == nil { - t.Errorf("期望有错误，但没有返回错误") - } else if tt.errorMsg != "" && !containsString(err.Error(), tt.errorMsg) { - t.Errorf("期望错误消息包含 '%s'，但得到 '%s'", tt.errorMsg, err.Error()) - } - } else { - if err != nil { - t.Errorf("期望没有错误，但得到错误: %v", err) - } - } - }) - } -} - -// containsString 检查字符串是否包含子字符串 -func containsString(s, substr string) bool { - return len(s) >= len(substr) && - (s == substr || - len(s) > len(substr) && - (s[:len(substr)] == substr || - s[len(s)-len(substr):] == substr || - containsSubstring(s, substr))) -} - -// containsSubstring 辅助函数检查子字符串 -func containsSubstring(s, substr string) bool { - for i := 0; i <= len(s)-len(substr); i++ { - if s[i:i+len(substr)] == substr { - return true - } - } - return false -}