master合并到dev分支

biz-base/src/main/resources/application-local.yml

@@ -22,7 +22,7 @@ spring:
             idle-timeout: 600000
             max-lifetime: 1800000
         dyoa:
-          url: jdbc:mysql://192.168.0.108/dyoa?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://localhost:3306/dyoa?autoReconnect=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
           driver-class-name: com.mysql.cj.jdbc.Driver
           username: root
           password: 914851221

service/src/main/java/com/dayou/dyoa/DyoaHistoryServiceImpl.java

@@ -281,14 +281,13 @@ public class DyoaHistoryServiceImpl implements IDyoaHistoryService{
             if (CollectionUtil.isNotEmpty(dataArray)){
                 List<HisAssetsOrder> hisAssetsOrders = dataArray.toJavaList(HisAssetsOrder.class);
                 page.setRecords(hisAssetsOrders);
-                page.setTotal(Long.valueOf(String.valueOf(data.get("total"))));
+                page.setTotal(Long.parseLong(String.valueOf(data.get("total"))));
             }
         } catch (JSONException e) {
             historySystemLogin();
             ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR,"远程连接超时，请刷新页面。");
         } catch (Exception e) {
             log.error("远程调用失败.");
-            e.printStackTrace();
         }
 
         return page;