fix: 使用精确类型

project-interface/src/main/java/com/dituhui/pea/common/Result.java

@@ -43,6 +43,10 @@ public class Result<T> {
 	public static Result<?> failed(String message) {
 		return new Result<>(ResultEnum.COMMON_FAILED.getCode(), message, null);
 	}
+	
+	public static <T> Result<T> failure(String message) {
+		return new Result<>(ResultEnum.COMMON_FAILED.getCode(), message, null);
+	}
 
 	public static Result<?> failed(IResult errorResult) {
 		return new Result<>(errorResult.getCode(), errorResult.getMessage(), null);

project-interface/src/main/java/com/dituhui/pea/user/IUser.java

@@ -11,6 +11,7 @@ import com.dituhui.pea.common.Result;
 import com.dituhui.pea.enums.ThirdPartyEnum;
 import com.dituhui.pea.pojo.ThirdUserInfo;
 import com.dituhui.pea.pojo.UserInfo;
+import com.dituhui.pea.pojo.UserLoginDTO;
 import com.dituhui.pea.pojo.UserLoginParam;
 import com.dituhui.pea.pojo.WebResult;
 
@@ -22,10 +23,10 @@ import com.dituhui.pea.pojo.WebResult;
 public interface IUser {
 	
 	@RequestMapping(value = "/pea-user/login", method = RequestMethod.POST)
-	public Result<?> userLogin(@RequestBody UserLoginParam user);
+	public Result<UserLoginDTO> userLogin(@RequestBody UserLoginParam user);
 	
 	@RequestMapping(value = "/pea-user/userInfo", method = RequestMethod.GET)
-	public Result<?> getUserInfo(@RequestHeader(name="userId", required = true) String userId);
+	public Result<UserLoginDTO> getUserInfo(@RequestHeader(name="userId", required = true) String userId);
 
     /**
      * 获取当前登陆用户信息

project-order/src/main/java/com/dituhui/pea/order/controller/PublicOrganizationController.java

@@ -9,7 +9,6 @@ import com.alibaba.druid.util.StringUtils;
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.dituhui.pea.common.BusinessException;
 import com.dituhui.pea.common.Result;
-import com.dituhui.pea.common.ResultEnum;
 import com.dituhui.pea.order.IOrganization;
 import com.dituhui.pea.order.service.OrganizationService;
 import com.dituhui.pea.pojo.OrganizationDTO;
@@ -27,10 +26,10 @@ public class PublicOrganizationController implements IOrganization {
 	@Override
 	public Result<List<OrganizationDTO>> getAllOrganizations(String levelType, List<String> organizationIds) {
 		if (StringUtils.isEmpty(levelType)) {
-			return Result.instance(ResultEnum.COMMON_FAILED.getCode(), "缺少参数levelType", null);
+			return Result.failure("缺少参数levelType");
 		}
 		if (CollectionUtils.isEmpty(organizationIds)) {
-			return Result.instance(ResultEnum.COMMON_FAILED.getCode(), "缺少参数organizationIds", null);
+			return Result.failure("缺少参数organizationIds");
 		}
 
 		Result<List<OrganizationDTO>> res = null;
@@ -38,7 +37,7 @@ public class PublicOrganizationController implements IOrganization {
 			List<OrganizationDTO> orgs = organizationService.getAllOrganizations(levelType, organizationIds);
 			res = Result.success(orgs);
 		} catch (BusinessException e) {
-			return Result.instance(ResultEnum.COMMON_FAILED.getCode(), e.getMessage(), null);
+			return Result.failure(e.getMessage());
 		}
 		return res;
 	}

project-user/src/main/java/com/dituhui/pea/user/controller/UserController.java

@@ -13,6 +13,7 @@ import com.dituhui.pea.enums.ThirdPartyEnum;
 import com.dituhui.pea.pojo.ThirdUserInfo;
 import com.dituhui.pea.pojo.UserAuthInfo;
 import com.dituhui.pea.pojo.UserInfo;
+import com.dituhui.pea.pojo.UserLoginDTO;
 import com.dituhui.pea.pojo.UserLoginParam;
 import com.dituhui.pea.pojo.WebResult;
 import com.dituhui.pea.user.IUser;
@@ -32,12 +33,12 @@ public class UserController implements IUser {
     private UserService userService;
 
     @Override
-	public Result<?> userLogin(UserLoginParam user) {
+	public Result<UserLoginDTO> userLogin(UserLoginParam user) {
 		return userService.userLogin(user.getAccount(), user.getPassword());
 	}
 
     @Override
-	public Result<?> getUserInfo(String userId) {
+	public Result<UserLoginDTO> getUserInfo(String userId) {
 		return userService.getUserInfo(userId);
 	}
 

project-user/src/main/java/com/dituhui/pea/user/service/UserService.java

@@ -93,12 +93,11 @@ public class UserService {
 	@Autowired
 	IOrganization organizationService;
 
-	public Result<?> userLogin(String account, String password) {
+	public Result<UserLoginDTO> userLogin(String account, String password) {
 		UserEntity user = userDao.findByAccountAndPassword(account, SecureUtil.md5(password));
 		log.info("{}/{} login", account, password);
 		if (null != user) {
 			UserLoginDTO userDTO = convertToUserLoginDTO(user);
-
 			// 生成token
 			String token = IdUtil.simpleUUID();
 			userDTO.setToken(token);
@@ -106,7 +105,7 @@ public class UserService {
 			redisService.set(RedisKeyGroup.authToken + ":" + token, gson.toJson(userDTO), timestamp / 1000);
 			return Result.success(userDTO);
 		} else {
-			return Result.failed("鉴权失败");
+			return Result.failure("鉴权失败");
 		}
 	}
 
@@ -176,7 +175,7 @@ public class UserService {
 		resourceInfo.setExtra(null);
 	}
 
-	public Result<?> getUserInfo(String userId) {
+	public Result<UserLoginDTO> getUserInfo(String userId) {
 		UserEntity user = userDao.getById(userId);
 		UserLoginDTO userDTO = convertToUserLoginDTO(user);
 		return Result.success(userDTO);