Browse Source

同步:https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1464/files

YunaiV 6 months ago
parent
commit
f7042897ff

+ 1 - 1
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/client/SocialClientSaveReqVO.java

@@ -65,7 +65,7 @@ public class SocialClientSaveReqVO {
     @JsonIgnore
     public boolean isPublicKeyValid() {
         // 如果是支付宝,必须填写 publicKey 属性
-        return !Objects.equals(socialType, SocialTypeEnum.ALIPAY.getType())
+        return !Objects.equals(socialType, SocialTypeEnum.ALIPAY_MINI_PROGRAM.getType())
                 || !StrUtil.isEmpty(publicKey);
     }
 

+ 6 - 0
yudao-server/src/main/resources/application-dev.yaml

@@ -198,6 +198,12 @@ justauth:
       client-id: ${wx.mp.app-id}
       client-secret: ${wx.mp.secret}
       ignore-check-redirect-uri: true
+    ALIPAY: # 支付宝小程序
+      client-id: xx
+      client-secret: xx
+      alipay-public-key: xx
+      ignore-check-redirect-uri: true
+      ignore-check-state: true
   cache:
     type: REDIS
     prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::

+ 6 - 0
yudao-server/src/main/resources/application-local.yaml

@@ -262,6 +262,12 @@ justauth:
       client-id: ${wx.mp.app-id}
       client-secret: ${wx.mp.secret}
       ignore-check-redirect-uri: true
+    ALIPAY: # 支付宝小程序
+      client-id: xx
+      client-secret: xx
+      alipay-public-key: xx
+      ignore-check-redirect-uri: true
+      ignore-check-state: true
   cache:
     type: REDIS
     prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::