shopCookie

src/main/java/com/edgec/browserbackend/browser/domain/Shop.java

 package com.edgec.browserbackend.browser.domain;
 
+import com.alibaba.fastjson.JSONObject;
 import com.edgec.browserbackend.browser.dto.ShopResultDto;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.springframework.data.annotation.Id;
@@ -34,7 +35,7 @@ public class Shop {
 
     private String shopUA;
 
-    private String shopCookie;
+    private JSONObject shopCookie;
 
     private long createTime;
 
@@ -183,11 +184,11 @@ public class Shop {
         this.shopPassword = shopPassword;
     }
 
-    public String getShopCookie() {
+    public JSONObject getShopCookie() {
         return shopCookie;
     }
 
-    public void setShopCookie(String shopCookie) {
+    public void setShopCookie(JSONObject shopCookie) {
         this.shopCookie = shopCookie;
     }
 

src/main/java/com/edgec/browserbackend/browser/dto/ShopResultDto.java

 package com.edgec.browserbackend.browser.dto;
 
+import com.alibaba.fastjson.JSONObject;
 import com.edgec.browserbackend.browser.domain.IpResource;
 import com.edgec.browserbackend.browser.domain.Shop;
 import com.edgec.browserbackend.browser.domain.TransferStatus;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.google.gson.JsonObject;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ShopResultDto {
@@ -28,7 +30,7 @@ public class ShopResultDto {
 
     private String shopUA;
 
-    private String shopCookie;
+    private JSONObject shopCookie;
 
     private IpResource bindIp;
 
@@ -149,11 +151,11 @@ public class ShopResultDto {
         this.shopUA = shopUA;
     }
 
-    public String getShopCookie() {
+    public JSONObject getShopCookie() {
         return shopCookie;
     }
 
-    public void setShopCookie(String shopCookie) {
+    public void setShopCookie(JSONObject shopCookie) {
         this.shopCookie = shopCookie;
     }
 

src/main/java/com/edgec/browserbackend/common/utils/FileUtil.java

@@ -88,7 +88,7 @@ public class FileUtil {
             //得到指定的单元格
             Cell cell = row.getCell(0);;
             int size = 1;
-            for (int i = 1; i < rowLength + 2; i++) {
+            for (int i = 0; i < rowLength; i++) {
                 row = sheet.getRow(i);
                 List<Object> rowvalue = new ArrayList<>();
                 size = 0;
@@ -97,6 +97,7 @@ public class FileUtil {
 //                    System.out.println(cell);
                     if (cell!=null) {
                         Object cellValue = getCellFormatValue(cell);
+                        if (cellValue.toString().contains(""))
                         rowvalue.add(cellValue);
                         if (StringUtils.isNotBlank(cellValue.toString())) {
                             size++;