张天森
2022-11-10 b5a53d719f01daac9f4b4d0aafa274cea152c92c
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java
@@ -1,11 +1,16 @@
package com.panzhihua.auth.service.impl;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.user.SysOperLogVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.IPUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
@@ -21,6 +26,10 @@
import com.panzhihua.common.model.vos.LoginReturnsVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.utlis.JWTTokenUtil;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.bind.annotation.RequestParam;
import static java.util.Objects.nonNull;
@@ -36,6 +45,8 @@
    private AuthenticationManager authenticationManager;
    @Autowired
    private StringRedisTemplate redisTemplate;
    @Resource
    private UserService userService;
    /**
     * 微信小程序登录
@@ -120,6 +131,21 @@
            loginReturnVO.setLat(comActVO.getLat());
            loginReturnVO.setLng(comActVO.getLng());
        }
        //保存登录日志
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        SysOperLogVO operlog = new SysOperLogVO();
        operlog.setTitle("登录操作"); // 操作模块
        operlog.setBusinessType(1); // 操作类型
        operlog.setMethod("com.panzhihua.community_backstage.api.LoginApi.login"); // 请求方法
        operlog.setAccount(loginUser.getAccount());
        operlog.setOperName(loginUser.getName()); // 请求用户名称
        operlog.setOperIp(IPUtil.getIpAddress(request)); // 请求IP
        operlog.setOperUrl(request.getRequestURI()); // 请求URI
        operlog.setRequestMethod(request.getMethod());
        operlog.setOperLocation(IPUtil.getIpBelongAddress(request));
        operlog.setOperTime(new Date()); // 创建时间
        operlog.setCommunityId(loginUser.getCommunityId());
        userService.addOperLog(operlog);
        return loginReturnVO;
    }
@@ -148,7 +174,7 @@
    /**
     * 大数据统计平台(区、街道、社区三层登陆接口)
     *
     *
     * @param account
     *            账户
     * @param password
@@ -323,8 +349,8 @@
     * @return 登录结果
     */
    @Override
    public LoginReturnVO loginBatteryUser(String account, String password) {
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_20", password));
    public LoginReturnVO loginBatteryUser(String account, String password,String appid) {
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_20"+"_"+appid, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);