修改一些借口接口rmi 与vo

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.senthink.www</groupId>
 	<artifactId>challenger-rmi</artifactId>
-	<version>0.1.4</version>
+	<version>0.1.17</version>
 	<packaging>jar</packaging>
 
 	<name>challenger-rmi</name>

src/main/java/com/senthink/rmi/challenger/rmi/EllaAppVersionRemoteService.java

@@ -22,19 +22,19 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaAppVersionRemoteService {
 
 	@ApiOperation("查询接口，参数search")
-	@RequestMapping(value = "appversion/getPage", method = RequestMethod.POST)
+	@RequestMapping(value = "challenger/appversion/getPage", method = RequestMethod.POST)
 	Message appVersionSearch(@RequestBody EllaAppVersionVo av);
 
 	@ApiOperation("编辑查找实体接口，参数id")
-	@RequestMapping(value = "appversion/toUpdate/{id}", method = RequestMethod.GET)
+	@RequestMapping(value = "challenger/appversion/toUpdate/{id}", method = RequestMethod.GET)
 	Message appVersionToupdate(@PathVariable(value = "id") Integer id);
 
 	@ApiOperation("保存接口")
-	@RequestMapping(value = "appversion/doAddOrUpdate", method = RequestMethod.POST)
+	@RequestMapping(value = "challenger/appversion/doAddOrUpdate", method = RequestMethod.POST)
 	Message appVersionDoUpdateOrAdd(@RequestBody EllaAppVersionVo av);
 
 	@ApiOperation("删除接口，参数id")
-	@RequestMapping(value = "appversion/delete/{id}", method = RequestMethod.GET)
+	@RequestMapping(value = "challenger/appversion/delete/{id}", method = RequestMethod.GET)
 	Message appVersiondelete(@PathVariable(value = "id") Integer id);
 
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaIndexRemoteService.java

@@ -29,7 +29,7 @@ public interface EllaIndexRemoteService {
 
 	@ApiOperation("根据用户id与菜单id获取该菜单下有权限的按钮")
 	@RequestMapping(value = "/challenger/index/getpre/{id}/{menuId}", method = RequestMethod.POST)
-	Message getIndexPre(@PathVariable Integer id, @PathVariable Integer menuId);
+	Message getIndexPre(@PathVariable(value = "id") Integer id, @PathVariable(value = "menuId") Integer menuId);
 
 	@ApiOperation("注册时检查是否重名的接口")
 	@RequestMapping(value = "/challenger/challenger/check/name/{name}", method = RequestMethod.GET)

src/main/java/com/senthink/rmi/challenger/rmi/EllaOrgStructureHystrix.java

@@ -15,9 +15,9 @@ import com.senthink.rmi.challenger.vo.EllaOrgStructureVo;
  */
 public abstract class EllaOrgStructureHystrix implements EllaOrgStructureRemoteService {
 
-	public abstract Message index();
+	public abstract Message index(@PathVariable(value = "userId") Integer userId);
 
-	public abstract Message orgToUpdate(@RequestBody EllaOrgStructureVo vo);
+	public abstract Message orgToUpdate(@PathVariable Integer id);
 
 	public abstract Message orgDoAddOrUpdate(@RequestBody EllaOrgStructureVo vo);
 

src/main/java/com/senthink/rmi/challenger/rmi/EllaOrgStructureRemoteService.java

@@ -21,19 +21,18 @@ import io.swagger.annotations.ApiOperation;
 @FeignClient(value = "challenger", fallback = EllaOrgStructureHystrix.class)
 public interface EllaOrgStructureRemoteService {
 	@ApiOperation(value = "获取组织架构列表")
-	@RequestMapping(value = { "/challenger/org/index", "/challenger/org/list",
-			"/challenger/back/org/list" }, method = RequestMethod.POST)
-	Message index();
+	@RequestMapping(value = "/challenger/org/index/{userId}", method = RequestMethod.POST)
+	public Message index(@PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation(value = "获取组织架构单个节点的信息")
-	@RequestMapping(value = "/challenger/org/toUpdate/", method = RequestMethod.GET)
-	Message orgToUpdate(@RequestBody EllaOrgStructureVo vo);
+	@RequestMapping(value = "/challenger/org/toUpdate/{id}", method = RequestMethod.POST)
+	Message orgToUpdate(@PathVariable(value = "id") Integer id);
 
 	@ApiOperation(value = "保存或更新该节点信息")
 	@RequestMapping(value = "/challenger/org/doAddOrUpdate", method = RequestMethod.POST)
 	Message orgDoAddOrUpdate(@RequestBody EllaOrgStructureVo vo);
 
 	@RequestMapping(value = "/challenger/org/doDelete/{id}", method = RequestMethod.GET)
-	Message orgDoDelete(@PathVariable Integer id);
+	Message orgDoDelete(@PathVariable(value = "id") Integer id);
 
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaPagePermissionRemoteService.java

@@ -22,8 +22,7 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaPagePermissionRemoteService {
 
 	@ApiOperation(value = "获取权限列表")
-	@RequestMapping(value = { "/challenger/pageper/index", "/challenger/pageper/list",
-			"/challenger/back/pageper/list" }, method = RequestMethod.POST)
+	@RequestMapping(value = { "/challenger/pageper/index" }, method = RequestMethod.POST)
 	Message orgDoDelete();
 
 	@ApiOperation(value = "获取当前节点信息，或插入")
@@ -36,6 +35,6 @@ public interface EllaPagePermissionRemoteService {
 
 	@ApiOperation("删除当前节点")
 	@RequestMapping(value = "/challenger/pageper/doDelete/{id}", method = RequestMethod.GET)
-	Message perDoDelete(@PathVariable Integer id);
+	Message perDoDelete(@PathVariable(value = "id") Integer id);
 
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaRoleRemoteService.java

@@ -22,16 +22,15 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaRoleRemoteService {
 
 	@ApiOperation("角色列表")
-	@RequestMapping(value = { "/challenger/role/searchList",
-			"/challenger/back/role/list" }, method = RequestMethod.POST)
+	@RequestMapping(value = { "/challenger/back/role/list" }, method = RequestMethod.POST)
 	Message roleSearchList(@RequestBody EllaRoleVo vo);
 
 	@ApiOperation("添加时获取权限树")
 	@RequestMapping(value = "/challenger/role/toAdd/{id}", method = RequestMethod.GET)
-	Message roleToAdd(@PathVariable Integer id);
+	Message roleToAdd(@PathVariable(value = "id") Integer id);
 
 	@ApiOperation("更新角色时获取该角色对象")
-	@RequestMapping(value = "/role/toUpdate/{roleId}/{userId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/role/toUpdate/{roleId}/{userId}", method = RequestMethod.GET)
 	public Message roleToUpdate(@PathVariable(value = "roleId") Integer roleId,
 			@PathVariable(value = "userId") String userId);
 
@@ -41,10 +40,10 @@ public interface EllaRoleRemoteService {
 
 	@ApiOperation("根据id删除角色")
 	@RequestMapping(value = "/challenger/role/doDelete/{id}", method = RequestMethod.GET)
-	Message roleDoDelete(@PathVariable Integer id);
+	Message roleDoDelete(@PathVariable(value = "id") Integer id);
 
 	@ApiOperation("角色详情")
 	@RequestMapping(value = "/challenger/role/toDetail/{roleId}", method = RequestMethod.GET)
-	Message roleToDetail(@PathVariable Integer roleId);
+	Message roleToDetail(@PathVariable(value = "roleId") Integer roleId);
 
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaSubsystemRemoteService.java

@@ -22,13 +22,12 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaSubsystemRemoteService {
 
 	@ApiOperation("查询")
-	@RequestMapping(value = { "/challenger/subsystem/searchList",
-			"/challenger/back/subsystem/list" }, method = RequestMethod.POST)
+	@RequestMapping(value = { "/challenger/back/subsystem/list" }, method = RequestMethod.POST)
 	Message subSearchList(@RequestBody EllaSubsystemVo vo);
 
 	@ApiOperation("根据id获取要更新的系统信息")
 	@RequestMapping(value = "/challenger/subsystem/toUpdate/{subsystemId}", method = RequestMethod.GET)
-	Message subToUpdate(@PathVariable Integer subsystemId);
+	Message subToUpdate(@PathVariable(value = "subsystemId") Integer subsystemId);
 
 	@ApiOperation("更新或插入操作")
 	@RequestMapping(value = "/challenger/subsystem/doAddOrUpdate", method = RequestMethod.POST)
@@ -36,6 +35,6 @@ public interface EllaSubsystemRemoteService {
 
 	@ApiOperation("删除操作")
 	@RequestMapping(value = "/challenger/subsystem/doDelete/{id}", method = RequestMethod.GET)
-	Message subDoDelete(@PathVariable Integer id);
+	Message subDoDelete(@PathVariable(value = "id") Integer id);
 
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaSubsystemSyncRemoteService.java

@@ -23,13 +23,12 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaSubsystemSyncRemoteService {
 
 	@ApiOperation("子系统同步信息首页")
-	@RequestMapping(value = { "/challenger/subsystemsync/list",
-			"/challenger/back/subsystemsync/list" }, method = RequestMethod.POST)
+	@RequestMapping(value = { "/challenger/back/subsystemsync/list" }, method = RequestMethod.POST)
 	Message subsIndex();
 
 	@ApiOperation("编辑页面初始化")
 	@RequestMapping(value = "/challenger/subsystemsync/toUpdate/{subsystemId}", method = RequestMethod.GET)
-	Message subsToUpdate(@PathVariable Integer subsystemId);
+	Message subsToUpdate(@PathVariable(value = "subsystemId") Integer subsystemId);
 
 	@ApiOperation("添加或者编辑子系统同步信息")
 	@RequestMapping(value = { "/challenger/subsystemsync/doAddOrUpdate" }, method = RequestMethod.POST)
@@ -37,7 +36,7 @@ public interface EllaSubsystemSyncRemoteService {
 
 	@ApiOperation("子系统同步删除")
 	@RequestMapping(value = "/challenger/subsystemsync/doDelete/{id}", method = RequestMethod.GET)
-	Message subsDoDelete(@PathVariable Integer id);
+	Message subsDoDelete(@PathVariable(value = "id") Integer id);
 
 	@ApiOperation("按条件查询")
 	@RequestMapping(value = { "/challenger/subsystemsync/searchList" }, method = RequestMethod.POST)

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserBaseHystrix.java

@@ -21,8 +21,7 @@ public abstract class EllaUserBaseHystrix implements EllaUserBaseRemoteService {
 
 	public abstract Message userToAdd(@PathVariable(value = "userId") Integer userId);
 
-	public abstract Message userToUpdate(@PathVariable(value = "id") Integer id,
-			@PathVariable(value = "userId") Integer userId);
+	public abstract Message userToUpdate(@PathVariable(value = "userId") Integer userId);
 
 	public abstract Message userDoAddOrUpdate(@RequestBody EllaUserBaseVo vo);
 
@@ -42,4 +41,8 @@ public abstract class EllaUserBaseHystrix implements EllaUserBaseRemoteService {
 
 	public abstract Message passwordReset(@PathVariable(value = "id") Integer id);
 
+	public abstract Message getUserByloginName(@PathVariable(value = "loginName") String loginName);
+
+	public abstract Message getUserById(@PathVariable(value = "userId") Integer userId);
+
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserBaseRemoteService.java

@@ -24,50 +24,58 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaUserBaseRemoteService {
 
 	@ApiOperation(value = "用户查询页面，用户列表初始化页面")
-	@RequestMapping(value = { "admin/user/list", "/back/user/list", "/user/index" }, method = RequestMethod.POST)
+	@RequestMapping(value = { "/challenger/back/user/list" }, method = RequestMethod.POST)
 	Message adminPage(@RequestBody EllaUserBaseVo vo);
 
 	@ApiOperation(value = "点击添加，返回用户类型，角色列表及组织架构信息")
-	@RequestMapping(value = "/user/toAdd/{userId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/user/toAdd/{userId}", method = RequestMethod.GET)
 	Message userToAdd(@PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation(value = "编辑，根据用户id返回用户信息")
-	@RequestMapping(value = "/user/toUpdate/{id}/{userId}", method = RequestMethod.GET)
-	Message userToUpdate(@PathVariable(value = "id") Integer id, @PathVariable(value = "userId") Integer userId);
+	@RequestMapping(value = "/challenger/user/toUpdate/{userId}", method = RequestMethod.GET)
+	Message userToUpdate(@PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation(value = "用户存储或更新操作")
-	@RequestMapping(value = "/user/doAddOrUpdate", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/user/doAddOrUpdate", method = RequestMethod.POST)
 	Message userDoAddOrUpdate(@RequestBody EllaUserBaseVo vo);
 
 	@ApiOperation(value = "文件上传")
-	@RequestMapping(value = "/file/upload", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/file/upload", method = RequestMethod.POST)
 	Message douploadfiles(MultipartFile file);
 
 	@ApiOperation(value = "文件删除")
-	@RequestMapping(value = "/file/delete/{fileName}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/file/delete/{fileName}", method = RequestMethod.GET)
 	Message deletefiles(@PathVariable(value = "fileName") String fileName);
 
 	@ApiOperation(value = " 禁用某个用户")
-	@RequestMapping(value = "/user/disable/{id}", method = RequestMethod.GET)
-	Message disableUser(@PathVariable Integer id);
+	@RequestMapping(value = "/challenger/user/disable/{id}", method = RequestMethod.GET)
+	Message disableUser(@PathVariable(value = "id") Integer id);
 
 	@ApiOperation(value = " 启用某个用户")
-	@RequestMapping(value = "/user/enable/{id}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/user/enable/{id}", method = RequestMethod.GET)
 	Message enableUser(@PathVariable(value = "id") Integer id);
 
 	@ApiOperation(value = " 修改登录密码")
-	@RequestMapping(value = "/user/updatePass", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/user/updatePass", method = RequestMethod.POST)
 	Message updatePass(@RequestBody UserUpdatePwdVo vo);
 
-	@RequestMapping(value = "/user/passCheck", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/user/passCheck", method = RequestMethod.POST)
 	Message passCheck(@RequestBody EllaUserBaseVo vo);
 
 	@ApiOperation(value = " 删除用户仅测试使用")
-	@RequestMapping(value = "/user/test/delete/{id}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/user/test/delete/{id}", method = RequestMethod.GET)
 	Message deleteAdminUser(@PathVariable(value = "id") Integer id);
 
 	@ApiOperation(value = "重置密码")
-	@RequestMapping(value = "/user/password/reset/{id}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/user/password/reset/{id}", method = RequestMethod.GET)
 	Message passwordReset(@PathVariable(value = "id") Integer id);
 
+	@ApiOperation(value = "根据loginName获取user")
+	@RequestMapping(value = "/challenger/user/get/{loginName}", method = RequestMethod.GET)
+	Message getUserByloginName(@PathVariable(value = "loginName") String loginName);
+
+	@ApiOperation(value = "根据userId获取user")
+	@RequestMapping(value = "/challenger/user/me/{userId}", method = RequestMethod.GET)
+	public Message getUserById(@PathVariable(value = "userId") Integer userId);
+
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserExtendsRemoteService.java

@@ -23,27 +23,27 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaUserExtendsRemoteService {
 
 	@ApiOperation("分页查询")
-	@RequestMapping(value = "/userextends/searchList", method = RequestMethod.POST)
+	@RequestMapping(value = { "/challenger/userextends/searchList" }, method = RequestMethod.POST)
 	Message userExSearchList(@RequestBody EllaUserExtendsVo vo);
 
 	@ApiOperation("根据用户类型查询扩展属性")
-	@RequestMapping(value = "/userextends/list/{userTypeId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/userextends/list/{userTypeId}", method = RequestMethod.GET)
 	Message userExIndex(@PathVariable(value = "userTypeId") Integer userTypeId);
 
 	@ApiOperation("添加时获取所有的用户类型")
-	@RequestMapping(value = "/userextends/toAdd/{userTypeId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/userextends/toAdd/{userTypeId}", method = RequestMethod.GET)
 	Message userExToAdd(@PathVariable(value = "userTypeId") Integer userTypeId);
 
 	@ApiOperation("添加扩展属性")
-	@RequestMapping(value = "/userextends/doAdd", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/userextends/doAdd", method = RequestMethod.POST)
 	Message userExDoAdd(@RequestBody @Validated EllaUserExtendsVo vo);
 
 	@ApiOperation("删除扩展属性")
-	@RequestMapping(value = "/userextends/doDelete/{id}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/userextends/doDelete/{id}", method = RequestMethod.GET)
 	Message userExDoDelete(@PathVariable(value = "id") Integer id);
 
 	@ApiOperation("根据用户类型获取对应的扩展属性")
-	@RequestMapping(value = "/userextends/getByUserTypeId/{userTypeId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/userextends/getByUserTypeId/{userTypeId}", method = RequestMethod.GET)
 	Message getByUserTypeId(@PathVariable(value = "userTypeId") Integer userTypeId);
 
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserLeaseRemoteService.java

@@ -26,77 +26,77 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaUserLeaseRemoteService {
 
 	@ApiOperation("租赁用户登录获取验证码")
-	@RequestMapping(value = "lease/getcodeByPhone/{phone}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/lease/getcodeByPhone/{phone}", method = RequestMethod.GET)
 	Message getLoginCodeByPhone(@PathVariable(value = "phone") String phone);
 
 	@ApiOperation("租赁用户根据手机验证码注册")
-	@RequestMapping(value = "lease/signinByphone", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/lease/signinByphone", method = RequestMethod.POST)
 	Message signInByPhoneAndCode(@RequestBody LeaseUserLoginInfoVo vo);
 
 	@ApiOperation("租赁用户根据手机验证码登录")
-	@RequestMapping(value = "lease/loginByphone", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/lease/loginByphone", method = RequestMethod.POST)
 	Message loginByPhoneAndCode(@RequestBody LeaseUserLoginInfoVo vo);
 
 	@ApiOperation("租赁微信用户关注时保存openId")
-	@RequestMapping(value = "lease/wechat/saveopenId/{openId}/{nickName}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/lease/wechat/saveopenId/{openId}/{nickName}", method = RequestMethod.GET)
 	Message wechatUserSaveOpenId(@PathVariable(value = "openId") String openId,
 			@PathVariable(value = "nickName") String nickName);
 
 	@ApiOperation("租赁微信用户实名认证并开户")
-	@RequestMapping(value = "lease/check/realname", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/lease/check/realname", method = RequestMethod.POST)
 	Message checkNameByIdCard(@RequestBody LeaseCheckRealNameVo vo);
 
 	@ApiOperation("生成邀请码并保存")
-	@RequestMapping(value = "lease/inviteCode/crate/{userId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/lease/inviteCode/crate/{userId}", method = RequestMethod.GET)
 	Message inviteCodeCreate(@PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation("根据userId获取生成InvitCouponsVo，请求lease生成奖券")
-	@RequestMapping(value = "lease/inviteCoupons/{userId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/lease/inviteCoupons/{userId}", method = RequestMethod.GET)
 	Message inviteReWard(@PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation("根据userId获取productId")
-	@RequestMapping(value = "lease/productId/get/{userId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/lease/productId/get/{userId}", method = RequestMethod.GET)
 	Message getProductIdByUserId(@PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation("根据userId获取orgCode")
-	@RequestMapping(value = "lease/orgCode/get/{userId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/lease/orgCode/get/{userId}", method = RequestMethod.GET)
 	Message getOrgCodeByUserId(@PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation("根据userId获取用户类型code")
-	@RequestMapping(value = "lease/userTypeCode/get/{userId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/lease/userTypeCode/get/{userId}", method = RequestMethod.GET)
 	Message getUserTypeCodeByUserId(@PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation("普通用户----根据userId获取普通用户的详细信息")
-	@RequestMapping(value = "lease/normalUser/detail/{userId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/lease/normalUser/detail/{userId}", method = RequestMethod.GET)
 	Message nomalUserBaseDetail(@PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation("普通用户----普通用户分页查询")
-	@RequestMapping(value = "lease/normalUser/page", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/lease/normalUser/page", method = RequestMethod.POST)
 	Message nomalUserGetPage(@RequestBody NormalUserSearchVo vo);
 
 	@ApiOperation("运营商/代理商/服务商----运营商分页查询")
-	@RequestMapping(value = "lease/operatorUser/page", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/lease/operatorUser/page", method = RequestMethod.POST)
 	Message operatorUserGetPage(@RequestBody YunyingUserSearchVo vo);
 
 	@ApiOperation("运营商/代理商/服务商----根据userId获取普通用户的详细信息")
-	@RequestMapping(value = "lease/operatorUser/detail/{userId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/lease/operatorUser/detail/{userId}", method = RequestMethod.GET)
 	Message operatorUserBaseDetail(@PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation("运营商/代理商/服务商----根据userId启用")
-	@RequestMapping(value = "lease/operator/enable/{userId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/lease/operator/enable/{userId}", method = RequestMethod.GET)
 	Message enableOperator(@PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation("运营商/代理商/服务商----根据userId禁用")
-	@RequestMapping(value = "lease/operator/disable/{userId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/lease/operator/disable/{userId}", method = RequestMethod.GET)
 	Message disableOperator(@PathVariable(value = "userId") Integer userId);
 
 	@ApiOperation("userId与loginNanem相互转换")
-	@RequestMapping(value = "lease/userIdOrLoginName/get", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/lease/userIdOrLoginName/get", method = RequestMethod.POST)
 	Message userIdAndLoginNameChange(@RequestParam(value = "userId", required = false) Integer userId,
 			@RequestParam(value = "loginName", required = false) String loginName);
 
 	@ApiOperation("普通用户注销")
-	@RequestMapping(value = "lease/user/cancel/{userId}", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/lease/user/cancel/{userId}", method = RequestMethod.POST)
 	Message userCancle(@PathVariable(value = "userId") Integer userId);
 
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserParkRemoteService.java

@@ -25,19 +25,19 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaUserParkRemoteService {
 
 	@ApiOperation("根据pid获取userId与orgCode")
-	@RequestMapping(value = "lease/getUserIdAndOrg/{pid}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/lease/getUserIdAndOrg/{pid}", method = RequestMethod.GET)
 	Message getUserIdAndOrgByPid(@PathVariable(value = "pid") Integer pid);
 
 	@ApiOperation("进入区域授权页")
-	@RequestMapping(value = "lease/zoom/auth/{userId}/{search}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/lease/zoom/auth/{userId}/{search}", method = RequestMethod.GET)
 	Message zoomAuth(@PathVariable(value = "userId") Integer userId, @PathVariable(value = "search") String search);
 
 	@ApiOperation("进入停车场授权页")
-	@RequestMapping(value = "lease/park/auth", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/lease/park/auth", method = RequestMethod.POST)
 	Message parkAuth(@RequestBody @Valid ParkVo vo);
 
 	@ApiOperation("区域授权")
-	@RequestMapping(value = "lease/zoom/auth/save", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/lease/zoom/auth/save", method = RequestMethod.POST)
 	Message zoomAuthSave(@RequestBody LeaseUserParkAuth vo);
 
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/rmi/EllaUserTypeRemoteService.java

@@ -22,19 +22,19 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaUserTypeRemoteService {
 
 	@ApiOperation("条件查询用户类型")
-	@RequestMapping(value = { "/usertype/searchList", "/back/usertype/list" }, method = RequestMethod.POST)
+	@RequestMapping(value = { "/challenger/back/usertype/list" }, method = RequestMethod.POST)
 	Message userTSearchList(@RequestBody EllaUserTypeVo vo);
 
 	@ApiOperation("根据id获取要跟新的usertype对象")
-	@RequestMapping(value = "/usertype/toUpdate/{userTypeId}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/usertype/toUpdate/{userTypeId}", method = RequestMethod.GET)
 	Message userTToUpdate(@PathVariable(value = "userTypeId") Integer userTypeId);
 
 	@ApiOperation(" 存储或更新用户类型操作")
-	@RequestMapping(value = "/usertype/doAddOrUpdate", method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/usertype/doAddOrUpdate", method = RequestMethod.POST)
 	Message userTDoAddOrUpdate(@RequestBody EllaUserTypeVo vo);
 
 	@ApiOperation("删除用户类型操作")
-	@RequestMapping(value = "/usertype/doDelete/{id}", method = RequestMethod.GET)
+	@RequestMapping(value = "/challenger/usertype/doDelete/{id}", method = RequestMethod.GET)
 	Message userTDoDelete(@PathVariable(value = "id") Integer id);
 
 }
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/vo/EllaRoleVo.java

-/*    */ package com.senthink.rmi.challenger.vo;
-/*    */ 
-/*    */ import io.swagger.annotations.ApiModel;
-/*    */ import io.swagger.annotations.ApiModelProperty;
-/*    */ import javax.validation.constraints.Pattern;
-/*    */ import org.hibernate.validator.constraints.NotEmpty;
-/*    */ 
-/*    */ @ApiModel("角色")
-/*    */ public class EllaRoleVo extends PageVo
-/*    */ {
-/*    */   private static final String numReg = "^[A-Za-z][A-Za-z1-9_-]+$";
-/*    */ 
-/*    */   @ApiModelProperty("角色名称")
-/*    */   @NotEmpty(message="角色名称不允许为空")
-/*    */   private String roleName;
-/*    */ 
-/*    */   @ApiModelProperty("角色编号")
-/*    */   @Pattern(regexp="^[A-Za-z][A-Za-z1-9_-]+$", message="请输入英文或数字")
-/*    */   private String roleNumber;
-/*    */ 
-/*    */   @ApiModelProperty("权限集合用 id_level,id_level... 表示")
-/*    */   private String permissions;
-/*    */ 
-/*    */   @ApiModelProperty("用户数据权限信息，id的集合,分割")
-/*    */   private String userdatas;
-/*    */ 
-/*    */   @ApiModelProperty("角色备注")
-/*    */   private String remark;
-/*    */ 
-/*    */   public String getRoleName()
-/*    */   {
-/* 41 */     return this.roleName;
-/*    */   }
-/*    */ 
-/*    */   public void setRoleName(String roleName) {
-/* 45 */     this.roleName = roleName;
-/*    */   }
-/*    */ 
-/*    */   public String getRoleNumber() {
-/* 49 */     return this.roleNumber;
-/*    */   }
-/*    */ 
-/*    */   public void setRoleNumber(String roleNumber) {
-/* 53 */     this.roleNumber = roleNumber;
-/*    */   }
-/*    */ 
-/*    */   public String getPermissions() {
-/* 57 */     return this.permissions;
-/*    */   }
-/*    */ 
-/*    */   public void setPermissions(String permissions) {
-/* 61 */     this.permissions = permissions;
-/*    */   }
-/*    */ 
-/*    */   public String getRemark() {
-/* 65 */     return this.remark;
-/*    */   }
-/*    */ 
-/*    */   public void setRemark(String remark) {
-/* 69 */     this.remark = remark;
-/*    */   }
-/*    */ 
-/*    */   public String getUserdatas() {
-/* 73 */     return this.userdatas;
-/*    */   }
-/*    */ 
-/*    */   public void setUserdatas(String userdatas) {
-/* 77 */     this.userdatas = userdatas;
-/*    */   }
-/*    */ }
-
-/* Location:           C:\Users\junzi\Desktop\challenger-rmi-0.1.4.jar
- * Qualified Name:     com.senthink.rmi.challenger.vo.EllaRoleVo
- * JD-Core Version:    0.6.0
+package com.senthink.rmi.challenger.vo;
+
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel("角色")
+public class EllaRoleVo extends PageVo {
+	private static final String numReg = "^[A-Za-z][A-Za-z1-9_-]+$";
+
+	@ApiModelProperty("角色名称")
+	@NotEmpty(message = "角色名称不允许为空")
+	private String roleName;
+
+	@ApiModelProperty("角色编号")
+	@Pattern(regexp = "^[A-Za-z][A-Za-z1-9_-]+$", message = "请输入英文或数字")
+	private String roleNumber;
+
+	@ApiModelProperty("权限集合用 id_level,id_level... 表示")
+	private String permissions;
+
+	@ApiModelProperty("用户数据权限信息，id的集合,分割")
+	private String userdatas;
+
+	@ApiModelProperty("角色备注")
+	private String remark;
+
+	@ApiModelProperty("當前登錄用戶的userid")
+	@NotEmpty(message = "用户ID不允许为空")
+	private Integer userId;
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public String getRoleName() {
+		/* 41 */ return this.roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		/* 45 */ this.roleName = roleName;
+	}
+
+	public String getRoleNumber() {
+		/* 49 */ return this.roleNumber;
+	}
+
+	public void setRoleNumber(String roleNumber) {
+		/* 53 */ this.roleNumber = roleNumber;
+	}
+
+	public String getPermissions() {
+		/* 57 */ return this.permissions;
+	}
+
+	public void setPermissions(String permissions) {
+		/* 61 */ this.permissions = permissions;
+	}
+
+	public String getRemark() {
+		/* 65 */ return this.remark;
+	}
+
+	public void setRemark(String remark) {
+		/* 69 */ this.remark = remark;
+	}
+
+	public String getUserdatas() {
+		/* 73 */ return this.userdatas;
+	}
+
+	public void setUserdatas(String userdatas) {
+		/* 77 */ this.userdatas = userdatas;
+	}
+}
+
+/*
+ * Location: C:\Users\junzi\Desktop\challenger-rmi-0.1.4.jar Qualified Name:
+ * com.senthink.rmi.challenger.vo.EllaRoleVo JD-Core Version: 0.6.0
  */
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/vo/LeaseUserParkAuth.java

 /*    */ package com.senthink.rmi.challenger.vo;
-/*    */ 
+
+/*    */
 /*    */ import java.util.List;
-/*    */ 
+
+/*    */
 /*    */ public class LeaseUserParkAuth
 /*    */ {
-/*    */   private Integer userId;
-/*    */   private List<EllaUserParkVo> parks;
-/*    */   private Integer businessType;
-/*    */   private Integer pType;
-/*    */ 
-/*    */   public Integer getUserId()
-/*    */   {
-/* 27 */     return this.userId;
-/*    */   }
-/*    */ 
-/*    */   public void setUserId(Integer userId) {
-/* 31 */     this.userId = userId;
-/*    */   }
-/*    */ 
-/*    */   public List<EllaUserParkVo> getParks() {
-/* 35 */     return this.parks;
-/*    */   }
-/*    */ 
-/*    */   public void setParks(List<EllaUserParkVo> parks) {
-/* 39 */     this.parks = parks;
-/*    */   }
-/*    */ 
-/*    */   public Integer getBusinessType() {
-/* 43 */     return this.businessType;
-/*    */   }
-/*    */ 
-/*    */   public void setBusinessType(Integer businessType) {
-/* 47 */     this.businessType = businessType;
-/*    */   }
-/*    */ 
-/*    */   public Integer getpType() {
-/* 51 */     return this.pType;
-/*    */   }
-/*    */ 
-/*    */   public void setpType(Integer pType) {
-/* 55 */     this.pType = pType;
-/*    */   }
-/*    */ }
-
-/* Location:           C:\Users\junzi\Desktop\challenger-rmi-0.1.4.jar
- * Qualified Name:     com.senthink.rmi.challenger.vo.LeaseUserParkAuth
- * JD-Core Version:    0.6.0
+	/*    */ private Integer userId;
+	/*    */ private List<EllaUserParkVo> parks;
+	/*    */ private Integer businessType;
+	/*    */ private Integer pType;
+
+	/*    */
+	/*    */ public Integer getUserId()
+	/*    */ {
+		/* 27 */ return this.userId;
+		/*    */ }
+
+	/*    */
+	/*    */ public void setUserId(Integer userId) {
+		/* 31 */ this.userId = userId;
+		/*    */ }
+
+	/*    */
+	/*    */ public List<EllaUserParkVo> getParks() {
+		/* 35 */ return this.parks;
+		/*    */ }
+
+	/*    */
+	/*    */ public void setParks(List<EllaUserParkVo> parks) {
+		/* 39 */ this.parks = parks;
+		/*    */ }
+
+	/*    */
+	/*    */ public Integer getBusinessType() {
+		/* 43 */ return this.businessType;
+		/*    */ }
+
+	/*    */
+	/*    */ public void setBusinessType(Integer businessType) {
+		/* 47 */ this.businessType = businessType;
+		/*    */ }
+
+	/*    */
+	public Integer getpType() {
+		return pType;
+	}
+
+	public void setpType(Integer pType) {
+		this.pType = pType;
+	}
+
+	/*    */ }
+
+/*
+ * Location: C:\Users\junzi\Desktop\challenger-rmi-0.1.4.jar Qualified Name:
+ * com.senthink.rmi.challenger.vo.LeaseUserParkAuth JD-Core Version: 0.6.0
  */
\ No newline at end of file

src/main/java/com/senthink/rmi/challenger/vo/YunyingUserSearchVo.java

@@ -24,7 +24,7 @@ public class YunyingUserSearchVo extends PageVo {
 	@ApiModelProperty("所属上级id")
 	private Integer parentId;
 	@ApiModelProperty("0:直属，1:不直属")
-	private Integer direct;
+	private String direct;
 
 	private Integer userTypeId;
 
@@ -110,11 +110,11 @@ public class YunyingUserSearchVo extends PageVo {
 		this.parentId = parentId;
 	}
 
-	public Integer getDirect() {
+	public String getDirect() {
 		return direct;
 	}
 
-	public void setDirect(Integer direct) {
+	public void setDirect(String direct) {
 		this.direct = direct;
 	}