Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/manager/AsyncFactoryNew.java

@@ -1,16 +1,17 @@
package com.panzhihua.auth.manager;

import java.util.TimerTask;

import com.panzhihua.auth.model.dos.SysLogininforDO;
import com.panzhihua.auth.model.dos.SysOperLogDO;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.auth.model.dos.SysLogininforDO;
import com.panzhihua.common.utlis.AddressUtils;
import com.panzhihua.common.utlis.IpUtils;
import com.panzhihua.common.utlis.LogUtils;
import com.panzhihua.common.utlis.ServletUtils;

import eu.bitwalker.useragentutils.UserAgent;
import lombok.extern.slf4j.Slf4j;

import java.util.TimerTask;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -24,22 +25,23 @@
    /**
     * 记录登录信息
     *
     * @param username 用户名
     * @param status 状态
     * @param message 消息
     * @param args 列表
     * @param username
     *            用户名
     * @param status
     *            状态
     * @param message
     *            消息
     * @param args
     *            列表
     * @return 任务task
     */
    public static TimerTask recordLogininfor(final String username, final String status, final String message,
                                             final Object... args)
    {
        final Object... args) {
        final UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
        final String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
        return new TimerTask()
        {
        return new TimerTask() {
            @Override
            public void run()
            {
            public void run() {
                String address = AddressUtils.getRealAddressByIP(ip);
                StringBuilder s = new StringBuilder();
                s.append(LogUtils.getBlock(ip));
@@ -62,12 +64,9 @@
                logininfor.setOs(os);
                logininfor.setMsg(message);
                // 日志状态
                if (Constants.LOGIN_SUCCESS.equals(status) || Constants.LOGOUT.equals(status))
                {
                if (Constants.LOGIN_SUCCESS.equals(status) || Constants.LOGOUT.equals(status)) {
                    logininfor.setStatus(Constants.SUCCESS+"");
                }
                else if (Constants.LOGIN_FAIL.equals(status))
                {
                } else if (Constants.LOGIN_FAIL.equals(status)) {
                    logininfor.setStatus(Constants.FAIL+"");
                }
                // 插入数据
@@ -79,16 +78,14 @@
    /**
     * 操作日志记录
     *
     * @param operLog 操作日志信息
     * @param operLog
     *            操作日志信息
     * @return 任务task
     */
    public static TimerTask recordOper(final SysOperLogDO operLog)
    {
        return new TimerTask()
        {
    public static TimerTask recordOper(final SysOperLogDO operLog) {
        return new TimerTask() {
            @Override
            public void run()
            {
            public void run() {
                // 远程查询操作地点
                operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
//                SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog);