Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-2/examcloud-rmi

examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/request/SyncOrgReq.java

@@ -10,8 +10,6 @@ public class SyncOrgReq extends SyncBaseRequest {
 
 	private Long parentId;
 
-	private Integer level;
-
 	private String name;
 
 	private Boolean enable;
@@ -40,14 +38,6 @@ public class SyncOrgReq extends SyncBaseRequest {
 		this.parentId = parentId;
 	}
 
-	public Integer getLevel() {
-		return level;
-	}
-
-	public void setLevel(Integer level) {
-		this.level = level;
-	}
-
 	public String getName() {
 		return name;
 	}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/ThirdPartyAccessBean.java

@@ -1,68 +1,68 @@
-package cn.com.qmth.examcloud.core.basic.api.bean;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-
-/**
- * 第三方接入信息
- *
- * @author WANGWEI
- * @date 2018年7月5日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class ThirdPartyAccessBean implements JsonSerializable {
-
-	private static final long serialVersionUID = 9212710623859419481L;
-
-	/**
-	 * 顶级机构ID
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 应用ID
-	 */
-	private String appId;
-
-	/**
-	 * 密钥
-	 */
-	private String secretKey;
-
-	/**
-	 * 时间差范围
-	 */
-	private long timeRange;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getAppId() {
-		return appId;
-	}
-
-	public void setAppId(String appId) {
-		this.appId = appId;
-	}
-
-	public String getSecretKey() {
-		return secretKey;
-	}
-
-	public void setSecretKey(String secretKey) {
-		this.secretKey = secretKey;
-	}
-
-	public long getTimeRange() {
-		return timeRange;
-	}
-
-	public void setTimeRange(long timeRange) {
-		this.timeRange = timeRange;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * 第三方接入信息
+ *
+ * @author WANGWEI
+ * @date 2018年7月5日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class ThirdPartyAccessBean implements JsonSerializable {
+
+	private static final long serialVersionUID = 9212710623859419481L;
+
+	/**
+	 * 顶级机构ID
+	 */
+	private Long rootOrgId;
+
+	/**
+	 * 应用ID
+	 */
+	private String appId;
+
+	/**
+	 * 密钥
+	 */
+	private String secretKey;
+
+	/**
+	 * 时间差范围
+	 */
+	private Long timeRange;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public String getAppId() {
+		return appId;
+	}
+
+	public void setAppId(String appId) {
+		this.appId = appId;
+	}
+
+	public String getSecretKey() {
+		return secretKey;
+	}
+
+	public void setSecretKey(String secretKey) {
+		this.secretKey = secretKey;
+	}
+
+	public Long getTimeRange() {
+		return timeRange;
+	}
+
+	public void setTimeRange(Long timeRange) {
+		this.timeRange = timeRange;
+	}
+
+}

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

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.core.questions.api.client;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
@@ -18,6 +19,7 @@ import cn.com.qmth.examcloud.core.questions.api.response.GetDefaultQuestionsResp
  * @company		qmth
  * @describle	试题对象服务
  */
+@Service
 public class QuestionCloudServiceClient extends BasicCloudClientSupport implements QuestionCloudService{
 
 	private static final long serialVersionUID = 309315715614556772L;

examcloud-task-api/src/main/java/cn/com/qmth/examcloud/task/api/request/SyncOrgReq.java

@@ -10,8 +10,6 @@ public class SyncOrgReq extends SyncBaseRequest {
 
 	private Long parentId;
 
-	private Integer level;
-
 	private String name;
 
 	private Boolean enable;
@@ -40,14 +38,6 @@ public class SyncOrgReq extends SyncBaseRequest {
 		this.parentId = parentId;
 	}
 
-	public Integer getLevel() {
-		return level;
-	}
-
-	public void setLevel(Integer level) {
-		this.level = level;
-	}
-
 	public String getName() {
 		return name;
 	}