工作端免登陆

esua-epdc/epdc-gateway/src/main/resources/application.yml

@@ -251,6 +251,7 @@ renren:
     - /api/analysis/user/getToken #数据分析端-获取token
     - /api/analysis/user/login #数据分析端-登录
     - /api/analysis/user/scripLogin #工作端-用户凭证登录
+    - /api/work/user/scripLogin #工作端-用户凭证登录
     - /api/work/*/swagger/**
   workUrls:
     - /api/work/** #工作端接口

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
+import com.elink.esua.epdc.common.token.dto.WorkUserScripLoginDTO;
 import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
@@ -59,6 +60,21 @@ public class ApiWorkUserController {
         ValidatorUtils.validateEntity(formDto);
         return workUserService.login(formDto);
     }
+    /**
+     * @Description   工作端-用户凭证登录
+     * @Author songyunpeng
+     * @Date  2020/7/8
+     * @Param [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO>
+     **/
+    @PostMapping("scripLogin")
+    public Result<WorkUserAuthorizationDTO> scripLogin(@RequestBody WorkUserScripLoginDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return workUserService.scripLogin(formDto);
+    }
+
+
+
 
     /**
      * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
+import com.elink.esua.epdc.common.token.dto.WorkUserScripLoginDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
@@ -139,4 +140,12 @@ public interface WorkUserService {
      * @Date 2019/12/25 10:17
      **/
     Result logout(Long userId);
+    /**
+     * @Description  用户凭证登录 
+     * @Author songyunpeng
+     * @Date  2020/7/8
+     * @Param [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO>
+     **/
+    Result<WorkUserAuthorizationDTO> scripLogin(WorkUserScripLoginDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java

@@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.hutool.core.collection.CollUtil;
 import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
+import com.elink.esua.epdc.common.token.dto.WorkUserScripLoginDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserTokenFormDTO;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
@@ -335,4 +336,11 @@ public class WorkUserServiceImpl implements WorkUserService {
     public Result logout(Long userId) {
         return resourceFeignClient.logoutUser(userId+"");
     }
+
+    @Override
+    public Result<WorkUserAuthorizationDTO> scripLogin(WorkUserScripLoginDTO formDto) {
+        // 获取openId
+        String openId = this.getWxMaUser(formDto.getWxCode()).getOpenid();
+        formDto.setOpenId(openId);
+        return resourceFeignClient.workScripLogin(formDto);    }
 }