|
@@ -31,6 +31,8 @@ public class JobService {
|
|
private final String HTTP = "http://";
|
|
private final String HTTP = "http://";
|
|
@Value("${audit.distribute.addr}")
|
|
@Value("${audit.distribute.addr}")
|
|
String auditDistributeUrl ;
|
|
String auditDistributeUrl ;
|
|
|
|
+ @Value("${mooctest.host}")
|
|
|
|
+ String mootestHost;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -152,6 +154,7 @@ public class JobService {
|
|
ResponseEntity<String> response2 = template.postForEntity(url, httpEntity, String.class);
|
|
ResponseEntity<String> response2 = template.postForEntity(url, httpEntity, String.class);
|
|
JSONObject tasksJson = JSON.parseObject(response2.getBody());
|
|
JSONObject tasksJson = JSON.parseObject(response2.getBody());
|
|
JSONArray array = new JSONArray();
|
|
JSONArray array = new JSONArray();
|
|
|
|
+ if(tasksJson == null) return array;
|
|
Iterator<String> sIterator = tasksJson.keySet().iterator();
|
|
Iterator<String> sIterator = tasksJson.keySet().iterator();
|
|
while(sIterator.hasNext()){
|
|
while(sIterator.hasNext()){
|
|
// 获得key
|
|
// 获得key
|
|
@@ -188,7 +191,7 @@ public class JobService {
|
|
List<HttpMessageConverter<?>> list=new ArrayList<HttpMessageConverter<?>>();
|
|
List<HttpMessageConverter<?>> list=new ArrayList<HttpMessageConverter<?>>();
|
|
list.add(stringHttpMessageConverter);
|
|
list.add(stringHttpMessageConverter);
|
|
rt.setMessageConverters(list);
|
|
rt.setMessageConverters(list);
|
|
- String str = "http://101.37.175.111:8191/api/user/"+id;
|
|
|
|
|
|
+ String str = mootestHost+"/api/user/"+id;
|
|
JSONObject tasksJson = JSON.parseObject(rt.getForObject(str , String.class));
|
|
JSONObject tasksJson = JSON.parseObject(rt.getForObject(str , String.class));
|
|
if(tasksJson == null || tasksJson.get("name")==null) return "No Name";
|
|
if(tasksJson == null || tasksJson.get("name")==null) return "No Name";
|
|
return tasksJson.get("name").toString();
|
|
return tasksJson.get("name").toString();
|