添加feign服务

ims-service/ims-eval/src/main/java/com/ims/eval/controller/UserController.java

@@ -38,10 +38,16 @@ public class UserController {
 	 */
 	//@ImsPreAuth("eval:organizationEvaluationRule:view")
 	@GetMapping(value = "getSysUser")
-	public JSONObject getSysUser(
+	public R getSysUser(
 		@RequestParam(value = "code", required = false) String code) {
-		JSONObject json = remoteServiceBuilder.getGatewayUrl().getSysUser(code);
-		return json;
+		JSONObject  json = null;
+		try {
+			json = remoteServiceBuilder.getGatewayUrl().getSysUser(code);
+		} catch (Exception e) {
+			return R.ok().data(null);
+		}
+
+		return R.ok().data(json);
 	}
 
 
@@ -52,10 +58,10 @@ public class UserController {
 	 */
 	//@ImsPreAuth("eval:organizationEvaluationRule:view")
 	@GetMapping(value = "getCodeByToken")
-	public JSONObject getCodeByToken(
+	public R getCodeByToken(
 		@RequestParam(value = "token", required = false) String token) {
 		JSONObject json = remoteServiceBuilder.getGatewayUrl().getCodeByToken(token);
-		return json;
+		return R.ok().data(json);
 	}
 
 

ims-service/ims-eval/src/main/java/com/ims/eval/feign/IGatewayUrlService.java

@@ -18,7 +18,7 @@ public interface IGatewayUrlService {
 	 */
 	@Headers({"Content-Type: application/json", "Accept: application/json"})
 	@RequestLine("POST /ims-idms/sysuser/getSysUser?code={code}")
-	JSONObject getSysUser(@Param(value = "code") String code);
+	JSONObject  getSysUser(@Param(value = "code") String code);
 
 
 	/**

ims-service/ims-eval/src/main/java/com/ims/eval/service/IUserService.java

@@ -39,7 +39,7 @@ public interface IUserService extends IService<Myuser> {
 	 * @param code
 	 * @return
 	 */
-	JSONObject getSysUser(String code);
+	Object getSysUser(String code);
 	/**
 	 * 通过token获取code
 	 * @param token

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/UserServiceImpl.java

@@ -66,8 +66,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, Myuser> implements
 	}
 
 	@Override
-	public JSONObject getSysUser(String code) {
-		JSONObject json = remoteServiceBuilder.getGatewayUrl().getSysUser(code);
+	public Object getSysUser(String code) {
+		Object json = remoteServiceBuilder.getGatewayUrl().getSysUser(code);
 		return json;
 	}
 

ims-service/ims-eval/src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 #服务器端口
 server:
-  port: 18800
+  port: 28800
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure: