This commit is contained in:
2026-06-19 18:52:13 +08:00
parent c4c9722250
commit 1ffff66dee
21 changed files with 1291 additions and 31 deletions

View File

@@ -0,0 +1,92 @@
syntax = "v1"
info (
title: "查询白名单管理"
desc: "代理天远查询白名单接口,并记录操作日志"
version: "v1"
)
@server (
prefix: /api/v1/admin/query-whitelist
group: admin_query_whitelist
middleware: AdminAuthInterceptor
)
service main {
@doc "创建查询白名单规则"
@handler AdminQueryWhitelistCreate
post /create (AdminQueryWhitelistCreateReq) returns (AdminQueryWhitelistOpResp)
@doc "追加查询白名单产品编码"
@handler AdminQueryWhitelistAppend
post /append (AdminQueryWhitelistAppendReq) returns (AdminQueryWhitelistOpResp)
@doc "查询白名单操作记录列表"
@handler AdminQueryWhitelistOpLogList
get /op-log/list (AdminQueryWhitelistOpLogListReq) returns (AdminQueryWhitelistOpLogListResp)
}
type (
AdminQueryWhitelistCreateReq {
Name string `json:"name"` // 姓名,* 表示仅按身份证匹配
IdCard string `json:"id_card"` // 身份证号
ApiCodes []string `json:"api_codes"` // 产品编码列表
Remark string `json:"remark,optional"` // 备注
}
AdminQueryWhitelistAppendReq {
Name string `json:"name"` // 姓名,* 表示仅按身份证匹配
IdCard string `json:"id_card"` // 身份证号
ApiCodes []string `json:"api_codes"` // 产品编码列表
Remark string `json:"remark,optional"` // 备注
}
AdminQueryWhitelistEntryItem {
Id string `json:"id"`
Name string `json:"name"`
IdCardMasked string `json:"id_card_masked"`
ApiCodes []string `json:"api_codes"`
Status string `json:"status"`
Remark string `json:"remark"`
CreatedAt string `json:"created_at"`
UpdatedAt string `json:"updated_at"`
}
AdminQueryWhitelistOpResp {
TianyuanCode int `json:"tianyuan_code"` // 天远业务码
TianyuanMessage string `json:"tianyuan_message"` // 天远返回描述
TransactionId string `json:"transaction_id,optional"` // 天远流水号
Entry *AdminQueryWhitelistEntryItem `json:"entry,optional"` // 成功时规则详情
}
AdminQueryWhitelistOpLogListReq {
Page int64 `form:"page,default=1"`
PageSize int64 `form:"page_size,default=20"`
IdCard *string `form:"id_card,optional"` // 身份证号
Action *string `form:"action,optional"` // create / append
TianyuanCode *int64 `form:"tianyuan_code,optional"` // 天远业务码0=成功
}
AdminQueryWhitelistOpLogItem {
Id string `json:"id"`
AdminUserId string `json:"admin_user_id"`
AdminUserName string `json:"admin_user_name"`
Action string `json:"action"`
Name string `json:"name"`
IdCard string `json:"id_card"`
IdCardMasked string `json:"id_card_masked"`
ApiCodes []string `json:"api_codes"`
Remark string `json:"remark"`
TianyuanCode int `json:"tianyuan_code"`
TianyuanMessage string `json:"tianyuan_message"`
TransactionId string `json:"transaction_id"`
EntryId string `json:"entry_id"`
EntryStatus string `json:"entry_status"`
EntryApiCodes []string `json:"entry_api_codes"`
CreateTime string `json:"create_time"`
}
AdminQueryWhitelistOpLogListResp {
Total int64 `json:"total"`
Items []AdminQueryWhitelistOpLogItem `json:"items"`
}
)

View File

@@ -29,3 +29,4 @@ import "./admin/admin_query.api"
import "./admin/admin_agent.api"
import "./admin/admin_api.api"
import "./admin/admin_role_api.api"
import "./admin/admin_query_whitelist.api"

View File

@@ -85,6 +85,7 @@ Tianyuanapi:
Key: "9e4f8a1b3c6d7e2f5a8b9c0d1e4f7a2b"
BaseURL: "https://api.tianyuanapi.com"
Timeout: 60
WhitelistMgmtKey: "2R12TmEc1e8P3p69RdIoN5Ykjk%H@4orPy7DZv7MXpGByoEL"
Authorization:
FileBaseURL: "https://www.zhenaicha.com/api/v1/auth-docs" # 授权书文件访问基础URL
Promotion:

View File

@@ -72,6 +72,7 @@ Tianyuanapi:
Key: "9e4f8a1b3c6d7e2f5a8b9c0d1e4f7a2b"
BaseURL: "https://api.tianyuanapi.com"
Timeout: 60
WhitelistMgmtKey: "2R12TmEc1e8P3p69RdIoN5Ykjk%H@4orPy7DZv7MXpGByoEL"
Authorization:
FileBaseURL: "https://www.zhenaicha.com/api/v1/auth-docs" # 授权书文件访问基础URL
Promotion:

View File

@@ -102,10 +102,11 @@ type TaxConfig struct {
TaxExemptionAmount float64
}
type TianyuanapiConfig struct {
AccessID string
Key string
BaseURL string
Timeout int64
AccessID string
Key string
BaseURL string
Timeout int64
WhitelistMgmtKey string
}
type AuthorizationConfig struct {

View File

@@ -0,0 +1,29 @@
package admin_query_whitelist
import (
"net/http"
"github.com/zeromicro/go-zero/rest/httpx"
"qnc-server/app/main/api/internal/logic/admin_query_whitelist"
"qnc-server/app/main/api/internal/svc"
"qnc-server/app/main/api/internal/types"
"qnc-server/common/result"
"qnc-server/pkg/lzkit/validator"
)
func AdminQueryWhitelistAppendHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminQueryWhitelistAppendReq
if err := httpx.Parse(r, &req); err != nil {
result.ParamErrorResult(r, w, err)
return
}
if err := validator.Validate(req); err != nil {
result.ParamValidateErrorResult(r, w, err)
return
}
l := admin_query_whitelist.NewAdminQueryWhitelistAppendLogic(r.Context(), svcCtx)
resp, err := l.AdminQueryWhitelistAppend(&req)
result.HttpResult(r, w, resp, err)
}
}

View File

@@ -0,0 +1,29 @@
package admin_query_whitelist
import (
"net/http"
"github.com/zeromicro/go-zero/rest/httpx"
"qnc-server/app/main/api/internal/logic/admin_query_whitelist"
"qnc-server/app/main/api/internal/svc"
"qnc-server/app/main/api/internal/types"
"qnc-server/common/result"
"qnc-server/pkg/lzkit/validator"
)
func AdminQueryWhitelistCreateHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminQueryWhitelistCreateReq
if err := httpx.Parse(r, &req); err != nil {
result.ParamErrorResult(r, w, err)
return
}
if err := validator.Validate(req); err != nil {
result.ParamValidateErrorResult(r, w, err)
return
}
l := admin_query_whitelist.NewAdminQueryWhitelistCreateLogic(r.Context(), svcCtx)
resp, err := l.AdminQueryWhitelistCreate(&req)
result.HttpResult(r, w, resp, err)
}
}

View File

