Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -17,5 +18,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface UserFeign {
     @RequestMapping(value = "/public/app/userinfo-by-token")
     public ObjectRestResponse<AppUserDTO> userDetailByToken(@RequestParam("token") String token);
+    @RequestMapping(value = "/api/app/user/authentication", method = RequestMethod.POST)
+    public ObjectRestResponse authentication( @RequestParam(value="userId")Integer  userId,
+                                              @RequestParam(value="idNumber")String idNumber,
+                                              @RequestParam(value="status")Integer  status);
+
 
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserInfoVo.java

+package com.github.wxiaoqi.security.admin.vo;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 用户信息表
+ */
+@Data
+public class AppUserInfoVo {
+
+	//用户id
+	private Integer userid;
+	//用户名
+	private String username;
+	//是否是会员
+	private Integer isMember;
+	//昵称
+	private String nickname;
+	//真实姓名
+	private String realname;
+	//头像
+	private String headimgurl;
+	//email
+	private String email;
+	//性别 0-女，1-男
+	private Integer sex;
+	//生日
+	private String birthday;
+
+	private String personSign;
+	private String remark;
+	private Long createtime;
+	private Long updatetime;
+	private Integer isdel;
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

-package com.github.wxiaoqi.security.admin.feign;
-
-
-//import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * ${DESCRIPTION}
- *
- * @author wanghaobin
- * @create 2017-06-21 8:11
- */
-@FeignClient(value = "ace-admin")
-public interface UserFeign {
-//    @RequestMapping(value = "/public/app/userinfo-by-token")
-//    public ObjectRestResponse<AppUserDTO> userDetailByToken(@RequestParam("token") String token);
-//
-
-
-}