zhenghuang
/
bsdgy-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

登录

Browse Source
master
yechenhao 6 years ago
parent 690a3e8ea2
commit 26d5a19b7f
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/com/kiisoo/ic/login/bean/LoginBean.java
Unescape Escape View File

@ -33,6 +33,16 @@ public class LoginBean {
*/
private String login;
/**
* 密码
*/
private String password;
/**
* 企业微信账号
*/
private String cpUserId;
/**
* 角色id
*/

30
src/main/java/com/kiisoo/ic/login/controller/LoginController.java
Unescape Escape View File

@ -11,10 +11,7 @@ import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpSession;
import java.util.HashMap;
@ -70,18 +67,15 @@ public class LoginController extends BaseController {
/**
* 小程序登录账号
* @param login 用户名
* @param password 密码
* @param loginParams 登录参数
* @return 成功/失败
*/
@RequestMapping(value = "/mini/login",method = RequestMethod.POST)
@ResponseBody
public Map<String, Object> miniLoginAccount(@RequestParam(value = "login")String login,
@RequestParam(value = "password")String password,
@RequestParam(value = "isMD5",required = false,defaultValue = "false")Boolean isMD5){
public Map<String, Object> miniLoginAccount(@RequestBody LoginBean loginParams){
try{
Map<String, Object> resultMap = new HashMap<>();
LoginBean loginBean = loginService.miniLogin(login, password,isMD5);
LoginBean loginBean = loginService.miniLogin(loginParams.getLogin(), loginParams.getPassword(),false);
resultMap.put("code", loginBean.getLoginInfo().get("code"));
resultMap.put("results", loginBean);
resultMap.put("success", Boolean.TRUE);
@ -105,7 +99,10 @@ public class LoginController extends BaseController {
LoginBean loginBean = null;
if (accountInfo!=null){
if (StringUtils.isNotBlank(accountInfo.get("login")) && StringUtils.isNotBlank(accountInfo.get("password"))){
loginBean = loginService.miniLogin(accountInfo.get("login"), accountInfo.get("password"), false);
loginBean = loginService.miniLogin(accountInfo.get("login"), accountInfo.get("password"), true);
if (accountInfo.get("cpUserId").equals(loginBean.getCpUserId())){
loginBean.getLoginInfo().put("code",LoginEnum.LOGIN_SUCCEED.getCode());
}
}else{
if (StringUtils.isNotBlank(accountInfo.get("cpUserId"))){
String cpUserId = accountInfo.get("cpUserId");
@ -125,21 +122,18 @@ public class LoginController extends BaseController {
/**
* 登录账号
* @param login 用户名
* @param password 密码
* @param qywxUserId 企业微信账号
* @param loginParams 登录参数
* @return 成功/失败
*/
@RequestMapping(value = "/login/bind",method = RequestMethod.POST)
@ResponseBody
public Map<String, Object> loginAccountBind(@RequestParam("login")String login, @RequestParam("password")String password,
@RequestParam("cpUserId")String qywxUserId){
public Map<String, Object> loginAccountBind(@RequestBody LoginBean loginParams){
try{
Map<String, Object> resultMap = new HashMap<>();
LoginBean loginBean = loginService.miniLogin(login, password,false);
LoginBean loginBean = loginService.miniLogin(loginParams.getLogin(), loginParams.getPassword(),false);
resultMap.put("code", loginBean.getLoginInfo().get("code"));
if (LoginEnum.LOGIN_SUCCEED.getCode().equals(loginBean.getLoginInfo().get("code"))){
loginService.bindQywxUserIdByUserId(loginBean.getUserId(),qywxUserId);
loginService.bindQywxUserIdByUserId(loginBean.getUserId(),loginParams.getCpUserId());
}
resultMap.put("results", loginBean);
resultMap.put("success", Boolean.TRUE);

13
src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java
Unescape Escape View File

@ -74,7 +74,7 @@ public class LoginServiceImpl implements LoginService {
@Override
public LoginBean login(String login, String password, Boolean isMD5) {
password = MD5FileUtil.getMD5String(password);
UsernamePasswordToken token = new UsernamePasswordToken(login, password, isMD5);
UsernamePasswordToken token = new UsernamePasswordToken(login, password, false);
Subject subject = SecurityUtils.getSubject();
try {
@ -114,8 +114,10 @@ public class LoginServiceImpl implements LoginService {
@Override
public LoginBean miniLogin(String login, String password, Boolean isMD5) {
password = MD5FileUtil.getMD5String(password);
UsernamePasswordToken token = new UsernamePasswordToken(login, password, isMD5);
if (!isMD5){
password = MD5FileUtil.getMD5String(password);
}
UsernamePasswordToken token = new UsernamePasswordToken(login, password, false);
Subject subject = SecurityUtils.getSubject();
try {
@ -151,12 +153,13 @@ public class LoginServiceImpl implements LoginService {
//查询绑定状态
Map<String, Object> selectBindAccountMap = new HashMap<>();
selectAccountMap.put("user_id", privilageUserDO.getId());
selectAccountMap.put("type", AccountEnum.ACCOUNT_TYPE_QYWX.getType());
selectBindAccountMap.put("user_id", privilageUserDO.getId());
selectBindAccountMap.put("type", AccountEnum.ACCOUNT_TYPE_QYWX.getType());
List<PrivilageAccountDO> bindAccounts = privilageAccountDOMapper.selectByMap(selectBindAccountMap);
if (CollectionUtils.isEmpty(bindAccounts)){
loginInfoMap.put("code", LoginEnum.LOGIN_SUCCEED.getCode());
}else{
loginBean.setCpUserId(bindAccounts.get(0).getLogin());
loginInfoMap.put("code", LoginEnum.LOGIN_USER_BINDED.getCode());
}

Write Preview
Loading…
Cancel
Save