wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lanxing 01

This commit is contained in:
lwl0608 2024-07-03 16:05:46 +08:00
parent 8702c44a2c
commit 0dc67b4291
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mix/conf/cfg.go
View File

@ -11,7 +11,7 @@ type ConfigSt struct {
WxpayTFZ *configcenter.WxpayClientConfig `json:"wxpay_tfz" yaml:"wxpay_tfz"` // 微信支付
Alipay *configcenter.AlipayClientConfig `json:"alipay" yaml:"alipay"` // 支付宝 心意到了
AlipayMYTS *configcenter.AlipayClientConfig `json:"alipay_myts" yaml:"alipay_myts"` // 支付宝 觅缘天使
AlipayXL01 *configcenter.AlipayClientConfig `json:"alipay_xl01" yaml:"alipay_xl01"` // 支付宝 星揽01
AlipayLX01 *configcenter.AlipayClientConfig `json:"alipay_lx01" yaml:"alipay_lx01"` // 支付宝 星揽01
Apollo *configcenter.ApolloConfig `json:"apollo" yaml:"apollo"` // Apollo
Media *configcenter.MediaConfig `json:"media" yaml:"media"` // 媒体配置
Dysmsapi *configcenter.DysmsapiConfig `json:"dysmsapi" yaml:"dysmsapi"` // 阿里云短信服务

2
app/mix/service/service.go
View File

@ -170,7 +170,7 @@ func (s *Service) Init(c any) (err error) {
s.defaultMelody = melody.New()
err = alipaycli.InitMulti(cfg.Alipay, cfg.AlipayMYTS, cfg.AlipayXL01)
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

0
etc/mix/alipaycert_xl01/alipayCertPublicKey_RSA2.crt → etc/mix/alipaycert_lx01/alipayCertPublicKey_RSA2.crt
View File

0
etc/mix/alipaycert_xl01/alipayRootCert.crt → etc/mix/alipaycert_lx01/alipayRootCert.crt
View File

0
etc/mix/alipaycert_xl01/appCertPublicKey_2021004153681591.crt → etc/mix/alipaycert_lx01/appCertPublicKey_2021004153681591.crt
View File

8
etc/mix/mix-local.yaml
View File

@ -65,13 +65,13 @@ 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_xl01:
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_xl01/appCertPublicKey_2021004153681591.crt"
alipay_root_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_xl01/alipayRootCert.crt"
alipay_public_cert_path: "/Users/erwin/wishpalv2/service/etc/mix/alipaycert_xl01/alipayCertPublicKey_RSA2.crt"
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"

8
etc/mix/mix-prod.yaml
View File

@ -57,13 +57,13 @@ 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_xl01:
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_myts/appCertPublicKey_2021004153681591.crt"
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"
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"

8
etc/mix/mix-test.yaml
View File

@ -76,13 +76,13 @@ 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_xl01:
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_xl01/appCertPublicKey_2021004153681591.crt"
alipay_root_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_xl01/alipayRootCert.crt"
alipay_public_cert_path: "/app/wishpal-ironfan/etc/mix/alipaycert_xl01/alipayCertPublicKey_RSA2.crt"
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"

4
library/payclients/alipaycli/client.go
View File

@ -20,13 +20,13 @@ const (
const (
AppIdXinYiDaoLe = "2021004115647165" // 心意到了
AppIdMiYuanTianShi = "2021004135664261" // 觅缘天使
AppIdXingLan01 = "2021004153681591" // 星揽01
AppIdLanXing01 = "2021004153681591" // 揽星01
)
var allAlipayClients = map[string]*AlipayClient{}
func GetDefaultAlipayClient() *AlipayClient {
return allAlipayClients[AppIdMiYuanTianShi]
return allAlipayClients[AppIdLanXing01]
}
func GetAlipayClientByAppId(appId string) *AlipayClient {

2
library/payclients/alipaycli/client_test.go
View File

@ -18,7 +18,7 @@ func TestMain(m *testing.M) {
fmt.Printf("%v\n", err)
}
err = InitMulti(cfg.Alipay, cfg.AlipayMYTS, cfg.AlipayXL01)
err = InitMulti(cfg.Alipay, cfg.AlipayMYTS, cfg.AlipayLX01)
if err != nil {
fmt.Println(err)
os.Exit(1)