Merge branch 'release' into 'master'

Release

See merge request !475

src/main/java/com/zhiwei/brandkbs2/easyexcel/listener/BytedanceEventListener.java

@@ -34,11 +34,12 @@ public class BytedanceEventListener extends AnalysisEventListener<UploadBytedanc
         taskData.setPlatform(dto.getPlatform());
         taskData.setChannel(dto.getChannel());
         taskData.setEventName(dto.getEventName());
-        taskData.setReading(Objects.isNull(dto.getReading()) ? 0 : Integer.parseInt(dto.getReading()));
-        taskData.setRead(Objects.isNull(dto.getRead()) ? 0 : Integer.parseInt(dto.getRead()));
-        taskData.setLike(Objects.isNull(dto.getLike()) ? 0 : Integer.parseInt(dto.getLike()));
-        taskData.setComment(Objects.isNull(dto.getComment()) ? 0 : Integer.parseInt(dto.getComment()));
-        taskData.setForward(Objects.isNull(dto.getForward()) ? 0 : Integer.parseInt(dto.getForward()));
+        // 填 "/" 当作0处理
+        taskData.setReading(Objects.isNull(dto.getReading()) || Objects.equals("/", dto.getReading()) ? 0 : Integer.parseInt(dto.getReading()));
+        taskData.setRead(Objects.isNull(dto.getRead()) || Objects.equals("/", dto.getRead())  ? 0 : Integer.parseInt(dto.getRead()));
+        taskData.setLike(Objects.isNull(dto.getLike()) || Objects.equals("/", dto.getLike())  ? 0 : Integer.parseInt(dto.getLike()));
+        taskData.setComment(Objects.isNull(dto.getComment()) || Objects.equals("/", dto.getComment())  ? 0 : Integer.parseInt(dto.getComment()));
+        taskData.setForward(Objects.isNull(dto.getForward()) || Objects.equals("/", dto.getForward())  ? 0 : Integer.parseInt(dto.getForward()));
         data.add(taskData);
     }
 

src/main/java/com/zhiwei/brandkbs2/service/impl/ToolsetServiceImpl.java

@@ -849,8 +849,6 @@ public class ToolsetServiceImpl implements ToolsetService {
         BigDecimal TR = BigDecimal.valueOf(Math.log(toutiaoRead + 1)).divide(BigDecimal.valueOf(Math.log(toutiaoReadWeight.getConstant() + 1)), 20, RoundingMode.HALF_UP).multiply(bigDecimal100);
         // 头条互动数：TI标= ln（TI+1）/ln（TI常+1）*100.0
         BigDecimal TI = BigDecimal.valueOf(Math.log(toutiaoInteraction + 1)).divide(BigDecimal.valueOf(Math.log(toutiaoInteractionWeight.getConstant() + 1)), 20, RoundingMode.HALF_UP).multiply(bigDecimal100);
-        log.info(data.get(0).getEventName() + "-【" + "NM:" + NM.toPlainString() + ",OM:" + OM.toPlainString() + ",WC:" + WC.toPlainString() + ",WCR:" + WCR.toPlainString() + ",WCL:"
-                + WCL.toPlainString() + ",WB:" + WB.toPlainString() + ",WBI:" + WBI.toPlainString() + ",T:" + T.toPlainString() + ",TR:" + TR.toPlainString() + ",TI:" + TI.toPlainString() + "】");
         // 标准值与权重计算取和得RMI
         return NM.multiply(BigDecimal.valueOf(normalMediaArticleWeight.getWeight()))
                 .add(OM.multiply(BigDecimal.valueOf(otherPlatformArticleWeight.getWeight())))

src/main/resources/application-dev.properties

@@ -2,9 +2,9 @@ application.name = brandkbs2
 server.port=8888
 spring.flyway.encoding=UTF-8
 #\u5355\u4E2A\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u8BBE\u7F6E
-spring.servlet.multipart.max-file-size=10MB
+spring.servlet.multipart.max-file-size=100MB
 #\u603B\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u8BBE\u7F6E
-spring.servlet.multipart.max-request-size=20MB
+spring.servlet.multipart.max-request-size=200MB
 server.servlet.context-path=/brandkbs
 #jwt
 jwt.key=Token

src/main/resources/application-local.properties

@@ -2,9 +2,9 @@ application.name = brandkbs2
 server.port=8888
 spring.flyway.encoding=UTF-8
 #\u5355\u4E2A\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u8BBE\u7F6E
-spring.servlet.multipart.max-file-size=10MB
+spring.servlet.multipart.max-file-size=100MB
 #\u603B\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u8BBE\u7F6E
-spring.servlet.multipart.max-request-size=20MB
+spring.servlet.multipart.max-request-size=200MB
 server.servlet.context-path=/brandkbs
 #jwt
 jwt.key=Token

src/main/resources/application-prod.properties

@@ -2,9 +2,9 @@ application.name = brandkbs2
 server.port=8888
 spring.flyway.encoding=UTF-8
 #\u5355\u4E2A\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u8BBE\u7F6E
-spring.servlet.multipart.max-file-size=10MB
+spring.servlet.multipart.max-file-size=100MB
 #\u603B\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u8BBE\u7F6E
-spring.servlet.multipart.max-request-size=20MB
+spring.servlet.multipart.max-request-size=200MB
 server.servlet.context-path=/brandkbs
 #jwt
 jwt.key=Token