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-common/src/main/java/com/github/wxiaoqi/security/common/msg/ObjectRestResponse.java

@@ -85,5 +85,14 @@ public class ObjectRestResponse<T> extends BaseResponse {
      */
     public static ObjectRestResponse createDefaultFail() {
         return  new ObjectRestResponse().status(WEB_CALL_RESULT_FAILED).msg(RESULT_FAIL_MSG).rel(false);
-}
+    }
+
+    /**
+     * 创建一个异常的调用结果并携带结果参数
+     * @param message
+     * @return
+     */
+    public static ObjectRestResponse createFailedResultWithObj(Integer code, String message,final Object data) {
+        return new ObjectRestResponse().status(code).msg(message).data(data).rel(false);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLoginBiz.java

@@ -144,4 +144,11 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         }
         return flag;
     }
+
+    //获取用户信息
+    public AppUserLogin getUserById(Integer userId){
+        return mapper.selectByPrimaryKey(userId);
+    }
+
+
 }

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);
+
+    @RequestMapping(value = "/api/app/user/authentication")
+    public ObjectRestResponse authentication( @RequestParam(value="userId")Integer  userId,
+                                              @RequestParam(value="idNumber")String idNumber,
+                                              @RequestParam(value="status")Integer  status);
+
+
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
 import com.github.wxiaoqi.security.api.vo.authority.PermissionInfo;
 import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
 import com.github.wxiaoqi.security.api.vo.user.UserInfo;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
@@ -159,5 +160,14 @@ public class AppUserRest {
         return appPermissionService.reset(username,mobilecode,password);
     }
 
+    @RequestMapping(value = "/user/authentication", method = RequestMethod.POST)
+    public @ResponseBody ObjectRestResponse authentication(
+            @RequestParam(value="userId",defaultValue="0")Integer  userId,
+            @RequestParam(value="idNumber",defaultValue="")String idNumber,
+            @RequestParam(value="status",defaultValue="0")Integer  status
+    ){
+        return appPermissionService.upAuthentication(userId,idNumber,status);
+    }
+
 
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -9,6 +9,7 @@ import com.github.wxiaoqi.security.admin.constant.RedisKey;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.api.vo.authority.PermissionInfo;
 import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.EmojiFilter;
 import com.github.wxiaoqi.security.common.util.VerificationUtils;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -484,4 +485,35 @@ public class AppPermissionService {
      }
     }
 
+    //实名认证
+    @Transactional
+    public ObjectRestResponse upAuthentication(Integer userid, String idNumber, Integer status) {
+        if(userid==null||userid==0||(status==1&&StringUtils.isBlank(idNumber))){
+            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
+        }
+        try {
+            AppUserLogin user=appUserLoginBiz.getUserById(userid);
+            if(user==null){
+                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "用户不存在");
+            }
+            if(user.getCertificationStatus()==1){
+                return ObjectRestResponse.createFailedResultWithObj(ResultCode.EXIST_CODE, "用户已认证",user.getIdNumber());
+            }
+            if(status==1){
+                String username=user.getUsername();
+                user=new AppUserLogin();
+                user.setId(userid);
+                user.setUsername(username);
+                user.setIdNumber(idNumber);
+                user.setCertificationStatus(1);
+                appUserLoginBiz.updateSelectiveById(user);
+            }
+            return  ObjectRestResponse.succ();
+        }catch (Exception e) {
+            log.error("upAuthentication->error:{}", e.getMessage(), e);
+            return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
+        }
+
+    }
+
 }