Merge remote-tracking branch 'origin/master'

examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/CommonCloudServiceClient.java

@@ -1,21 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.api.client;
-
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.core.basic.api.CommonCloudService;
-import cn.com.qmth.examcloud.core.basic.api.request.GetThirdPartyAccessInfoReq;
-import cn.com.qmth.examcloud.core.basic.api.response.GetThirdPartyAccessInfoResp;
-
-@Service
-public class CommonCloudServiceClient extends AbstractCloudClientSupport
-		implements
-			CommonCloudService {
-
-	private static final long serialVersionUID = 6826389318398035229L;
-
-	@Override
-	public GetThirdPartyAccessInfoResp getThirdPartyAccessInfo(GetThirdPartyAccessInfoReq req) {
-		return post("common/getThirdPartyAccessInfo", req, GetThirdPartyAccessInfoResp.class);
-	}
-
-}

examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/OrgCloudServiceClient.java

@@ -3,14 +3,10 @@ package cn.com.qmth.examcloud.core.basic.api.client;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.core.basic.api.OrgCloudService;
-import cn.com.qmth.examcloud.core.basic.api.request.GetAllOrgPropertiesReq;
-import cn.com.qmth.examcloud.core.basic.api.request.GetOrgPropertyReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgsByIdListReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgsReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveOrgReq;
-import cn.com.qmth.examcloud.core.basic.api.response.GetAllOrgPropertiesResp;
-import cn.com.qmth.examcloud.core.basic.api.response.GetOrgPropertyResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgsByIdListResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgsResp;
@@ -44,16 +40,6 @@ public class OrgCloudServiceClient extends AbstractCloudClientSupport implements
 		return post("org/getOrgs", req, GetOrgsResp.class);
 	}
 
-	@Override
-	public GetAllOrgPropertiesResp getAllOrgProperties(GetAllOrgPropertiesReq req) {
-		return post("org/getAllOrgProperties", req, GetAllOrgPropertiesResp.class);
-	}
-
-	@Override
-	public GetOrgPropertyResp getOrgProperty(GetOrgPropertyReq req) {
-		return post("org/getOrgProperty", req, GetOrgPropertyResp.class);
-	}
-
 	@Override
 	public GetOrgsByIdListResp getOrgsByIdList(GetOrgsByIdListReq req) {
 		return post("org/getOrgsByIdList", req, GetOrgsByIdListResp.class);

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

@@ -1,26 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.api;
-
-import cn.com.qmth.examcloud.api.commons.CloudService;
-import cn.com.qmth.examcloud.core.basic.api.request.GetThirdPartyAccessInfoReq;
-import cn.com.qmth.examcloud.core.basic.api.response.GetThirdPartyAccessInfoResp;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年7月5日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface CommonCloudService extends CloudService {
-
-	/**
-	 * 方法注释
-	 *
-	 * @author WANGWEI
-	 * @param rootOrgId
-	 * @param appId
-	 * @return
-	 */
-	GetThirdPartyAccessInfoResp getThirdPartyAccessInfo(GetThirdPartyAccessInfoReq req);
-
-}

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

@@ -1,14 +1,10 @@
 package cn.com.qmth.examcloud.core.basic.api;
 
 import cn.com.qmth.examcloud.api.commons.CloudService;
-import cn.com.qmth.examcloud.core.basic.api.request.GetAllOrgPropertiesReq;
-import cn.com.qmth.examcloud.core.basic.api.request.GetOrgPropertyReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgsByIdListReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgsReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveOrgReq;
-import cn.com.qmth.examcloud.core.basic.api.response.GetAllOrgPropertiesResp;
-import cn.com.qmth.examcloud.core.basic.api.response.GetOrgPropertyResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgsByIdListResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgsResp;
@@ -32,8 +28,4 @@ public interface OrgCloudService extends CloudService {
 
 	GetOrgsResp getOrgs(GetOrgsReq req);
 
-	GetAllOrgPropertiesResp getAllOrgProperties(GetAllOrgPropertiesReq req);
-
-	GetOrgPropertyResp getOrgProperty(GetOrgPropertyReq req);
-
 }

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

@@ -1,68 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.api.bean;
-
-import cn.com.qmth.examcloud.api.commons.exchange.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-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetThirdPartyAccessInfoReq.java

@@ -1,29 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
-
-public class GetThirdPartyAccessInfoReq extends BaseRequest {
-
-	private static final long serialVersionUID = -8087094118667193680L;
-
-	private Long rootOrgId;
-
-	private String appId;
-
-	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;
-	}
-
-}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetThirdPartyAccessInfoResp.java

@@ -1,20 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
-import cn.com.qmth.examcloud.core.basic.api.bean.ThirdPartyAccessBean;
-
-public class GetThirdPartyAccessInfoResp extends BaseResponse {
-
-	private static final long serialVersionUID = -5868292504966057746L;
-
-	private ThirdPartyAccessBean thirdPartyAccessBean;
-
-	public ThirdPartyAccessBean getThirdPartyAccessBean() {
-		return thirdPartyAccessBean;
-	}
-
-	public void setThirdPartyAccessBean(ThirdPartyAccessBean thirdPartyAccessBean) {
-		this.thirdPartyAccessBean = thirdPartyAccessBean;
-	}
-
-}