team/tyc-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
liangzai
2025-08-16 13:06:51 +08:00
parent fb30503997
commit 053a302c80
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/api/etc/main.dev.yaml
View File

@@ -90,3 +90,5 @@ Tianyuanapi:
Key: "2732f526167c2de9b8dc6aa0f24ba8b7" Key: "2732f526167c2de9b8dc6aa0f24ba8b7"
BaseURL: "https://api.tianyuanapi.com" BaseURL: "https://api.tianyuanapi.com"
Timeout: 60 Timeout: 60
VerifyConfig:
TwoFactor: true

2
app/main/api/etc/main.yaml
View File

@@ -77,3 +77,5 @@ Tianyuanapi:
Key: "2732f526167c2de9b8dc6aa0f24ba8b7" Key: "2732f526167c2de9b8dc6aa0f24ba8b7"
BaseURL: "https://api.tianyuanapi.com" BaseURL: "https://api.tianyuanapi.com"
Timeout: 60 Timeout: 60
VerifyConfig:
TwoFactor: true

4
app/main/api/internal/config/config.go
View File

@@ -23,6 +23,7 @@ type Config struct {
AdminPromotion AdminPromotion AdminPromotion AdminPromotion
CleanTask CleanTask CleanTask CleanTask
Tianyuanapi TianyuanapiConfig Tianyuanapi TianyuanapiConfig
VerifyConfig VerifyConfig
} }
// JwtAuth 用于 JWT 鉴权配置 // JwtAuth 用于 JWT 鉴权配置
@@ -112,3 +113,6 @@ type TianyuanapiConfig struct {
BaseURL string BaseURL string
Timeout int64 Timeout int64
} }
type VerifyConfig struct {
TwoFactor bool
}

25
app/main/api/internal/logic/query/queryservicelogic.go
View File

@@ -77,27 +77,34 @@ func (l *QueryServiceLogic) VerifyCode(mobile string, code string) error {
// 三要素验证 // 三要素验证
func (l *QueryServiceLogic) Verify(Name string, IDCard string, Mobile string) error { func (l *QueryServiceLogic) Verify(Name string, IDCard string, Mobile string) error {
fmt.Println("Mobile", Mobile) // fmt.Println("Mobile", Mobile)
// 下午18点到次日早上8点半调用二要素，其余时间三要素 // // 下午18点到次日早上8点半调用二要素，其余时间三要素
now := time.Now() // now := time.Now()
// 获取当前小时和分钟 // // 获取当前小时和分钟
hour := now.Hour() // hour := now.Hour()
minute := now.Minute() // minute := now.Minute()
// 判断是否在18:00到次日8:30之间 // 判断是否在18:00到次日8:30之间
if hour >= 18 || (hour < 8) || (hour == 8 && minute < 30) { // if hour >= 18 || (hour < 8) || (hour == 8 && minute < 30) {
// 二要素验证 // 二要素验证
if l.svcCtx.Config.VerifyConfig.TwoFactor {
twoFactorsErr := l.VerifyTwoFactors(Name, IDCard) twoFactorsErr := l.VerifyTwoFactors(Name, IDCard)
if twoFactorsErr != nil { if twoFactorsErr != nil {
return twoFactorsErr return twoFactorsErr
} }
} else { } else {
// 三要素验证
threeFactorsErr := l.VerifyThreeFactors(Name, IDCard, Mobile) threeFactorsErr := l.VerifyThreeFactors(Name, IDCard, Mobile)
if threeFactorsErr != nil { if threeFactorsErr != nil {
return threeFactorsErr return threeFactorsErr
} }
} }
// } else {
// // 三要素验证
// threeFactorsErr := l.VerifyThreeFactors(Name, IDCard, Mobile)
// if threeFactorsErr != nil {
// return threeFactorsErr
// }
// }
return nil return nil
} }