perf：调整登录模块

tiesheng-login/src/main/java/com/tiesheng/login/LoginAutoImportSelector.java

@@ -0,0 +1,15 @@
+package com.tiesheng.login;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.ComponentScan;
+
+/**
+ * @author hao
+ */
+
+@ComponentScan({
+        "com.tiesheng.login.**.*",
+})
+@MapperScan("com.tiesheng.login.mapper")
+public class LoginAutoImportSelector {
+}

tiesheng-login/src/main/java/com/tiesheng/login/config/token/TsTokenAspect.java

@@ -0,0 +1,63 @@
+package com.tiesheng.login.config.token;
+
+import com.tiesheng.annotation.token.TokenIgnore;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+
+/**
+ * @author hao
+ * @ProjectName CmccSpring
+ * @Copyright Hangzhou ShuoChuang Technology Co.,Ltd All Right Reserved
+ * @Description 这里是对文件的描述
+ * @data 2019-07-15
+ * @note 这里写文件的详细功能和改动
+ * @note
+ */
+@Aspect
+@Component
+public class TsTokenAspect {
+
+    @Autowired
+    TsTokenConfig tsTokenConfig;
+
+
+    /**
+     * 切入点
+     */
+    @Pointcut("execution(* com..controller..*.*(..))")
+    public void methodArgs() {
+
+    }
+
+
+    /**
+     * 获取操作日志说明
+     *
+     * @param joinPoint
+     */
+    @Before("methodArgs()")
+    public void before(JoinPoint joinPoint) {
+
+        // 过滤不要需要验证的接口
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        Method method = signature.getMethod();
+        TokenIgnore apiTokenIgnore = method.getAnnotation(TokenIgnore.class);
+        if (apiTokenIgnore != null) {
+            return;
+        }
+
+        // token验证
+        tsTokenConfig.validToken(true);
+
+    }
+
+
+}

tiesheng-login/src/main/java/com/tiesheng/login/config/token/TsTokenConfig.java

