Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -1,18 +1,28 @@
 package com.huiju.estateagents.center.taUser.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.entity.TaPerson;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -31,6 +41,9 @@ public class TaUserController extends BaseController {
 
     @Autowired
     public ITaUserService iTaUserService;
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
 
 
     /**
@@ -125,14 +138,16 @@ public class TaUserController extends BaseController {
     }
 
     /**
-     * 根据id查询对象
-     * @param id  实体ID
+     * 获取当前用户信息
      */
-    @RequestMapping(value="/taUser/{id}",method= RequestMethod.GET)
-    public ResponseBean taUserGet(@PathVariable Integer id){
+    @RequestMapping(value="/admin/taUser/current",method= RequestMethod.GET)
+    public ResponseBean taUserGet(HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        String userId = JWTUtils.getSubject(request);
         try {
-            responseBean.addSuccess(iTaUserService.getById(id));
+            TaUser taUser = iTaUserService.getById(userId);
+            taUser.setLoginPassword("");
+            responseBean.addSuccess(taUser);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taUserDelete -=- {}",e.toString());
@@ -140,4 +155,52 @@ public class TaUserController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 用户手机号登录
+     * @param paramStr
+     * @return
+     */
+    @PostMapping("/admin/taUser/signin")
+    public ResponseBean signin(@RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (params == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+    
+        String userName = params.getString("loginName");
+        String userPassword = params.getString("loginPassword");
+    
+        //验证用户名密码是否正确
+        QueryWrapper<TaUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("login_name",userName);
+        sysUserQueryWrapper.eq("login_password", MD5Utils.md5(userPassword));
+        TaUser taUser = iTaUserService.getOne(sysUserQueryWrapper);
+        if (taUser == null) {
+            return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+    
+        if (taUser.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        taUser.setLoginPassword("");
+        String token = JWTUtils.newToken(taUser.getUserId().toString());
+    
+        //保存token
+        saveToken(token);
+    
+        Map<String, Object> result = new HashMap<>();
+        result.put("token", token);
+        result.put("user", taUser);
+    
+        return ResponseBean.success(result);
+    }
+    
+    
+    private void saveToken(String token) {
+        SysToken sysToken = new SysToken();
+        sysToken.setToken(token);
+        sysToken.setExpDate(LocalDateTime.now());
+        sysTokenService.save(sysToken);
+    }
 }

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -28,6 +28,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/api/taCheckin/activity",
             "/api/wx/qrcode/scene",
 		    "/api/center/signin",
+		    "/api/admin/taUser/signin",
     };
 
     /*