kobe6258 1 долоо хоног өмнө
parent
commit
f36fb3afd5

+ 2 - 2
api/ht_api.go

@@ -46,14 +46,14 @@ func GetInstance() *HTApi {
 
 type ClientSuitInfoReq struct {
 	ClientName string `json:"client_name"`
-	IdKind     int    `json:"id_kind"`
+	IdKind     string `json:"id_kind"`
 	IdNo       string `json:"id_no"`
 }
 
 type CustomerRiskReq struct {
 	MobileTel  string `json:"mobile_tel"`
 	ClientName string `json:"client_name"`
-	IdKind     int    `json:"id_kind"`
+	IdKind     string `json:"id_kind"`
 	IdNo       string `json:"id_no"`
 	CreateTime string `json:"create_time"`
 	LoginType  string `json:"login_type"`

+ 4 - 4
controllers/web_hook/htfutures_account_controller.go

@@ -415,8 +415,8 @@ var (
 		"success": AccountStatusOpenSuccess,
 		"failed":  AccountStatusOpenFailed,
 	}
-	idKindMap = map[int]IdKind{
-		1: Id,
+	idKindMap = map[string]IdKind{
+		"1": Id,
 	}
 )
 
@@ -430,7 +430,7 @@ type AccountOpenInfoReq struct {
 	MobileTel string `json:"mobile_tel"`
 	//DealMobileTel string        `json:"deal_mobile_tel"`
 	ClientName    string        `json:"client_name"`
-	IdKind        int           `json:"id_kind"`
+	IdKind        string        `json:"id_kind"`
 	IdNo          string        `json:"id_no"`
 	AccountStatus AccountStatus `json:"account_status"`
 	//ErrorCode     int           `json:"error_code"`
@@ -441,7 +441,7 @@ type AccountOpenInfoReq struct {
 }
 type IDInfoReq struct {
 	MobileTel   string `json:"mobile_tel"`
-	IdKind      int    `json:"id_kind"`
+	IdKind      string `json:"id_kind"`
 	IdNo        string `json:"id_no"`
 	IdBeginDate string `json:"id_begin_date"`
 	IdEndDate   string `json:"id_end_date"`

+ 1 - 1
domian/user/user_serivce.go

@@ -35,7 +35,7 @@ type OfficialUserDTO struct {
 	IdNo           string
 	RealName       string
 	TemplateUserID int
-	IdKind         int
+	IdKind         string
 	IDValid        bool
 	AccountStatus  string
 	UserType       int

+ 20 - 25
main.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"encoding/base64"
-	"encoding/json"
 	"eta/eta_mini_ht_api/api"
 	_ "eta/eta_mini_ht_api/common/component"
 	"eta/eta_mini_ht_api/common/component/cache"
@@ -10,16 +8,13 @@ import (
 	logger "eta/eta_mini_ht_api/common/component/log"
 	"eta/eta_mini_ht_api/common/contants"
 	"eta/eta_mini_ht_api/common/exception"
-	"eta/eta_mini_ht_api/common/utils/auth"
 	"eta/eta_mini_ht_api/common/utils/redis"
-	"eta/eta_mini_ht_api/controllers/web_hook"
 	"eta/eta_mini_ht_api/domian/report"
 	"eta/eta_mini_ht_api/models/eta"
 	"eta/eta_mini_ht_api/models/ht"
 	merchantDao "eta/eta_mini_ht_api/models/merchant"
 	_ "eta/eta_mini_ht_api/routers"
 	_ "eta/eta_mini_ht_api/task"
-	"fmt"
 	"github.com/beego/beego/v2/server/web"
 	"sync"
 	"time"
@@ -30,25 +25,25 @@ var (
 	htApi      = api.GetInstance()
 )
 
-func test() {
-	pk, _ := auth.ParsePublicKeyFromPEM()
-	data := web_hook.AccountOpenInfoReq{
-		MobileTel: "18267183251",
-		//DealMobileTel string        `json:"deal_mobile_tel"`
-		ClientName:    "陈晗",
-		IdKind:        1,
-		IdNo:          "330501199101080013",
-		AccountStatus: "success",
-		//ErrorCode     int           `json:"error_code"`
-		IdBeginDate:  "2021-03-10",
-		IdEndDate:    "2029-03-10",
-		ErrorMessage: "",
-		Timestamp:    time.Now().Unix(),
-	}
-	bytes, _ := json.Marshal(data)
-	entry, _ := auth.EncryptWithRSA(pk, bytes)
-	fmt.Println(base64.StdEncoding.EncodeToString(entry))
-}
+//func test() {
+//	pk, _ := auth.ParsePublicKeyFromPEM()
+//	data := web_hook.AccountOpenInfoReq{
+//		MobileTel: "18267183251",
+//		//DealMobileTel string        `json:"deal_mobile_tel"`
+//		ClientName:    "陈晗",
+//		IdKind:        1,
+//		IdNo:          "330501199101080013",
+//		AccountStatus: "success",
+//		//ErrorCode     int           `json:"error_code"`
+//		IdBeginDate:  "2021-03-10",
+//		IdEndDate:    "2029-03-10",
+//		ErrorMessage: "",
+//		Timestamp:    time.Now().Unix(),
+//	}
+//	bytes, _ := json.Marshal(data)
+//	entry, _ := auth.EncryptWithRSA(pk, bytes)
+//	fmt.Println(base64.StdEncoding.EncodeToString(entry))
+//}
 
 func main() {
 
@@ -74,7 +69,7 @@ func main() {
 
 	}()
 	logger.Info("初始化成功")
-	test()
+	//test()
 	web.Run()
 }
 func initThirdPartyAccessToken() {

+ 1 - 1
models/user/user.go

@@ -15,7 +15,7 @@ type User struct {
 	TemplateUserID int           `gorm:"column:template_user_id"`
 	RealName       string        `gorm:"column:real_name;size:255"`
 	IDNo           string        `gorm:"column:id_no;size:15"`
-	IDKind         int           `gorm:"column:id_kind"`
+	IDKind         string        `gorm:"column:id_kind"`
 	IDBeginDate    time.Time     `gorm:"column:id_begin_date"`
 	IDEndDate      time.Time     `gorm:"column:id_end_date"`
 	AccountStatus  AccountStatus `gorm:"column:account_status;type:enum('unOpen','opening','open')"`

+ 2 - 2
service/user/user_service.go

@@ -612,7 +612,7 @@ type BookMarkReport struct {
 type AccountStatusDTO struct {
 	MobileTel     string
 	ClientName    string
-	IdKind        int
+	IdKind        string
 	IdNo          string
 	IdBeginDate   time.Time
 	IdEndDate     time.Time
@@ -621,7 +621,7 @@ type AccountStatusDTO struct {
 }
 type IDInfoDTO struct {
 	MobileTel   string
-	IdKind      int
+	IdKind      string
 	IdNo        string
 	IdBeginDate time.Time
 	IdEndDate   time.Time