@@ -0,0 +1,146 @@
+package com.tiesheng.login.config.token;
+
+
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.servlet.ServletUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import cn.hutool.jwt.JWT;
+import com.tiesheng.login.config.token.bean.TokenBean;
+import com.tiesheng.util.ServletKit;
+import com.tiesheng.util.exception.ApiException;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Map;
+
+
+/**
+ * @author hao
+ */
+@Configuration
+@ConfigurationProperties("tiesheng.token")
+public class TsTokenConfig {
+
+    private Map<String, TokenBean> ignores = MapUtil.newHashMap();
+    private String encryptKey = "%kIp9frQCu";
+    private Integer expireHours = 48;
+
+
+    /**
+     * 获取当前登录的token
+     *
+     * @return
+     */
+    public static TokenBean get() {
+        TsTokenConfig tokenConfig = SpringUtil.getBean(TsTokenConfig.class);
+        return tokenConfig.validToken(true);
+    }
+
+
+    /**
+     * 获取当前登录的token
+     *
+     * @return
+     */
+    public static TokenBean getWithoutThr() {
+        TsTokenConfig tokenConfig = SpringUtil.getBean(TsTokenConfig.class);
+        return tokenConfig.validToken(false);
+    }
+
+
+    /**
+     * 验证token
+     *
+     * @param token
+     * @return
+     */
+    public TokenBean isIgnored(String token) {
+        if (ignores == null) {
+            return null;
+        }
+        return ignores.get(token);
+    }
+
+    /**
+     * 设置token
+     */
+    public String toToken(String id, String environmentType, String service, String extra) {
+        return JWT.create()
+                .setPayload("id", id)
+                .setPayload("environmentType", environmentType)
+                .setPayload("service", service)
+                .setPayload("extra", extra)
+                .setPayload("time", System.currentTimeMillis() + expireHours * 1000 * 60 * 60)
+                .setKey(getEncryptKey().getBytes())
+                .sign();
+    }
+
+    /**
+     * 验证token
+     *
+     * @return
+     */
+    public TokenBean validToken(boolean thrExp) {
+        String token = ServletUtil.getHeader(ServletKit.getRequest(), "token", "utf-8");
+        TokenBean tokenBean = isIgnored(token);
+        if (tokenBean != null) {
+            return tokenBean;
+        }
+
+        try {
+            JWT decode = JWT.of(token);
+            String id = decode.getPayload("id").toString();
+            String environmentType = decode.getPayload("environmentType").toString();
+            String service = decode.getPayload("service").toString();
+            String extra = decode.getPayload("extra").toString();
+            Long expireTime = decode.getPayloads().getLong("time");
+            if (expireTime != null && expireTime < System.currentTimeMillis()) {
+                throw new ApiException("登录过期，请重新登陆");
+            }
+
+            tokenBean = new TokenBean(id, environmentType, service);
+            tokenBean.setExtra(extra);
+        } catch (Exception ignored) {
+        }
+
+        if (tokenBean == null && thrExp) {
+            throw new ApiException(StrUtil.isEmpty(token) ? "请先登录" : "登录过期，请重新登陆");
+        }
+
+        if (tokenBean == null) {
+            tokenBean = new TokenBean();
+            tokenBean.setId("");
+        }
+
+        return tokenBean;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public Map<String, TokenBean> getIgnores() {
+        return ignores;
+    }
+
+    public void setIgnores(Map<String, TokenBean> ignores) {
+        this.ignores = ignores;
+    }
+
+    public String getEncryptKey() {
+        return encryptKey;
+    }
+
+    public void setEncryptKey(String encryptKey) {
+        this.encryptKey = encryptKey;
+    }
+
+    public Integer getExpireHours() {
+        return expireHours;
+    }
+
+    public void setExpireHours(Integer expireHours) {
+        this.expireHours = expireHours;
+    }
+}

tiesheng-login/src/main/java/com/tiesheng/login/config/token/bean/TokenBean.java

@@ -0,0 +1,58 @@
+package com.tiesheng.login.config.token.bean;
+
+/**
+ * @author hao
+ */
+public class TokenBean {
+
+    private String id;
+    private String environmentType;
+    private String service;
+    private String extra;
+
+    public TokenBean() {
+    }
+
+    public TokenBean(String id, String environmentType, String service) {
+        this.id = id;
+        this.environmentType = environmentType;
+        this.service = service;
+        this.extra = "";
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // setter\getter
+    ///////////////////////////////////////////////////////////////////////////
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getEnvironmentType() {
+        return environmentType;
+    }
+
+    public void setEnvironmentType(String environmentType) {
+        this.environmentType = environmentType;
+    }
+
+    public String getService() {
+        return service;
+    }
+
+    public void setService(String service) {
+        this.service = service;
+    }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+}

tiesheng-login/src/main/java/com/tiesheng/login/controller/LoginUserController.java

@@ -0,0 +1,12 @@
+package com.tiesheng.login.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author hao
+ */
+@RestController
+@RequestMapping("/login/user")
+public class LoginUserController {
+}

tiesheng-login/src/main/java/com/tiesheng/login/mapper/CoreLogLoginMapper.java

@@ -0,0 +1,7 @@
+package com.tiesheng.login.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tiesheng.login.pojos.dao.CoreLogLogin;
+
+public interface CoreLogLoginMapper extends BaseMapper<CoreLogLogin> {
+}

tiesheng-login/src/main/java/com/tiesheng/login/pojos/dao/CoreLogLogin.java

@@ -0,0 +1,156 @@
+package com.tiesheng.login.pojos.dao;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+
+/**
+ * 日志-登录
+ */
+@TableName(value = "core_log_login")
+public class CoreLogLogin {
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @TableField(value = "is_deleted")
+    private Integer isDeleted;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_name")
+    private String userName;
+
+    /**
+     * ip
+     */
+    @TableField(value = "platform")
+    private String platform;
+
+    /**
+     * ip
+     */
+    @TableField(value = "ip")
+    private String ip;
+
+    /**
+     * ip地址
+     */
+    @TableField(value = "address")
+    private String address;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(Integer isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    /**
+     * 获取用户id
+     *
+     * @return user_id - 用户id
+     */
+    public String getUserId() {
+        return userId;
+    }
+
+    /**
+     * 设置用户id
+     *
+     * @param userId 用户id
+     */
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
+    /**
+     * 获取ip
+     *
+     * @return ip - ip
+     */
+    public String getIp() {
+        return ip;
+    }
+
+    /**
+     * 设置ip
+     *
+     * @param ip ip
+     */
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    /**
+     * 获取ip地址
+     *
+     * @return address - ip地址
+     */
+    public String getAddress() {
+        return address;
+    }
+
+    /**
+     * 设置ip地址
+     *
+     * @param address ip地址
+     */
+    public void setAddress(String address) {
+        this.address = address;
+    }
+}

tiesheng-login/src/main/java/com/tiesheng/login/service/LoginLogService.java

@@ -0,0 +1,42 @@
+package com.tiesheng.login.service;
+
+import cn.hutool.extra.servlet.ServletUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.tiesheng.login.mapper.CoreLogLoginMapper;
+import com.tiesheng.login.pojos.dao.CoreLogLogin;
+import com.tiesheng.util.ServletKit;
+import com.tiesheng.util.ip2region.DataBlock;
+import com.tiesheng.util.ip2region.Ip2Region;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author hao
+ */
+@Service
+public class LoginLogService extends ServiceImpl<CoreLogLoginMapper, CoreLogLogin> {
+
+
+    /**
+     * 获取
+     *
+     * @param userId
+     */
+    public void addLog(String userId, String platform) {
+
+        HttpServletRequest request = ServletKit.getRequest();
+        String ip = ServletUtil.getClientIP(request);
+
+        CoreLogLogin login = new CoreLogLogin();
+        login.setUserId(userId);
+        login.setPlatform(platform);
+
+        login.setIp(ip);
+        DataBlock dataBlock = Ip2Region.getInstance().btreeSearch(ip);
+        login.setAddress(dataBlock.getRegion());
+        save(login);
+    }
+
+
+}