Merge branch 'main' into feat-IRONFANS-163-Robin
This commit is contained in:
commit
0665b22b3f
|
|
@ -29,6 +29,7 @@ const (
|
|||
AccountPunishment_BlockFromBeingSearched = 4 // 禁止被搜索到
|
||||
AccountPunishment_BlockFromBeingDiscovered = 5 // 禁止在推荐被发现
|
||||
AccountPunishment_BlockFromBeingSeenAtMoment = 6 // 禁止在广场被发现
|
||||
AccountPunishment_BlockFromPaying = 7 // 禁止付款
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package main
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"math/rand"
|
||||
"net"
|
||||
"net/http"
|
||||
"os"
|
||||
|
|
@ -31,6 +32,8 @@ func main() {
|
|||
logger.Recover()
|
||||
}()
|
||||
|
||||
rand.Seed(time.Now().UnixNano())
|
||||
|
||||
// 加载配置
|
||||
// 1.默认配置
|
||||
configPath := consts.ProductionConfigPath
|
||||
|
|
|
|||
|
|
@ -9,8 +9,11 @@ type ConfigSt struct {
|
|||
Crypto *configcenter.CryptoConfig `json:"crypto" yaml:"crypto"` // 账号相关加密
|
||||
Wxpay *configcenter.WxpayClientConfig `json:"wxpay" yaml:"wxpay"` // 微信支付
|
||||
WxpayTFZ *configcenter.WxpayClientConfig `json:"wxpay_tfz" yaml:"wxpay_tfz"` // 微信支付
|
||||
WxpayTieFanZone *configcenter.WxpayClientConfig `json:"wxpay_tiefanzone" yaml:"wxpay_tiefanzone"` // 微信支付
|
||||
Alipay *configcenter.AlipayClientConfig `json:"alipay" yaml:"alipay"` // 支付宝 心意到了
|
||||
AlipayMYTS *configcenter.AlipayClientConfig `json:"alipay_myts" yaml:"alipay_myts"` // 支付宝 觅缘天使
|
||||
AlipayLX01 *configcenter.AlipayClientConfig `json:"alipay_lx01" yaml:"alipay_lx01"` // 支付宝 揽星02
|
||||
AlipayLX02 *configcenter.AlipayClientConfig `json:"alipay_lx02" yaml:"alipay_lx02"` // 支付宝 揽星02
|
||||
Apollo *configcenter.ApolloConfig `json:"apollo" yaml:"apollo"` // Apollo
|
||||
Media *configcenter.MediaConfig `json:"media" yaml:"media"` // 媒体配置
|
||||
Dysmsapi *configcenter.DysmsapiConfig `json:"dysmsapi" yaml:"dysmsapi"` // 阿里云短信服务
|
||||
|
|
|
|||
|
|
@ -10,9 +10,7 @@ import (
|
|||
)
|
||||
|
||||
func AlipayCallback(ctx *gin.Context) {
|
||||
//req, _ := ctx.GetRawData()
|
||||
//logger.Info("_AlipayCallback req: %v", string(req))
|
||||
bm, err := alipaycli.GetDefaultAlipayClient().ParseNotify(ctx.Request)
|
||||
bm, err := alipaycli.ParseNotify(ctx.Request)
|
||||
if err != nil {
|
||||
logger.Error("ParseNotify fail, req: %v, err: %v", util.ToJson(bm), err)
|
||||
return
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package service
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"service/api/consts"
|
||||
"service/api/errcode"
|
||||
accountproto "service/api/proto/account/proto"
|
||||
|
|
@ -9,6 +10,7 @@ import (
|
|||
momentproto "service/api/proto/moment/proto"
|
||||
streamerproto "service/api/proto/streamer/proto"
|
||||
streamerauthapprovalproto "service/api/proto/streamerauthapproval/proto"
|
||||
vasproto "service/api/proto/vas/proto"
|
||||
vericodeproto "service/api/proto/vericode/proto"
|
||||
zone_collaborator_proto "service/api/proto/zone_collaborator/proto"
|
||||
zone_third_partner_proto "service/api/proto/zone_third_partner/proto"
|
||||
|
|
@ -730,3 +732,16 @@ func (s *Service) ApiUpdateZoneCollaboratorBusinessValidate(ctx *gin.Context, re
|
|||
|
||||
return
|
||||
}
|
||||
|
||||
func (s *Service) ApiCreateOrderBusinessValidate(ctx *gin.Context, req *vasproto.CreateOrderReq) (err error) {
|
||||
|
||||
result := businessvalidator.NewAuthBusinessValidator(ctx, req).
|
||||
EnsureSuchAccountPunishmentNotExist(req.BaseRequest.Mid, consts.AccountPunishment_BlockFromPaying, _DefaultAccountPunishment.OpListByMidAndType).
|
||||
Validate().
|
||||
Collect()
|
||||
ec := result[0].(errcode.ErrCode)
|
||||
if ec == errcode.ErrCodeAccountPunishmentExist {
|
||||
return fmt.Errorf("账号已受限，解限请联系客服")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,6 +41,8 @@ type Vas struct {
|
|||
zone *Zone
|
||||
zonetp *ZoneThirdPartner
|
||||
zoneclr *ZoneCollaborator
|
||||
|
||||
createOrderProxy *CreateOrderProxy
|
||||
}
|
||||
|
||||
func NewVas(store *dao.Store, streamer *Streamer, account *Account, zone *Zone, zonetp *ZoneThirdPartner, zoneclr *ZoneCollaborator) (v *Vas) {
|
||||
|
|
@ -54,6 +56,10 @@ func NewVas(store *dao.Store, streamer *Streamer, account *Account, zone *Zone,
|
|||
}
|
||||
}
|
||||
|
||||
func (v *Vas) RegisterProxyForCreateOrder(proxy *CreateOrderProxy) {
|
||||
v.createOrderProxy = proxy
|
||||
}
|
||||
|
||||
func (v *Vas) GetCoinsProductList(ctx *gin.Context, req *vasproto.GetCoinsProductListReq) (listAlipayH5 []*dbstruct.Product, err error) {
|
||||
// 获取所有金币商品
|
||||
list, err := v.store.GetProductByDtType(ctx, req.DevType, dbstruct.ProductTypeCoins)
|
||||
|
|
@ -118,7 +124,17 @@ var CreateOrderBlacklist = map[int64]bool{
|
|||
359498: true,
|
||||
}
|
||||
|
||||
type CreateOrderProxy struct {
|
||||
PreProc func(ctx *gin.Context, req *vasproto.CreateOrderReq) (data any, err error)
|
||||
}
|
||||
|
||||
func (v *Vas) CreateOrder(ctx *gin.Context, req *vasproto.CreateOrderReq) (data *vasproto.CreateOrderData, err error) {
|
||||
|
||||
_, err = v.createOrderProxy.PreProc(ctx, req)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if CreateOrderBlacklist[req.Mid] {
|
||||
err = fmt.Errorf("账号已受限，解限请联系客服")
|
||||
return
|
||||
|
|
|
|||
|
|
@ -171,13 +171,13 @@ func (s *Service) Init(c any) (err error) {
|
|||
|
||||
s.defaultMelody = melody.New()
|
||||
|
||||
err = alipaycli.InitMulti(cfg.Alipay, cfg.AlipayMYTS)
|
||||
err = alipaycli.InitMulti(cfg.Alipay, cfg.AlipayMYTS, cfg.AlipayLX01)
|
||||
if err != nil {
|
||||
logger.Error("alipaycli.Init fail, cfg: %v, err: %v", util.ToJson(cfg.Alipay), err)
|
||||
return
|
||||
}
|
||||
|
||||
err = wxpaycli.InitMulti(cfg.Wxpay, cfg.WxpayTFZ)
|
||||
err = wxpaycli.InitMulti(cfg.Wxpay, cfg.WxpayTFZ, cfg.WxpayTieFanZone)
|
||||
if err != nil {
|
||||
logger.Error("wxpaycli.Init fail, cfg: %v, err: %v", util.ToJson(cfg.Wxpay), err)
|
||||
return
|
||||
|
|
@ -239,6 +239,13 @@ func (s *Service) Init(c any) (err error) {
|
|||
|
||||
_DefaultVas = logic.NewVas(store, _DefaultStreamer, _DefaultAccount, _DefaultZone, _DefaultZoneThirdPartner, _DefaultZoneCollaborator)
|
||||
_DefaultStreamerAcct = logic.NewStreamerAcct(store)
|
||||
|
||||
_DefaultVas.RegisterProxyForCreateOrder(&logic.CreateOrderProxy{
|
||||
PreProc: func(ctx *gin.Context, req *vasproto.CreateOrderReq) (data any, err error) {
|
||||
err = s.ApiCreateOrderBusinessValidate(ctx, req)
|
||||
return nil, err
|
||||
},
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -77,6 +77,16 @@ type Video struct {
|
|||
Fmt string `json:"fmt" bson:"fmt"`
|
||||
}
|
||||
|
||||
func (i *Video) SelectMinSizeOssId() string {
|
||||
if i == nil {
|
||||
return ""
|
||||
}
|
||||
if i.Status == VideoStatusResizeDone && len(i.SrcId720) > 0 && i.Size720 < i.SizeSrc {
|
||||
return i.SrcId720
|
||||
}
|
||||
return i.SrcId
|
||||
}
|
||||
|
||||
type ToCVideo struct {
|
||||
Id int64 `json:"id"` // 视频id
|
||||
Dur int64 `json:"dur"` // 视频时
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIDsjCCApqgAwIBAgIQICQHAzR5b8oH4GqNTA34zjANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
|
||||
BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
|
||||
aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
|
||||
YXNzIDIgUjEwHhcNMjQwNzAzMDc0NTA2WhcNMjkwNzAyMDc0NTA2WjCBkjELMAkGA1UEBhMCQ04x
|
||||
LTArBgNVBAoMJOaJv+W+t+aPveaYn+e9kee7nOenkeaKgOaciemZkOWFrOWPuDEPMA0GA1UECwwG
|
||||
QWxpcGF5MUMwQQYDVQQDDDrmlK/ku5jlrp0o5Lit5Zu9Kee9kee7nOaKgOacr+aciemZkOWFrOWP
|
||||
uC0yMDg4ODQxMzM2NDUyMzY1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2g87ogy
|
||||
chLGAeHPndSPRkylFWxZL3SYUqEg9QkH58CW4/2SEt5+X2SUHWRlOLafKsJwC06/OQwSwZL8RBtz
|
||||
/HFiS/T9KSuyZOKzhfBzWh3sIBlzE+SU5ke8DgUrMVyl7VCzEVfXa9CIR203dCyOUGZf2eS728+1
|
||||
3urSn8Fu2rk+ah+uaRDc/1hcXDH1cTpY/U+NljG3q/IHQT7OsNDwWolnP/tr6MaWoCUHuCzmtlNy
|
||||
9QwNAJx0fXupmId5CQLpI5LHynila+4RxZQN6dM5uwjPZZ3DqTNir+XdPUb/uIwmYBoAtTjlg9zS
|
||||
PYml485SxB9ca6/i6LCeuhRCLkGhRwIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCA/gwDQYJKoZIhvcN
|
||||
AQELBQADggEBAAoEoorrfpHY/z0ES66MtFbWI5zc6gTYUs7MuZBaThAribl8OxOSAMMH57VuL9kt
|
||||
jUXommJguk5tRphZBxr/3KoTlxJVhnz0RORzePWaquCPYA3FwHPeuqW1UB7onJGk1kvDdVsizzDY
|
||||
8JNyEy14MDl/76HLU7W5LKDoNVdgSy1Yz8hRCO2yBCaw9VxoqgDH2E8xDQlsN+dajbsgyd2jvXiv
|
||||
Ruxa6rTV7a0bgGdTicF9DNZsAylR0GNmHJC7/uFicctbBD4uVtN1kDxOYN7nRWPVVGM74cYEo+tx
|
||||
PT253Bu7jWl1F+/G0EtX3DkTs84cZVutLhFHfi7b0ZP3DhtqAHI=
|
||||
-----END CERTIFICATE-----
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIE4jCCAsqgAwIBAgIIYsSr5bKAMl8wDQYJKoZIhvcNAQELBQAwejELMAkGA1UEBhMCQ04xFjAU
|
||||
BgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEw
|
||||
LwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMy
|
||||
MjE0MzQxNVoXDTM3MTEyNjE0MzQxNVowgYIxCzAJBgNVBAYTAkNOMRYwFAYDVQQKDA1BbnQgRmlu
|
||||
YW5jaWFsMSAwHgYDVQQLDBdDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTE5MDcGA1UEAwwwQW50IEZp
|
||||
bmFuY2lhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBDbGFzcyAyIFIxMIIBIjANBgkqhkiG9w0B
|
||||
AQEFAAOCAQ8AMIIBCgKCAQEAsLMfYaoRoPRbmDcAfXPCmKf43pWRN5yTXa/KJWO0l+mrgQvs89bA
|
||||
NEvbDUxlkGwycwtwi5DgBuBgVhLliXu+R9CYgr2dXs8D8Hx/gsggDcyGPLmVrDOnL+dyeauheARZ
|
||||
fA3du60fwEwwbGcVIpIxPa/4n3IS/ElxQa6DNgqxh8J9Xwh7qMGl0JK9+bALuxf7B541Gr4p0WEN
|
||||
G8fhgjBV4w4ut9eQLOoa1eddOUSZcy46Z7allwowwgt7b5VFfx/P1iKJ3LzBMgkCK7GZ2kiLrL7R
|
||||
iqV+h482J7hkJD+ardoc6LnrHO/hIZymDxok+VH9fVeUdQa29IZKrIDVj65THQIDAQABo2MwYTAf
|
||||
BgNVHSMEGDAWgBRfdLQEwE8HWurlsdsio4dBspzhATAdBgNVHQ4EFgQUSqHkYINtUSAtDPnS8Xoy
|
||||
oP9p7qEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIB
|
||||
AIQ8TzFy4bVIVb8+WhHKCkKNPcJe2EZuIcqvRoi727lZTJOfYy/JzLtckyZYfEI8J0lasZ29wkTt
|
||||
a1IjSo+a6XdhudU4ONVBrL70U8Kzntplw/6TBNbLFpp7taRALjUgbCOk4EoBMbeCL0GiYYsTS0mw
|
||||
7xdySzmGQku4GTyqutIGPQwKxSj9iSFw1FCZqr4VP4tyXzMUgc52SzagA6i7AyLedd3tbS6lnR5B
|
||||
L+W9Kx9hwT8L7WANAxQzv/jGldeuSLN8bsTxlOYlsdjmIGu/C9OWblPYGpjQQIRyvs4Cc/mNhrh+
|
||||
14EQgwuemIIFDLOgcD+iISoN8CqegelNcJndFw1PDN6LkVoiHz9p7jzsge8RKay/QW6C03KNDpWZ
|
||||
EUCgCUdfHfo8xKeR+LL1cfn24HKJmZt8L/aeRZwZ1jwePXFRVtiXELvgJuM/tJDIFj2KD337iV64
|
||||
fWcKQ/ydDVGqfDZAdcU4hQdsrPWENwPTQPfVPq2NNLMyIH9+WKx9Ed6/WzeZmIy5ZWpX1TtTolo6
|
||||
OJXQFeItMAjHxW/ZSZTok5IS3FuRhExturaInnzjYpx50a6kS34c5+c8hYq7sAtZ/CNLZmBnBCFD
|
||||
aMQqT8xFZJ5uolUaSeXxg7JFY1QsYp5RKvj4SjFwCGKJ2+hPPe9UyyltxOidNtxjaknOCeBHytOr
|
||||
-----END CERTIFICATE-----
|
||||
|
|
@ -0,0 +1,88 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIBszCCAVegAwIBAgIIaeL+wBcKxnswDAYIKoEcz1UBg3UFADAuMQswCQYDVQQG
|
||||
EwJDTjEOMAwGA1UECgwFTlJDQUMxDzANBgNVBAMMBlJPT1RDQTAeFw0xMjA3MTQw
|
||||
MzExNTlaFw00MjA3MDcwMzExNTlaMC4xCzAJBgNVBAYTAkNOMQ4wDAYDVQQKDAVO
|
||||
UkNBQzEPMA0GA1UEAwwGUk9PVENBMFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE
|
||||
MPCca6pmgcchsTf2UnBeL9rtp4nw+itk1Kzrmbnqo05lUwkwlWK+4OIrtFdAqnRT
|
||||
V7Q9v1htkv42TsIutzd126NdMFswHwYDVR0jBBgwFoAUTDKxl9kzG8SmBcHG5Yti
|
||||
W/CXdlgwDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFEwysZfZ
|
||||
MxvEpgXBxuWLYlvwl3ZYMAwGCCqBHM9VAYN1BQADSAAwRQIgG1bSLeOXp3oB8H7b
|
||||
53W+CKOPl2PknmWEq/lMhtn25HkCIQDaHDgWxWFtnCrBjH16/W3Ezn7/U/Vjo5xI
|
||||
pDoiVhsLwg==
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIF0zCCA7ugAwIBAgIIH8+hjWpIDREwDQYJKoZIhvcNAQELBQAwejELMAkGA1UE
|
||||
BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmlj
|
||||
YXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5jaWFsIENlcnRpZmlj
|
||||
YXRpb24gQXV0aG9yaXR5IFIxMB4XDTE4MDMyMTEzNDg0MFoXDTM4MDIyODEzNDg0
|
||||
MFowejELMAkGA1UEBhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNV
|
||||
BAsMF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MTEwLwYDVQQDDChBbnQgRmluYW5j
|
||||
aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFIxMIICIjANBgkqhkiG9w0BAQEF
|
||||
AAOCAg8AMIICCgKCAgEAtytTRcBNuur5h8xuxnlKJetT65cHGemGi8oD+beHFPTk
|
||||
rUTlFt9Xn7fAVGo6QSsPb9uGLpUFGEdGmbsQ2q9cV4P89qkH04VzIPwT7AywJdt2
|
||||
xAvMs+MgHFJzOYfL1QkdOOVO7NwKxH8IvlQgFabWomWk2Ei9WfUyxFjVO1LVh0Bp
|
||||
dRBeWLMkdudx0tl3+21t1apnReFNQ5nfX29xeSxIhesaMHDZFViO/DXDNW2BcTs6
|
||||
vSWKyJ4YIIIzStumD8K1xMsoaZBMDxg4itjWFaKRgNuPiIn4kjDY3kC66Sl/6yTl
|
||||
YUz8AybbEsICZzssdZh7jcNb1VRfk79lgAprm/Ktl+mgrU1gaMGP1OE25JCbqli1
|
||||
Pbw/BpPynyP9+XulE+2mxFwTYhKAwpDIDKuYsFUXuo8t261pCovI1CXFzAQM2w7H
|
||||
DtA2nOXSW6q0jGDJ5+WauH+K8ZSvA6x4sFo4u0KNCx0ROTBpLif6GTngqo3sj+98
|
||||
SZiMNLFMQoQkjkdN5Q5g9N6CFZPVZ6QpO0JcIc7S1le/g9z5iBKnifrKxy0TQjtG
|
||||
PsDwc8ubPnRm/F82RReCoyNyx63indpgFfhN7+KxUIQ9cOwwTvemmor0A+ZQamRe
|
||||
9LMuiEfEaWUDK+6O0Gl8lO571uI5onYdN1VIgOmwFbe+D8TcuzVjIZ/zvHrAGUcC
|
||||
AwEAAaNdMFswCwYDVR0PBAQDAgEGMAwGA1UdEwQFMAMBAf8wHQYDVR0OBBYEFF90
|
||||
tATATwda6uWx2yKjh0GynOEBMB8GA1UdIwQYMBaAFF90tATATwda6uWx2yKjh0Gy
|
||||
nOEBMA0GCSqGSIb3DQEBCwUAA4ICAQCVYaOtqOLIpsrEikE5lb+UARNSFJg6tpkf
|
||||
tJ2U8QF/DejemEHx5IClQu6ajxjtu0Aie4/3UnIXop8nH/Q57l+Wyt9T7N2WPiNq
|
||||
JSlYKYbJpPF8LXbuKYG3BTFTdOVFIeRe2NUyYh/xs6bXGr4WKTXb3qBmzR02FSy3
|
||||
IODQw5Q6zpXj8prYqFHYsOvGCEc1CwJaSaYwRhTkFedJUxiyhyB5GQwoFfExCVHW
|
||||
05ZFCAVYFldCJvUzfzrWubN6wX0DD2dwultgmldOn/W/n8at52mpPNvIdbZb2F41
|
||||
T0YZeoWnCJrYXjq/32oc1cmifIHqySnyMnavi75DxPCdZsCOpSAT4j4lAQRGsfgI
|
||||
kkLPGQieMfNNkMCKh7qjwdXAVtdqhf0RVtFILH3OyEodlk1HYXqX5iE5wlaKzDop
|
||||
PKwf2Q3BErq1xChYGGVS+dEvyXc/2nIBlt7uLWKp4XFjqekKbaGaLJdjYP5b2s7N
|
||||
1dM0MXQ/f8XoXKBkJNzEiM3hfsU6DOREgMc1DIsFKxfuMwX3EkVQM1If8ghb6x5Y
|
||||
jXayv+NLbidOSzk4vl5QwngO/JYFMkoc6i9LNwEaEtR9PhnrdubxmrtM+RjfBm02
|
||||
77q3dSWFESFQ4QxYWew4pHE0DpWbWy/iMIKQ6UZ5RLvB8GEcgt8ON7BBJeMc+Dyi
|
||||
kT9qhqn+lw==
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIICiDCCAgygAwIBAgIIQX76UsB/30owDAYIKoZIzj0EAwMFADB6MQswCQYDVQQG
|
||||
EwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UECwwXQ2VydGlmaWNh
|
||||
dGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNpYWwgQ2VydGlmaWNh
|
||||
dGlvbiBBdXRob3JpdHkgRTEwHhcNMTkwNDI4MTYyMDQ0WhcNNDkwNDIwMTYyMDQ0
|
||||
WjB6MQswCQYDVQQGEwJDTjEWMBQGA1UECgwNQW50IEZpbmFuY2lhbDEgMB4GA1UE
|
||||
CwwXQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxMTAvBgNVBAMMKEFudCBGaW5hbmNp
|
||||
YWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRTEwdjAQBgcqhkjOPQIBBgUrgQQA
|
||||
IgNiAASCCRa94QI0vR5Up9Yr9HEupz6hSoyjySYqo7v837KnmjveUIUNiuC9pWAU
|
||||
WP3jwLX3HkzeiNdeg22a0IZPoSUCpasufiLAnfXh6NInLiWBrjLJXDSGaY7vaokt
|
||||
rpZvAdmjXTBbMAsGA1UdDwQEAwIBBjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBRZ
|
||||
4ZTgDpksHL2qcpkFkxD2zVd16TAfBgNVHSMEGDAWgBRZ4ZTgDpksHL2qcpkFkxD2
|
||||
zVd16TAMBggqhkjOPQQDAwUAA2gAMGUCMQD4IoqT2hTUn0jt7oXLdMJ8q4vLp6sg
|
||||
wHfPiOr9gxreb+e6Oidwd2LDnC4OUqCWiF8CMAzwKs4SnDJYcMLf2vpkbuVE4dTH
|
||||
Rglz+HGcTLWsFs4KxLsq7MuU+vJTBUeDJeDjdA==
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIDxTCCAq2gAwIBAgIUEMdk6dVgOEIS2cCP0Q43P90Ps5YwDQYJKoZIhvcNAQEF
|
||||
BQAwajELMAkGA1UEBhMCQ04xEzARBgNVBAoMCmlUcnVzQ2hpbmExHDAaBgNVBAsM
|
||||
E0NoaW5hIFRydXN0IE5ldHdvcmsxKDAmBgNVBAMMH2lUcnVzQ2hpbmEgQ2xhc3Mg
|
||||
MiBSb290IENBIC0gRzMwHhcNMTMwNDE4MDkzNjU2WhcNMzMwNDE4MDkzNjU2WjBq
|
||||
MQswCQYDVQQGEwJDTjETMBEGA1UECgwKaVRydXNDaGluYTEcMBoGA1UECwwTQ2hp
|
||||
bmEgVHJ1c3QgTmV0d29yazEoMCYGA1UEAwwfaVRydXNDaGluYSBDbGFzcyAyIFJv
|
||||
b3QgQ0EgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPPShpV
|
||||
nJbMqqCw6Bz1kehnoPst9pkr0V9idOwU2oyS47/HjJXk9Rd5a9xfwkPO88trUpz5
|
||||
4GmmwspDXjVFu9L0eFaRuH3KMha1Ak01citbF7cQLJlS7XI+tpkTGHEY5pt3EsQg
|
||||
wykfZl/A1jrnSkspMS997r2Gim54cwz+mTMgDRhZsKK/lbOeBPpWtcFizjXYCqhw
|
||||
WktvQfZBYi6o4sHCshnOswi4yV1p+LuFcQ2ciYdWvULh1eZhLxHbGXyznYHi0dGN
|
||||
z+I9H8aXxqAQfHVhbdHNzi77hCxFjOy+hHrGsyzjrd2swVQ2iUWP8BfEQqGLqM1g
|
||||
KgWKYfcTGdbPB1MCAwEAAaNjMGEwHQYDVR0OBBYEFG/oAMxTVe7y0+408CTAK8hA
|
||||
uTyRMB8GA1UdIwQYMBaAFG/oAMxTVe7y0+408CTAK8hAuTyRMA8GA1UdEwEB/wQF
|
||||
MAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBLnUTfW7hp
|
||||
emMbuUGCk7RBswzOT83bDM6824EkUnf+X0iKS95SUNGeeSWK2o/3ALJo5hi7GZr3
|
||||
U8eLaWAcYizfO99UXMRBPw5PRR+gXGEronGUugLpxsjuynoLQu8GQAeysSXKbN1I
|
||||
UugDo9u8igJORYA+5ms0s5sCUySqbQ2R5z/GoceyI9LdxIVa1RjVX8pYOj8JFwtn
|
||||
DJN3ftSFvNMYwRuILKuqUYSHc2GPYiHVflDh5nDymCMOQFcFG3WsEuB+EYQPFgIU
|
||||
1DHmdZcz7Llx8UOZXX2JupWCYzK1XhJb+r4hK5ncf/w8qGtYlmyJpxk3hr1TfUJX
|
||||
Yf4Zr0fJsGuv
|
||||
-----END CERTIFICATE-----
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIEoDCCA4igAwIBAgIQICQHA0KlRNnCZ1YEetezpTANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
|
||||
BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
|
||||
aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
|
||||
YXNzIDEgUjEwHhcNMjQwNzAzMDc0NTA1WhcNMjkwNzAyMDc0NTA1WjBoMQswCQYDVQQGEwJDTjEt
|
||||
MCsGA1UECgwk5om/5b635o+95pif572R57uc56eR5oqA5pyJ6ZmQ5YWs5Y+4MQ8wDQYDVQQLDAZB
|
||||
bGlwYXkxGTAXBgNVBAMMEDIwODg4NDEzMzY0NTIzNjUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
|
||||
ggEKAoIBAQCNlFVmQzpE296r66hKWA45bG82LjA/8a/v8WT9CMGYNvvn9q7aqP2gt0k1xIDxzQkX
|
||||
66Dnwdkb8zSlEsTD+biOUQP/jQpje8hbbVMxBV9eC1gxdSLEOunCF8mE0vlRQSjNQZhigwMbJKyd
|
||||
PSSqwCkwoIYdR63uUYpNFNQoIbBL4b2L/urDvWIU7e61aAmWJeohUUmU0cWa7qo2lLcLBM7m5VH1
|
||||
kQQGAutEagxVezgkUB9rRMr2c/gcoFFDLxDODE4Rp8sRsSlY2sUSDWhaHV59DrwzVeq1IFtW8oNx
|
||||
OUcuxh5UhC/NcFMWZrxwajaZhw8lz2sCLT2rQoh7jMQ5AJ1LAgMBAAGjggEpMIIBJTAfBgNVHSME
|
||||
GDAWgBRxB+IEYRbk5fJl6zEPyeD0PJrVkTAdBgNVHQ4EFgQUoTtN/8z4X9vjHmIwn+GoU1wmR6Qw
|
||||
QAYDVR0gBDkwNzA1BgdggRwBbgEBMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9jYS5hbGlwYXkuY29t
|
||||
L2Nwcy5wZGYwDgYDVR0PAQH/BAQDAgbAMC8GA1UdHwQoMCYwJKAioCCGHmh0dHA6Ly9jYS5hbGlw
|
||||
YXkuY29tL2NybDkxLmNybDBgBggrBgEFBQcBAQRUMFIwKAYIKwYBBQUHMAKGHGh0dHA6Ly9jYS5h
|
||||
bGlwYXkuY29tL2NhNi5jZXIwJgYIKwYBBQUHMAGGGmh0dHA6Ly9jYS5hbGlwYXkuY29tOjgzNDAv
|
||||
MA0GCSqGSIb3DQEBCwUAA4IBAQBATTKCU2mF8Ss5EAM1yQyMXuL1+96gLgUqfVxYqdbSGT/ZJshG
|
||||
t3ZNWwICivwPMW+7XcTlYi/35VcjFSbsXuQPkbx9znDX9aGM1Uvi3Z94mNkKwnqturPNms2cXTKt
|
||||
GI/ljafoiTOUyHxf2PKPYMxL3+Z8ERsXH3eR4twzQLWQfNkw7eXyr25JhvRRjTVScXP6TSO6/jc6
|
||||
WotCDAlu7splwtDWhBs8lKTRT3nh6x6JvW/K7v5aF7OGMLrWDZ7EUNq34woqjtVCLiJAMPQTSUTm
|
||||
8S9Dk1oegX5z6/FT76EDRV4dIr8T1U/xj7g8WShzovZ1JT99ICCv0oe9eTzpg2I+
|
||||
-----END CERTIFICATE-----
|
||||
|
|
@ -36,6 +36,14 @@ wxpay:
|
|||
notify_url: "https://api.tiefen.fun/ext/vas/wxpay_callback"
|
||||
app_secret: "ebc325109b91087e22f046bc8ac5c940"
|
||||
|
||||
wxpay_tiefanzone:
|
||||
mchid: "1679775327"
|
||||
appid: "wx9ef291dbf4684ace"
|
||||
serial_no: "64BB9C68FD441858D428D73182AB4D62D27A5DE2"
|
||||
apiv3_key: "5QwY1XMK1HW3JQwGKbA3mfJ5cdsTQGjR"
|
||||
private_key_path: "/Users/erwin/wishpalv2/service/etc/mix/wxpaycert_tiefanzone/apiclient_key.pem"
|
||||
notify_url: "https://testapi.tiefen.fun/ext/vas/wxpay_callback"
|
||||
|
||||
crypto:
|
||||
aes:
|
||||
private_key: "Xbz1145141919810"
|
||||
|
|
@ -65,6 +73,14 @@ alipay_myts:
|
|||
alipay_root_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_myts/alipayRootCert.crt"
|
||||
alipay_public_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_myts/alipayCertPublicKey_RSA2.crt"
|
||||
|
||||
alipay_lx01:
|
||||
appid: "2021004153681591"
|
||||
private_key: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCNlFVmQzpE296r66hKWA45bG82LjA/8a/v8WT9CMGYNvvn9q7aqP2gt0k1xIDxzQkX66Dnwdkb8zSlEsTD+biOUQP/jQpje8hbbVMxBV9eC1gxdSLEOunCF8mE0vlRQSjNQZhigwMbJKydPSSqwCkwoIYdR63uUYpNFNQoIbBL4b2L/urDvWIU7e61aAmWJeohUUmU0cWa7qo2lLcLBM7m5VH1kQQGAutEagxVezgkUB9rRMr2c/gcoFFDLxDODE4Rp8sRsSlY2sUSDWhaHV59DrwzVeq1IFtW8oNxOUcuxh5UhC/NcFMWZrxwajaZhw8lz2sCLT2rQoh7jMQ5AJ1LAgMBAAECggEAeyx3E+4fLrM/ScFPe8aaMXlWVAPhNHCXyZ/xZXcNvtjvVkM2osPtTLrJNb8NE9F3PNlh9t+efIOd5JOsnnePCjoPyXAyfpS9nlVB0F9FNjOWegjXw3Mh1hwN1cIa6IdQ8SpFYkdrF11T08TTNr7R1x2BMM4g0zsboK4jWfrdP1YNyCM9MB/KRMldLZ8y9Bc4MJGOpWNlMWoEcN8QQd1LKki0iqMhnGYEy+XkoOsWQgnHgdvF9xmVss1+aRNPW7fO3EDtKqHu1KBccgyGIdUJ3DNV6t+A6fOw50bHuqNVGtTJPiwEhqwfnv5zLwSKzUozUhd0YZUow/W2T1Jz81/jMQKBgQDDpPekBShhwsJTkgHIGBQB36qj0uWqXrRmiWV/HC3rAyHANJ4LzoBjXhnHAggTFrQfnBFp6Oy0Zp9LYZiB1UKCPnbFYV2kpSK/6s0ddMm4R3JyBVFBldGmb3FqIvvj7VEjiqpa6pm4qllD5pmVWkj39JPFjXQ3Z8MZFsjGFD5LWQKBgQC5QZSVzQDvuUhD33PG29vEVE2YFOCWU5Cp+Fs8ncIuxPyAfjekLoOJJMvW03+KYDyT4zX76gdiZu+qAtLTBmMsNYn6f1mfXpSoThkJYdpiGw+YFTf5/fw6YT/B6Zy0aOIWjdw+d5ub91CwLMkjFh6gkEs/HiRMwR9sEQMkTc5tQwKBgGlu353ewbJdeMf8qUUh5LZVyOncX7R+sQ2JAc+Mahp6Z5fjQ0DtmjbyoUWkDKHs3EkknCXNRrK5kyLWh4+AVAVIkE0yeXqfG6j9amhzZboPltdnkjCcAo2FBUPDcqeUXuOeeMviHdFszApRnXblXulxPql536V0H6nHo49LnX6RAoGBAIY4J2jpIHaOrPbP3FgFTpJN6fH3nkgLv1IGKEQgoGG2QqLtz25abN5eFHlOvqcI1prnEWO0ySjYH2fzp79Qb2XGXHNq9QnsQpQ2ERmlFc3igUfUh7vN8oJxlvntQaXMH5HrsdhoXAuCAanCqO+MxR/bq0jNk8swWI25Pad938N1AoGBAKeG3wdQDe2M1QblI8kLZGKvY85/Sn6Kg4XEDh409QnLH2teC/MBtVglRjb6HV+Vmsg4nmGbwSrZ41B8Orxj4s0dAaqGzR/mf8X6eSxCnOo5AdAHbQoj55G3qjoq+QX0G+V1oBjCQ70GxhKLkJvaiRK0+7rWNz5bYu0UK86a7UrY"
|
||||
notify_url: ""
|
||||
app_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_lx01/appCertPublicKey_2021004153681591.crt"
|
||||
alipay_root_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_lx01/alipayRootCert.crt"
|
||||
alipay_public_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_lx01/alipayCertPublicKey_RSA2.crt"
|
||||
|
||||
apollo:
|
||||
app_id: "wishpal_live_service"
|
||||
cluster: "dev"
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ apollo:
|
|||
app_id: "wishpal_live_service"
|
||||
cluster: "dev"
|
||||
ip: "http://172.16.0.186:8080"
|
||||
namespace_name: "application,tag,account_init,platform,support_wx_id,version"
|
||||
namespace_name: "application,tag,account_init,platform,support_wx_id,version,zone"
|
||||
secret: ""
|
||||
is_back_up_config: true
|
||||
sync_server_timeout: 2
|
||||
|
|
|
|||
|
|
@ -57,6 +57,14 @@ alipay_myts:
|
|||
alipay_root_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_myts/alipayRootCert.crt"
|
||||
alipay_public_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_myts/alipayCertPublicKey_RSA2.crt"
|
||||
|
||||
alipay_lx01:
|
||||
appid: "2021004153681591"
|
||||
private_key: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCNlFVmQzpE296r66hKWA45bG82LjA/8a/v8WT9CMGYNvvn9q7aqP2gt0k1xIDxzQkX66Dnwdkb8zSlEsTD+biOUQP/jQpje8hbbVMxBV9eC1gxdSLEOunCF8mE0vlRQSjNQZhigwMbJKydPSSqwCkwoIYdR63uUYpNFNQoIbBL4b2L/urDvWIU7e61aAmWJeohUUmU0cWa7qo2lLcLBM7m5VH1kQQGAutEagxVezgkUB9rRMr2c/gcoFFDLxDODE4Rp8sRsSlY2sUSDWhaHV59DrwzVeq1IFtW8oNxOUcuxh5UhC/NcFMWZrxwajaZhw8lz2sCLT2rQoh7jMQ5AJ1LAgMBAAECggEAeyx3E+4fLrM/ScFPe8aaMXlWVAPhNHCXyZ/xZXcNvtjvVkM2osPtTLrJNb8NE9F3PNlh9t+efIOd5JOsnnePCjoPyXAyfpS9nlVB0F9FNjOWegjXw3Mh1hwN1cIa6IdQ8SpFYkdrF11T08TTNr7R1x2BMM4g0zsboK4jWfrdP1YNyCM9MB/KRMldLZ8y9Bc4MJGOpWNlMWoEcN8QQd1LKki0iqMhnGYEy+XkoOsWQgnHgdvF9xmVss1+aRNPW7fO3EDtKqHu1KBccgyGIdUJ3DNV6t+A6fOw50bHuqNVGtTJPiwEhqwfnv5zLwSKzUozUhd0YZUow/W2T1Jz81/jMQKBgQDDpPekBShhwsJTkgHIGBQB36qj0uWqXrRmiWV/HC3rAyHANJ4LzoBjXhnHAggTFrQfnBFp6Oy0Zp9LYZiB1UKCPnbFYV2kpSK/6s0ddMm4R3JyBVFBldGmb3FqIvvj7VEjiqpa6pm4qllD5pmVWkj39JPFjXQ3Z8MZFsjGFD5LWQKBgQC5QZSVzQDvuUhD33PG29vEVE2YFOCWU5Cp+Fs8ncIuxPyAfjekLoOJJMvW03+KYDyT4zX76gdiZu+qAtLTBmMsNYn6f1mfXpSoThkJYdpiGw+YFTf5/fw6YT/B6Zy0aOIWjdw+d5ub91CwLMkjFh6gkEs/HiRMwR9sEQMkTc5tQwKBgGlu353ewbJdeMf8qUUh5LZVyOncX7R+sQ2JAc+Mahp6Z5fjQ0DtmjbyoUWkDKHs3EkknCXNRrK5kyLWh4+AVAVIkE0yeXqfG6j9amhzZboPltdnkjCcAo2FBUPDcqeUXuOeeMviHdFszApRnXblXulxPql536V0H6nHo49LnX6RAoGBAIY4J2jpIHaOrPbP3FgFTpJN6fH3nkgLv1IGKEQgoGG2QqLtz25abN5eFHlOvqcI1prnEWO0ySjYH2fzp79Qb2XGXHNq9QnsQpQ2ERmlFc3igUfUh7vN8oJxlvntQaXMH5HrsdhoXAuCAanCqO+MxR/bq0jNk8swWI25Pad938N1AoGBAKeG3wdQDe2M1QblI8kLZGKvY85/Sn6Kg4XEDh409QnLH2teC/MBtVglRjb6HV+Vmsg4nmGbwSrZ41B8Orxj4s0dAaqGzR/mf8X6eSxCnOo5AdAHbQoj55G3qjoq+QX0G+V1oBjCQ70GxhKLkJvaiRK0+7rWNz5bYu0UK86a7UrY"
|
||||
notify_url: "https://api.tiefen.fun/ext/vas/alipay_callback"
|
||||
app_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_lx01/appCertPublicKey_2021004153681591.crt"
|
||||
alipay_root_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_lx01/alipayRootCert.crt"
|
||||
alipay_public_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_lx01/alipayCertPublicKey_RSA2.crt"
|
||||
|
||||
wxpay:
|
||||
mchid: "1665016206"
|
||||
appid: "wxc28fd8aaf31984b6"
|
||||
|
|
@ -75,11 +83,19 @@ wxpay_tfz:
|
|||
notify_url: "https://api.tiefen.fun/ext/vas/wxpay_callback"
|
||||
app_secret: "ebc325109b91087e22f046bc8ac5c940"
|
||||
|
||||
wxpay_tiefanzone:
|
||||
mchid: "1679775327"
|
||||
appid: "wx9ef291dbf4684ace"
|
||||
serial_no: "64BB9C68FD441858D428D73182AB4D62D27A5DE2"
|
||||
apiv3_key: "5QwY1XMK1HW3JQwGKbA3mfJ5cdsTQGjR"
|
||||
private_key_path: "/app/wishpal-ironfan/etc/mix/wxpaycert_tiefanzone/apiclient_key.pem"
|
||||
notify_url: "https://api.tiefen.fun/ext/vas/wxpay_callback"
|
||||
|
||||
apollo:
|
||||
app_id: "wishpal_live_service"
|
||||
cluster: "dev"
|
||||
ip: "http://172.16.0.186:8080"
|
||||
namespace_name: "application,tag,account_init,platform,support_wx_id,version"
|
||||
namespace_name: "application,tag,account_init,platform,support_wx_id,version,zone"
|
||||
secret: ""
|
||||
is_back_up_config: true
|
||||
sync_server_timeout: 2
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ apollo:
|
|||
app_id: "wishpal_live_service"
|
||||
cluster: "dev"
|
||||
ip: "http://localhost:8080"
|
||||
namespace_name: "application,tag,account_init,platform,support_wx_id,version"
|
||||
namespace_name: "application,tag,account_init,platform,support_wx_id,version,zone"
|
||||
secret: ""
|
||||
is_back_up_config: true
|
||||
sync_server_timeout: 2
|
||||
|
|
|
|||
|
|
@ -46,6 +46,14 @@ wxpay_tfz:
|
|||
app_secret: "ebc325109b91087e22f046bc8ac5c940"
|
||||
apiv2_key: "mot5410nh69k87e22f046bc8anv5xds8"
|
||||
|
||||
wxpay_tiefanzone:
|
||||
mchid: "1679775327"
|
||||
appid: "wx9ef291dbf4684ace"
|
||||
serial_no: "64BB9C68FD441858D428D73182AB4D62D27A5DE2"
|
||||
apiv3_key: "5QwY1XMK1HW3JQwGKbA3mfJ5cdsTQGjR"
|
||||
private_key_path: "/app/wishpal-ironfan/etc/mix/wxpaycert_tiefanzone/apiclient_key.pem"
|
||||
notify_url: "https://testapi.tiefen.fun/ext/vas/wxpay_callback"
|
||||
|
||||
crypto:
|
||||
aes:
|
||||
private_key: "Xbz1145141919810"
|
||||
|
|
@ -76,11 +84,19 @@ alipay_myts:
|
|||
alipay_root_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_myts/alipayRootCert.crt"
|
||||
alipay_public_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_myts/alipayCertPublicKey_RSA2.crt"
|
||||
|
||||
alipay_lx01:
|
||||
appid: "2021004153681591"
|
||||
private_key: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCNlFVmQzpE296r66hKWA45bG82LjA/8a/v8WT9CMGYNvvn9q7aqP2gt0k1xIDxzQkX66Dnwdkb8zSlEsTD+biOUQP/jQpje8hbbVMxBV9eC1gxdSLEOunCF8mE0vlRQSjNQZhigwMbJKydPSSqwCkwoIYdR63uUYpNFNQoIbBL4b2L/urDvWIU7e61aAmWJeohUUmU0cWa7qo2lLcLBM7m5VH1kQQGAutEagxVezgkUB9rRMr2c/gcoFFDLxDODE4Rp8sRsSlY2sUSDWhaHV59DrwzVeq1IFtW8oNxOUcuxh5UhC/NcFMWZrxwajaZhw8lz2sCLT2rQoh7jMQ5AJ1LAgMBAAECggEAeyx3E+4fLrM/ScFPe8aaMXlWVAPhNHCXyZ/xZXcNvtjvVkM2osPtTLrJNb8NE9F3PNlh9t+efIOd5JOsnnePCjoPyXAyfpS9nlVB0F9FNjOWegjXw3Mh1hwN1cIa6IdQ8SpFYkdrF11T08TTNr7R1x2BMM4g0zsboK4jWfrdP1YNyCM9MB/KRMldLZ8y9Bc4MJGOpWNlMWoEcN8QQd1LKki0iqMhnGYEy+XkoOsWQgnHgdvF9xmVss1+aRNPW7fO3EDtKqHu1KBccgyGIdUJ3DNV6t+A6fOw50bHuqNVGtTJPiwEhqwfnv5zLwSKzUozUhd0YZUow/W2T1Jz81/jMQKBgQDDpPekBShhwsJTkgHIGBQB36qj0uWqXrRmiWV/HC3rAyHANJ4LzoBjXhnHAggTFrQfnBFp6Oy0Zp9LYZiB1UKCPnbFYV2kpSK/6s0ddMm4R3JyBVFBldGmb3FqIvvj7VEjiqpa6pm4qllD5pmVWkj39JPFjXQ3Z8MZFsjGFD5LWQKBgQC5QZSVzQDvuUhD33PG29vEVE2YFOCWU5Cp+Fs8ncIuxPyAfjekLoOJJMvW03+KYDyT4zX76gdiZu+qAtLTBmMsNYn6f1mfXpSoThkJYdpiGw+YFTf5/fw6YT/B6Zy0aOIWjdw+d5ub91CwLMkjFh6gkEs/HiRMwR9sEQMkTc5tQwKBgGlu353ewbJdeMf8qUUh5LZVyOncX7R+sQ2JAc+Mahp6Z5fjQ0DtmjbyoUWkDKHs3EkknCXNRrK5kyLWh4+AVAVIkE0yeXqfG6j9amhzZboPltdnkjCcAo2FBUPDcqeUXuOeeMviHdFszApRnXblXulxPql536V0H6nHo49LnX6RAoGBAIY4J2jpIHaOrPbP3FgFTpJN6fH3nkgLv1IGKEQgoGG2QqLtz25abN5eFHlOvqcI1prnEWO0ySjYH2fzp79Qb2XGXHNq9QnsQpQ2ERmlFc3igUfUh7vN8oJxlvntQaXMH5HrsdhoXAuCAanCqO+MxR/bq0jNk8swWI25Pad938N1AoGBAKeG3wdQDe2M1QblI8kLZGKvY85/Sn6Kg4XEDh409QnLH2teC/MBtVglRjb6HV+Vmsg4nmGbwSrZ41B8Orxj4s0dAaqGzR/mf8X6eSxCnOo5AdAHbQoj55G3qjoq+QX0G+V1oBjCQ70GxhKLkJvaiRK0+7rWNz5bYu0UK86a7UrY"
|
||||
notify_url: "https://testapi.tiefen.fun/ext/vas/alipay_callback"
|
||||
app_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_lx01/appCertPublicKey_2021004153681591.crt"
|
||||
alipay_root_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_lx01/alipayRootCert.crt"
|
||||
alipay_public_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_lx01/alipayCertPublicKey_RSA2.crt"
|
||||
|
||||
apollo:
|
||||
app_id: "wishpal_live_service"
|
||||
cluster: "dev"
|
||||
ip: "http://172.31.37.71:8080"
|
||||
namespace_name: "application,tag,account_init,platform,support_wx_id,version"
|
||||
namespace_name: "application,tag,account_init,platform,support_wx_id,version,zone"
|
||||
secret: ""
|
||||
is_back_up_config: true
|
||||
sync_server_timeout: 2
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -0,0 +1,25 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIEKDCCAxCgAwIBAgIUZLucaP1EGFjUKNcxgqtNYtJ6XeIwDQYJKoZIhvcNAQEL
|
||||
BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
|
||||
FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
|
||||
Q0EwHhcNMjQwNzE3MTM0NzUyWhcNMjkwNzE2MTM0NzUyWjCBgTETMBEGA1UEAwwK
|
||||
MTY3OTc3NTMyNzEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL
|
||||
DCTmiJDpg73lpJrloZTmlofljJbkvKDlqpLmnInpmZDlhazlj7gxCzAJBgNVBAYT
|
||||
AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
|
||||
AQoCggEBAM7dkKC36tZGdxGMwlNSuH4WKa9VD+mtPZV9i4EwV136amilSMBRtk4t
|
||||
IsN9mbNlMEC1eL93zbcjRHa/dQELgIJyhya5kjCneuEgdNmQlmGzpX+s+XHzsEWp
|
||||
eCPpcRjOEvE6PuCqatAHic61wsqJN6Od9LSC8K/frXFsUB7He9Bm+EgrfyUnZuPw
|
||||
N9iejWdeEjmYOqnt++5JC6ca2RCs2b8iB/lI3sZXbMhPX6H3w7xdiELiOyWfmxUP
|
||||
WwjD9KY2i0Z0dHTo8Q4TWIXuCB9FJo3MUYbI9eS90XFDjpv3uroI8ERTschkSa/s
|
||||
/c4liaVv4xwuNrXPSSJCTqNuD09dNj0CAwEAAaOBuTCBtjAJBgNVHRMEAjAAMAsG
|
||||
A1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2Y2Eu
|
||||
aXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRC
|
||||
MDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJCMjdB
|
||||
OUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQAs8aV4
|
||||
GayiCGAERyLSAgsaWHrSKs+D4Aatrt/JlnSolDUDBD6V4eIcS4RS0KKnTrzJXops
|
||||
a0l0VHU2cdjBMAUVzwowN1/c/agbr+cQR232oOpgQF6pvZkvbu+7O0k/MqY9rkC4
|
||||
iVDweorKpnVFetmks3LNGpg22VZ85TSEKpSrqDkDxu5pX43dk0VJORK9JdGyWt59
|
||||
0DtOcLNhDffA2cCiQiyV6fXFRdSRnj4PawR0jKXRT4ZyNmNuaHLJrVu4UIU+wbHd
|
||||
2OBwyBxqKovnwjWWrugckkrUYKA54drJQwRZnWmfoLt63rZ6Y49D1i13Na+hEn+F
|
||||
NArbmO1Lc/s1ke86
|
||||
-----END CERTIFICATE-----
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
-----BEGIN PRIVATE KEY-----
|
||||
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDO3ZCgt+rWRncR
|
||||
jMJTUrh+FimvVQ/prT2VfYuBMFdd+mpopUjAUbZOLSLDfZmzZTBAtXi/d823I0R2
|
||||
v3UBC4CCcocmuZIwp3rhIHTZkJZhs6V/rPlx87BFqXgj6XEYzhLxOj7gqmrQB4nO
|
||||
tcLKiTejnfS0gvCv361xbFAex3vQZvhIK38lJ2bj8DfYno1nXhI5mDqp7fvuSQun
|
||||
GtkQrNm/Igf5SN7GV2zIT1+h98O8XYhC4jsln5sVD1sIw/SmNotGdHR06PEOE1iF
|
||||
7ggfRSaNzFGGyPXkvdFxQ46b97q6CPBEU7HIZEmv7P3OJYmlb+McLja1z0kiQk6j
|
||||
bg9PXTY9AgMBAAECggEAEjAEwTyqVwCHA3H+u9iwA9XrAFFYPtFOctBA7bDUXZzg
|
||||
siamCNKmVqU9QzbNxqoE3guWfC8KVSmyoUYgAWGDgPSU0WDLa5+t/BEgdOhzcE+d
|
||||
I2aP3+bu/pDx0SZ7HRUxMShP0uzoyzV+dkAgyjHaRHZkx2IjyzK9SxWczbf4ONBM
|
||||
PMnKdQmrhvIRphzkAs3/qw6b43sAaSVzIB8ixfDOZC0PGrYHGfEoZG0eBWMaw0r3
|
||||
LCC5/rjEXvZxNZE/9+/O7lrUQJKBHuwmD8ja8TwJGUye+2jziUdw7NQCj9UnFkS/
|
||||
+MnfbITPSTES+L85yR3P7NwlOyKPwmlUnya0mkLQwQKBgQD3qz/gT8QGbb/Hogze
|
||||
UbrOTS5s+TMdYiXcfUmoIP55yLlwAV5d4TnP14bymltBWfnyVTY1C2u42QHQTM1m
|
||||
bqe5LTLb7M/aQo8Z7CAP0GlcuBsMBKdg00pMqTS1tCBY2DGl3lzzKtxNExLMr4ud
|
||||
Ps5uhrZig+0CSyQGB/RUKxHsmQKBgQDV0vHfwIA7Bmx63jhgR+5UULjBmggXf7QZ
|
||||
gEOwfRKuSquf4xKs+Ewo6RL1OghgVYRDxma1iFpPir63m2uw6GUyUx0MVxqGP5j+
|
||||
XAHra21pdAzIZRPbKrt8D7mSF7+dzFg2g7z6OMF8kXZlpIBlxAnRO6Ek0jFo1Gd0
|
||||
7RO7ocmZRQKBgQCGX1Y/uGdNaZwkjspWkJc+uOdYXngaGBccoqkk3AnVP09E8qkl
|
||||
XD5GgtQHqjGaqluO3CaV7wVZ+/sc7Z5/VcgQEvLGGZzH+Va0pMTcb6HKmWSrR5cc
|
||||
VGa6Yw9jCkCGk32UVamukPGHq7KGdTPVc68CjnpDxvn/RY9c6lHonJmT+QKBgHfr
|
||||
+yPWvxRbofO3Nj8pmI1JSJWsYeVsBgJXYZ9WRmfiESd3Hz5Lc8tuDOfkSFZfH/Mz
|
||||
Dt+5PY1m71finx9092ymGKCXKZUpjhD6YUk70v1VzOWHav98k/Icj6NUFm/V75OD
|
||||
hzV/J2VJ3/FZtXld3XOv0czo5jU5C10UqgCN2JdRAoGBAOzEKRPDhg23X7p4oLRG
|
||||
Npu8GYlvB6AGpYPKhfmJULtkzg7w6DZiZt9Iwf8xBVXTsKBlgdn4uwK+Ocs9rRnU
|
||||
iy/7Nb1MTCMpYABTSmPYxkdYvCU3NPlJ3JNHEMIkoU0StDKMfzuDOhDIuNssZaNE
|
||||
HFptQp66ZDVAd5FLt4HOD1Ks
|
||||
-----END PRIVATE KEY-----
|
||||
|
|
@ -68,7 +68,7 @@ func transToCVideo(video *dbstruct.Video, coverImg *dbstruct.Image) *dbstruct.To
|
|||
Id: video.Id,
|
||||
Dur: video.Dur,
|
||||
CoverUrls: []string{},
|
||||
Urls: []string{defaultMediaFiller.GetFileServerDomain() + video.SrcId},
|
||||
Urls: []string{defaultMediaFiller.GetFileServerDomain() + video.SelectMinSizeOssId()},
|
||||
}
|
||||
if coverImg != nil {
|
||||
ret.CoverW = coverImg.W
|
||||
|
|
@ -107,7 +107,7 @@ func transToCVideoInternal(video *dbstruct.Video, coverImg *dbstruct.Image) *dbs
|
|||
Id: video.Id,
|
||||
Dur: video.Dur,
|
||||
CoverUrls: []string{},
|
||||
Urls: []string{defaultMediaFiller.GetInternalFileServerDomain() + video.SrcId},
|
||||
Urls: []string{defaultMediaFiller.GetInternalFileServerDomain() + video.SelectMinSizeOssId()},
|
||||
}
|
||||
if coverImg != nil {
|
||||
ret.CoverW = coverImg.W
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import (
|
|||
"fmt"
|
||||
"github.com/go-pay/gopay"
|
||||
"github.com/go-pay/gopay/alipay"
|
||||
"math/rand"
|
||||
"net/http"
|
||||
"service/bizcommon/util"
|
||||
"service/library/configcenter"
|
||||
|
|
@ -20,12 +21,17 @@ const (
|
|||
const (
|
||||
AppIdXinYiDaoLe = "2021004115647165" // 心意到了
|
||||
AppIdMiYuanTianShi = "2021004135664261" // 觅缘天使
|
||||
AppIdLanXing01 = "2021004153681591" // 揽星01
|
||||
)
|
||||
|
||||
var allAlipayClients = map[string]*AlipayClient{}
|
||||
|
||||
func GetDefaultAlipayClient() *AlipayClient {
|
||||
return allAlipayClients[AppIdMiYuanTianShi]
|
||||
rate := rand.Intn(1000)
|
||||
if rate < 980 {
|
||||
return allAlipayClients[AppIdMiYuanTianShi]
|
||||
}
|
||||
return allAlipayClients[AppIdLanXing01]
|
||||
}
|
||||
|
||||
func GetAlipayClientByAppId(appId string) *AlipayClient {
|
||||
|
|
@ -78,8 +84,28 @@ func NewAlipayClient(cfg *configcenter.AlipayClientConfig) (ret *AlipayClient, e
|
|||
return
|
||||
}
|
||||
|
||||
//// 解析回调参数
|
||||
//func (c *AlipayClient) ParseNotify(req *http.Request) (notify gopay.BodyMap, err error) {
|
||||
// // 解析参数
|
||||
// notifyTmp, err := alipay.ParseNotifyToBodyMap(req)
|
||||
// if err != nil {
|
||||
// logger.Error("ParseNotifyToBodyMap fail, req: %v, err: %v", util.ToJson(req), err)
|
||||
// return
|
||||
// }
|
||||
// logger.Info("Alipay ParseNotify, %v", util.ToJson(notifyTmp))
|
||||
//
|
||||
// // 验签
|
||||
// ok, err := alipay.VerifySignWithCert(c.alipayPublicCertPath, notifyTmp)
|
||||
// if !ok {
|
||||
// logger.Error("VerifySign fail, not ok, bm: %v", util.ToJson(notifyTmp))
|
||||
// return
|
||||
// }
|
||||
// notify = notifyTmp
|
||||
// return
|
||||
//}
|
||||
|
||||
// 解析回调参数
|
||||
func (c *AlipayClient) ParseNotify(req *http.Request) (notify gopay.BodyMap, err error) {
|
||||
func ParseNotify(req *http.Request) (notify gopay.BodyMap, err error) {
|
||||
// 解析参数
|
||||
notifyTmp, err := alipay.ParseNotifyToBodyMap(req)
|
||||
if err != nil {
|
||||
|
|
@ -88,6 +114,15 @@ func (c *AlipayClient) ParseNotify(req *http.Request) (notify gopay.BodyMap, err
|
|||
}
|
||||
logger.Info("Alipay ParseNotify, %v", util.ToJson(notifyTmp))
|
||||
|
||||
// 获取appId
|
||||
appId := notifyTmp.Get("app_id")
|
||||
c := GetAlipayClientByAppId(appId)
|
||||
if c == nil {
|
||||
err = fmt.Errorf("GetAlipayClientByAppId fail, appId: %v", appId)
|
||||
logger.Error("GetAlipayClientByAppId fail, appId: %v", appId)
|
||||
return
|
||||
}
|
||||
|
||||
// 验签
|
||||
ok, err := alipay.VerifySignWithCert(c.alipayPublicCertPath, notifyTmp)
|
||||
if !ok {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ func TestMain(m *testing.M) {
|
|||
fmt.Printf("%v\n", err)
|
||||
}
|
||||
|
||||
err = InitMulti(cfg.Alipay, cfg.AlipayMYTS)
|
||||
err = InitMulti(cfg.Alipay, cfg.AlipayMYTS, cfg.AlipayLX01)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
os.Exit(1)
|
||||
|
|
|
|||
|
|
@ -33,12 +33,13 @@ const (
|
|||
const (
|
||||
AppIdXinYiDaoLe = "1665016206"
|
||||
AppIdTieFenZone = "1675813721"
|
||||
AppIdTieFanZone = "1679775327"
|
||||
)
|
||||
|
||||
var allWxpayClients = map[string]*WxpayClient{}
|
||||
|
||||
func GetDefaultWxpayClient() *WxpayClient {
|
||||
return allWxpayClients[AppIdTieFenZone]
|
||||
return allWxpayClients[AppIdTieFanZone]
|
||||
}
|
||||
|
||||
type WxpayClient struct {
|
||||
|
|
@ -302,7 +303,7 @@ func (c *WxpayClient) H5Pay(ctx context.Context, param *H5PayParam) (wxpayH5Para
|
|||
return
|
||||
}
|
||||
if resp.Code != wxpayv3.Success {
|
||||
logger.Info("wxpayv3 NativePay fail, code: %v, error: %v, response: %v", resp.Code, resp.Error, util.ToJson(resp.Response))
|
||||
logger.Info("wxpayv3 H5Pay fail, code: %v, error: %v, response: %v", resp.Code, resp.Error, util.ToJson(resp.Response))
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ func TestMain(m *testing.M) {
|
|||
fmt.Printf("%v\n", err)
|
||||
}
|
||||
|
||||
err = InitMulti(cfg.Wxpay)
|
||||
err = InitMulti(cfg.Wxpay, cfg.WxpayTieFanZone)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
os.Exit(1)
|
||||
|
|
|
|||
Loading…
Reference in New Issue