当前补全一些方法

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

 
 package com.senthink.rmi.challenger.rmi;
 
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaUserBaseSignInVo;
+import com.senthink.rmi.challenger.vo.EllaUserBaseSignInVo.login;
+
+import io.swagger.annotations.ApiOperation;
 
 /**
  * @ClassName : EllaIndexHystrix
@@ -13,6 +21,19 @@ import com.senthink.rmi.challenger.response.Message;
  */
 public abstract class EllaIndexHystrix implements EllaIndexRemoteService {
 
-	public abstract Message getIndex(@PathVariable Integer id, @PathVariable Integer order);
+	public abstract Message getIndex(@PathVariable(value = "id") Integer id,
+			@PathVariable(value = "order") Integer order);
+
+	@ApiOperation("根据用户id与菜单id获取该菜单下有权限的按钮")
+	@RequestMapping(value = "index/getpre/{id}/{menuId}", method = RequestMethod.POST)
+	public abstract Message getIndexPre(@PathVariable Integer id, @PathVariable Integer menuId);
+
+	@ApiOperation("注册时检查是否重名的接口")
+	@RequestMapping(value = "check/name/{name}", method = RequestMethod.GET)
+	public abstract Message checkNameSignIn(@PathVariable(value = "name") String name);
+
+	@ApiOperation("登录接口")
+	@RequestMapping(value = "check/login", method = RequestMethod.POST)
+	public abstract Message loginIn(@RequestBody @Validated(login.class) EllaUserBaseSignInVo vo);
 
 }
\ No newline at end of file

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

@@ -2,11 +2,17 @@
 package com.senthink.rmi.challenger.rmi;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaUserBaseSignInVo;
