Merge branch 'develop'

kustomization/base/configMap.yaml

@@ -5,3 +5,5 @@ metadata:
   namespace: default
 data:
   SPRING_PROFILES_ACTIVE: default
+  SW_AGENT_COLLECTOR_BACKEND_SERVICES: "default-oap.skywalking-swck-system:11800"
+  SW_AGENT_NAME: payment

kustomization/base/deployment.yaml

@@ -14,6 +14,7 @@ spec:
     metadata:
       labels:
         app: payment
+        swck-java-agent-injected: 'true'
     spec:
       containers:
         - name: payment
@@ -21,6 +22,9 @@ spec:
           volumeMounts:
             - name: log-of-app
               mountPath: /var/log/app
+            - name: localtime
+              mountPath: /etc/localtime
+              readOnly: true
           resources:
             limits:
               memory: 1024Mi
@@ -33,7 +37,20 @@ spec:
                 configMapKeyRef:
                   name: payment-map
                   key: SPRING_PROFILES_ACTIVE
+            - name: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+              valueFrom:
+                configMapKeyRef:
+                  name: payment-map
+                  key: SW_AGENT_COLLECTOR_BACKEND_SERVICES
+            - name: SW_AGENT_NAME
+              valueFrom:
+                configMapKeyRef:
+                  name: payment-map
+                  key: SW_AGENT_NAME
       volumes:
         - name: log-of-app
           hostPath:
-            path: /var/log/app
+            path: /var/log/app
\ No newline at end of file
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
\ 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: 100991a5fb3e8db73695404a54af20b579da421f
+  newTag: f5eadfeec3ddfc5625a89ed26a6e25ffd58ace2a

src/main/java/com/mmc/payment/common/util/JsonUtil.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.*;
 import java.util.List;
@@ -13,12 +14,13 @@ import java.util.List;
  * @Date 2023/5/23 19:31
  * @Version 1.0
  */
+@Slf4j
 public class JsonUtil {
 
     public static void main(String[] args) {
         String array = "[1,24,23]";
         List<Integer> list = JSONArray.parseArray(array, Integer.class);
-        System.out.println(list.get(2));
+        log.info(String.valueOf(list.get(2)));
     }
 
     /**

src/main/java/com/mmc/payment/service/Impl/RepoCashServiceImpl.java

@@ -30,6 +30,7 @@ import com.mmc.payment.model.vo.repo.RepoOrderPayVO;
 import com.mmc.payment.model.vo.wallet.WalletUsersVO;
 import com.mmc.payment.service.RepoCashService;
 import io.jsonwebtoken.lang.Collections;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -52,6 +53,7 @@ import java.util.stream.Collectors;
  * @Author small @Date 2023/5/24 10:06 @Version 1.0
  */
 @Service
+@Slf4j
 public class RepoCashServiceImpl implements RepoCashService {
 
     @Autowired
@@ -101,7 +103,7 @@ public class RepoCashServiceImpl implements RepoCashService {
                 t.setUserName(account.getUserName());
             }
         });
-        System.out.println(list);
+        log.info(String.valueOf(list));
 
         List<RepoCashDTO> data =
                 list.stream()
@@ -494,7 +496,7 @@ public class RepoCashServiceImpl implements RepoCashService {
         HttpEntity<MultiValueMap<String, Object>> formEntity = new HttpEntity<MultiValueMap<String, Object>>(headers);
         ResponseEntity<String> exchange = restTemplate.exchange(omsUrl + "RentalOrders/orderStatusChanges?orderNo=" + orderNo + "&tranStatus=" + 200,
                 HttpMethod.GET, formEntity, String.class);
-        System.out.println(exchange);
+        log.info(String.valueOf(exchange));
 
     }