Merge branch 'develop'

csm-service/cms-service-user/src/main/resources/application-prod.yml

@@ -77,6 +77,13 @@ third-party:
     authNotify: https://www.iuav.shop/userapp/xz/xzAuthNotify
     withdrawNotify: https://www.iuav.shop/userapp/xz/xzWithdrawNotify
 
+fdd:
+  appid: 407664
+  appkey: q146q3Cjmi7Y6BVl8jtZK9pH
+  version: 2
+  host: https://testapi.fadada.com:8443/api/
+  mmc-url: https://test.iuav.shop/userapp/
+
 iuav:
   pay:
     uri: http://payment-svc:8088

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 902a215520b53a526b6a1c467371e1a4b02f89bd
+  newTag: d6374ab7d29958354b2b0f4cc1e6e29f6b17f717