diff --git a/api/core/config.go b/api/core/config.go index 95c8953a..77722515 100644 --- a/api/core/config.go +++ b/api/core/config.go @@ -33,9 +33,10 @@ func NewDefaultConfig() *types.AppConfig { BasePath: "./static/upload", }, }, - MjConfig: types.MidJourneyConfig{Enabled: false}, - SdConfig: types.StableDiffusionConfig{Enabled: false, Txt2ImgJsonPath: "res/text2img.json"}, - WeChatBot: false, + MjConfig: types.MidJourneyConfig{Enabled: false}, + SdConfig: types.StableDiffusionConfig{Enabled: false, Txt2ImgJsonPath: "res/text2img.json"}, + WeChatBot: false, + AlipayConfig: types.AlipayConfig{SandBox: true}, } } diff --git a/api/core/types/config.go b/api/core/types/config.go index 49f1ea6c..221399e3 100644 --- a/api/core/types/config.go +++ b/api/core/types/config.go @@ -61,7 +61,8 @@ type AliYunSmsConfig struct { } type AlipayConfig struct { - Enabled bool // 是否启用支付宝服务 + Enabled bool // 是否启用该服务 + SandBox bool // 是否沙箱环境 Company string // 公司名称 UserId string // 支付宝用户 ID AppId string // 支付宝 AppID diff --git a/api/res/img/alipay.jpg b/api/res/img/alipay.jpg new file mode 100644 index 00000000..af7b4068 Binary files /dev/null and b/api/res/img/alipay.jpg differ diff --git a/api/service/payment/alipay_service.go b/api/service/payment/alipay_service.go index 64ab8aa3..d33d5032 100644 --- a/api/service/payment/alipay_service.go +++ b/api/service/payment/alipay_service.go @@ -20,27 +20,27 @@ var logger = logger2.GetLogger() func NewAlipayService(appConfig *types.AppConfig) (*AlipayService, error) { config := appConfig.AlipayConfig if !config.Enabled { - logger.Info("Disabled alipay service") + logger.Info("Disabled Alipay service") return nil, nil } priKey, err := readKey(config.PrivateKey) if err != nil { - return nil, err + return nil, fmt.Errorf("error with read App Private key: %v", err) } - xClient, err := alipay.New(config.AppId, priKey, true) + xClient, err := alipay.New(config.AppId, priKey, !config.SandBox) if err != nil { return nil, fmt.Errorf("error with initialize alipay service: %v", err) } if err = xClient.LoadAppCertPublicKeyFromFile(config.PublicKey); err != nil { - return nil, fmt.Errorf("error with loading alipay CertPublicKey: %v", err) + return nil, fmt.Errorf("error with loading App PublicKey: %v", err) } if err = xClient.LoadAliPayRootCertFromFile(config.RootCert); err != nil { return nil, fmt.Errorf("error with loading alipay RootCert: %v", err) } if err = xClient.LoadAlipayCertPublicKeyFromFile(config.AlipayPublicKey); err != nil { - return nil, fmt.Errorf("error with loading alipay AlipayCertPublicKey: %v", err) + return nil, fmt.Errorf("error with loading Alipay PublicKey: %v", err) } return &AlipayService{config: &config, client: xClient}, nil diff --git a/api/service/sd/service.go b/api/service/sd/service.go index ed7ff531..def9940a 100644 --- a/api/service/sd/service.go +++ b/api/service/sd/service.go @@ -81,7 +81,7 @@ func (s *Service) Run() { // PushTask 推送任务到队列 func (s *Service) PushTask(task types.SdTask) { - logger.Infof("add a new MidJourney Task: %+v", task) + logger.Infof("add a new Stable Diffusion Task: %+v", task) s.taskQueue.RPush(task) } diff --git a/web/public/images/alipay.jpg b/web/public/images/alipay.jpg new file mode 100644 index 00000000..af7b4068 Binary files /dev/null and b/web/public/images/alipay.jpg differ diff --git a/web/public/images/vip.png b/web/public/images/vip.png new file mode 100644 index 00000000..e7374cfa Binary files /dev/null and b/web/public/images/vip.png differ diff --git a/web/src/views/Member.vue b/web/src/views/Member.vue index cf8eb528..7b283bae 100644 --- a/web/src/views/Member.vue +++ b/web/src/views/Member.vue @@ -1,39 +1,184 @@ -