Skip to content

H
haoban-manage3.0
Commit a57b5a59 by 墨竹
Options

feat:企微登录好办增加token

parent 19ec2e27
Showing with 68 additions and 48 deletions
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java
......@@ -47,12 +47,12 @@ import java.util.stream.Collectors;
@RestController
public class LoginController extends WebBaseController {
private static Logger logger = LoggerFactory.getLogger(LoginController.class);
private static final Logger logger = LoggerFactory.getLogger(LoginController.class);
private static final String LOGIN_KEY = "haoban#login$key";
@Autowired
StaffApiService staffApiService;
private StaffApiService staffApiService;
@Autowired
private QywxCorpApiService qywxCorpApiService;
......@@ -69,7 +69,6 @@ public class LoginController extends WebBaseController {
@Autowired
private WxApplicationApiService wxApplicationApiService;
@Autowired
private Config config;
......@@ -157,7 +156,14 @@ public class LoginController extends WebBaseController {
}
//运维登录
/**
* 运维登录
*
* @param wxEnterpriseId
* @param random
* @param response
* @return
*/
@IgnoreLogin
@RequestMapping("yw-login")
public HaobanResponse ywLogin(String wxEnterpriseId, String random, HttpServletResponse response) {
......@@ -166,7 +172,6 @@ public class LoginController extends WebBaseController {
if (o == null) {
return resultResponse(HaoBanErrCode.ERR_4);
}
//TODO 获取超级管理员账号接口
StaffDTO staff = staffApiService.getAndAddSupperAdmin(wxEnterpriseId);
if (staff == null) {
logger.info("运维登录超级管理员不存在");
......@@ -194,7 +199,14 @@ public class LoginController extends WebBaseController {
}
//运维登录
/**
* gic登录
*
* @param random
* @param wxEnterpriseId
* @param response
* @return
*/
@IgnoreLogin
@RequestMapping("gic-login")
public ModelAndView gicLogin(String random, String wxEnterpriseId, HttpServletResponse response) {
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/interceptor/WebInterceptor.java
package com.gic.haoban.manage.web.interceptor;
import com.alibaba.fastjson.JSONObject;
import com.gic.haoban.auth.api.anno.MenuCheck;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.LoginDTO;
import com.gic.haoban.manage.web.anno.IgnoreLogin;
......@@ -22,7 +21,6 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.Map;
//import com.gic.redis.data.util.GicRateLimiter;
/**
* Created 2018/7/20.
......@@ -31,11 +29,9 @@ import java.util.Map;
*/
public class WebInterceptor extends HandlerInterceptorAdapter {
private static Logger logger= LoggerFactory.getLogger(WebInterceptor.class);
private static final Logger logger = LoggerFactory.getLogger(WebInterceptor.class);
// @Autowired
// private ClerkRightManageService clerkRightManageService;
private static String MOUDLE="haoban-manage3-web";
private static final String MOUDLE = "haoban-manage3-web";
private void errorResult(HttpServletResponse httpServletResponse, HaoBanErrCode errCode) {
HaobanResponse response = new HaobanResponse();
......@@ -89,7 +85,6 @@ public class WebInterceptor extends HandlerInterceptorAdapter {
if (method == null) {
return true;
}
MenuCheck methodAnnotation = method.getMethodAnnotation(MenuCheck.class);
if (StringUtils.isNotBlank(loginUser.getWxEnterpriseId())) {
httpServletRequest.setAttribute("wxEnterpriseId", loginUser.getWxEnterpriseId());
}
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/InfoController.java
......@@ -44,24 +44,22 @@ import java.util.Set;
import java.util.stream.Collectors;
@RestController
public class InfoController extends WebBaseController{
// public static final String siteId = "ww2c34dc56739bb105";
public class InfoController extends WebBaseController {
@Autowired
private QywxCorpApiService qywxCorpApiService;
@Autowired
private StaffApiService staffApiService;
@Autowired
private WxEnterpriseApiService wxEnterpriseApiService;
private static final Logger logger = LoggerFactory.getLogger(InfoController.class);
@Autowired
private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
private QywxCorpApiService qywxCorpApiService;
@Autowired
private StaffApiService staffApiService;
@Autowired
private WxEnterpriseApiService wxEnterpriseApiService;
@Autowired
private QywxUserApiService qywxUserApiService;
private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
@Autowired
private DepartmentApiService departmentApiService;
private QywxUserApiService qywxUserApiService;
@Autowired
private com.gic.enterprise.api.service.StoreService storeService;
......@@ -70,11 +68,6 @@ public class InfoController extends WebBaseController{
private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
@Autowired
private ClerkService clerkService;
@Autowired
private ClerkMainStoreRelatedApiService clerkMainStoreRelatedApiService;
@Autowired
private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
@Autowired
private ManagerDictService managerDictService;
......@@ -94,8 +87,6 @@ public class InfoController extends WebBaseController{
@Autowired
private EnterpriseService enterpriseService;
private static Logger logger= LoggerFactory.getLogger(InfoController.class);
@Autowired
private Config config;
......@@ -142,11 +133,7 @@ public class InfoController extends WebBaseController{
if (staffDTOS.size() > 1) {
String dictName = loginUserId.getDictName();
loginStaff = staffDTOS.stream().filter(staffDTO -> {
if (dictName.indexOf(staffDTO.getWxEnterpriseId()) > 0) {
return true;
} else {
return false;
}
return dictName.indexOf(staffDTO.getWxEnterpriseId()) > 0;
}).findFirst().orElse(loginStaff);
} else {
loginStaff = staffDTOS.get(0);
......@@ -184,9 +171,6 @@ public class InfoController extends WebBaseController{
@RequestMapping("get-user-by-member-code")
public HaobanResponse getInfoByMemberCode(GetUserByMemberCodeQo qo) {
// if (qo.getMemberId().equals("ff80808172cbd0410172cc894e6503c9")) {
// return resultResponse(HaoBanErrCode.ERR_500003, "1111");
// }
WxEnterpriseDTO enterpriseDetailDTO = null;
if (StringUtils.isNotBlank(qo.getCorpId())) {
enterpriseDetailDTO = wxEnterpriseApiService.getEnterpriseBycorpId(qo.getCorpId());
......@@ -250,11 +234,7 @@ public class InfoController extends WebBaseController{
List<StoreMemberVO> retList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(result)) {
result.stream().filter(staffClerkInfoDTO -> {
if (staffClerkInfoDTO.getEnterpriseId().equals(qo.getGicEnterpriseId())) {
return true;
}else{
return false;
}
return staffClerkInfoDTO.getEnterpriseId().equals(qo.getGicEnterpriseId());
}).forEach(dto -> {
StoreMemberVO VO = new StoreMemberVO();
StoreDTO store = storeService.getStore(dto.getStoreId());
......@@ -279,7 +259,6 @@ public class InfoController extends WebBaseController{
user.setStoreList(retList);
}
return resultResponse(HaoBanErrCode.ERR_1, user);
}
private MemberLoginQo getUserByCode(WxEnterpriseDTO enterpriseDTO, String code, String enterpriseId) {
......@@ -291,9 +270,6 @@ public class InfoController extends WebBaseController{
String userDTOJson = qywxUserApiService.getUserByCode(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), code);
logger.info("会员微信登录信息=============>{}", userDTOJson);
MemberLoginQo user = JSON.parseObject(userDTOJson, MemberLoginQo.class);
if (user == null) {
return null;
}
return user;
}
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WechatLoginController.java 0 → 100644
package com.gic.haoban.manage.web.controller;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author xuwenqian
* @date 2021/11/25 09:43
*/
@RestController
public class WechatLoginController extends WebBaseController {
/**
* 好办小程序-登陆
*
* @return
*/
@RequestMapping("welldone-login")
public HaobanResponse welldoneLogin() {
return resultResponse(HaoBanErrCode.ERR_1);
}
/**
* 好办小程序-登出
*
* @return
*/
@RequestMapping("welldone-loginout")
public HaobanResponse welldoneLoginOut() {
return resultResponse(HaoBanErrCode.ERR_1);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment