Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/payment into develop

Dockerfile

 FROM openjdk:8-jdk-alpine
+VOLUME ["/var/log/app/"]
 ARG JAVA_OPTS
 ENV JAVA_OPTS=$JAVA_OPTS
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone

kustomization/base/deployment.yaml

@@ -18,6 +18,9 @@ spec:
       containers:
         - name: payment
           image: REGISTRY/NAMESPACE/IMAGE:TAG
+          volumeMounts:
+            - name: log-of-app
+              mountPath: /var/log/app
           resources:
             limits:
               memory: 1024Mi
@@ -29,4 +32,8 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   name: payment-map
-                  key: SPRING_PROFILES_ACTIVE
\ No newline at end of file
+                  key: SPRING_PROFILES_ACTIVE
+      volumes:
+        - name: log-of-app
+          hostPath:
+            path: /var/log/app
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/payment
-  newTag: 642940535bb943af9c9d6997ca98abba29b14203
+  newTag: 962913d2eb614f13fed96a484f8d1468c4076539

src/main/java/com/mmc/payment/controller/RepoCashController.java

@@ -83,7 +83,7 @@ public class RepoCashController extends BaseController {
 
     @ApiOperation(value = "租赁——订单支付")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    @PostMapping("orderPayment")
+    @GetMapping("orderPayment")
     public ResultBody orderPayment(HttpServletRequest request, @RequestParam String orderNo) {
         return repoCashService.orderPayment(this.getCurrentAccount(request), orderNo);
     }

src/main/resources/application.yml

@@ -15,8 +15,12 @@ spring:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
+  main:
+    banner-mode: off
 logging:
   level:
     com:
       mmc:
         payment: DEBUG
+  file:
+    name: "/var/log/app/${spring.application.name}.log"