Merge remote-tracking branch 'origin/develop' into develop

kustomization/api-wx-external.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: api-wx
+  namespace: default
+spec:
+  type: ExternalName
+  externalName: api.weixin.qq.com
+  ports:
+    - port: 80
\ No newline at end of file

kustomization/ingress.yaml

+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: sharefly-ingress #不能超过 253 个字符；只能包含小写字母、数字，以及 '-' 和 '.'；必须以字母数字开头；必须以字母数字结尾
+  namespace: default
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: / #使用注解（annotations）来配置一些选项，具体取决于 Ingress 控制器
+spec:
+  #ingressClassName: nginx
+  rules:
+#    - host: iuav.mmcuav.cn
+#      http
+    - http:
+        paths:
+          - path: /pms
+            pathType: Prefix
+            backend:
+              service:
+                name: pms-svc
+                port:
+                  number: 8099
+

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: a3f79b49134092c8a4a92e4c1996ac2f0522deba
+  newTag: 4930721159f6cd570b7b50519e9e74c8e57e37ab