Merge branch 'master' of D:\examCloudMarking\examcloud-rmi with conflicts.

examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/BasicCloudClientSupport.java

@@ -12,6 +12,6 @@ import cn.com.qmth.examcloud.commons.web.support.CloudClientSupport;
 public abstract class BasicCloudClientSupport extends CloudClientSupport {
     @Override
     public String getUrlPrefix() {
-        return "http://EC-CORE-MARKING/api/core/marking/";
+        return "http://NIKANG-EC-CORE-MARKING/api/core/marking/";
     }
 }

examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkResultCloudServiceClient.java

@@ -5,6 +5,7 @@ import cn.com.qmth.examcloud.marking.api.MarkResultCloudService;
 import cn.com.qmth.examcloud.marking.api.request.GetMarkResultReq;
 import cn.com.qmth.examcloud.marking.api.response.GetMarkResultResp;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -14,6 +15,7 @@ import org.springframework.web.client.RestTemplate;
  * @Date 2018/9/27 9:16
  * @Version 3.0
  */
+@Service
 public class MarkResultCloudServiceClient extends BasicCloudClientSupport implements MarkResultCloudService {
     @Autowired
     RestTemplate restTemplate;

examcloud-core-questions-api-client/src/main/java/cn/com/qmth/examcloud/core/questions/api/client/BasicCloudClientSupport.java

@@ -12,7 +12,7 @@ public abstract class BasicCloudClientSupport extends CloudClientSupport {
 
 	@Override
 	protected String getUrlPrefix() {
-		return "http://EC-CORE-QUESTION/api/core/questions/";
+		return "http://WEIWENHAI-EXAMCLOUD-SERVICE-QUESTION/api/core/questions/";
 	}
 
 }