添加了rmi

.gitignore

@@ -9,3 +9,4 @@
 *.iml
 out
 gen
+/bin/

.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>challenger-rmi</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

src/main/java/com/senthink/rmi/challenger/param/EllaSubsystemParam.java

@@ -36,8 +36,17 @@ public class EllaSubsystemParam extends PageParam {
 	@ApiModelProperty("权限集")
 	private List<EllaPagePermissionParam> permissions;
 
+	private String isDefault;
 
 
+	public String getIsDefault() {
+		return isDefault;
+	}
+
+	public void setIsDefault(String isDefault) {
+		this.isDefault = isDefault;
+	}
+
 	public Integer getId() {
 		return id;
 	}

src/main/java/com/senthink/rmi/challenger/param/EmaillogParam.java

+package com.senthink.rmi.challenger.param;
+
+import java.util.Date;
+
+/**
+ *
+ * 
+ *
+ */
+public class EmaillogParam extends PageParam {
+
+	private Integer id;
+
+	/** 邮件接收帐号 */
+	private String email;
+
+	/** 发送内容 */
+	private String content;
+
+	/** 发送时间 */
+	private Date gmtSend;
+
+	private Date satrtTime;
+	private Date endTime;
+
+	private String search;
+	public Date getSatrtTime() {
+		return satrtTime;
+	}
+
+	public void setSatrtTime(Date satrtTime) {
+		this.satrtTime = satrtTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public Integer getId() {
+		return this.id;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public Date getGmtSend() {
+		return gmtSend;
+	}
+
+	public void setGmtSend(Date gmtSend) {
+		this.gmtSend = gmtSend;
+	}
+
+	public String getSearch() {
+		return search;
+	}
+
+	public void setSearch(String search) {
+		this.search = search;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+}

src/main/java/com/senthink/rmi/challenger/param/MessagelogParam.java

+package com.senthink.rmi.challenger.param;
+
+import java.util.Date;
+
+/**
+ *
+ * 
+ *
+ */
+public class MessagelogParam extends PageParam {
+
+
+	private Integer id;
+
+	/** 短信接收手机号 */
+	private String telNo;
+
+	/** 短信发送内容 */
+	private String content;
+
+	/** 短信发送时间 */
+	private Date gmtSend;
+
+	private Date satrtTime;
+	private Date endTime;
+
+	private String search;
+
+
+	public String getTelNo() {
+		return telNo;
+	}
+
+	public void setTelNo(String telNo) {
+		this.telNo = telNo;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public Date getGmtSend() {
+		return gmtSend;
+	}
+
+	public void setGmtSend(Date gmtSend) {
+		this.gmtSend = gmtSend;
+	}
+
+	public String getSearch() {
+		return search;
+	}
+
+	public void setSearch(String search) {
+		this.search = search;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Date getSatrtTime() {
+		return satrtTime;
+	}
+
+	public void setSatrtTime(Date satrtTime) {
+		this.satrtTime = satrtTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public Integer getId() {
+		return this.id;
+	}
+
+
+
+}

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.web.bind.annotation.PathVariable;
+
+import com.senthink.rmi.challenger.response.Message;
+
+/**
+ * @ClassName : EllaIndexHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class EllaIndexHystrix implements EllaIndexRemoteService {
+
+	public abstract Message getIndex(@PathVariable Integer id, @PathVariable Integer order);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.senthink.rmi.challenger.response.Message;
+
+/**
+ * @ClassName : EllaIndexRemoteService
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = EllaIndexHystrix.class)
+public interface EllaIndexRemoteService {
+
+	@RequestMapping(value = "/{id}/{order}", method = RequestMethod.POST)
+	Message getIndex(@PathVariable Integer id, @PathVariable Integer order);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaOrgStructureVo;
+
+/**
+ * @ClassName : EllaOrgStructureHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class EllaOrgStructureHystrix implements EllaOrgStructureRemoteService {
+
+	public abstract Message index();
+
+	public abstract Message toUpdate(@RequestBody EllaOrgStructureVo vo);
+
+	public abstract Message doAddOrUpdate(@RequestBody EllaOrgStructureVo vo);
+
+	public abstract Message doDelete(@PathVariable Integer id);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+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 com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaOrgStructureVo;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @ClassName : EllaOrgStructureRemoteService
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = EllaOrgStructureHystrix.class)
+public interface EllaOrgStructureRemoteService {
+
+	@ApiOperation(value = "获取组织架构列表")
+	@RequestMapping(value = { "/org/index", "/org/list", "/back/org/list" }, method = RequestMethod.POST)
+	Message index();
+
+	@ApiOperation(value = "获取组织架构单个节点的信息")
+	@RequestMapping(value = "/org/toUpdate/", method = RequestMethod.GET)
+	Message toUpdate(@RequestBody EllaOrgStructureVo vo);
+
+	@ApiOperation(value = "保存或更新该节点信息")
+	@RequestMapping(value = "/org/doAddOrUpdate", method = RequestMethod.POST)
+	Message doAddOrUpdate(@RequestBody EllaOrgStructureVo vo);
+
+	@RequestMapping(value = "/org/doDelete/{id}", method = RequestMethod.GET)
+	Message doDelete(@PathVariable Integer id);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.senthink.rmi.challenger.param.EllaPagePermissionParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaPagePermissionVo;
+
+/**
+ * @ClassName : EllaPagePermissionHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class EllaPagePermissionHystrix implements EllaPagePermissionRemoteService {
+
+	public abstract Message index();
+
+	public abstract Message searchList(EllaPagePermissionParam 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

+
+package com.senthink.rmi.challenger.rmi;
+
+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 com.senthink.rmi.challenger.param.EllaPagePermissionParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaPagePermissionVo;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @ClassName : EllaPagePermissionRemoteService
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = EllaPagePermissionHystrix.class)
+public interface EllaPagePermissionRemoteService {
+
+	@ApiOperation(value = "获取权限列表")
+	@RequestMapping(value = { "/pageper/index", "/pageper/list", "/back/pageper/list" }, method = RequestMethod.POST)
+	Message index();
+
+	@RequestMapping(value = { "/pageper/searchList" }, method = RequestMethod.POST)
+	Message searchList(EllaPagePermissionParam param);
+
+	@ApiOperation(value = "获取当前节点信息，或插入")
+	@RequestMapping(value = "/pageper/toUpdate", method = RequestMethod.POST)
+	Message toUpdate(@RequestBody EllaPagePermissionVo pageperVo);
+
+	@ApiOperation("更新节点信息")
+	@RequestMapping(value = "/pageper/doAddOrUpdate", method = RequestMethod.POST)
+	Message doAddOrUpdate(@RequestBody EllaPagePermissionVo vo);
+
+	@ApiOperation("删除当前节点")
+	@RequestMapping(value = "/pageper/doDelete/{id}", method = RequestMethod.GET)
+	Message doDelete(@PathVariable Integer id);
+
+	@RequestMapping(value = "/pageper/getPermissionTree", method = RequestMethod.GET)
+	Message getPermissionTree();
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.senthink.rmi.challenger.param.EllaRoleParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaRoleVo;
+
+/**
+ * @ClassName : EllaRoleHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class EllaRoleHystrix implements EllaRoleRemoteService {
+
+	public abstract Message searchList(@RequestBody EllaRoleParam param);
+
+	public abstract Message toAdd(@PathVariable Integer id);
+
+	public abstract Message toUpdate(@PathVariable Integer roleId, String loginName);
+
+	public abstract Message doAddOrUpdate(@RequestBody EllaRoleVo vo);
+
+	public abstract Message doDelete(@PathVariable Integer id);
+
+	public abstract Message toDetail(@PathVariable Integer roleId);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+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 com.senthink.rmi.challenger.param.EllaRoleParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaRoleVo;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @ClassName : EllaRoleRemoteService
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = EllaRoleHystrix.class)
+public interface EllaRoleRemoteService {
+
+	@ApiOperation("角色列表")
+	@RequestMapping(value = { "/role/searchList", "/back/role/list" }, method = RequestMethod.POST)
+	Message searchList(@RequestBody EllaRoleParam param);
+
+	@RequestMapping(value = "/role/toAdd/{id}", method = RequestMethod.GET)
+	Message toAdd(@PathVariable Integer id);
+
+	@RequestMapping(value = "/role/toUpdate/{roleId}", method = RequestMethod.GET)
+	Message toUpdate(@PathVariable Integer roleId, String loginName);
+
+	@RequestMapping(value = "/role/doAddOrUpdate", method = RequestMethod.POST)
+	Message doAddOrUpdate(@RequestBody EllaRoleVo vo);
+
+	@RequestMapping(value = "/role/doDelete/{id}", method = RequestMethod.GET)
+	Message doDelete(@PathVariable Integer id);
+
+	@RequestMapping(value = "/role/toDetail/{roleId}", method = RequestMethod.GET)
+	Message toDetail(@PathVariable Integer roleId);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.senthink.rmi.challenger.param.EllaSubsystemParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaSubsystemVo;
+
+/**
+ * @ClassName : EllaSubsystemHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class EllaSubsystemHystrix implements EllaSubsystemRemoteService {
+
+	public abstract Message searchList(@RequestBody EllaSubsystemParam param);
+
+	public abstract Message toUpdate(@PathVariable Integer subsystemId);
+
+	public abstract Message doAddOrUpdate(@RequestBody EllaSubsystemVo vo);
+
+	public abstract Message doDelete(@PathVariable Integer id);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+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 com.senthink.rmi.challenger.param.EllaSubsystemParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaSubsystemVo;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @ClassName : EllaSubsystemRemoteService
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = EllaSubsystemHystrix.class)
+public interface EllaSubsystemRemoteService {
+
+	@ApiOperation("查询")
+	@RequestMapping(value = { "/subsystem/searchList", "/back/subsystem/list" }, method = RequestMethod.POST)
+	Message searchList(@RequestBody EllaSubsystemParam param);
+
+	@ApiOperation("根据id获取要更新的系统信息")
+	@RequestMapping(value = "/subsystem/toUpdate/{subsystemId}", method = RequestMethod.GET)
+	Message toUpdate(@PathVariable Integer subsystemId);
+
+	@ApiOperation("更新或插入操作")
+	@RequestMapping(value = "/subsystem/doAddOrUpdate", method = RequestMethod.POST)
+	Message doAddOrUpdate(@RequestBody EllaSubsystemVo vo);
+
+	@ApiOperation("删除操作")
+	@RequestMapping(value = "/subsystem/doDelete/{id}", method = RequestMethod.GET)
+	Message doDelete(@PathVariable Integer id);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.PathVariable;
+
+import com.senthink.rmi.challenger.param.EllaSubsystemSyncParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaSubsystemSyncVo;
+
+/**
+ * @ClassName : EllaSubsystemSyncHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class EllaSubsystemSyncHystrix implements EllaSubsystemSyncRemoteService {
+
+	public abstract Message index();
+
+	public abstract Message toUpdate(@PathVariable Integer subsystemId);
+
+	public abstract Message doAddOrUpdate(@Valid EllaSubsystemSyncVo vo);
+
+	public abstract Message doDelete(@PathVariable Integer id);
+
+	public abstract Message searchList(EllaSubsystemSyncParam param);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import javax.validation.Valid;
+
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.senthink.rmi.challenger.param.EllaSubsystemSyncParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaSubsystemSyncVo;
+
+/**
+ * @ClassName : EllaSubsystemSyncRemoteService
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = EllaSubsystemSyncHystrix.class)
+public interface EllaSubsystemSyncRemoteService {
+
+	@RequestMapping(value = { "/subsystemsync/list", "/back/subsystemsync/list" }, method = RequestMethod.POST)
+	Message index();
+
+	@RequestMapping(value = "/subsystemsync/toUpdate/{subsystemId}", method = RequestMethod.GET)
+	Message toUpdate(@PathVariable Integer subsystemId);
+
+	@RequestMapping(value = { "/subsystemsync/doAddOrUpdate" }, method = RequestMethod.POST)
+	Message doAddOrUpdate(@Valid EllaSubsystemSyncVo vo);
+
+	@RequestMapping(value = "/subsystemsync/doDelete/{id}", method = RequestMethod.GET)
+	Message doDelete(@PathVariable Integer id);
+
+	@RequestMapping(value = { "/subsystemsync/searchList" }, method = RequestMethod.POST)
+	Message searchList(EllaSubsystemSyncParam param);
+
+}
\ No newline at end of file

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.param.EllaUserBaseParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaUserBaseVo;
+import com.senthink.rmi.challenger.vo.UserUpdatePwdVo;
+
+/**
+ * @ClassName : EllaUserBaseHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class EllaUserBaseHystrix implements EllaUserBaseRemoteService {
+
+	public abstract Message index();
+
+	public abstract Message adminPage(@RequestBody EllaUserBaseParam param);
+
+	public abstract Message normalPage(@RequestBody EllaUserBaseParam param);
+
+	public abstract Message dealerSearchList(@RequestBody EllaUserBaseParam param);
+
+	public abstract Message toAdd();
+
+	public abstract Message toUpdate(@PathVariable Integer userId, HttpServletRequest request);
+
+	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 disableUser(@PathVariable Integer id);
+
+	public abstract Message enableUser(@PathVariable Integer id);
+
+	public abstract Message updatePass(@RequestBody UserUpdatePwdVo vo);
+
+	public abstract Message passCheck(@RequestBody EllaUserBaseVo vo);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Value;
+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.param.EllaUserBaseParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaUserBaseVo;
+import com.senthink.rmi.challenger.vo.UserUpdatePwdVo;
+
+/**
+ * @ClassName           : EllaUserBaseRemoteService
+ * @Description         :
+ * @Author              : xujialin
+ * @CreationDate        : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = EllaUserBaseHystrix.class)
+public interface EllaUserBaseRemoteService {
+
+	
+@Value("${ella.url}")
+	private String ellaUrl;
+
+	/
+	@RequestMapping(value = { "/user/list", "/user/index" }, method = RequestMethod.GET)
+	 Message  index() ;
+@RequestMapping(value = { "admin/user/list", "/back/user/list" }, method = RequestMethod.GET)
+	 Message  adminPage(@RequestBody EllaUserBaseParam param) ;
+@RequestMapping(value = { "normal/user/list", "/back/consumer/list" }, method = RequestMethod.GET)
+	 Message  normalPage(@RequestBody EllaUserBaseParam param) ;
+@RequestMapping(value = { "/user/searchList" }, method = RequestMethod.POST)
+	 Message  dealerSearchList(@RequestBody EllaUserBaseParam param) ;
+@RequestMapping(value = "/user/toAdd", method = RequestMethod.GET)
+	 Message  toAdd() ;
+@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, String orgs, @RequestParam(value = "file", required = false) MultipartFile file)
+			;
+@RequestMapping(value = { "/user/disable/{id}" }, method = RequestMethod.GET)
+	 Message  disableUser(@PathVariable Integer id) ;
+@RequestMapping(value = { "/user/enable/{id}" }, method = RequestMethod.GET)
+	 Message  enableUser(@PathVariable Integer id) ;
+@RequestMapping(value = { "/user/updatePass" }, method = RequestMethod.POST)
+	 Message  updatePass(@RequestBody UserUpdatePwdVo vo) ;
+@RequestMapping(value = { "/user/passCheck" }, method = RequestMethod.POST)
+	 Message  passCheck(@RequestBody EllaUserBaseVo vo) ;
+
+ }
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.PathVariable;
+
+import com.senthink.rmi.challenger.param.EllaUserExtendsParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaUserExtendsVo;
+
+/**
+ * @ClassName : EllaUserExtendsHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class EllaUserExtendsHystrix implements EllaUserExtendsRemoteService {
+
+	public abstract Message searchList(EllaUserExtendsParam param);
+
+	public abstract Message index(@PathVariable Integer userTypeId);
+
+	public abstract Message toAdd(@PathVariable Integer userTypeId);
+
+	public abstract Message doAdd(@Valid EllaUserExtendsVo vo);
+
+	public abstract Message doDelete(HttpServletRequest request);
+
+	public abstract Message getByUserTypeId(@Valid Integer userTypeId);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.senthink.rmi.challenger.param.EllaUserExtendsParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaUserExtendsVo;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @ClassName : EllaUserExtendsRemoteService
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = EllaUserExtendsHystrix.class)
+public interface EllaUserExtendsRemoteService {
+
+	@RequestMapping(value = { "/userextends/searchList" }, method = RequestMethod.POST)
+	Message searchList(EllaUserExtendsParam param);
+
+	@ApiOperation("根据用户类型查询扩展属性")
+	@RequestMapping(value = { "/userextends/list/{userTypeId}" }, method = RequestMethod.GET)
+	Message index(@PathVariable Integer userTypeId);
+
+	@RequestMapping(value = "/userextends/toAdd/{userTypeId}", method = RequestMethod.GET)
+	Message toAdd(@PathVariable Integer userTypeId);
+
+	@RequestMapping("/userextends/doAdd")
+	Message doAdd(@Valid EllaUserExtendsVo vo);
+
+	@RequestMapping(value = { "/userextends/doDelete" }, method = RequestMethod.POST)
+	Message doDelete(HttpServletRequest request);
+
+	@RequestMapping(value = "/userextends/getByUserTypeId", method = RequestMethod.POST)
+	Message getByUserTypeId(@Valid Integer userTypeId);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.senthink.rmi.challenger.param.EllaUserTypeParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaUserTypeVo;
+
+/**
+ * @ClassName : EllaUserTypeHystrix
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午3:51:54
+ */
+public abstract class EllaUserTypeHystrix implements EllaUserTypeRemoteService {
+
+	public abstract Message searchList(@RequestBody EllaUserTypeParam param);
+
+	public abstract Message toUpdate(@PathVariable Integer userTypeId);
+
+	public abstract Message doAddOrUpdate(@RequestBody EllaUserTypeVo vo);
+
+	public abstract Message doDelete(@PathVariable Integer id);
+
+}
\ No newline at end of file

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

+
+package com.senthink.rmi.challenger.rmi;
+
+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 com.senthink.rmi.challenger.param.EllaUserTypeParam;
+import com.senthink.rmi.challenger.response.Message;
+import com.senthink.rmi.challenger.vo.EllaUserTypeVo;
+
+/**
+ * @ClassName : EllaUserTypeRemoteService
+ * @Description :
+ * @Author : xujialin
+ * @CreationDate : 2017年1月11日下午4:07:08
+ */
+@FeignClient(value = "challenger", fallback = EllaUserTypeHystrix.class)
+public interface EllaUserTypeRemoteService {
+
+	@RequestMapping(value = { "/usertype/searchList", "/back/usertype/list" }, method = RequestMethod.POST)
+	Message searchList(@RequestBody EllaUserTypeParam param);
+
+	@RequestMapping(value = "/usertype/toUpdate/{userTypeId}", method = RequestMethod.GET)
+	Message toUpdate(@PathVariable Integer userTypeId);
+
+	@RequestMapping(value = "/usertype/doAddOrUpdate", method = RequestMethod.POST)
+	Message doAddOrUpdate(@RequestBody EllaUserTypeVo vo);
+
+	@RequestMapping(value = { "/usertype/doDelete/{id}" }, method = RequestMethod.GET)
+	Message doDelete(@PathVariable Integer id);
+
+}
\ No newline at end of file