Bläddra i källkod

增加dev-online信创分支

郭超 4 år sedan
förälder
incheckning
cf20ea33fb

+ 1 - 0
1718.json

@@ -0,0 +1 @@
+[{"item":"首页","children":[{"item":"众测广场","children":[{"item":"众测项目"},{"item":"众测任务"}]},{"item":"众测技术","children":[{"item":"技术文章"},{"item":"论文专著"}]},{"item":"个人中心","children":[{"item":"基本信息"},{"item":"我的资质"},{"item":"我的银行卡"},{"item":"修改登录密码"},{"item":"手机号绑定"},{"item":"邮箱绑定"},{"item":"身份认证"}]},{"item":"我的众测","children":[{"item":"未完成任务"},{"item":"已完成任务"},{"item":"我的项目"},{"item":"处理中的项目"},{"item":"可接收项目"}]}]}]

+ 2 - 0
src/main/java/com/mooctest/service/TaskService.java

@@ -91,6 +91,7 @@ public class TaskService {
         list.add(stringHttpMessageConverter);
         rt.setMessageConverters(list);
         // 将获得task字符船以json格式解析
+        System.out.println("taskInfoAddr " + taskInfoAddr);
         JSONObject tasksJson = JSON.parseObject(rt.getForObject(taskInfoAddr, String.class));
         // 获得tasksJson中的“data”字段的迭代器
         ListIterator<Object> tasksIter = tasksJson.getJSONArray("data").listIterator();
@@ -298,6 +299,7 @@ public class TaskService {
         restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
         ResponseEntity<String> responseEntity = restTemplate.postForEntity
                 ("http://" + reportHost  + "/Bug/api/extra/uploadExamUrl", params, String.class);
+        System.out.println(responseEntity.getStatusCode());
         if (responseEntity.getStatusCode().equals(HttpStatus.OK)){
             fileService.uploadJson(responseEntity.getBody(),caseId);
             return caseId;

+ 32 - 4
src/main/resources/application.yml

@@ -1,4 +1,4 @@
-spring.profiles.active: private-cloud
+spring.profiles.active: dev-online
 spring:
   mvc:
     favicon:
@@ -13,18 +13,46 @@ spring:
     content-type: text/html
     mode: HTML5
     cache: false   #避免改了模版还要重启服务器
+
+report.host: 127.0.0.1:8090
+
 ---
 spring:
-  profiles: dev
+  profiles: dev-online
   thymeleaf:
     cache: false
 
+mongodb1.database: test
+mongodb1.host: 127.0.0.1
+mongodb1.port: 27017
+
+mongodb2.database: test
+mongodb2.host: 127.0.0.1
+mongodb2.port: 27017
+
+report.export.addr: http://47.99.140.117:9002/generateReport
+report.export.excel.addr: http://47.99.140.117:9003/generateReport
+task.info.addr: http://127.0.0.1:8090/Bug/api/extra/getExamList
+
+server:
+  port: 9004
+#    port: 8090
+logging:
+  level:
+    com.mooctest: debug
+  pattern:
+    console: "%d{yyyy-MM-dd HH:mm:ss} [%p] [%t] [%c] %m%n"
+---
+spring:
+  profiles: dev
+  thymeleaf:
+    cache: false
 
-mongodb1.database: crowd_review
+mongodb1.database: test
 mongodb1.host: 127.0.0.1
 mongodb1.port: 27017
 
-mongodb2.database: co-report
+mongodb2.database: test
 mongodb2.host: 127.0.0.1
 mongodb2.port: 27017
 

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -1,4 +1,4 @@
-spring.profiles.active: dev
+spring.profiles.active: dev-online
 spring:
   application:
     name: mooctest-crowd-review