syh пре 5 година
родитељ
комит
f9fab8f830

+ 7 - 5
module-common/src/main/java/cn/com/ctop/common/module/utils/MpsUtils.java

@@ -8,7 +8,6 @@ import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.exceptions.ServerException;
 import com.aliyuncs.mts.model.v20140618.*;
 import com.aliyuncs.profile.DefaultProfile;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
@@ -56,7 +55,8 @@ public class MpsUtils {
      */
     private static void arrangementSelect(String[] dataList, String[] resultList, int resultIndex) {
         int resultLen = resultList.length;
-        if (resultIndex >= resultLen) { // 全部选择完时,输出排列结果
+        // 全部选择完时,输出排列结果
+        if (resultIndex >= resultLen) {
             System.out.println(Arrays.asList(resultList));
             return;
         }
@@ -71,7 +71,8 @@ public class MpsUtils {
                     break;
                 }
             }
-            if (!exists) { // 排列结果不存在该项,才可选择
+            // 排列结果不存在该项,才可选择
+            if (!exists) {
                 resultList[resultIndex] = dataList[i];
                 arrangementSelect(dataList, resultList, resultIndex + 1);
             }
@@ -108,7 +109,7 @@ public class MpsUtils {
      */
     public static void combinationSelect(String[] dataList, int n) {
         System.out.println(String.format("C(%d, %d) = %d",
-                dataList.length, n, combination(dataList.length, n)));
+                dataList.length, n, combination(n, dataList.length)));
         combinationSelect(dataList, 0, new String[n], 0);
     }
 
@@ -122,7 +123,8 @@ public class MpsUtils {
     private static void combinationSelect(String[] dataList, int dataIndex, String[] resultList, int resultIndex) {
         int resultLen = resultList.length;
         int resultCount = resultIndex + 1;
-        if (resultCount > resultLen) { // 全部选择完时,输出组合结果
+        // 全部选择完时,输出组合结果
+        if (resultCount > resultLen) {
             System.out.println(Arrays.asList(resultList));
             return;
         }

+ 3 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/service/impl/KuaishouCrawlerServiceImpl.java

@@ -27,11 +27,13 @@ public class KuaishouCrawlerServiceImpl implements IKuaishouCrawlerService {
     @Override
     public String getVideoFeeds(KuaishouAppAccount kuaishouAppAccount, Integer page) {
         IpPool ipPool = iIpPoolService.getAvaliableIp();
+//        String.format(kuaishouAppAccount.getBodyParam(), String.valueOf(page.intValue()), String.valueOf(100 + page.intValue()), String.valueOf(page.intValue()))
+        String bodyParam = kuaishouAppAccount.getBodyParam().replaceFirst("%s", String.valueOf(page.intValue())).replaceFirst("%s", String.valueOf(100 + page.intValue())).replaceFirst("%s", String.valueOf(page.intValue()));
         CrawlerLog crawlerLog = KuaishouUtil.kuaishouAppDataFeatch(
                 kuaishouAppAccount.getUrl(),
                 kuaishouAppAccount.getPath(),
                 String.format(kuaishouAppAccount.getUrlParam(), String.valueOf(System.currentTimeMillis())).replace(" ", "-"),
-                String.format(kuaishouAppAccount.getBodyParam(), String.valueOf(page.intValue()), String.valueOf(100 + page.intValue()), String.valueOf(page.intValue())),
+                bodyParam,
                 String.format(kuaishouAppAccount.getHeaderParam(), randomRequestId()),
                 kuaishouAppAccount.getToken(), ipPool);
         if (crawlerLog != null){

+ 33 - 0
mondule-jbpm/pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>jeecg-boot-parent</artifactId>
+        <groupId>org.jeecgframework.boot</groupId>
+        <version>2.0.2</version>
+    </parent>
+    <groupId>cn.com.ctop</groupId>
+    <artifactId>jbpm</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>jbpm</name>
+
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.com.ctop</groupId>
+            <artifactId>module-common</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.activiti</groupId>
+            <artifactId>activiti-spring</artifactId>
+            <version>6.0.0</version>
+        </dependency>
+    </dependencies>
+
+
+</project>