Commit ac57656c by Xujialin

错误修改

parent 3fce46d2
...@@ -3,7 +3,6 @@ package com.senthink.rmi.challenger.rmi; ...@@ -3,7 +3,6 @@ package com.senthink.rmi.challenger.rmi;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -26,36 +25,38 @@ import com.senthink.rmi.challenger.vo.UserUpdatePwdVo; ...@@ -26,36 +25,38 @@ import com.senthink.rmi.challenger.vo.UserUpdatePwdVo;
@FeignClient(value = "challenger", fallback = EllaUserBaseHystrix.class) @FeignClient(value = "challenger", fallback = EllaUserBaseHystrix.class)
public interface EllaUserBaseRemoteService { public interface EllaUserBaseRemoteService {
@RequestMapping(value = { "/user/list", "/user/index" }, method = RequestMethod.GET)
Message index();
@Value("${ella.url}") @RequestMapping(value = { "admin/user/list", "/back/user/list" }, method = RequestMethod.GET)
private String ellaUrl; Message adminPage(@RequestBody EllaUserBaseParam param);
/ @RequestMapping(value = { "normal/user/list", "/back/consumer/list" }, method = RequestMethod.GET)
@RequestMapping(value = { "/user/list", "/user/index" }, method = RequestMethod.GET) Message normalPage(@RequestBody EllaUserBaseParam param);
Message index() ;
@RequestMapping(value = { "admin/user/list", "/back/user/list" }, method = RequestMethod.GET) @RequestMapping(value = { "/user/searchList" }, method = RequestMethod.POST)
Message adminPage(@RequestBody EllaUserBaseParam param) ; Message dealerSearchList(@RequestBody EllaUserBaseParam param);
@RequestMapping(value = { "normal/user/list", "/back/consumer/list" }, method = RequestMethod.GET)
Message normalPage(@RequestBody EllaUserBaseParam param) ; @RequestMapping(value = "/user/toAdd", method = RequestMethod.GET)
@RequestMapping(value = { "/user/searchList" }, method = RequestMethod.POST) Message toAdd();
Message dealerSearchList(@RequestBody EllaUserBaseParam param) ;
@RequestMapping(value = "/user/toAdd", method = RequestMethod.GET) @RequestMapping(value = "/user/toUpdate/{userId}", method = RequestMethod.GET)
Message toAdd() ; Message toUpdate(@PathVariable Integer userId, HttpServletRequest request);
@RequestMapping(value = "/user/toUpdate/{userId}", method = RequestMethod.GET)
Message toUpdate(@PathVariable Integer userId, HttpServletRequest request) @RequestMapping(value = "/user/doAddOrUpdate", method = RequestMethod.POST)
; Message doAddOrUpdate(@RequestBody EllaUserBaseVo vo, String roles, String extendIds, String extendValues,
@RequestMapping(value = "/user/doAddOrUpdate", method = RequestMethod.POST) String orgs, @RequestParam(value = "file", required = false) MultipartFile file);
Message doAddOrUpdate(@RequestBody EllaUserBaseVo vo, String roles,
String extendIds, @RequestMapping(value = { "/user/disable/{id}" }, method = RequestMethod.GET)
String extendValues, String orgs, @RequestParam(value = "file", required = false) MultipartFile file) Message disableUser(@PathVariable Integer id);
;
@RequestMapping(value = { "/user/disable/{id}" }, method = RequestMethod.GET) @RequestMapping(value = { "/user/enable/{id}" }, method = RequestMethod.GET)
Message disableUser(@PathVariable Integer id) ; Message enableUser(@PathVariable Integer id);
@RequestMapping(value = { "/user/enable/{id}" }, method = RequestMethod.GET)
Message enableUser(@PathVariable Integer id) ; @RequestMapping(value = { "/user/updatePass" }, method = RequestMethod.POST)
@RequestMapping(value = { "/user/updatePass" }, method = RequestMethod.POST) Message updatePass(@RequestBody UserUpdatePwdVo vo);
Message updatePass(@RequestBody UserUpdatePwdVo vo) ;
@RequestMapping(value = { "/user/passCheck" }, method = RequestMethod.POST) @RequestMapping(value = { "/user/passCheck" }, method = RequestMethod.POST)
Message passCheck(@RequestBody EllaUserBaseVo vo) ; Message passCheck(@RequestBody EllaUserBaseVo vo);
} }
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment