wangwei 7 жил өмнө
parent
commit
615425dc95

+ 4 - 3
examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/DemoCloudServiceClient.java

@@ -1,12 +1,13 @@
 package cn.com.qmth.examcloud.core.basic.api.client;
 
-import org.examcloud.core.basic.api.DemoCloudService;
-import org.examcloud.core.basic.api.request.GetXxxReq;
-import org.examcloud.core.basic.api.response.GetXxxResp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import cn.com.qmth.examcloud.core.basic.api.DemoCloudService;
+import cn.com.qmth.examcloud.core.basic.api.request.GetXxxReq;
+import cn.com.qmth.examcloud.core.basic.api.response.GetXxxResp;
+
 /**
  * demo 云服务客户端
  * 

+ 2 - 2
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/DemoController.java → examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/DemoCloudServiceProvider.java

@@ -1,6 +1,5 @@
 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;
@@ -8,11 +7,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.common.support.ControllerSupport;
+import cn.com.qmth.examcloud.core.basic.api.response.GetXxxResp;
 import cn.com.qmth.examcloud.core.basic.service.DemoService;
 
 @RestController
 @RequestMapping("${app.api.root}/demo")
-public class DemoController extends ControllerSupport {
+public class DemoCloudServiceProvider extends ControllerSupport {
 
 	DemoService demoService;
 

+ 42 - 0
examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/provider/UserCloudServiceProvider.java

@@ -0,0 +1,42 @@
+package cn.com.qmth.examcloud.core.basic.api.provider;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import cn.com.qmth.examcloud.common.support.ControllerSupport;
+import cn.com.qmth.examcloud.core.basic.api.UserCloudService;
+import cn.com.qmth.examcloud.core.basic.api.bean.UserInfo;
+import cn.com.qmth.examcloud.core.basic.api.request.GetUserInfoReq;
+import cn.com.qmth.examcloud.core.basic.api.response.GetUserInfoResp;
+import cn.com.qmth.examcloud.service.core.service.UserService;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 用户服务 controller
+ * 
+ * @author WANGWEI
+ *
+ */
+@RestController
+@RequestMapping("${url.prefix}/user")
+public class UserCloudServiceProvider extends ControllerSupport implements UserCloudService {
+
+	@Autowired
+	UserService userService;
+
+	@ApiOperation(value = "获取用户信息", notes = "获取用户信息")
+	@PostMapping("getUserInfo")
+	@Override
+	public GetUserInfoResp getUserInfo(@RequestBody GetUserInfoReq req) {
+
+		GetUserInfoResp resp = new GetUserInfoResp();
+		UserInfo userInfo = new UserInfo();
+		userInfo.setLoginName("wangwei");
+		resp.setUserInfo(userInfo);
+		return resp;
+	}
+
+}

+ 4 - 3
examcloud-core-basic-api/src/main/java/org/examcloud/core/basic/api/DemoCloudService.java → examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/DemoCloudService.java

@@ -1,8 +1,9 @@
-package org.examcloud.core.basic.api;
+package cn.com.qmth.examcloud.core.basic.api;
 
 import org.examcloud.commons.api.CloudService;