@@ -0,0 +1,29 @@
package admin_query_whitelist
import (
"net/http"
"github.com/zeromicro/go-zero/rest/httpx"
"qnc-server/app/main/api/internal/logic/admin_query_whitelist"
"qnc-server/app/main/api/internal/svc"
"qnc-server/app/main/api/internal/types"
"qnc-server/common/result"
"qnc-server/pkg/lzkit/validator"
)
func AdminQueryWhitelistOpLogListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.AdminQueryWhitelistOpLogListReq
if err := httpx.Parse(r, &req); err != nil {
result.ParamErrorResult(r, w, err)
return
}
if err := validator.Validate(req); err != nil {
result.ParamValidateErrorResult(r, w, err)
return
}
l := admin_query_whitelist.NewAdminQueryWhitelistOpLogListLogic(r.Context(), svcCtx)
resp, err := l.AdminQueryWhitelistOpLogList(&req)
result.HttpResult(r, w, resp, err)
}
}

View File

@@ -15,6 +15,7 @@ import (
admin_platform_user "qnc-server/app/main/api/internal/handler/admin_platform_user"
admin_product "qnc-server/app/main/api/internal/handler/admin_product"
admin_query "qnc-server/app/main/api/internal/handler/admin_query"
admin_query_whitelist "qnc-server/app/main/api/internal/handler/admin_query_whitelist"
admin_role "qnc-server/app/main/api/internal/handler/admin_role"
admin_role_api "qnc-server/app/main/api/internal/handler/admin_role_api"
admin_user "qnc-server/app/main/api/internal/handler/admin_user"
@@ -478,6 +479,33 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
rest.WithPrefix("/api/v1/admin/query"),
)
server.AddRoutes(
rest.WithMiddlewares(
[]rest.Middleware{serverCtx.AdminAuthInterceptor},
[]rest.Route{
{
// 追加查询白名单产品编码
Method: http.MethodPost,
Path: "/append",
Handler: admin_query_whitelist.AdminQueryWhitelistAppendHandler(serverCtx),
},
{
// 创建查询白名单规则
Method: http.MethodPost,
Path: "/create",
Handler: admin_query_whitelist.AdminQueryWhitelistCreateHandler(serverCtx),
},
{
// 查询白名单操作记录列表
Method: http.MethodGet,
Path: "/op-log/list",
Handler: admin_query_whitelist.AdminQueryWhitelistOpLogListHandler(serverCtx),
},
}...,
),
rest.WithPrefix("/api/v1/admin/query-whitelist"),
)
server.AddRoutes(
rest.WithMiddlewares(
[]rest.Middleware{serverCtx.AdminAuthInterceptor},

View File

@@ -0,0 +1,37 @@
package admin_query_whitelist
import (
"context"
tianyuanapi "qnc-server/app/main/api/internal/service/tianyuanapi_sdk"
"qnc-server/app/main/api/internal/svc"
"qnc-server/app/main/api/internal/types"
"github.com/zeromicro/go-zero/core/logx"
)
type AdminQueryWhitelistAppendLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewAdminQueryWhitelistAppendLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminQueryWhitelistAppendLogic {
return &AdminQueryWhitelistAppendLogic{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
func (l *AdminQueryWhitelistAppendLogic) AdminQueryWhitelistAppend(req *types.AdminQueryWhitelistAppendReq) (resp *types.AdminQueryWhitelistOpResp, err error) {
createReq := &types.AdminQueryWhitelistCreateReq{
Name: req.Name,
IdCard: req.IdCard,
ApiCodes: req.ApiCodes,
Remark: req.Remark,
}
return executeQueryWhitelistOp(l.ctx, l.svcCtx, "append", createReq, func(client *tianyuanapi.Client, payload tianyuanapi.QueryWhitelistRequest) *tianyuanapi.QueryWhitelistResult {
return client.AppendQueryWhitelistEntry(payload)
})
}

View File

@@ -0,0 +1,31 @@
package admin_query_whitelist
import (
"context"
tianyuanapi "qnc-server/app/main/api/internal/service/tianyuanapi_sdk"
"qnc-server/app/main/api/internal/svc"
"qnc-server/app/main/api/internal/types"
"github.com/zeromicro/go-zero/core/logx"
)
type AdminQueryWhitelistCreateLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewAdminQueryWhitelistCreateLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminQueryWhitelistCreateLogic {
return &AdminQueryWhitelistCreateLogic{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
func (l *AdminQueryWhitelistCreateLogic) AdminQueryWhitelistCreate(req *types.AdminQueryWhitelistCreateReq) (resp *types.AdminQueryWhitelistOpResp, err error) {
return executeQueryWhitelistOp(l.ctx, l.svcCtx, "create", req, func(client *tianyuanapi.Client, payload tianyuanapi.QueryWhitelistRequest) *tianyuanapi.QueryWhitelistResult {
return client.CreateQueryWhitelistEntry(payload)
})
}

View File

@@ -0,0 +1,75 @@
package admin_query_whitelist
import (
"context"
"qnc-server/app/main/api/internal/svc"
"qnc-server/app/main/api/internal/types"
"qnc-server/app/main/model"
"qnc-server/common/globalkey"
"qnc-server/common/xerr"
"github.com/pkg/errors"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/core/mr"
)
type AdminQueryWhitelistOpLogListLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewAdminQueryWhitelistOpLogListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminQueryWhitelistOpLogListLogic {
return &AdminQueryWhitelistOpLogListLogic{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
func (l *AdminQueryWhitelistOpLogListLogic) AdminQueryWhitelistOpLogList(req *types.AdminQueryWhitelistOpLogListReq) (resp *types.AdminQueryWhitelistOpLogListResp, err error) {
builder := l.svcCtx.QueryWhitelistOpLogModel.SelectBuilder().
Where("del_state = ?", globalkey.DelStateNo)
if req.IdCard != nil && *req.IdCard != "" {
builder = builder.Where("id_card = ?", *req.IdCard)
}
if req.Action != nil && *req.Action != "" {
builder = builder.Where("action = ?", *req.Action)
}
if req.TianyuanCode != nil {
builder = builder.Where("tianyuan_code = ?", *req.TianyuanCode)
}
var total int64
var logs []*model.QueryWhitelistOpLog
err = mr.Finish(func() error {
count, countErr := l.svcCtx.QueryWhitelistOpLogModel.FindCount(l.ctx, builder, "id")
if countErr != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询操作记录总数失败: %v", countErr)
}
total = count
return nil
}, func() error {
list, listErr := l.svcCtx.QueryWhitelistOpLogModel.FindPageListByPage(l.ctx, builder, req.Page, req.PageSize, "create_time DESC")
if listErr != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询操作记录列表失败: %v", listErr)
}
logs = list
return nil
})
if err != nil {
return nil, err
}
resp = &types.AdminQueryWhitelistOpLogListResp{
Total: total,
Items: make([]types.AdminQueryWhitelistOpLogItem, 0, len(logs)),
}
for _, log := range logs {
resp.Items = append(resp.Items, buildOpLogListItem(l.ctx, l.svcCtx, log))
}
return resp, nil
}

View File

@@ -0,0 +1,141 @@
package admin_query_whitelist
import (
"context"
"database/sql"
"encoding/json"
"qnc-server/app/main/api/internal/svc"
"qnc-server/app/main/api/internal/types"
tianyuanapi "qnc-server/app/main/api/internal/service/tianyuanapi_sdk"
"qnc-server/app/main/model"
"qnc-server/common/ctxdata"
"qnc-server/common/xerr"
"github.com/pkg/errors"
)
func executeQueryWhitelistOp(
ctx context.Context,
svcCtx *svc.ServiceContext,
action string,
req *types.AdminQueryWhitelistCreateReq,
callFn func(client *tianyuanapi.Client, payload tianyuanapi.QueryWhitelistRequest) *tianyuanapi.QueryWhitelistResult,
) (*types.AdminQueryWhitelistOpResp, error) {
adminUserId, err := ctxdata.GetUidFromCtx(ctx)
if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.TOKEN_EXPIRE_ERROR), "获取管理员信息失败: %v", err)
}
if svcCtx.TianyuanapiClient == nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "天远API客户端未初始化")
}
name := req.Name
if name == "" {
name = "*"
}
payload := tianyuanapi.QueryWhitelistRequest{
Name: name,
IdCard: req.IdCard,
ApiCodes: req.ApiCodes,
Remark: req.Remark,
}
result := callFn(svcCtx.TianyuanapiClient, payload)
apiCodesJSON, _ := json.Marshal(req.ApiCodes)
opLog := &model.QueryWhitelistOpLog{
AdminUserId: adminUserId,
Action: action,
Name: name,
IdCard: req.IdCard,
ApiCodes: string(apiCodesJSON),
TianyuanCode: int64(result.Code),
}
if req.Remark != "" {
opLog.Remark = sql.NullString{String: req.Remark, Valid: true}
}
if result.Message != "" {
opLog.TianyuanMessage = sql.NullString{String: result.Message, Valid: true}
}
if result.TransactionID != "" {
opLog.TransactionId = sql.NullString{String: result.TransactionID, Valid: true}
}
if result.Entry != nil {
opLog.IdCardMasked = sql.NullString{String: result.Entry.IdCardMasked, Valid: result.Entry.IdCardMasked != ""}
opLog.EntryId = sql.NullString{String: result.Entry.Id, Valid: result.Entry.Id != ""}
opLog.EntryStatus = sql.NullString{String: result.Entry.Status, Valid: result.Entry.Status != ""}
if len(result.Entry.ApiCodes) > 0 {
entryApiCodesJSON, _ := json.Marshal(result.Entry.ApiCodes)
opLog.EntryApiCodes = sql.NullString{String: string(entryApiCodesJSON), Valid: true}
}
}
if _, insertErr := svcCtx.QueryWhitelistOpLogModel.Insert(ctx, nil, opLog); insertErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "保存操作记录失败: %v", insertErr)
}
resp := &types.AdminQueryWhitelistOpResp{
TianyuanCode: result.Code,
TianyuanMessage: result.Message,
TransactionId: result.TransactionID,
}
if result.Entry != nil {
resp.Entry = &types.AdminQueryWhitelistEntryItem{
Id: result.Entry.Id,
Name: result.Entry.Name,
IdCardMasked: result.Entry.IdCardMasked,
ApiCodes: result.Entry.ApiCodes,
Status: result.Entry.Status,
Remark: result.Entry.Remark,
CreatedAt: result.Entry.CreatedAt,
UpdatedAt: result.Entry.UpdatedAt,
}
}
return resp, nil
}
func buildOpLogListItem(ctx context.Context, svcCtx *svc.ServiceContext, log *model.QueryWhitelistOpLog) types.AdminQueryWhitelistOpLogItem {
item := types.AdminQueryWhitelistOpLogItem{
Id: log.Id,
AdminUserId: log.AdminUserId,
Action: log.Action,
Name: log.Name,
IdCard: log.IdCard,
IdCardMasked: log.IdCardMasked.String,
Remark: log.Remark.String,
TianyuanCode: int(log.TianyuanCode),
TianyuanMessage: log.TianyuanMessage.String,
TransactionId: log.TransactionId.String,
EntryId: log.EntryId.String,
EntryStatus: log.EntryStatus.String,
CreateTime: log.CreateTime.Format("2006-01-02 15:04:05"),
}
if log.ApiCodes != "" {
var apiCodes []string
if json.Unmarshal([]byte(log.ApiCodes), &apiCodes) == nil {
item.ApiCodes = apiCodes
}
}
if log.EntryApiCodes.Valid && log.EntryApiCodes.String != "" {
var entryApiCodes []string
if json.Unmarshal([]byte(log.EntryApiCodes.String), &entryApiCodes) == nil {
item.EntryApiCodes = entryApiCodes
}
}
if log.AdminUserId != "" {
if adminUser, err := svcCtx.AdminUserModel.FindOne(ctx, log.AdminUserId); err == nil {
item.AdminUserName = adminUser.RealName
if item.AdminUserName == "" {
item.AdminUserName = adminUser.Username
}
}
}
return item
}

