Explorar o código

合并master到test

huangxuechao %!s(int64=3) %!d(string=hai) anos
pai
achega
9df2df17ed

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -9,7 +9,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.entity.UserCompany;
 import cn.com.ctop.common.module.mapper.SysUserMapper;
 import cn.com.ctop.common.module.service.IUserCompanyService;
@@ -18,6 +17,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.entity.SysUser;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouAudienceReportDailyService.java

@@ -24,5 +24,5 @@ public interface IKuaishouAudienceReportDailyService extends IService<KuaishouAu
 
     void crowdAnalysisReport2(CtopOauthToken token, String date, String type, Long plan, Long unit, Integer page, Integer pageSize);
 
-    void crowdAnalysisReport3(CtopOauthToken token, String date, String type, Long plan, JSONArray unit, Integer page, Integer pageSize);
+    void crowdAnalysisReport3(CtopOauthToken token, String date, JSONArray reportDims, Long plan, Long unit, Integer page, Integer pageSize);
 }

+ 4 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouAudienceReportDailyServiceImpl.java

@@ -346,12 +346,12 @@ public class KuaishouAudienceReportDailyServiceImpl extends ServiceImpl<Kuaishou
 
 
     @Override
-    public void crowdAnalysisReport3(CtopOauthToken token, String date, String type, Long plan, JSONArray unit, Integer page, Integer pageSize) {
+    public void crowdAnalysisReport3(CtopOauthToken token, String date, JSONArray reportDims , Long plan, Long unit, Integer page, Integer pageSize) {
         long start = System.currentTimeMillis();
         try {
             String url = urlPath + KuaishouInterfaceConstant.AUDIENCE_REPORT;
-            JSONArray reportDims = new JSONArray();
-            reportDims.add(type);
+//            JSONArray reportDims = new JSONArray();
+//            reportDims.add(type);
             Map<String, String> headers = new HashMap<>();
             headers.put("Access-Token", token.getAccessToken());
             headers.put("Content-Type", "application/json");
@@ -382,7 +382,7 @@ public class KuaishouAudienceReportDailyServiceImpl extends ServiceImpl<Kuaishou
                 }
             }
         } catch (Exception e) {
-            log.error("插入人群分析报表数据异常,数据维度:{}", type, e);
+            log.error("插入人群分析报表数据异常,数据维度:{}", reportDims.toJSONString(), e);
         }
     }
 }

+ 10 - 10
jeecg-boot-module-system/src/main/java/org/jeecg/config/Elasticsearch/ElasticsearchConfig.java

@@ -27,31 +27,31 @@ public class ElasticsearchConfig {
      *  连接超时时间
      */
     @Value("${jeecg.elasticsearch.connect-timeout}")
-    private int connectTimeOut = 1000;
+    private String connectTimeOut = "1000";
 
     /**
      * 连接超时时间
      */
     @Value("${jeecg.elasticsearch.socket-timeout}")
-    private int socketTimeOut = 30000;
+    private String socketTimeOut = "30000";
 
     /**
      * 获取连接的超时时间
      */
     @Value("${jeecg.elasticsearch.connection-request-timeout}")
-    private int connectionRequestTimeOut = 500;
+    private String connectionRequestTimeOut = "500";
 
     /**
      * 最大连接数
      */
     @Value("${jeecg.elasticsearch.max-connect-num}")
-    private int maxConnectNum = 100;
+    private String maxConnectNum = "100";
 
     /**
      * 最大路由连接数
      */
     @Value("${jeecg.elasticsearch.max-connect-per-route}")
-    private int maxConnectPerRoute = 100;
+    private String maxConnectPerRoute = "100";
 
 
     @Bean
@@ -68,9 +68,9 @@ public class ElasticsearchConfig {
         builder.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
             @Override
             public RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder requestConfigBuilder) {
-                requestConfigBuilder.setConnectTimeout(connectTimeOut);
-                requestConfigBuilder.setSocketTimeout(socketTimeOut);
-                requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeOut);
+                requestConfigBuilder.setConnectTimeout(Integer.parseInt(connectTimeOut));
+                requestConfigBuilder.setSocketTimeout(Integer.parseInt(socketTimeOut));
+                requestConfigBuilder.setConnectionRequestTimeout(Integer.parseInt(connectionRequestTimeOut));
                 return requestConfigBuilder;
             }
         });
@@ -78,8 +78,8 @@ public class ElasticsearchConfig {
         builder.setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
             @Override
             public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
-                httpClientBuilder.setMaxConnTotal(maxConnectNum);
-                httpClientBuilder.setMaxConnPerRoute(maxConnectPerRoute);
+                httpClientBuilder.setMaxConnTotal(Integer.parseInt(maxConnectNum));
+                httpClientBuilder.setMaxConnPerRoute(Integer.parseInt(maxConnectPerRoute));
                 return httpClientBuilder;
             }
         });

+ 32 - 8
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -1,4 +1,4 @@
-//package org.jeecg;
+package org.jeecg;
 //
 //import org.jeecg.modules.demo.mock.MockController;
 //import org.jeecg.modules.demo.test.entity.JeecgDemo;
@@ -6,16 +6,40 @@
 //import org.jeecg.modules.demo.test.service.IJeecgDemoService;
 //import org.junit.Assert;
 //import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringRunner;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.kuaishou.modules.report.service.IKuaishouAudienceReportDailyService;
+import com.alibaba.fastjson.JSONArray;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 //
 //import javax.annotation.Resource;
 //import java.util.List;
 //
-//@RunWith(SpringRunner.class)
-//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
-//public class SampleTest {
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
+public class SampleTest {
+    @Autowired
+    private ICtopOauthTokenService tokenService;
+    @Autowired
+    IKuaishouAudienceReportDailyService kuaishouAudienceReportDailyService;
+    @Test
+    public void haha(){
+        CtopOauthToken token = tokenService.getTokenByAccountId(9556431l);
+        JSONArray types = new JSONArray();
+        // province: 省级地域分布, city: 地级地域分布,gender: 性别分布,ageSegment: 年龄分布, clientId: 系统分布 businessInterestTags: 商业兴趣分布
+
+        types.add("province");
+        types.add("city");
+        types.add("gender");
+        types.add("ageSegment");
+        types.add("businessInterestTags");
+        types.add("clientId");
+        kuaishouAudienceReportDailyService.crowdAnalysisReport3(token, "2021-05-01", types, 50293820l, 216264247l, 1, 2000);
+    }
 //
 //	@Resource
 //	private JeecgDemoMapper jeecgDemoMapper;
@@ -62,4 +86,4 @@
 ////		sysDataLogService.addDataLog(tableName, dataId, dataContent);
 ////	}
 //	//author:lvdandan-----date:20190315---for:添加数据日志测试----
-//}
+}

+ 6 - 0
jeecg-cloud-module/jeecg-cloud-gateway/pom.xml

@@ -74,6 +74,12 @@
             <artifactId>knife4j-spring-boot-starter</artifactId>
             <version>${knife4j-spring-boot-starter.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+            <version>2.2.5.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

+ 12 - 0
jeecg-cloud-module/jeecg-cloud-system-start/pom.xml

@@ -33,6 +33,18 @@
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-module-system</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+            <version>2.2.5.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-hystrix</artifactId>
+            <version>10.10.1</version>
+            <scope>compile</scope>
+        </dependency>
 
         <!--rabbitmq消息队列-->
 <!--        <dependency>-->