+import com.senthink.rmi.challenger.vo.EllaUserBaseSignInVo.login;
+
+import io.swagger.annotations.ApiOperation;
 
 /**
  * @ClassName : EllaIndexRemoteService
@@ -17,7 +23,20 @@ import com.senthink.rmi.challenger.response.Message;
 @FeignClient(value = "challenger", fallback = EllaIndexHystrix.class)
 public interface EllaIndexRemoteService {
 
+	@ApiOperation("开局根据用户id获取系统和菜单 参数 id，order")
 	@RequestMapping(value = "/challenger/{id}/{order}", method = RequestMethod.POST)
-	Message getIndex(@PathVariable Integer id, @PathVariable Integer order);
+	Message getIndex(@PathVariable(value = "id") Integer id, @PathVariable(value = "order") Integer order);
+
+	@ApiOperation("根据用户id与菜单id获取该菜单下有权限的按钮")
+	@RequestMapping(value = "/challenger/index/getpre/{id}/{menuId}", method = RequestMethod.POST)
+	Message getIndexPre(@PathVariable Integer id, @PathVariable Integer menuId);
+
+	@ApiOperation("注册时检查是否重名的接口")
+	@RequestMapping(value = "/challenger/challenger/check/name/{name}", method = RequestMethod.GET)
+	Message checkNameSignIn(@PathVariable(value = "name") String name);
+
+	@ApiOperation("登录接口")
+	@RequestMapping(value = "/challenger/check/login", method = RequestMethod.POST)
+	Message loginIn(@RequestBody @Validated(login.class) EllaUserBaseSignInVo vo);
 
 }
\ No newline at end of file

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

@@ -22,7 +22,8 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaOrgStructureRemoteService {
 
 	@ApiOperation(value = "获取组织架构列表")
-	@RequestMapping(value = { "/challenger/org/index", "/challenger/org/list", "/challenger/back/org/list" }, method = RequestMethod.POST)
+	@RequestMapping(value = { "/challenger/org/index", "/challenger/org/list",
+			"/challenger/back/org/list" }, method = RequestMethod.POST)
 	Message index();
 
 	@ApiOperation(value = "获取组织架构单个节点的信息")

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

@@ -17,14 +17,10 @@ public abstract class EllaPagePermissionHystrix implements EllaPagePermissionRem
 
 	public abstract Message index();
 
-	public abstract Message searchList(EllaPagePermissionVo param);
-
 	public abstract Message toUpdate(@RequestBody EllaPagePermissionVo pageperVo);
 
 	public abstract Message doAddOrUpdate(@RequestBody EllaPagePermissionVo vo);
 
 	public abstract Message doDelete(@PathVariable Integer id);
 
-	public abstract Message getPermissionTree();
-
 }
\ No newline at end of file

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

@@ -22,12 +22,10 @@ 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", "/challenger/pageper/list",
+			"/challenger/back/pageper/list" }, method = RequestMethod.POST)
 	Message index();
 
-	@RequestMapping(value = { "/challenger/pageper/searchList" }, method = RequestMethod.POST)
-	Message searchList(EllaPagePermissionVo vo);
-
 	@ApiOperation(value = "获取当前节点信息，或插入")
 	@RequestMapping(value = "/challenger/pageper/toUpdate", method = RequestMethod.POST)
 	Message toUpdate(@RequestBody EllaPagePermissionVo pageperVo);
@@ -40,7 +38,4 @@ public interface EllaPagePermissionRemoteService {
 	@RequestMapping(value = "/challenger/pageper/doDelete/{id}", method = RequestMethod.GET)
 	Message doDelete(@PathVariable Integer id);
 
-	@RequestMapping(value = "/challenger/pageper/getPermissionTree", method = RequestMethod.GET)
-	Message getPermissionTree();
-
 }
\ No newline at end of file

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

@@ -22,21 +22,27 @@ import io.swagger.annotations.ApiOperation;
 public interface EllaRoleRemoteService {
 
 	@ApiOperation("角色列表")
-	@RequestMapping(value = { "/challenger/role/searchList", "/challenger/back/role/list" }, method = RequestMethod.POST)
+	@RequestMapping(value = { "/challenger/role/searchList",
+			"/challenger/back/role/list" }, method = RequestMethod.POST)
 	Message searchList(@RequestBody EllaRoleVo vo);
 
+	@ApiOperation("添加时获取权限树")
 	@RequestMapping(value = "/challenger/role/toAdd/{id}", method = RequestMethod.GET)
 	Message toAdd(@PathVariable Integer id);
 
+	@ApiOperation("更新角色时获取该角色对象")
 	@RequestMapping(value = "/challenger/role/toUpdate/{roleId}", method = RequestMethod.GET)
 	Message toUpdate(@PathVariable Integer roleId, String loginName);
 
+	@ApiOperation("更新角色")
 	@RequestMapping(value = "/challenger/role/doAddOrUpdate", method = RequestMethod.POST)
 	Message doAddOrUpdate(@RequestBody EllaRoleVo vo);
 
+	@ApiOperation("根据id删除角色")
 	@RequestMapping(value = "/challenger/role/doDelete/{id}", method = RequestMethod.GET)
 	Message doDelete(@PathVariable Integer id);
 
+	@ApiOperation("角色详情")
 	@RequestMapping(value = "/challenger/role/toDetail/{roleId}", method = RequestMethod.GET)
 	Message toDetail(@PathVariable Integer roleId);
 

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

@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import com.senthink.rmi.challenger.response.Message;
 import com.senthink.rmi.challenger.vo.EllaSubsystemSyncVo;
 
+import io.swagger.annotations.ApiOperation;
+
 /**
  * @ClassName : EllaSubsystemSyncRemoteService
  * @Description :
@@ -20,18 +22,24 @@ import com.senthink.rmi.challenger.vo.EllaSubsystemSyncVo;
 @FeignClient(value = "challenger", fallback = EllaSubsystemSyncHystrix.class)
 public interface EllaSubsystemSyncRemoteService {
 
-	@RequestMapping(value = { "/challenger/subsystemsync/list", "/challenger/back/subsystemsync/list" }, method = RequestMethod.POST)
+	@ApiOperation("子系统同步信息首页")
+	@RequestMapping(value = { "/challenger/subsystemsync/list",
+			"/challenger/back/subsystemsync/list" }, method = RequestMethod.POST)
 	Message index();
 
+	@ApiOperation("编辑页面初始化")
 	@RequestMapping(value = "/challenger/subsystemsync/toUpdate/{subsystemId}", method = RequestMethod.GET)
 	Message toUpdate(@PathVariable Integer subsystemId);
 
+	@ApiOperation("添加或者编辑子系统同步信息")
 	@RequestMapping(value = { "/challenger/subsystemsync/doAddOrUpdate" }, method = RequestMethod.POST)
 	Message doAddOrUpdate(@Valid EllaSubsystemSyncVo vo);
 
+	@ApiOperation("子系统同步删除")
 	@RequestMapping(value = "/challenger/subsystemsync/doDelete/{id}", method = RequestMethod.GET)
 	Message doDelete(@PathVariable Integer id);
 
+	@ApiOperation("按条件查询")
 	@RequestMapping(value = { "/challenger/subsystemsync/searchList" }, method = RequestMethod.POST)
 	Message searchList(EllaSubsystemSyncVo vo);
 

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

 
 package com.senthink.rmi.challenger.rmi;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.senthink.rmi.challenger.response.Message;
@@ -20,24 +17,21 @@ import com.senthink.rmi.challenger.vo.UserUpdatePwdVo;
  */
 public abstract class EllaUserBaseHystrix implements EllaUserBaseRemoteService {
 
-	public abstract Message index();
-
 	public abstract Message adminPage(@RequestBody EllaUserBaseVo vo);
 
-	public abstract Message normalPage(@RequestBody EllaUserBaseVo vo);
+	public abstract Message toAdd();
 
-	public abstract Message dealerSearchList(@RequestBody EllaUserBaseVo vo);
+	public abstract Message toUpdate(@PathVariable Integer userId);
 
-	public abstract Message toAdd();
+	public abstract Message doAddOrUpdate(@RequestBody EllaUserBaseVo vo);
 
-	public abstract Message toUpdate(@PathVariable Integer userId, HttpServletRequest request);
+	public abstract Message douploadfiles(MultipartFile file);
 
-	public abstract Message doAddOrUpdate(@RequestBody EllaUserBaseVo vo, String roles, String extendIds,
-			String extendValues, String orgs, @RequestParam(value = "file", required = false) MultipartFile file);
+	public abstract Message deletefiles(@PathVariable(value = "fileName") String fileName);
 
 	public abstract Message disableUser(@PathVariable Integer id);
 
-	public abstract Message enableUser(@PathVariable Integer id);
+	public abstract Message enableUser(@PathVariable(value = "id") Integer id);
 
 	public abstract Message updatePass(@RequestBody UserUpdatePwdVo vo);
 

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

 
 package com.senthink.rmi.challenger.rmi;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.senthink.rmi.challenger.response.Message;
 import com.senthink.rmi.challenger.vo.EllaUserBaseVo;
 import com.senthink.rmi.challenger.vo.UserUpdatePwdVo;
 
+import io.swagger.annotations.ApiOperation;
+
 /**
  * @ClassName : EllaUserBaseRemoteService
  * @Description :
@@ -24,38 +23,44 @@ import com.senthink.rmi.challenger.vo.UserUpdatePwdVo;
 @FeignClient(value = "challenger", fallback = EllaUserBaseHystrix.class)
 public interface EllaUserBaseRemoteService {
 
-	@RequestMapping(value = { "/challenger/user/list", "/challenger/user/index" }, method = RequestMethod.GET)
-	Message index();
-
-	@RequestMapping(value = { "/challenger/admin/user/list", "/challenger/back/user/list" }, method = RequestMethod.GET)
+	@ApiOperation(value = "用户查询页面，用户列表初始化页面")
+	@RequestMapping(value = { "/challenger/admin/user/list", "/challenger/back/user/list",
+			"/challenger/user/index" }, method = RequestMethod.POST)
 	Message adminPage(@RequestBody EllaUserBaseVo vo);
 
-	@RequestMapping(value = { "/challenger/normal/user/list", "/back/consumer/list" }, method = RequestMethod.GET)
-	Message normalPage(@RequestBody EllaUserBaseVo vo);
-
-	@RequestMapping(value = { "/challenger/user/searchList" }, method = RequestMethod.POST)
-	Message dealerSearchList(@RequestBody EllaUserBaseVo vo);
-
+	@ApiOperation(value = "点击添加，返回用户类型，角色列表及组织架构信息")
 	@RequestMapping(value = "/challenger/user/toAdd", method = RequestMethod.GET)
 	Message toAdd();
 
+	@ApiOperation(value = "编辑，根据用户id返回用户信息")
 	@RequestMapping(value = "/challenger/user/toUpdate/{userId}", method = RequestMethod.GET)
-	Message toUpdate(@PathVariable Integer userId, HttpServletRequest request);
+	Message toUpdate(@PathVariable Integer userId);
 
+	@ApiOperation(value = "用户存储或更新操作")
 	@RequestMapping(value = "/challenger/user/doAddOrUpdate", method = RequestMethod.POST)
-	Message doAddOrUpdate(@RequestBody EllaUserBaseVo vo, String roles, String extendIds, String extendValues,
-			String orgs, @RequestParam(value = "file", required = false) MultipartFile file);
+	Message doAddOrUpdate(@RequestBody EllaUserBaseVo vo);
+
+	@ApiOperation(value = "文件上传")
+	@RequestMapping(value = "/challenger/file/upload", method = RequestMethod.POST)
+	Message douploadfiles(MultipartFile file);
+
+	@ApiOperation(value = "文件删除")
+	@RequestMapping(value = "/challenger/file/delete/{fileName}", method = RequestMethod.GET)
+	Message deletefiles(@PathVariable(value = "fileName") String fileName);
 
-	@RequestMapping(value = { "/challenger/user/disable/{id}" }, method = RequestMethod.GET)
+	@ApiOperation(value = " 禁用某个用户")
+	@RequestMapping(value = "/challenger/user/disable/{id}", method = RequestMethod.GET)
 	Message disableUser(@PathVariable Integer id);
 
-	@RequestMapping(value = { "/challenger/user/enable/{id}" }, method = RequestMethod.GET)
-	Message enableUser(@PathVariable Integer id);
+	@ApiOperation(value = " 启用某个用户")
+	@RequestMapping(value = "/challenger/user/enable/{id}", method = RequestMethod.GET)
+	Message enableUser(@PathVariable(value = "id") Integer id);
 
-	@RequestMapping(value = { "/challenger/user/updatePass" }, method = RequestMethod.POST)
+	@ApiOperation(value = " 修改登录密码")
+	@RequestMapping(value = "/challenger/user/updatePass", method = RequestMethod.POST)
 	Message updatePass(@RequestBody UserUpdatePwdVo vo);
 
-	@RequestMapping(value = { "/challenger/user/passCheck" }, method = RequestMethod.POST)
+	@RequestMapping(value = "/challenger/user/passCheck", method = RequestMethod.POST)
 	Message passCheck(@RequestBody EllaUserBaseVo vo);
 
 }
\ No newline at end of file

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

@@ -22,7 +22,7 @@ import io.swagger.annotations.ApiOperation;
  */
 @FeignClient(value = "challenger", fallback = EllaUserExtendsHystrix.class)
 public interface EllaUserExtendsRemoteService {
-
+	@ApiOperation("分页查询")
 	@RequestMapping(value = { "/challenger/userextends/searchList" }, method = RequestMethod.POST)
 	Message searchList(EllaUserExtendsVo vo);
 
@@ -30,15 +30,19 @@ public interface EllaUserExtendsRemoteService {
 	@RequestMapping(value = { "/challenger/userextends/list/{userTypeId}" }, method = RequestMethod.GET)
 	Message index(@PathVariable Integer userTypeId);
 
+	@ApiOperation("添加时获取所有的用户类型")
 	@RequestMapping(value = "/challenger/userextends/toAdd/{userTypeId}", method = RequestMethod.GET)
 	Message toAdd(@PathVariable Integer userTypeId);
 
+	@ApiOperation("添加扩展属性")
 	@RequestMapping("/challenger/userextends/doAdd")
 	Message doAdd(@Valid EllaUserExtendsVo vo);
 
+	@ApiOperation("删除扩展属性")
 	@RequestMapping(value = { "/challenger/userextends/doDelete" }, method = RequestMethod.POST)
 	Message doDelete(HttpServletRequest request);
 
+	@ApiOperation("根据用户类型获取对应的扩展属性")
 	@RequestMapping(value = "/challenger/userextends/getByUserTypeId", method = RequestMethod.POST)
 	Message getByUserTypeId(@Valid Integer userTypeId);
 

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

@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import com.senthink.rmi.challenger.response.Message;
 import com.senthink.rmi.challenger.vo.EllaUserTypeVo;
 
+import io.swagger.annotations.ApiOperation;
+
 /**
  * @ClassName : EllaUserTypeRemoteService
  * @Description :
@@ -18,16 +20,20 @@ import com.senthink.rmi.challenger.vo.EllaUserTypeVo;
  */
 @FeignClient(value = "challenger", fallback = EllaUserTypeHystrix.class)
 public interface EllaUserTypeRemoteService {
-
-	@RequestMapping(value = { "/challenger/usertype/searchList", "/challenger/back/usertype/list" }, method = RequestMethod.POST)
+	@ApiOperation("条件查询用户类型")
+	@RequestMapping(value = { "/challenger/usertype/searchList",
+			"/challenger/back/usertype/list" }, method = RequestMethod.POST)
 	Message searchList(@RequestBody EllaUserTypeVo vo);
 
+	@ApiOperation("根据id获取要跟新的usertype对象")
 	@RequestMapping(value = "/challenger/usertype/toUpdate/{userTypeId}", method = RequestMethod.GET)
 	Message toUpdate(@PathVariable Integer userTypeId);
 
+	@ApiOperation(" 存储或更新用户类型操作")
 	@RequestMapping(value = "/challenger/usertype/doAddOrUpdate", method = RequestMethod.POST)
 	Message doAddOrUpdate(@RequestBody EllaUserTypeVo vo);
 
+	@ApiOperation("删除用户类型操作")
 	@RequestMapping(value = { "/challenger/usertype/doDelete/{id}" }, method = RequestMethod.GET)
 	Message doDelete(@PathVariable Integer id);
 

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaUserBaseSignInVo;
+import com.senthink.rmi.challenger.vo.EllaUserBaseSignInVo.mail;
+import com.senthink.rmi.challenger.vo.EmaillogVo;
+
+/**
+ * @ClassName : EmaillogHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class EmaillogHystrix implements EmaillogRemoteService {
+
+	public abstract Message getMessagePage(@RequestBody EmaillogVo vo);
+
+	public abstract Message emialSign(@RequestBody @Validated(mail.class) EllaUserBaseSignInVo vo);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaUserBaseSignInVo;
+import com.senthink.rmi.challenger.vo.EllaUserBaseSignInVo.mail;
+import com.senthink.rmi.challenger.vo.EmaillogVo;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @ClassName : EmaillogRemoteService
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = EmaillogHystrix.class)
+public interface EmaillogRemoteService {
+
+	@ApiOperation("获取email分页")
+	@RequestMapping(value = "/challenger/email/log", method = RequestMethod.POST)
+	Message getMessagePage(@RequestBody EmaillogVo vo);
+
+	@ApiOperation("邮箱注册")
+	@RequestMapping(value = "/challenger/email/signIn", method = RequestMethod.POST)
+	Message emialSign(@RequestBody @Validated(mail.class) EllaUserBaseSignInVo vo);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaUserBaseChangeMailTelVo;
+import com.senthink.rmi.challenger.vo.EllaUserBaseChangeMailTelVo.change;
+import com.senthink.rmi.challenger.vo.EllaUserBaseSignInVo;
+import com.senthink.rmi.challenger.vo.EllaUserBaseSignInVo.phone;
+import com.senthink.rmi.challenger.vo.MessagelogVo;
+
+/**
+ * @ClassName : MessagelogHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class MessagelogHystrix implements MessagelogRemoteService {
+
+	public abstract Message getMessagePage(@RequestBody MessagelogVo vo);
+
+	public abstract Message getMessageCode(@RequestBody @Validated(phone.class) EllaUserBaseSignInVo vo);
+
+	public abstract Message getMailOrTelCode(@RequestBody @Validated EllaUserBaseChangeMailTelVo vo);
+
+	public abstract Message changeTelOrMail(@RequestBody @Validated(change.class) EllaUserBaseChangeMailTelVo vo);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaUserBaseChangeMailTelVo;
+import com.senthink.rmi.challenger.vo.EllaUserBaseChangeMailTelVo.change;
+import com.senthink.rmi.challenger.vo.EllaUserBaseSignInVo;
+import com.senthink.rmi.challenger.vo.EllaUserBaseSignInVo.phone;
+import com.senthink.rmi.challenger.vo.MessagelogVo;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @ClassName : MessagelogRemoteService
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = MessagelogHystrix.class)
+public interface MessagelogRemoteService {
+
+	@ApiOperation("获取短信page")
+	@RequestMapping(value = "/challenger/message/log", method = RequestMethod.POST)
+	Message getMessagePage(@RequestBody MessagelogVo vo);
+
+	@ApiOperation("手机注册接口")
+	@RequestMapping(value = "/challenger/message/signIn", method = RequestMethod.POST)
+	Message getMessageCode(@RequestBody @Validated(phone.class) EllaUserBaseSignInVo vo);
+
+	@ApiOperation("改变绑定手机或邮箱时的获取验证码接口")
+	@RequestMapping(value = "/challenger/get/mailOrTelCode", method = RequestMethod.POST)
+	Message getMailOrTelCode(@RequestBody @Validated EllaUserBaseChangeMailTelVo vo);
+
+	@ApiOperation("获取验证码后改变tel或mail的接口")
+	@RequestMapping(value = "/challenger/change/tekOrMail", method = RequestMethod.POST)
+	Message changeTelOrMail(@RequestBody @Validated(change.class) EllaUserBaseChangeMailTelVo vo);
+
+}
\ No newline at end of file

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

+/**
+ * 
+ */
+package com.senthink.rmi.challenger.vo;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @ClassName : EllaUserBaseChangeVo
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年2月24日下午3:34:48
+ */
+@ApiModel("改变绑定mail或tel的vo")
+public class EllaUserBaseChangeMailTelVo {
+	@ApiModelProperty("用户id")
+	@NotEmpty(message = "用户id不能为空")
+	private Integer userId;
+
+	@ApiModelProperty("旧的mail地址")
+	private String oldMail;
+
+	@ApiModelProperty("新的mail地址")
+	private String newMail;
+
+	@ApiModelProperty("旧的手机号")
+	private String oldTel;
+
+	@ApiModelProperty("新的手机号")
+	private String newTel;
+	@ApiModelProperty("验证码")
+	@NotEmpty(message = "用户id不能为空", groups = change.class)
+	private String code;
+
+	public interface change {
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public String getOldMail() {
+		return oldMail;
+	}
+
+	public void setOldMail(String oldMail) {
+		this.oldMail = oldMail;
+	}
+
+	public String getNewMail() {
+		return newMail;
+	}
+
+	public void setNewMail(String newMail) {
+		this.newMail = newMail;
+	}
+
+	public String getOldTel() {
+		return oldTel;
+	}
+
+	public void setOldTel(String oldTel) {
+		this.oldTel = oldTel;
+	}
+
+	public String getNewTel() {
+		return newTel;
+	}
+
+	public void setNewTel(String newTel) {
+		this.newTel = newTel;
+	}
+
+}

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

@@ -43,6 +43,33 @@ public class EllaUserBaseSignInVo {
 	@ApiModelProperty("地址")
 	private String address;
 
+	@ApiModelProperty("登录名称：tel ，mail ，登录名都可以")
+	@NotEmpty(message = "登录名不能为空", groups = login.class)
+	private String login;
+
+	@ApiModelProperty("密码")
+	@NotEmpty(message = "密码不能为空", groups = login.class)
+	private String password;
+
+	public interface login {
+	};
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public String getLogin() {
+		return login;
+	}
+
+	public void setLogin(String login) {
+		this.login = login;
+	}
+
 	public interface phone {
 
 	}

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

@@ -57,6 +57,26 @@ public class EllaUserBaseVo extends PageVo {
 
 	private MultipartFile file;
 
+	private MultipartFile[] files;
+
+	private String filesIds;
+
+	public String getFilesIds() {
+		return filesIds;
+	}
+
+	public void setFilesIds(String filesIds) {
+		this.filesIds = filesIds;
+	}
+
+	public MultipartFile[] getFiles() {
+		return files;
+	}
+
+	public void setFiles(MultipartFile[] files) {
+		this.files = files;
+	}
+
 	public EllaUserBaseVo() {
 		super();
 	}