View File

@@ -58,19 +58,21 @@ type ApiCallOptions struct {
// Client 天元API客户端
type Client struct {
accessID string
key string
baseURL string
timeout time.Duration
client *http.Client
accessID string
key string
baseURL string
whitelistMgmtKey string
timeout time.Duration
client *http.Client
}
// Config 客户端配置
type Config struct {
AccessID string // 访问ID
Key string // AES密钥16进制
BaseURL string // API基础URL
Timeout time.Duration // 超时时间
AccessID string // 访问ID
Key string // AES密钥16进制
BaseURL string // API基础URL
WhitelistMgmtKey string // 查询白名单管理密钥
Timeout time.Duration // 超时时间
}
// Request 请求参数
@@ -122,10 +124,11 @@ func NewClient(config Config) (*Client, error) {
}
return &Client{
accessID: config.AccessID,
key: config.Key,
baseURL: config.BaseURL,
timeout: config.Timeout,
accessID: config.AccessID,
key: config.Key,
baseURL: config.BaseURL,
whitelistMgmtKey: config.WhitelistMgmtKey,
timeout: config.Timeout,
client: &http.Client{
Timeout: config.Timeout,
},

View File

@@ -0,0 +1,148 @@
package tianyuanapi
import (
"bytes"
"encoding/json"
"fmt"
"io"
"net/http"
)
// QueryWhitelistRequest 查询白名单请求参数(加密前明文)
type QueryWhitelistRequest struct {
Name string `json:"name"`
IdCard string `json:"id_card"`
ApiCodes []string `json:"api_codes"`
Remark string `json:"remark,omitempty"`
}
// QueryWhitelistEntry 查询白名单规则(解密后 data
type QueryWhitelistEntry struct {
Id string `json:"id"`
Name string `json:"name"`
IdCardMasked string `json:"id_card_masked"`
ApiCodes []string `json:"api_codes"`
Status string `json:"status"`
Remark string `json:"remark"`
CreatedAt string `json:"created_at"`
UpdatedAt string `json:"updated_at"`
}
// QueryWhitelistResult 查询白名单接口调用结果(保留天远原始业务码)
type QueryWhitelistResult struct {
Code int `json:"code"`
Message string `json:"message"`
TransactionID string `json:"transaction_id"`
Entry *QueryWhitelistEntry `json:"entry,omitempty"`
RequestError string `json:"request_error,omitempty"`
}
// CreateQueryWhitelistEntry 创建查询白名单规则
func (c *Client) CreateQueryWhitelistEntry(req QueryWhitelistRequest) *QueryWhitelistResult {
return c.callQueryWhitelist("query-whitelist/entries", req)
}
// AppendQueryWhitelistEntry 向已有规则追加产品编码
func (c *Client) AppendQueryWhitelistEntry(req QueryWhitelistRequest) *QueryWhitelistResult {
return c.callQueryWhitelist("query-whitelist/entries/append", req)
}
func (c *Client) callQueryWhitelist(path string, payload QueryWhitelistRequest) *QueryWhitelistResult {
if c.whitelistMgmtKey == "" {
return &QueryWhitelistResult{
Code: 1010,
Message: "缺少管理密钥",
}
}
jsonData, err := json.Marshal(payload)
if err != nil {
return &QueryWhitelistResult{
Code: 1001,
Message: "接口异常",
RequestError: fmt.Sprintf("参数序列化失败: %v", err),
}
}
encryptedData, err := c.encrypt(string(jsonData))
if err != nil {
return &QueryWhitelistResult{
Code: 1001,
Message: "接口异常",
RequestError: fmt.Sprintf("数据加密失败: %v", err),
}
}
requestBody := map[string]interface{}{
"data": encryptedData,
}
requestBodyBytes, err := json.Marshal(requestBody)
if err != nil {
return &QueryWhitelistResult{
Code: 1001,
Message: "接口异常",
RequestError: fmt.Sprintf("请求体序列化失败: %v", err),
}
}
url := fmt.Sprintf("%s/api/v1/%s", c.baseURL, path)
httpReq, err := http.NewRequest("POST", url, bytes.NewBuffer(requestBodyBytes))
if err != nil {
return &QueryWhitelistResult{
Code: 1001,
Message: "接口异常",
RequestError: fmt.Sprintf("创建HTTP请求失败: %v", err),
}
}
httpReq.Header.Set("Content-Type", "application/json")
httpReq.Header.Set("Access-Id", c.accessID)
httpReq.Header.Set("Whitelist-Mgmt-Key", c.whitelistMgmtKey)
httpReq.Header.Set("User-Agent", "TianyuanAPI-Go-SDK/1.0.0")
resp, err := c.client.Do(httpReq)
if err != nil {
return &QueryWhitelistResult{
Code: 1001,
Message: "接口异常",
RequestError: err.Error(),
}
}
defer resp.Body.Close()
body, err := io.ReadAll(resp.Body)
if err != nil {
return &QueryWhitelistResult{
Code: 1001,
Message: "接口异常",
RequestError: fmt.Sprintf("读取响应失败: %v", err),
}
}
var apiResp ApiResponse
if err := json.Unmarshal(body, &apiResp); err != nil {
return &QueryWhitelistResult{
Code: 1001,
Message: "接口异常",
RequestError: fmt.Sprintf("响应解析失败: %v", err),
}
}
result := &QueryWhitelistResult{
Code: apiResp.Code,
Message: apiResp.Message,
TransactionID: apiResp.TransactionID,
}
if apiResp.Data != "" {
decryptedData, err := c.decrypt(apiResp.Data)
if err == nil {
var entry QueryWhitelistEntry
if json.Unmarshal([]byte(decryptedData), &entry) == nil {
result.Entry = &entry
}
}
}
return result
}

View File

@@ -83,10 +83,12 @@ type ServiceContext struct {
WhitelistOrderModel model.WhitelistOrderModel
WhitelistOrderItemModel model.WhitelistOrderItemModel
TianyuanapiCallLogModel model.TianyuanapiCallLogModel
QueryWhitelistOpLogModel model.QueryWhitelistOpLogModel
// 服务
WhitelistService *service.WhitelistService
TianyuanapiCallLogService *service.TianyuanapiCallLogService
TianyuanapiClient *tianyuanapi.Client
AlipayService *service.AliPayService
WechatPayService *service.WechatPayService
ApplePayService *service.ApplePayService
@@ -172,13 +174,15 @@ func NewServiceContext(c config.Config) *ServiceContext {
whitelistOrderModel := model.NewWhitelistOrderModel(db, cacheConf)
whitelistOrderItemModel := model.NewWhitelistOrderItemModel(db, cacheConf)
tianyuanapiCallLogModel := model.NewTianyuanapiCallLogModel(db, cacheConf)
queryWhitelistOpLogModel := model.NewQueryWhitelistOpLogModel(db, cacheConf)
// ============================== 第三方服务初始化 ==============================
tianyuanapi, err := tianyuanapi.NewClient(tianyuanapi.Config{
AccessID: c.Tianyuanapi.AccessID,
Key: c.Tianyuanapi.Key,
BaseURL: c.Tianyuanapi.BaseURL,
Timeout: time.Duration(c.Tianyuanapi.Timeout) * time.Second,
AccessID: c.Tianyuanapi.AccessID,
Key: c.Tianyuanapi.Key,
BaseURL: c.Tianyuanapi.BaseURL,
WhitelistMgmtKey: c.Tianyuanapi.WhitelistMgmtKey,
Timeout: time.Duration(c.Tianyuanapi.Timeout) * time.Second,
})
if err != nil {
logx.Errorf("初始化天远API失败: %+v", err)
@@ -279,10 +283,12 @@ func NewServiceContext(c config.Config) *ServiceContext {
WhitelistOrderModel: whitelistOrderModel,
WhitelistOrderItemModel: whitelistOrderItemModel,
TianyuanapiCallLogModel: tianyuanapiCallLogModel,
QueryWhitelistOpLogModel: queryWhitelistOpLogModel,
// 服务
WhitelistService: service.NewWhitelistService(c, userFeatureWhitelistModel, whitelistOrderModel, whitelistOrderItemModel, queryModel, featureModel),
TianyuanapiCallLogService: service.NewTianyuanapiCallLogService(tianyuanapiCallLogModel, featureModel),
TianyuanapiClient: tianyuanapi,
AlipayService: alipayService,
WechatPayService: wechatPayService,
ApplePayService: applePayService,

View File

@@ -742,6 +742,70 @@ type AdminQueryItem struct {
Data interface{} `json:"data"` // 这里可以是 map 或 具体的 struct
}
type AdminQueryWhitelistAppendReq struct {
Name string `json:"name"` // 姓名,* 表示仅按身份证匹配
IdCard string `json:"id_card"` // 身份证号
ApiCodes []string `json:"api_codes"` // 产品编码列表
Remark string `json:"remark,optional"` // 备注
}
type AdminQueryWhitelistCreateReq struct {
Name string `json:"name"` // 姓名,* 表示仅按身份证匹配
IdCard string `json:"id_card"` // 身份证号
ApiCodes []string `json:"api_codes"` // 产品编码列表
Remark string `json:"remark,optional"` // 备注
}
type AdminQueryWhitelistEntryItem struct {
Id string `json:"id"`
Name string `json:"name"`
IdCardMasked string `json:"id_card_masked"`
ApiCodes []string `json:"api_codes"`
Status string `json:"status"`
Remark string `json:"remark"`
CreatedAt string `json:"created_at"`
UpdatedAt string `json:"updated_at"`
}
type AdminQueryWhitelistOpLogItem struct {
Id string `json:"id"`
AdminUserId string `json:"admin_user_id"`
AdminUserName string `json:"admin_user_name"`
Action string `json:"action"`
Name string `json:"name"`
IdCard string `json:"id_card"`
IdCardMasked string `json:"id_card_masked"`
ApiCodes []string `json:"api_codes"`
Remark string `json:"remark"`
TianyuanCode int `json:"tianyuan_code"`
TianyuanMessage string `json:"tianyuan_message"`
TransactionId string `json:"transaction_id"`
EntryId string `json:"entry_id"`
EntryStatus string `json:"entry_status"`
EntryApiCodes []string `json:"entry_api_codes"`
CreateTime string `json:"create_time"`
}
type AdminQueryWhitelistOpLogListReq struct {
Page int64 `form:"page,default=1"`
PageSize int64 `form:"page_size,default=20"`
IdCard *string `form:"id_card,optional"` // 身份证号
Action *string `form:"action,optional"` // create / append
TianyuanCode *int64 `form:"tianyuan_code,optional"` // 天远业务码0=成功
}
type AdminQueryWhitelistOpLogListResp struct {
Total int64 `json:"total"`
Items []AdminQueryWhitelistOpLogItem `json:"items"`
}
type AdminQueryWhitelistOpResp struct {
TianyuanCode int `json:"tianyuan_code"` // 天远业务码
TianyuanMessage string `json:"tianyuan_message"` // 天远返回描述
TransactionId string `json:"transaction_id,optional"` // 天远流水号
Entry *AdminQueryWhitelistEntryItem `json:"entry,optional"` // 成功时规则详情
}
type AdminRefundOrderReq struct {
Id string `path:"id"` // 订单ID
RefundAmount float64 `json:"refund_amount"` // 退款金额
@@ -1137,7 +1201,7 @@ type AgentWithdrawalListItem struct {
PayeeAccount string `json:"payee_account"` // 收款账户
PayeeName string `json:"payee_name"` // 收款人姓名
BankName string `json:"bank_name"` // 开户行
BankCardNo string `json:"bank_card_no"` // 银行卡号
BankCardNo string `json:"bank_card_no"` // 银行卡号(掩码)
BankReservedMobile string `json:"bank_reserved_mobile"` // 银行预留手机号
Remark string `json:"remark"` // 备注
CreateTime string `json:"create_time"` // 创建时间
@@ -1153,13 +1217,13 @@ type ApplyUpgradeResp struct {
}
type ApplyWithdrawalReq struct {
Amount float64 `json:"amount"` // 提现金额
WithdrawMethod int64 `json:"withdraw_method"` // 提现方式1=支付宝2=银行卡
PayeeAccount string `json:"payee_account"` // 收款账户(支付宝)
PayeeName string `json:"payee_name"` // 收款人姓名/持卡人姓名
BankName string `json:"bank_name"` // 开户行(银行卡必填)
BankCardNo string `json:"bank_card_no"` // 银行卡号(银行卡必填)
BankReservedMobile string `json:"bank_reserved_mobile"` // 银行预留手机号(银行卡必填)
Amount float64 `json:"amount"` // 提现金额
WithdrawMethod int64 `json:"withdraw_method"` // 提现方式1=支付宝2=银行卡
PayeeAccount string `json:"payee_account"` // 收款账户(支付宝)
PayeeName string `json:"payee_name"` // 收款人姓名/持卡人姓名
BankName string `json:"bank_name,optional"` // 开户行(银行卡必填)
BankCardNo string `json:"bank_card_no,optional"` // 银行卡号(银行卡必填)
BankReservedMobile string `json:"bank_reserved_mobile,optional"` // 银行预留手机号(银行卡必填)
}
type ApplyWithdrawalResp struct {
@@ -2303,7 +2367,7 @@ type WithdrawalItem struct {
PayeeAccount string `json:"payee_account"` // 收款账户
PayeeName string `json:"payee_name"` // 收款人姓名
BankName string `json:"bank_name"` // 开户行
BankCardNo string `json:"bank_card_no"` // 银行卡号
BankCardNo string `json:"bank_card_no"` // 银行卡号(掩码)
BankReservedMobile string `json:"bank_reserved_mobile"` // 银行预留手机号
Remark string `json:"remark"` // 备注
CreateTime string `json:"create_time"` // 创建时间

View File

@@ -0,0 +1,27 @@
package model
import (
"github.com/zeromicro/go-zero/core/stores/cache"
"github.com/zeromicro/go-zero/core/stores/sqlx"
)
var _ QueryWhitelistOpLogModel = (*customQueryWhitelistOpLogModel)(nil)
type (
// QueryWhitelistOpLogModel is an interface to be customized, add more methods here,
// and implement the added methods in customQueryWhitelistOpLogModel.
QueryWhitelistOpLogModel interface {
queryWhitelistOpLogModel
}
customQueryWhitelistOpLogModel struct {
*defaultQueryWhitelistOpLogModel
}
)
// NewQueryWhitelistOpLogModel returns a model for the database table.
func NewQueryWhitelistOpLogModel(conn sqlx.SqlConn, c cache.CacheConf) QueryWhitelistOpLogModel {
return &customQueryWhitelistOpLogModel{
defaultQueryWhitelistOpLogModel: newQueryWhitelistOpLogModel(conn, c),
}
}

View File

@@ -0,0 +1,398 @@
// Code generated by goctl. DO NOT EDIT!
package model
import (
"context"
"database/sql"
"fmt"
"strings"
"reflect"
"time"
"github.com/Masterminds/squirrel"
"github.com/google/uuid"
"github.com/pkg/errors"
"github.com/zeromicro/go-zero/core/stores/builder"
"github.com/zeromicro/go-zero/core/stores/cache"
"github.com/zeromicro/go-zero/core/stores/sqlc"
"github.com/zeromicro/go-zero/core/stores/sqlx"
"github.com/zeromicro/go-zero/core/stringx"
"qnc-server/common/globalkey"
)
var (
queryWhitelistOpLogFieldNames = builder.RawFieldNames(&QueryWhitelistOpLog{})
queryWhitelistOpLogRows = strings.Join(queryWhitelistOpLogFieldNames, ",")
queryWhitelistOpLogRowsExpectAutoSet = strings.Join(stringx.Remove(queryWhitelistOpLogFieldNames, "`create_time`", "`update_time`"), ",")
queryWhitelistOpLogRowsWithPlaceHolder = strings.Join(stringx.Remove(queryWhitelistOpLogFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?"
cacheQncQueryWhitelistOpLogIdPrefix = "cache:qnc:queryWhitelistOpLog:id:"
)
type (
queryWhitelistOpLogModel interface {
Insert(ctx context.Context, session sqlx.Session, data *QueryWhitelistOpLog) (sql.Result, error)
FindOne(ctx context.Context, id string) (*QueryWhitelistOpLog, error)
Update(ctx context.Context, session sqlx.Session, data *QueryWhitelistOpLog) (sql.Result, error)
UpdateWithVersion(ctx context.Context, session sqlx.Session, data *QueryWhitelistOpLog) error
Trans(ctx context.Context, fn func(context context.Context, session sqlx.Session) error) error
SelectBuilder() squirrel.SelectBuilder
DeleteSoft(ctx context.Context, session sqlx.Session, data *QueryWhitelistOpLog) error
FindSum(ctx context.Context, sumBuilder squirrel.SelectBuilder, field string) (float64, error)
FindCount(ctx context.Context, countBuilder squirrel.SelectBuilder, field string) (int64, error)
FindAll(ctx context.Context, rowBuilder squirrel.SelectBuilder, orderBy string) ([]*QueryWhitelistOpLog, error)
FindPageListByPage(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*QueryWhitelistOpLog, error)
FindPageListByPageWithTotal(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*QueryWhitelistOpLog, int64, error)
FindPageListByIdDESC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*QueryWhitelistOpLog, error)
FindPageListByIdASC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*QueryWhitelistOpLog, error)
Delete(ctx context.Context, session sqlx.Session, id string) error
}
defaultQueryWhitelistOpLogModel struct {
sqlc.CachedConn
table string
}
QueryWhitelistOpLog struct {
Id string `db:"id"` // UUID主键
CreateTime time.Time `db:"create_time"` // 创建时间
UpdateTime time.Time `db:"update_time"` // 更新时间
DeleteTime sql.NullTime `db:"delete_time"` // 删除时间
DelState int64 `db:"del_state"` // 删除状态0=未删除1=已删除
Version int64 `db:"version"` // 版本号(乐观锁)
AdminUserId string `db:"admin_user_id"` // 操作管理员ID
Action string `db:"action"` // 操作类型create=创建规则append=追加接口
Name string `db:"name"` // 姓名规则
IdCard string `db:"id_card"` // 身份证号(明文,供后台审计)
IdCardMasked sql.NullString `db:"id_card_masked"` // 天远返回的脱敏身份证号
ApiCodes string `db:"api_codes"` // 本次提交的产品编码JSON数组
Remark sql.NullString `db:"remark"` // 备注
TianyuanCode int64 `db:"tianyuan_code"` // 天远 API 业务码
TianyuanMessage sql.NullString `db:"tianyuan_message"` // 天远 API 返回描述
TransactionId sql.NullString `db:"transaction_id"` // 天远 API 流水号
EntryId sql.NullString `db:"entry_id"` // 天远规则ID成功时
EntryStatus sql.NullString `db:"entry_status"` // 规则状态(成功时)
EntryApiCodes sql.NullString `db:"entry_api_codes"` // 规则当前产品编码列表JSON数组成功时
}
)
func newQueryWhitelistOpLogModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultQueryWhitelistOpLogModel {
return &defaultQueryWhitelistOpLogModel{
CachedConn: sqlc.NewConn(conn, c),
table: "`query_whitelist_op_log`",
}
}
func (m *defaultQueryWhitelistOpLogModel) Insert(ctx context.Context, session sqlx.Session, data *QueryWhitelistOpLog) (sql.Result, error) {
data.DelState = globalkey.DelStateNo
m.insertUUID(data)
queryWhitelistOpLogIdKey := fmt.Sprintf("%s%v", cacheQncQueryWhitelistOpLogIdPrefix, data.Id)
return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, queryWhitelistOpLogRowsExpectAutoSet)
if session != nil {
return session.ExecCtx(ctx, query, data.Id, data.DeleteTime, data.DelState, data.Version, data.AdminUserId, data.Action, data.Name, data.IdCard, data.IdCardMasked, data.ApiCodes, data.Remark, data.TianyuanCode, data.TianyuanMessage, data.TransactionId, data.EntryId, data.EntryStatus, data.EntryApiCodes)
}
return conn.ExecCtx(ctx, query, data.Id, data.DeleteTime, data.DelState, data.Version, data.AdminUserId, data.Action, data.Name, data.IdCard, data.IdCardMasked, data.ApiCodes, data.Remark, data.TianyuanCode, data.TianyuanMessage, data.TransactionId, data.EntryId, data.EntryStatus, data.EntryApiCodes)
}, queryWhitelistOpLogIdKey)
}
func (m *defaultQueryWhitelistOpLogModel) insertUUID(data *QueryWhitelistOpLog) {
t := reflect.TypeOf(data).Elem()
v := reflect.ValueOf(data).Elem()
for i := 0; i < t.NumField(); i++ {
sf := t.Field(i)
if sf.Tag.Get("db") == "id" {
f := v.Field(i)
if f.IsValid() && f.CanSet() && f.Kind() == reflect.String {
if f.String() == "" {
f.SetString(uuid.NewString())
}
}
break
}
}
}
func (m *defaultQueryWhitelistOpLogModel) FindOne(ctx context.Context, id string) (*QueryWhitelistOpLog, error) {
queryWhitelistOpLogIdKey := fmt.Sprintf("%s%v", cacheQncQueryWhitelistOpLogIdPrefix, id)
var resp QueryWhitelistOpLog
err := m.QueryRowCtx(ctx, &resp, queryWhitelistOpLogIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error {
query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", queryWhitelistOpLogRows, m.table)
return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo)
})
switch err {
case nil:
return &resp, nil
case sqlc.ErrNotFound:
return nil, ErrNotFound
default:
return nil, err
}
}
func (m *defaultQueryWhitelistOpLogModel) Update(ctx context.Context, session sqlx.Session, data *QueryWhitelistOpLog) (sql.Result, error) {
queryWhitelistOpLogIdKey := fmt.Sprintf("%s%v", cacheQncQueryWhitelistOpLogIdPrefix, data.Id)
return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, queryWhitelistOpLogRowsWithPlaceHolder)
if session != nil {
return session.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.AdminUserId, data.Action, data.Name, data.IdCard, data.IdCardMasked, data.ApiCodes, data.Remark, data.TianyuanCode, data.TianyuanMessage, data.TransactionId, data.EntryId, data.EntryStatus, data.EntryApiCodes, data.Id)
}
return conn.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.AdminUserId, data.Action, data.Name, data.IdCard, data.IdCardMasked, data.ApiCodes, data.Remark, data.TianyuanCode, data.TianyuanMessage, data.TransactionId, data.EntryId, data.EntryStatus, data.EntryApiCodes, data.Id)
}, queryWhitelistOpLogIdKey)
}
func (m *defaultQueryWhitelistOpLogModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, data *QueryWhitelistOpLog) error {
oldVersion := data.Version
data.Version += 1
var sqlResult sql.Result
var err error
queryWhitelistOpLogIdKey := fmt.Sprintf("%s%v", cacheQncQueryWhitelistOpLogIdPrefix, data.Id)
sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, queryWhitelistOpLogRowsWithPlaceHolder)
if session != nil {
return session.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.AdminUserId, data.Action, data.Name, data.IdCard, data.IdCardMasked, data.ApiCodes, data.Remark, data.TianyuanCode, data.TianyuanMessage, data.TransactionId, data.EntryId, data.EntryStatus, data.EntryApiCodes, data.Id, oldVersion)
}
return conn.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.AdminUserId, data.Action, data.Name, data.IdCard, data.IdCardMasked, data.ApiCodes, data.Remark, data.TianyuanCode, data.TianyuanMessage, data.TransactionId, data.EntryId, data.EntryStatus, data.EntryApiCodes, data.Id, oldVersion)
}, queryWhitelistOpLogIdKey)
if err != nil {
return err
}
updateCount, err := sqlResult.RowsAffected()
if err != nil {
return err
}
if updateCount == 0 {
return ErrNoRowsUpdate
}
return nil
}
func (m *defaultQueryWhitelistOpLogModel) DeleteSoft(ctx context.Context, session sqlx.Session, data *QueryWhitelistOpLog) error {
data.DelState = globalkey.DelStateYes
data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true}
if err := m.UpdateWithVersion(ctx, session, data); err != nil {
return errors.Wrapf(errors.New("delete soft failed "), "QueryWhitelistOpLogModel delete err : %+v", err)
}
return nil
}
func (m *defaultQueryWhitelistOpLogModel) FindSum(ctx context.Context, builder squirrel.SelectBuilder, field string) (float64, error) {
if len(field) == 0 {
return 0, errors.Wrapf(errors.New("FindSum Least One Field"), "FindSum Least One Field")
}
builder = builder.Columns("IFNULL(SUM(" + field + "),0)")
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql()
if err != nil {
return 0, err
}
var resp float64
err = m.QueryRowNoCacheCtx(ctx, &resp, query, values...)
switch err {
case nil:
return resp, nil
default:
return 0, err
}
}
func (m *defaultQueryWhitelistOpLogModel) FindCount(ctx context.Context, builder squirrel.SelectBuilder, field string) (int64, error) {
if len(field) == 0 {
return 0, errors.Wrapf(errors.New("FindCount Least One Field"), "FindCount Least One Field")
}
builder = builder.Columns("COUNT(" + field + ")")
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql()
if err != nil {
return 0, err
}
var resp int64
err = m.QueryRowNoCacheCtx(ctx, &resp, query, values...)
switch err {
case nil:
return resp, nil
default:
return 0, err
}
}
func (m *defaultQueryWhitelistOpLogModel) FindAll(ctx context.Context, builder squirrel.SelectBuilder, orderBy string) ([]*QueryWhitelistOpLog, error) {
builder = builder.Columns(queryWhitelistOpLogRows)
if orderBy == "" {
builder = builder.OrderBy("id DESC")
} else {
builder = builder.OrderBy(orderBy)
}
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql()
if err != nil {
return nil, err
}
var resp []*QueryWhitelistOpLog
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
switch err {
case nil:
return resp, nil
default:
return nil, err
}
}
func (m *defaultQueryWhitelistOpLogModel) FindPageListByPage(ctx context.Context, builder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*QueryWhitelistOpLog, error) {
builder = builder.Columns(queryWhitelistOpLogRows)
if orderBy == "" {
builder = builder.OrderBy("id DESC")
} else {
builder = builder.OrderBy(orderBy)
}
if page < 1 {
page = 1
}
offset := (page - 1) * pageSize
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).Offset(uint64(offset)).Limit(uint64(pageSize)).ToSql()
if err != nil {
return nil, err
}
var resp []*QueryWhitelistOpLog
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
switch err {
case nil:
return resp, nil
default:
return nil, err
}
}
func (m *defaultQueryWhitelistOpLogModel) FindPageListByPageWithTotal(ctx context.Context, builder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*QueryWhitelistOpLog, int64, error) {
total, err := m.FindCount(ctx, builder, "id")
if err != nil {
return nil, 0, err
}
builder = builder.Columns(queryWhitelistOpLogRows)
if orderBy == "" {
builder = builder.OrderBy("id DESC")
} else {
builder = builder.OrderBy(orderBy)
}
if page < 1 {
page = 1
}
offset := (page - 1) * pageSize
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).Offset(uint64(offset)).Limit(uint64(pageSize)).ToSql()
if err != nil {
return nil, total, err
}
var resp []*QueryWhitelistOpLog
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
switch err {
case nil:
return resp, total, nil
default:
return nil, total, err
}
}
func (m *defaultQueryWhitelistOpLogModel) FindPageListByIdDESC(ctx context.Context, builder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*QueryWhitelistOpLog, error) {
builder = builder.Columns(queryWhitelistOpLogRows)
if preMinId > 0 {
builder = builder.Where(" id < ? ", preMinId)
}
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).OrderBy("id DESC").Limit(uint64(pageSize)).ToSql()
if err != nil {
return nil, err
}
var resp []*QueryWhitelistOpLog
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
switch err {
case nil:
return resp, nil
default:
return nil, err
}
}
func (m *defaultQueryWhitelistOpLogModel) FindPageListByIdASC(ctx context.Context, builder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*QueryWhitelistOpLog, error) {
builder = builder.Columns(queryWhitelistOpLogRows)
if preMaxId > 0 {
builder = builder.Where(" id > ? ", preMaxId)
}
query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).OrderBy("id ASC").Limit(uint64(pageSize)).ToSql()
if err != nil {
return nil, err
}
var resp []*QueryWhitelistOpLog
err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...)
switch err {
case nil:
return resp, nil
default:
return nil, err
}
}
func (m *defaultQueryWhitelistOpLogModel) Trans(ctx context.Context, fn func(ctx context.Context, session sqlx.Session) error) error {
return m.TransactCtx(ctx, func(ctx context.Context, session sqlx.Session) error {
return fn(ctx, session)
})
}
func (m *defaultQueryWhitelistOpLogModel) SelectBuilder() squirrel.SelectBuilder {
return squirrel.Select().From(m.table)
}
func (m *defaultQueryWhitelistOpLogModel) Delete(ctx context.Context, session sqlx.Session, id string) error {
queryWhitelistOpLogIdKey := fmt.Sprintf("%s%v", cacheQncQueryWhitelistOpLogIdPrefix, id)
_, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
query := fmt.Sprintf("delete from %s where `id` = ?", m.table)
if session != nil {
return session.ExecCtx(ctx, query, id)
}
return conn.ExecCtx(ctx, query, id)
}, queryWhitelistOpLogIdKey)
return err
}
func (m *defaultQueryWhitelistOpLogModel) formatPrimary(primary interface{}) string {
return fmt.Sprintf("%s%v", cacheQncQueryWhitelistOpLogIdPrefix, primary)
}
func (m *defaultQueryWhitelistOpLogModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error {
query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", queryWhitelistOpLogRows, m.table)
return conn.QueryRowCtx(ctx, v, query, primary, globalkey.DelStateNo)
}
func (m *defaultQueryWhitelistOpLogModel) tableName() string {
return m.table
}

View File

@@ -17,7 +17,8 @@ $tables = @(
"tianyuanapi_call_log",
"user_feature_whitelist",
"whitelist_order",
"whitelist_order_item"
"whitelist_order_item",
"query_whitelist_op_log"
# ============================================
# 新代理系统表
# ============================================

View File

@@ -0,0 +1,118 @@
-- ============================================
-- 查询白名单:操作记录表 + 菜单 + API 权限
-- 数据库zac
-- ============================================
-- 1. 创建操作记录表
CREATE TABLE IF NOT EXISTS `query_whitelist_op_log` (
`id` CHAR(36) NOT NULL COMMENT 'UUID主键',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
`delete_time` datetime DEFAULT NULL COMMENT '删除时间',
`del_state` tinyint NOT NULL DEFAULT '0' COMMENT '删除状态0=未删除1=已删除',
`version` bigint NOT NULL DEFAULT '0' COMMENT '版本号(乐观锁)',
`admin_user_id` CHAR(36) NOT NULL COMMENT '操作管理员ID',
`action` varchar(20) NOT NULL COMMENT '操作类型create=创建规则append=追加接口',
`name` varchar(50) NOT NULL DEFAULT '*' COMMENT '姓名规则',
`id_card` varchar(50) NOT NULL COMMENT '身份证号(明文,供后台审计)',
`id_card_masked` varchar(50) DEFAULT NULL COMMENT '天远返回的脱敏身份证号',
`api_codes` varchar(2000) NOT NULL COMMENT '本次提交的产品编码JSON数组',
`remark` varchar(500) DEFAULT NULL COMMENT '备注',
`tianyuan_code` int NOT NULL DEFAULT 0 COMMENT '天远 API 业务码',
`tianyuan_message` varchar(500) DEFAULT NULL COMMENT '天远 API 返回描述',
`transaction_id` varchar(64) DEFAULT NULL COMMENT '天远 API 流水号',
`entry_id` varchar(64) DEFAULT NULL COMMENT '天远规则ID成功时',
`entry_status` varchar(20) DEFAULT NULL COMMENT '规则状态(成功时)',
`entry_api_codes` varchar(2000) DEFAULT NULL COMMENT '规则当前产品编码列表JSON数组成功时',
PRIMARY KEY (`id`),
KEY `idx_admin_user_id` (`admin_user_id`),
KEY `idx_id_card` (`id_card`),
KEY `idx_action` (`action`),
KEY `idx_tianyuan_code` (`tianyuan_code`),
KEY `idx_create_time` (`create_time`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='查询白名单操作记录表';
-- 2. 菜单:新增「查询白名单」
INSERT INTO `admin_menu` (
`id`, `pid`, `name`, `path`, `component`, `redirect`, `meta`,
`status`, `type`, `sort`, `del_state`, `version`
)
SELECT
'd02e094d-6af8-11f1-bd31-dec53e82fe75',
'48d0e129-a141-4a74-b519-7adc38d22d27',
'queryWhitelist',
'/product-manage/query-whitelist/list',
'/product-manage/query-whitelist/list',
NULL,
JSON_OBJECT('icon', 'lucide:shield-off', 'title', '查询白名单'),
1,
1,
0,
0,
0
FROM DUAL
WHERE NOT EXISTS (
SELECT 1 FROM `admin_menu`
WHERE `path` = '/product-manage/query-whitelist/list' AND `del_state` = 0
);
-- 3. 给超级管理员授权菜单
INSERT INTO `admin_role_menu` (`id`, `role_id`, `menu_id`, `del_state`, `version`)
SELECT
UUID(),
'741b7a39-a95d-4b9d-8dc0-84ee664d5fef',
m.`id`,
0,
0
FROM `admin_menu` m
WHERE m.`path` = '/product-manage/query-whitelist/list'
AND m.`del_state` = 0
AND NOT EXISTS (
SELECT 1 FROM `admin_role_menu` rm
WHERE rm.`role_id` = '741b7a39-a95d-4b9d-8dc0-84ee664d5fef'
AND rm.`menu_id` = m.`id`
AND rm.`del_state` = 0
);
-- 4. 注册后台 API 权限
INSERT INTO `admin_api` (`id`, `create_time`, `update_time`, `delete_time`, `del_state`, `version`, `api_name`, `api_code`, `method`, `url`, `status`, `description`)
SELECT UUID(), NOW(), NOW(), NULL, 0, 0, '查询白名单-创建', 'post__api_v1_admin_query-whitelist_create', 'POST', '/api/v1/admin/query-whitelist/create', 1, '创建查询白名单规则'
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `admin_api` WHERE `url` = '/api/v1/admin/query-whitelist/create' AND `method` = 'POST' AND `del_state` = 0);
INSERT INTO `admin_api` (`id`, `create_time`, `update_time`, `delete_time`, `del_state`, `version`, `api_name`, `api_code`, `method`, `url`, `status`, `description`)
SELECT UUID(), NOW(), NOW(), NULL, 0, 0, '查询白名单-追加', 'post__api_v1_admin_query-whitelist_append', 'POST', '/api/v1/admin/query-whitelist/append', 1, '追加查询白名单产品编码'
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `admin_api` WHERE `url` = '/api/v1/admin/query-whitelist/append' AND `method` = 'POST' AND `del_state` = 0);
INSERT INTO `admin_api` (`id`, `create_time`, `update_time`, `delete_time`, `del_state`, `version`, `api_name`, `api_code`, `method`, `url`, `status`, `description`)
SELECT UUID(), NOW(), NOW(), NULL, 0, 0, '查询白名单-操作记录', 'get__api_v1_admin_query-whitelist_op-log_list', 'GET', '/api/v1/admin/query-whitelist/op-log/list', 1, '查询白名单操作记录列表'
FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM `admin_api` WHERE `url` = '/api/v1/admin/query-whitelist/op-log/list' AND `method` = 'GET' AND `del_state` = 0);
-- 5. 给超级管理员授权 API
INSERT INTO `admin_role_api` (`id`, `create_time`, `update_time`, `delete_time`, `del_state`, `version`, `role_id`, `api_id`)
SELECT UUID(), NOW(), NOW(), NULL, 0, 0, '741b7a39-a95d-4b9d-8dc0-84ee664d5fef', a.`id`
FROM `admin_api` a
WHERE a.`url` = '/api/v1/admin/query-whitelist/create' AND a.`method` = 'POST' AND a.`del_state` = 0
AND NOT EXISTS (
SELECT 1 FROM `admin_role_api` ra
WHERE ra.`role_id` = '741b7a39-a95d-4b9d-8dc0-84ee664d5fef' AND ra.`api_id` = a.`id` AND ra.`del_state` = 0
);
INSERT INTO `admin_role_api` (`id`, `create_time`, `update_time`, `delete_time`, `del_state`, `version`, `role_id`, `api_id`)
SELECT UUID(), NOW(), NOW(), NULL, 0, 0, '741b7a39-a95d-4b9d-8dc0-84ee664d5fef', a.`id`
FROM `admin_api` a
WHERE a.`url` = '/api/v1/admin/query-whitelist/append' AND a.`method` = 'POST' AND a.`del_state` = 0
AND NOT EXISTS (
SELECT 1 FROM `admin_role_api` ra
WHERE ra.`role_id` = '741b7a39-a95d-4b9d-8dc0-84ee664d5fef' AND ra.`api_id` = a.`id` AND ra.`del_state` = 0
);
INSERT INTO `admin_role_api` (`id`, `create_time`, `update_time`, `delete_time`, `del_state`, `version`, `role_id`, `api_id`)
SELECT UUID(), NOW(), NOW(), NULL, 0, 0, '741b7a39-a95d-4b9d-8dc0-84ee664d5fef', a.`id`
FROM `admin_api` a
WHERE a.`url` = '/api/v1/admin/query-whitelist/op-log/list' AND a.`method` = 'GET' AND a.`del_state` = 0
AND NOT EXISTS (
SELECT 1 FROM `admin_role_api` ra
WHERE ra.`role_id` = '741b7a39-a95d-4b9d-8dc0-84ee664d5fef' AND ra.`api_id` = a.`id` AND ra.`del_state` = 0
);