阳光数据接口调试bug

book-push/src/main/resources/application-dev.yml

@@ -24,7 +24,7 @@ spring:
     cps:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://rm-bp1978b18gyf7v7byzo.mysql.rds.aliyuncs.com:3306/test_cps?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+      jdbc-url: jdbc:mysql://rm-bp1978b18gyf7v7byzo.mysql.rds.aliyuncs.com:3306/test_cps?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
       username: test_cps
       password: oRt+rY(7x3&kB#OQdit9
       #下面为连接池补充设置
@@ -58,7 +58,7 @@ spring:
     polar:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://rm-bp1978b18gyf7v7byzo.mysql.rds.aliyuncs.com:3306/polardb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+      jdbc-url: jdbc:mysql://rm-bp1978b18gyf7v7byzo.mysql.rds.aliyuncs.com:3306/polardb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
       username: test_cps
       password: oRt+rY(7x3&kB#OQdit9
       #下面为连接池补充设置
@@ -92,7 +92,7 @@ spring:
     cpsshard:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://rm-bp1978b18gyf7v7byzo.mysql.rds.aliyuncs.com:3306/test_cps_shard?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+      jdbc-url: jdbc:mysql://rm-bp1978b18gyf7v7byzo.mysql.rds.aliyuncs.com:3306/test_cps_shard?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
       username: test_cps
       password: oRt+rY(7x3&kB#OQdit9
       #下面为连接池补充设置

book-push/src/main/resources/application-pro.yml

@@ -32,7 +32,7 @@ spring:
     cps:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://rm-bp1978b18gyf7v7by.mysql.rds.aliyuncs.com:3306/test_cps?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+      jdbc-url: jdbc:mysql://rm-bp1978b18gyf7v7by.mysql.rds.aliyuncs.com:3306/test_cps?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
       username: test_cps
       password: oRt+rY(7x3&kB#OQdit9
       #下面为连接池补充设置
@@ -66,7 +66,7 @@ spring:
     polar:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://rm-bp1978b18gyf7v7by.mysql.rds.aliyuncs.com:3306/polardb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+      jdbc-url: jdbc:mysql://rm-bp1978b18gyf7v7by.mysql.rds.aliyuncs.com:3306/polardb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
       username: test_cps
       password: oRt+rY(7x3&kB#OQdit9
       #下面为连接池补充设置
@@ -100,7 +100,7 @@ spring:
     cpsshard:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://rm-bp1978b18gyf7v7by.mysql.rds.aliyuncs.com:3306/test_cps_shard?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+      jdbc-url: jdbc:mysql://rm-bp1978b18gyf7v7by.mysql.rds.aliyuncs.com:3306/test_cps_shard?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
       username: test_cps
       password: oRt+rY(7x3&kB#OQdit9
       #下面为连接池补充设置

book-push/src/main/resources/application-test.yml

@@ -24,7 +24,7 @@ spring:
     cps:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://121.41.100.198:3306/test_cps?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+      jdbc-url: jdbc:mysql://121.41.100.198:3306/test_cps?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
       username: root
       password: root
       #下面为连接池补充设置
@@ -58,7 +58,7 @@ spring:
     polar:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://121.41.100.198:3306/polar?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+      jdbc-url: jdbc:mysql://121.41.100.198:3306/polar?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
       username: root
       password: root
       #下面为连接池补充设置
@@ -92,7 +92,7 @@ spring:
     cpsshard:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://121.41.100.198:3306/test_cps_shard_192?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+      jdbc-url: jdbc:mysql://121.41.100.198:3306/test_cps_shard_192?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
       username: root
       password: root
       #下面为连接池补充设置

book-server/src/main/java/com/book/server/controller/SunDataController.java

@@ -55,7 +55,7 @@ public class SunDataController extends BaseController {
     @PostMapping("/pullData")
     public String pushData(@RequestBody SunNotifyRequest request) {
         sunDataService.pullData(request);
-        String s = "{\"code\":200\",msg\":\"ok\"}";
+        String s = "{\"code\":200,\"msg\":\"ok\"}";
         return s;
 
     }

book-server/src/main/java/com/book/server/service/SunDataService.java

@@ -10,7 +10,6 @@ import com.book.server.common.entity.Result;
 import com.book.server.config.SunTypeEnum;
 import com.book.server.vo.SunNotifyRequest;
 import com.book.server.vo.SunRequest;
-import com.book.server.vo.SunResult;
 
 /**
  * created in 2021/9/28

book-server/src/main/java/com/book/server/service/impl/SunDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.book.server.service.impl;
 
+import com.alibaba.druid.support.json.JSONUtils;
 import com.book.dao.VO.SunVO;
 import com.book.dao.polardb.entity.SunChannel;
 import com.book.dao.polardb.entity.SunOrder;
@@ -53,7 +54,7 @@ public class SunDataServiceImpl implements SunDataService {
     private static final String TOKEN = "PKp2HD39ze3CdzizqH";
     private static final String VIP_ID = "36637";
     private static final String URL = "https://data.yifengaf.cn";
-
+    public static final boolean debug = false;
 
     private Map<Integer, SunRequest> taskMap = new ConcurrentHashMap<>();
     @Autowired
@@ -71,7 +72,6 @@ public class SunDataServiceImpl implements SunDataService {
 
             String url = URL + sunTypeEnum.getPath();
             request.setClient_id(CLIENT_ID);
-//            request.setToken(TOKEN);
             request.setNonce(UUID.randomUUID().toString().replace("-", ""));
             request.setTimestamp(System.currentTimeMillis() + "");
             request.setVip_id(VIP_ID);
@@ -103,6 +103,11 @@ public class SunDataServiceImpl implements SunDataService {
 
     @Override
     public void pullData(SunNotifyRequest request) {
+        if (debug) {
+            SunRequest object = JsonUtils.getObject("{\"client_id\":\"10005818\",\"nonce\":\"e1f1209a83e44dd1bbc6119d3d6386d7\",\"timestamp\":\"1632970800073\",\"signaure\":\"ba63fa6b6f1305ba0d29a759dad30a3dd70337a6\",\"vip_id\":\"36637\",\"start_time\":\"2021-9-30 10:00:00\",\"end_time\":\"2021-9-30 11:00:00\",\"is_finish\":\"1\"}\n", SunRequest.class);
+            taskMap.put(request.getTaskId(), object);
+        }
+
         try {
 
 
@@ -181,7 +186,7 @@ public class SunDataServiceImpl implements SunDataService {
         long l = sunChannelMapper.countByExample(example);
         example.page(sunVO.getPage(), sunVO.getSize());
 
-        return new PageResult<>(l,sunChannelMapper.selectByExample(example));
+        return new PageResult<>(l, sunChannelMapper.selectByExample(example));
     }
 
     @Override
@@ -190,7 +195,7 @@ public class SunDataServiceImpl implements SunDataService {
         long l = sunOrderMapper.countByExample(example);
         example.page(sunVO.getPage(), sunVO.getSize());
         example.orderBy(SunOrder.Column.createTime.desc());
-        return new PageResult<>(l,sunOrderMapper.selectByExample(example));
+        return new PageResult<>(l, sunOrderMapper.selectByExample(example));
     }
 
     @Override
@@ -199,7 +204,7 @@ public class SunDataServiceImpl implements SunDataService {
         long l = sunOrderCollectMapper.countByExample(example);
         example.page(sunVO.getPage(), sunVO.getSize());
         example.orderBy(SunOrderCollect.Column.createTime.desc());
-        return new PageResult<>(l,sunOrderCollectMapper.selectByExample(example));
+        return new PageResult<>(l, sunOrderCollectMapper.selectByExample(example));
     }
 
     @Override
@@ -208,7 +213,7 @@ public class SunDataServiceImpl implements SunDataService {
         long l = sunUserCollectMapper.countByExample(example);
         example.page(sunVO.getPage(), sunVO.getSize());
         example.orderBy(SunUserCollect.Column.createTime.desc());
-        return new PageResult<>(l,sunUserCollectMapper.selectByExample(example));
+        return new PageResult<>(l, sunUserCollectMapper.selectByExample(example));
     }
 
     private void handleOrder(List<String> list, Integer taskId) {
@@ -327,4 +332,13 @@ public class SunDataServiceImpl implements SunDataService {
         }
         return result;
     }
+
+    public static void main(String[] args) {
+        String line = "{\"merchant_id\":\"20210930105902_643505930_Sbjp\",\"transaction_id\":null,\"type\":\"书币充值\",\"money\":\"66.0\",\"state\":\"未完成\",\"create_time\":\"2021-09-30 10:59:03\",\"finish_time\":null,\"book_id\":null,\"book_name\":null,\"book_tags\":null,\"referral_id\":\"11539446\",\"referral_url\":\"https://wx6ba3406d7a8bddbd.yifengab.cn/t/11539446\",\"user_id\":\"643505930\",\"channel_id\":\"36648\",\"subscribe_time\":\"2021-09-30 09:16:08\",\"user_createtime\":\"2021-09-30 09:16:08\",\"openid\":\"ogjqN5g2cQlvpJPwtupxIq7NPXf8\",\"ip\":\"171.104.15.31\",\"user_agent\":\"Mozilla/5.0 (iPhone; CPU iPhone OS 14_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 MicroMessenger/8.0.7(0x18000733) NetType/4G Language/zh_CN\",\"activity_id\":\"7574690\",\"register_ip\":\"171.104.15.31\",\"recharge_money\":null,\"recharge_count\":null}\n";
+        GsonBuilder gsonBuilder = new GsonBuilder();
+        gsonBuilder.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
+        Gson gson = gsonBuilder.setDateFormat("yyyy-MM-dd HH:mm:ss").create();
+        SunOrder sunOrder = gson.fromJson(line, SunOrder.class);
+        System.out.println(sunOrder);
+    }
 }

book-server/src/main/java/com/book/server/task/SunDataTask.java

@@ -24,7 +24,7 @@ import java.util.Calendar;
 @EnableScheduling
 @Slf4j
 public class SunDataTask {
-    public static final Integer FIX_DELAY_HOUR = 4;
+    public static final Integer FIX_DELAY_HOUR = 1;
 
     @Autowired
     private SunDataService sunDataService;
@@ -53,6 +53,8 @@ public class SunDataTask {
                     break;
 
                 case order:
+                    request.setStart_time(timeFrom);
+                    request.setEnd_time(timeNow);
                     request.setIs_finish("1");
                     sunDataService.requestData(request, sunTypeEnum);
                     break;

book-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
     cps:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://121.41.100.198:3306/test_cps?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+      jdbc-url: jdbc:mysql://121.41.100.198:3306/test_cps?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
       username: root
       password: root
       #下面为连接池补充设置
@@ -43,7 +43,7 @@ spring:
     polar:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://121.41.100.198:3306/polardb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+      jdbc-url: jdbc:mysql://121.41.100.198:3306/polardb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
       username: root
       password: root
       #下面为连接池补充设置
@@ -77,7 +77,7 @@ spring:
     cpsshard:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://121.41.100.198:3306/test_cps_shard_192?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC
+      jdbc-url: jdbc:mysql://121.41.100.198:3306/test_cps_shard_192?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
       username: root
       password: root
       #下面为连接池补充设置