结构调整

examcloud-core-basic-client/pom.xml → examcloud-core-basic-api-client/pom.xml

@@ -8,13 +8,13 @@
 		<artifactId>examcloud-core-basic</artifactId>
 		<version>0.1.0</version>
 	</parent>
-	<artifactId>examcloud-core-basic-client</artifactId>
+	<artifactId>examcloud-core-basic-api-client</artifactId>
 	<packaging>jar</packaging>
 
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud.core.basic</groupId>
-			<artifactId>examcloud-core-basic-domain</artifactId>
+			<artifactId>examcloud-core-basic-api</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 		<dependency>

examcloud-core-basic-api-provider/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>cn.com.qmth.examcloud.core.basic</groupId>
+		<artifactId>examcloud-core-basic</artifactId>
+		<version>0.1.0</version>
+	</parent>
+	<artifactId>examcloud-core-basic-api-provider</artifactId>
+	<packaging>jar</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud.core.basic</groupId>
+			<artifactId>examcloud-core-basic-api</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud.core.basic</groupId>
+			<artifactId>examcloud-core-basic-service</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+	
+	</dependencies>
+
+</project>

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/service/core/api/DemoApi.java → examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/DemoController.java

@@ -1,23 +1,24 @@
-package cn.com.qmth.examcloud.service.core.api;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import cn.com.qmth.examcloud.core.basic.domain.response.GetXxxResp;
-
-@RestController
-@RequestMapping("${app.api.root}/demo")
-public class DemoApi {
-
-	@GetMapping("getXxx")
-	public ResponseEntity<GetXxxResp> getXxx() {
-		GetXxxResp demoResp = new GetXxxResp();
-		demoResp.setS("test");
-
-		return new ResponseEntity<GetXxxResp>(demoResp, HttpStatus.OK);
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.provider;
+
+import org.examcloud.core.basic.api.response.GetXxxResp;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import cn.com.qmth.examcloud.common.support.ControllerSupport;
+
+@RestController
+@RequestMapping("${app.api.root}/demo")
+public class DemoController extends ControllerSupport {
+
+	@GetMapping("getXxx")
+	public ResponseEntity<GetXxxResp> getXxx() {
+		GetXxxResp demoResp = new GetXxxResp();
+		demoResp.setS("test");
+
+		return new ResponseEntity<GetXxxResp>(demoResp, HttpStatus.OK);
+	}
+
+}

examcloud-core-basic-api/pom.xml

@@ -9,20 +9,13 @@
 		<version>0.1.0</version>
 	</parent>
 	<artifactId>examcloud-core-basic-api</artifactId>
-	<packaging>jar</packaging>
 
 	<dependencies>
 		<dependency>
-			<groupId>cn.com.qmth.examcloud.core.basic</groupId>
-			<artifactId>examcloud-core-basic-domain</artifactId>
-			<version>${examcloud.version}</version>
+			<groupId>cn.com.qmth.examcloud.commons</groupId>
+			<artifactId>examcloud-commons-api</artifactId>
+			<version>0.1.0</version>
 		</dependency>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.core.basic</groupId>
-			<artifactId>examcloud-core-basic-service</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-	
 	</dependencies>
 
 </project>

examcloud-core-basic-api/src/main/java/org/examcloud/core/basic/api/DemoProvider.java

@@ -0,0 +1,17 @@
+package org.examcloud.core.basic.api;
+
+import org.examcloud.commons.api.Provider;
+import org.examcloud.core.basic.api.request.GetXxxReq;
+import org.examcloud.core.basic.api.response.GetXxxResp;
+
+/**
+ * demo 服务接口
+ * 
+ * @author WANG
+ *
+ */
+public interface DemoProvider extends Provider {
+
+	GetXxxResp getXxx(GetXxxReq req);
+
+}

examcloud-core-basic-domain/src/main/java/cn/com/qmth/examcloud/core/basic/domain/request/GetXxxReq.java → examcloud-core-basic-api/src/main/java/org/examcloud/core/basic/api/request/GetXxxReq.java

@@ -1,13 +1,13 @@
-package cn.com.qmth.examcloud.core.basic.domain.request;
-
-import org.examcloud.commons.api.BaseRequest;
-
-/**
- * @author WANGWEI
- *
- */
-public class GetXxxReq extends BaseRequest {
-
-	private static final long serialVersionUID = -6925630706679571172L;
-
-}
+package org.examcloud.core.basic.api.request;
+
+import org.examcloud.commons.api.BaseRequest;
+
+/**
+ * @author WANGWEI					
+ *
+ */
+public class GetXxxReq extends BaseRequest {
+
+	private static final long serialVersionUID = -6925630706679571172L;
+
+}

examcloud-core-basic-domain/src/main/java/cn/com/qmth/examcloud/core/basic/domain/response/GetXxxResp.java → examcloud-core-basic-api/src/main/java/org/examcloud/core/basic/api/response/GetXxxResp.java

@@ -1,23 +1,23 @@
-package cn.com.qmth.examcloud.core.basic.domain.response;
-
-import org.examcloud.commons.api.BaseResponse;
-
-/**
- * @author WANGWEI
- *
- */
-public class GetXxxResp extends BaseResponse {
-
-	private static final long serialVersionUID = -6925630706679571172L;
-
-	private String s;
-
-	public String getS() {
-		return s;
-	}
-
-	public void setS(String s) {
-		this.s = s;
-	}
-
-}
+package org.examcloud.core.basic.api.response;
+
+import org.examcloud.commons.api.BaseResponse;
+
+/**
+ * @author WANGWEI
+ *
+ */
+public class GetXxxResp extends BaseResponse {
+
+	private static final long serialVersionUID = -6925630706679571172L;
+
+	private String s;
+
+	public String getS() {
+		return s;
+	}
+
+	public void setS(String s) {
+		this.s = s;
+	}
+
+}

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

@@ -1,16 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.client;
-
-import cn.com.qmth.examcloud.core.basic.domain.request.GetXxxReq;
-import cn.com.qmth.examcloud.core.basic.domain.response.GetXxxResp;
-
-/**
- * 机构客户端
- * 
- * @author WANG
- *
- */
-public interface DemoClient {
-
-	GetXxxResp getXxx(GetXxxReq req);
-
-}

examcloud-core-basic-client/src/main/java/cn/com/qmth/examcloud/core/basic/client/impl/DemoClientImpl.java

@@ -1,33 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.client.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import cn.com.qmth.examcloud.core.basic.client.DemoClient;
-import cn.com.qmth.examcloud.core.basic.domain.request.GetXxxReq;
-import cn.com.qmth.examcloud.core.basic.domain.response.GetXxxResp;
-
-/**
- * 机构客户端
- * 
- * @author WANG
- *
- */
-@Service
-public class DemoClientImpl implements DemoClient {
-
-	@Autowired
-	RestTemplate restTemplate;
-
-	@Override
-	public GetXxxResp getXxx(GetXxxReq req) {
-		ResponseEntity<GetXxxResp> respEntity = restTemplate.getForEntity("http://ExamCloud-service-core/demo/getXxx",
-				GetXxxResp.class);
-		GetXxxResp resp = respEntity.getBody();
-		System.out.println(resp);
-		return null;
-	}
-
-}

examcloud-core-basic-domain/pom.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn.com.qmth.examcloud.core.basic</groupId>
-		<artifactId>examcloud-core-basic</artifactId>
-		<version>0.1.0</version>
-	</parent>
-
-	<artifactId>examcloud-core-basic-domain</artifactId>
-	<packaging>jar</packaging>
-
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.commons</groupId>
-			<artifactId>examcloud-commons-api</artifactId>
-			<version>0.1.0</version>
-		</dependency>
-
-	</dependencies>
-
-</project>

examcloud-core-basic-main/pom.xml

@@ -14,7 +14,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud.core.basic</groupId>
-			<artifactId>examcloud-core-basic-api</artifactId>
+			<artifactId>examcloud-core-basic-api-provider</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 

pom.xml

@@ -12,11 +12,11 @@
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>examcloud-core-basic-domain</module>
 		<module>examcloud-core-basic-main</module>
-		<module>examcloud-core-basic-service</module>
-		<module>examcloud-core-basic-client</module>
 		<module>examcloud-core-basic-api</module>
+		<module>examcloud-core-basic-api-client</module>
+		<module>examcloud-core-basic-api-provider</module>
+		<module>examcloud-core-basic-service</module>
 		<module>examcloud-core-basic-dao</module>
 	</modules>