From d56a86e433d8ed656ef57285b54657c389c081aa Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 8 Jul 2020 15:17:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=85=8D?= =?UTF-8?q?=E7=99=BB=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 1 + .../epdc/controller/ApiWorkUserController.java | 16 ++++++++++++++++ .../elink/esua/epdc/service/WorkUserService.java | 9 +++++++++ .../epdc/service/impl/WorkUserServiceImpl.java | 8 ++++++++ 4 files changed, 34 insertions(+) diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index 5c3c15cc..f5a2e159 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/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/** #工作端接口 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java index 9d352c2f..4a4754fc 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java +++ b/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 + **/ + @PostMapping("scripLogin") + public Result scripLogin(@RequestBody WorkUserScripLoginDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return workUserService.scripLogin(formDto); + } + + + /** * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户） diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java index f3ff61fb..00b4fa2c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java +++ b/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 + **/ + Result scripLogin(WorkUserScripLoginDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index 06cd1386..c8778e90 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/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 scripLogin(WorkUserScripLoginDTO formDto) { + // 获取openId + String openId = this.getWxMaUser(formDto.getWxCode()).getOpenid(); + formDto.setOpenId(openId); + return resourceFeignClient.workScripLogin(formDto); } } From be170f813c76fb55a05d3794cc682225266f231f Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Mon, 13 Jul 2020 16:43:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=AB=AF=E9=85=8D=E7=BD=AE=E5=85=8Dtoken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-gateway/src/main/resources/application.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index f5a2e159..1d09342f 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -253,6 +253,7 @@ renren: - /api/analysis/user/scripLogin #工作端-用户凭证登录 - /api/work/user/scripLogin #工作端-用户凭证登录 - /api/work/*/swagger/** + - /api/residentConfig/getResidentConfig #获取居民端配置 workUrls: - /api/work/** #工作端接口 - /api/analysis/** #数据端接口 From cb28437d580b3b2c6190cce0c74e505cd8ec9527 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 14 Jul 2020 17:22:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20=E5=85=8Dtoken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-gateway/src/main/resources/application.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index 1d09342f..277a34d9 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -279,3 +279,4 @@ epdc: - /api/work/** #工作端接口不拦截 - /api/analysis/** #数据端接口不拦截 - /cloudAnalysis/** #数据端接口 + - /api/residentConfig/getResidentConfig #获取居民端配置