-import org.examcloud.core.basic.api.request.GetXxxReq;
-import org.examcloud.core.basic.api.response.GetXxxResp;
+
+import cn.com.qmth.examcloud.core.basic.api.request.GetXxxReq;
+import cn.com.qmth.examcloud.core.basic.api.response.GetXxxResp;
 
 /**
  * demo 云服务接口

+ 23 - 0
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/UserCloudService.java

@@ -0,0 +1,23 @@
+package cn.com.qmth.examcloud.core.basic.api;
+
+import cn.com.qmth.examcloud.core.basic.api.request.GetUserInfoReq;
+import cn.com.qmth.examcloud.core.basic.api.response.GetUserInfoResp;
+
+/**
+ * 用户云服务
+ * 
+ * @author WANGWEI
+ *
+ */
+public interface UserCloudService {
+
+	/**
+	 * 获取用户信息
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetUserInfoResp getUserInfo(GetUserInfoReq req);
+
+}

+ 176 - 0
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/UserInfo.java

@@ -0,0 +1,176 @@
+package cn.com.qmth.examcloud.core.basic.api.bean;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class UserInfo implements Serializable {
+
+	private static final long serialVersionUID = 7939545789907406883L;
+
+	private Long userId;
+
+	private Long orgId;
+
+	private Long rootOrgId;
+
+	private String name;
+
+	private String loginName;
+
+	private String type;
+
+	private String token;
+
+	private String avatar;
+
+	private String orgName;
+
+	private String rootOrgName;
+
+	private String rootOrgLogo;
+
+	private Long studentId;
+
+	private String identityNumber;
+
+	private String studentCode;
+
+	private List<UserRole> userRoles;
+
+	private List<String> roleNames;
+
+	public static long getSerialVersionUID() {
+		return serialVersionUID;
+	}
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getLoginName() {
+		return loginName;
+	}
+
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getToken() {
+		return token;
+	}
+
+	public void setToken(String token) {
+		this.token = token;
+	}
+
+	public String getAvatar() {
+		return avatar;
+	}
+
+	public void setAvatar(String avatar) {
+		this.avatar = avatar;
+	}
+
+	public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
+	public String getRootOrgName() {
+		return rootOrgName;
+	}
+
+	public void setRootOrgName(String rootOrgName) {
+		this.rootOrgName = rootOrgName;
+	}
+
+	public String getRootOrgLogo() {
+		return rootOrgLogo;
+	}
+
+	public void setRootOrgLogo(String rootOrgLogo) {
+		this.rootOrgLogo = rootOrgLogo;
+	}
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getStudentId() {
+		return studentId;
+	}
+
+	public void setStudentId(Long studentId) {
+		this.studentId = studentId;
+	}
+
+	public String getIdentityNumber() {
+		return identityNumber;
+	}
+
+	public void setIdentityNumber(String identityNumber) {
+		this.identityNumber = identityNumber;
+	}
+
+	public List<UserRole> getUserRoles() {
+		return userRoles;
+	}
+
+	public void setUserRoles(List<UserRole> userRoles) {
+		this.userRoles = userRoles;
+	}
+
+	public List<String> getRoleNames() {
+		return roleNames;
+	}
+
+	public void setRoleNames(List<String> roleNames) {
+		this.roleNames = roleNames;
+	}
+
+	public String getStudentCode() {
+		return studentCode;
+	}
+
+	public void setStudentCode(String studentCode) {
+		this.studentCode = studentCode;
+	}
+
+	public UserInfo() {
+	}
+}

+ 43 - 0
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/UserRole.java

@@ -0,0 +1,43 @@
+package cn.com.qmth.examcloud.core.basic.api.bean;
+
+import java.io.Serializable;
+
+/**
+ * @author WANGWEI
+ *
+ */
+public class UserRole implements Serializable {
+
+	private static final long serialVersionUID = -5202947216906275866L;
+
+	private Long id;
+
+	private String appCode;
+
+	private String roleCode;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getAppCode() {
+		return appCode;
+	}
+
+	public void setAppCode(String appCode) {
+		this.appCode = appCode;
+	}
+
+	public String getRoleCode() {
+		return roleCode;
+	}
+
+	public void setRoleCode(String roleCode) {
+		this.roleCode = roleCode;
+	}
+
+}

+ 39 - 0
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetUserInfoReq.java

@@ -0,0 +1,39 @@
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import org.examcloud.commons.api.BaseRequest;
+
+/**
+ * @author WANGWEI
+ *
+ */
+public class GetUserInfoReq extends BaseRequest {
+
+	private static final long serialVersionUID = 3858312269358420299L;
+
+	/**
+	 * 账号类型
+	 */
+	private String accountType;
+
+	/**
+	 * 账号值
+	 */
+	private String accountValue;
+
+	public String getAccountType() {
+		return accountType;
+	}
+
+	public void setAccountType(String accountType) {
+		this.accountType = accountType;
+	}
+
+	public String getAccountValue() {
+		return accountValue;
+	}
+
+	public void setAccountValue(String accountValue) {
+		this.accountValue = accountValue;
+	}
+
+}

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

@@ -1,4 +1,4 @@
-package org.examcloud.core.basic.api.request;
+package cn.com.qmth.examcloud.core.basic.api.request;
 
 import org.examcloud.commons.api.BaseRequest;
 

+ 20 - 0
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetUserInfoResp.java

@@ -0,0 +1,20 @@
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import org.examcloud.commons.api.BaseResponse;
+
+import cn.com.qmth.examcloud.core.basic.api.bean.UserInfo;
+
+public class GetUserInfoResp extends BaseResponse {
+	private static final long serialVersionUID = 1618003517901624074L;
+
+	private UserInfo userInfo;
+
+	public UserInfo getUserInfo() {
+		return userInfo;
+	}
+
+	public void setUserInfo(UserInfo userInfo) {
+		this.userInfo = userInfo;
+	}
+
+}

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

@@ -1,4 +1,4 @@
-package org.examcloud.core.basic.api.response;
+package cn.com.qmth.examcloud.core.basic.api.response;
 
 import org.examcloud.commons.api.BaseResponse;
 

+ 1 - 0
examcloud-core-basic-starter/src/main/resources/application.properties

@@ -25,6 +25,7 @@ server.port=8000
 eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
 hystrix.command.default.execution.timeout.enabled=false
 app.api.root=/api/ecs_core
+url.prefix=/api/core/basic
 
 staticResource.rootPath=/home/qmth/project/examcloud/static