对外登录接口提交代码

nafmii-app/src/main/java/org/nafmii/app/feign/controller/UserFeignController.java

@@ -36,12 +36,4 @@ public class UserFeignController {
         ApiResponse userLogin = feignService.userLogin(object);
         ApiResponse userLogin = feignService.userLogin(object);
         return userLogin;
         return userLogin;
     }
     }
-
-    @ApiOperation( value = "app手机号登陆接口",notes = "app手机号登陆接口")
-    @PostMapping("/phoneLogin")
-    @ResponseBody
-    public ApiResponse phoneLogin (@RequestBody JSONObject object){
-        ApiResponse phoneLogin = feignService.phoneLogin(object);
-        return phoneLogin;
-    }
 }
 }

nafmii-app/src/main/java/org/nafmii/app/feign/service/UserFeignService.java

@@ -12,8 +12,6 @@ import org.nafmii.common.response.ApiResponse;
  * @remark:
  * @remark:
  */
  */
 public interface UserFeignService {
 public interface UserFeignService {
-    //对外提供手机号登陆接口
-    ApiResponse phoneLogin(JSONObject object);
 
 
     //对外提供用户登陆接口
     //对外提供用户登陆接口
     ApiResponse userLogin(JSONObject object);
     ApiResponse userLogin(JSONObject object);

nafmii-app/src/main/java/org/nafmii/app/feign/service/impl/UserFeignServiceImpl.java

@@ -28,36 +28,21 @@ public class UserFeignServiceImpl implements UserFeignService {
     private UserClient userClient;
     private UserClient userClient;
 
 
     /**
     /**
-     * 对外提供手机号登陆接口
-     * @param object
-     * @return
-     */
-    @Override
-    public ApiResponse phoneLogin(JSONObject object) {
-        ApiResponse<UserFeignVO> apiResponse = new ApiResponse<>();
-        log.info("对外提供手机号登陆接口相关json参数========》{}",object.toJSONString());
-        LoginClientParam loginClientParam = BeanTransferUtils.transfer(object, LoginClientParam.class);
-        log.info("对外提供手机号登陆接口相关对象参数========》{}",loginClientParam);
-        if("002".equals(object.get("apiCode"))){
-            apiResponse = userClient.phoneLogin(loginClientParam);
-        }
-        return apiResponse;
-    }
-
-    /**
      * 对外提供用户登陆接口
      * 对外提供用户登陆接口
      * @param object
      * @param object
      * @return
      * @return
      */
      */
     @Override
     @Override
     public ApiResponse userLogin(JSONObject object) {
     public ApiResponse userLogin(JSONObject object) {
-        ApiResponse<UserFeignVO> apiResponse = new ApiResponse<>();
         log.info("对外提供登陆接口相关json参数========》{}",object.toJSONString());
         log.info("对外提供登陆接口相关json参数========》{}",object.toJSONString());
         LoginClientParam loginClientParam = BeanTransferUtils.transfer(object, LoginClientParam.class);
         LoginClientParam loginClientParam = BeanTransferUtils.transfer(object, LoginClientParam.class);
         log.info("对外提供登陆接口相关对象参数========》{}",loginClientParam);
         log.info("对外提供登陆接口相关对象参数========》{}",loginClientParam);
-        if("001".equals(object.get("apiCode"))){
-            apiResponse =  userClient.userLogin(loginClientParam);
+        if("ul-0001".equals(object.get("apiCode"))){
+            return  new ApiResponse(userClient.userLogin(loginClientParam));
+        }
+        if("ul-0002".equals(object.get("apiCode"))){
+            return  new ApiResponse(userClient.phoneLogin(loginClientParam));
         }
         }
-        return apiResponse;
+        return new ApiResponse();
     }
     }
 }
 }