登录加接口验证

@@ -30,6 +30,11 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
         <!-- MySQL Connector -->
         <dependency>
             <groupId>mysql</groupId>

+package com.ash.Filter;
+
+import com.ash.util.AshConstant;
+import com.ash.util.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@Component
+@Slf4j
+@Order(1)
+public class LoginFilter implements Filter {
+
+    @Resource
+    RedisUtil redisUtil;
+
+    @Value("#{'${auth.white.list}'.split(',')}")
+    private List<String> white_List;
+
+    @Value("${auth.enable}")
+    private Boolean authEnable;
+
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+
+        if (authEnable == null || !authEnable) {
+            chain.doFilter(request, servletResponse);
+            return;
+        }
+
+        // url白名单
+        String path = request.getRequestURI();
+        boolean isWhiteUrl = white_List.stream().anyMatch(path::endsWith);
+
+        if (!isWhiteUrl) {
+            String sid = request.getHeader(AshConstant.AUTHORIZATION);
+
+            String sessionKey = AshConstant.UC_LOGIN_SESSION + AshConstant.REDIS_DIVISION + sid;
+            String data = redisUtil.get(sessionKey);
+
+            if (data == null) {
+                HttpServletResponse response = (HttpServletResponse) servletResponse;
+                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+                return;
+            }
+        }
+
+        chain.doFilter(request, servletResponse);
+    }
+}

+package com.ash.Filter;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.ash.base.ExecutionContext;
+import com.ash.util.AshConstant;
+import com.ash.util.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.Map;
+
+@Slf4j
+@Order(2)
+@Component
+public class TransmitExecutionFilter implements Filter {
+
+    @Resource
+    RedisUtil redisUtil;
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        this.initCpmtext((HttpServletRequest) request);
+        chain.doFilter(request, response);
+    }
+
+    private void initCpmtext(HttpServletRequest request) {
+        try {
+            String sid = request.getHeader(AshConstant.AUTHORIZATION);
+            log.info("接收sid信息:" + sid);
+            String sessionKey = AshConstant.UC_LOGIN_SESSION + AshConstant.REDIS_DIVISION + sid;
+            String data = redisUtil.get(sessionKey);
+            if (StringUtils.isNotBlank(data)) {
+                Map<String, Object> userMap = JSONObject.parseObject(data, (Type) Map.class);
+                String userId = userMap.get("id") + "";
+                ExecutionContext.setUserId(userId);
+                ExecutionContext.setSid(sid);
+            } else {
+                String remoteHost = getRemoteHost(request);
+                log.error("================= init sid empty! ip:" + remoteHost);
+            }
+
+        } catch (Exception e) {
+            log.error("init sid error", e);
+        }
+
+    }
+
+    public String getRemoteHost(HttpServletRequest request) {
+        String ip = request.getHeader("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+        return ip.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ip;
+    }
+}

@@ -6,6 +6,10 @@ public enum AshErrorCode {
     DATA_NOT_EXIST("数据不存在"),
     INVOKE_SERVICE_FAILED("远程服务调用失败"),
     SYSTEM_ERROR("系统异常"),
+    USER_NOT_EXIST("用户不存在"),
+    LOGINNAME_PWD_NOT_MATCH("用户名密码不正确"),
+    USER_FORBIDDEN("用户名冻结"),
+    LOGINNAME_OR_PWD_EMPTY("用户名密码为空"),
     ;
 
     private final String text;

+package com.ash.base;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ExecutionContext {
+    private static ThreadLocal<Map<String, String>> threadLocal = new ThreadLocal<>();
+
+    /**
+     * 用户id 键
+     */
+    public static final String USER_ID = "user_id";
+    public static final String SID = "sid";
+    public static final String IS_SUPER_ADMIN = "is_super_admin";
+
+    /**
+     * 构造函数
+     */
+    public ExecutionContext() {
+        // For Spring initialization.
+    }
+
+    /**
+     * 从 ThreadLocal中获取名值Map(不包含appCode)
+     *
+     * @return 名值Map
+     */
+    public static Map<String, String> getContextMap() {
+        return threadLocal.get();
+    }
+
+    /**
+     * 从 ThreadLocal 获取名值Map
+     *
+     * @param contextMap 名值Map
+     */
+    public static void setContextMap(Map<String, String> contextMap) {
+        threadLocal.set(contextMap);
+    }
+
+    /**
+     * （获取键下的值.如果不存在，返回null；如果名值Map未初始化，也返回null） Get the value of key. Would
+     * return null if context map hasn't been initialized.
+     *
+     * @param key 键
+     * @return 键下的值
+     */
+    public static String get(String key) {
+        Map<String, String> contextMap = getContextMap();
+        if (contextMap == null) {
+            return null;
+        }
+
+        return contextMap.get(key);
+    }
+
+    /**
+     * （设置名值对。如果Map之前为null，则会被初始化） Put the key-value into the context map;
+     * <p>
+     * Initialize the map if the it doesn't exist.
+     *
+     * @param key   键
+     * @param value 值
+     * @return 之前的值
+     */
+    public static String put(String key, String value) {
+        Map<String, String> contextMap = getContextMap();
+        if (contextMap == null) {
+            contextMap = new HashMap<>();
+            setContextMap(contextMap);
+        }
+
+        return contextMap.put(key, value);
+    }
+
+    public static String getUserId() {
+        return get(USER_ID);
+    }
+
+    public static void setUserId(String userId) {
+        put(USER_ID, userId);
+    }
+
+    public static String getSid() {
+        return get(SID);
+    }
+
+    public static void setSid(String sid) {
+        put(SID, sid);
+    }
+
+    public static boolean isSuperAdmin(){
+        String isSuperAdmin = get(IS_SUPER_ADMIN);
+        return "true".equals(isSuperAdmin);
+    }
+
+    public static void setIsSuperAdmin(Boolean isSuperAdmin){
+        put(IS_SUPER_ADMIN, isSuperAdmin+"");
+    }
+
+}

 package com.ash.config;
 
+import com.ash.base.ExecutionContext;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
@@ -14,19 +15,19 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
     @Override
     public void insertFill(MetaObject metaObject) {
         Date now=new Date();
-//        String userId = ExecutionContext.getUserId();
+        String userId = ExecutionContext.getUserId();
         this.strictInsertFill(metaObject, "createTime", Date.class, now);
         this.strictUpdateFill(metaObject, "lastModifyTime", Date.class, now);
-//        this.strictInsertFill(metaObject, "createBy", String.class, userId);
-//        this.strictUpdateFill(metaObject, "lastModifyBy", String.class, userId);
+        this.strictInsertFill(metaObject, "createBy", String.class, userId);
+        this.strictUpdateFill(metaObject, "lastModifyBy", String.class, userId);
     }
 
     @Override
     public void updateFill(MetaObject metaObject) {
         Date now=new Date();
-//        String userId = ExecutionContext.getUserId();
+        String userId = ExecutionContext.getUserId();
         this.strictUpdateFill(metaObject, "lastModifyTime", Date.class, now);
-//        this.strictUpdateFill(metaObject, "lastModifyBy", String.class, userId);
+        this.strictUpdateFill(metaObject, "lastModifyBy", String.class, userId);
     }
 }
 

+package com.ash.controller;
+
+import com.ash.base.BaseController;
+import com.ash.base.ExecutionContext;
+import com.ash.base.JsonResult;
+import com.ash.base.OptionStatus;
+import com.ash.entity.UserInfo;
+import com.ash.service.UserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/login")
+@Slf4j
+public class LoginController  extends BaseController {
+    @Resource
+    private UserService userService;
+
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    public JsonResult login(@RequestBody UserInfo userInfo) {
+        JsonResult loginResult = null;
+        try {
+            loginResult = userService.login(userInfo);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+
+        return loginResult;
+    }
+
+    @RequestMapping(value = "/logout", method = RequestMethod.POST)
+    public JsonResult logout() {
+        JsonResult loginResult = null;
+        try {
+            String userId = ExecutionContext.getUserId();
+            loginResult = userService.logout(userId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+
+        return loginResult;
+    }
+}

+package com.ash.controller;
+
+
+import com.ash.base.BaseController;
+import com.ash.base.JsonResult;
+import com.ash.base.OptionStatus;
+import com.ash.entity.UserInfo;
+import com.ash.service.UserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/user")
+@Slf4j
+public class UserServiceController extends BaseController {
+
+    @Resource
+    private UserService userService;
+
+    @PostMapping("/save")
+    public JsonResult saveUser(@RequestBody UserInfo userInfo) {
+        try {
+            boolean success = userService.save(userInfo);
+            return new JsonResult(success, OptionStatus.OPT_SUCCESS.getName(), null);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            return JsonResult.error(OptionStatus.OPT_ERROR.getName());
+        }
+    }
+}

+package com.ash.entity;
+
+import com.ash.base.BaseModel;
+import com.ash.enums.UserStatusEnum;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName(value = "t_ash_user")
+public class UserInfo extends BaseModel {
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 工号
+     */
+    @TableField(value = "employee_code")
+    private String employeeCode;
+
+    /**
+     * 姓名
+     */
+    @TableField(value = "user_name")
+    private String userName;
+
+    /**
+     * 登录名
+     */
+    @TableField(value = "login_name")
+    private String loginName;
+
+    /**
+     * 密码
+     */
+    @TableField(value = "password")
+    private String password;
+
+    /**
+     * 状态(ENABLE 激活 FORBIDDEN冻结)"
+     */
+    @TableField(value = "status")
+    private UserStatusEnum status;
+
+    /**
+     * 性别(性别 0女 1男)
+     */
+    @TableField(value = "sex")
+    private int sex;
+
+    /**
+     * 手机号码
+     */
+    @TableField(value = "mobile")
+    private String mobile;
+
+}

+package com.ash.entity.dao;
+
+import com.ash.entity.UserInfo;
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface UserMapper extends CommonBaseMapper<UserInfo>, MPJBaseMapper<UserInfo> {
+}

+package com.ash.enums;
+
+public enum UserStatusEnum {
+    ENABLE("激活"),
+    FORBIDDEN("冻结"),
+            ;
+
+
+    private final String text;
+
+    private UserStatusEnum(String text) {
+        this.text = text;
+    }
+
+    public String getText() {
+        return text;
+    }
+}

+package com.ash.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.ash.base.AshErrorCode;
+import com.ash.base.AshException;
+import com.ash.base.JsonResult;
+import com.ash.entity.UserInfo;
+import com.ash.entity.dao.UserMapper;
+import com.ash.enums.UserStatusEnum;
+import com.ash.util.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@Service
+public class UserService {
+
+    @Resource
+    private UserMapper userMapper;
+
+    @Resource
+    RedisUtil redisUtil;
+
+    public Boolean save(UserInfo userInfo) {
+        String uuid = UUIDGenerator.uuid();
+        userInfo.setId(uuid);
+        String pwd = MD5Generator.getHexMD5(userInfo.getPassword());
+        userInfo.setPassword(pwd);
+        if (userInfo.getStatus()==null) {
+            userInfo.setStatus(UserStatusEnum.ENABLE);
+        }
+
+        int result = userMapper.insert(userInfo);
+        return result > 0;
+    }
+
+    public Boolean saveAll(List<UserInfo> userInfoList) {
+        if (CollectionUtils.isEmpty(userInfoList)) {
+            throw new AshException(AshErrorCode.ILLEGAL_PARAM, "userInfoList is empty!");
+        }
+
+        int pageSize = 100;
+        int pages = (userInfoList.size() + pageSize - 1) / pageSize;
+        int count = 0;
+        int fromIndex = 0;
+        int toIndex = pageSize;
+        List<UserInfo> sub;
+        for (int i = 0; i < pages; i++) {
+            if (toIndex > userInfoList.size()) {
+                toIndex = userInfoList.size();
+            }
+            log.info("from " + fromIndex + " to " + toIndex + "....");
+            sub = userInfoList.subList(fromIndex, toIndex);
+            sub.forEach(t -> {
+                String uuid = UUIDGenerator.uuid();
+                t.setId(uuid);
+            });
+            try {
+                Integer result = userMapper.insertBatchSomeColumn(sub);
+                count += result;
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            fromIndex = toIndex;
+            toIndex = toIndex + pageSize;
+        }
+
+        return count > 0;
+    }
+
+    public JsonResult login(UserInfo loginUser) {
+        JsonResult result = new JsonResult();
+        result.setSuccess(true);
+        if (StringUtils.isBlank(loginUser.getLoginName()) || StringUtils.isBlank(loginUser.getPassword())) {
+            result.setSuccess(false);
+            result.setMsg(AshErrorCode.LOGINNAME_OR_PWD_EMPTY.getText());
+            return result;
+        }
+
+        String password = loginUser.getPassword();
+        password = AesUtils.aesDecrypt(password);
+        loginUser.setPassword(password);
+
+        String loginPwd = MD5Generator.getHexMD5(loginUser.getPassword());
+        UserInfo userInfo = getUserByLoginName(loginUser.getLoginName());
+
+        if (userInfo == null) {
+            result.setSuccess(false);
+            result.setMsg(AshErrorCode.USER_NOT_EXIST.getText());
+            return result;
+        }
+
+        if (!userInfo.getPassword().equals(loginPwd)) {
+            result.setSuccess(false);
+            result.setMsg(AshErrorCode.LOGINNAME_PWD_NOT_MATCH.getText());
+            return result;
+        }
+
+        if (UserStatusEnum.ENABLE != userInfo.getStatus()) {
+            result.setSuccess(false);
+            result.setMsg(AshErrorCode.USER_FORBIDDEN.getText());
+            return result;
+        }
+
+        String sessionId = storeSession(userInfo);
+        result.setData(sessionId);
+        return result;
+    }
+
+    public JsonResult logout(String userId) {
+        JsonResult result = new JsonResult();
+        try {
+            String loginKey = AshConstant.UC_ALREADY_LOGIN + AshConstant.REDIS_DIVISION + userId;
+            String loginSessionId = redisUtil.get(loginKey);
+            String loginSessionKey = AshConstant.UC_LOGIN_SESSION + AshConstant.REDIS_DIVISION + loginSessionId;
+            redisUtil.delete(loginSessionKey);
+            redisUtil.delete(loginKey);
+
+            result.setSuccess(true);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+            result.setSuccess(false);
+            result.setMsg(AshErrorCode.SYSTEM_ERROR.getText());
+        }
+
+        return result;
+    }
+
+    protected String storeSession(UserInfo userInfo) {
+        String sessionId = UUIDGenerator.uuid();
+        try {
+            String loginKey = AshConstant.UC_ALREADY_LOGIN + AshConstant.REDIS_DIVISION + userInfo.getId();
+            Boolean result = redisUtil.setNx(loginKey, sessionId);
+            //互踢
+            if (!result) {
+                String loginSessionId = redisUtil.get(loginKey);
+                String loginSessionKey = AshConstant.UC_LOGIN_SESSION + AshConstant.REDIS_DIVISION + loginSessionId;
+                log.info("==========" + userInfo.getLoginName() + " already session id :{" + loginSessionId + "}");
+                redisUtil.delete(loginSessionKey);
+                redisUtil.set(loginKey, sessionId);
+            }
+
+            String sessionKey = AshConstant.UC_LOGIN_SESSION + AshConstant.REDIS_DIVISION + sessionId;
+            redisUtil.setEx(sessionKey, JSONObject.toJSONString(userInfo), AshConstant.sessionExprie, TimeUnit.MINUTES);
+            redisUtil.expire(loginKey, AshConstant.sessionExprie, TimeUnit.MINUTES);
+
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            log.error(ex.getMessage());
+        }
+        return sessionId;
+
+    }
+
+    public UserInfo getUserByLoginName(String loginName) {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setLoginName(loginName);
+        List<UserInfo> userInfoList = listByCondition(userInfo);
+        if (CollectionUtils.isEmpty(userInfoList)) {
+            return null;
+        }
+        return userInfoList.get(0);
+    }
+
+    public List<UserInfo> listByCondition(UserInfo userInfo) {
+        QueryWrapper<UserInfo> queryWrapper = getQwCondition(userInfo);
+        return userMapper.selectList(queryWrapper);
+    }
+
+    private QueryWrapper<UserInfo> getQwCondition(UserInfo userInfo) {
+        if (userInfo == null)
+            return null;
+        QueryWrapper<UserInfo> queryWrapper = new QueryWrapper<UserInfo>();
+        LambdaQueryWrapper<UserInfo> lambda = queryWrapper.lambda();
+        if (StringUtils.isNotBlank(userInfo.getUserName())) {
+            lambda.like(UserInfo::getUserName, userInfo.getUserName());
+        }
+
+        if (StringUtils.isNotBlank(userInfo.getLoginName())) {
+            lambda.eq(UserInfo::getLoginName, userInfo.getLoginName());
+        }
+
+        return queryWrapper;
+    }
+}

+package com.ash.util;
+
+
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.spec.SecretKeySpec;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+
+
+public class AesUtils {
+    //密钥 (需要前端和后端保持一致)
+    private static final String KEY = "MIGfMA0GCSqGSIb3";
+    //算法
+    private static final String ALGORITHMSTR = "AES/ECB/PKCS5Padding";
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AesUtils.class);
+
+    public static String aesDecrypt(String encrypt) {
+        try {
+            return aesDecrypt(encrypt, KEY);
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage(), e);
+            return "";
+        }
+    }
+
+
+    public static String aesEncrypt(String content) {
+        try {
+            return aesEncrypt(content, KEY);
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage(), e);
+            return "";
+        }
+    }
+
+    public static String binary(byte[] bytes, int radix){
+        return new BigInteger(1, bytes).toString(radix);// 这里的1代表正数
+    }
+
+    public static String base64Encode(byte[] bytes){
+        return Base64.getEncoder().encodeToString(bytes);
+    }
+
+    public static byte[] base64Decode(String base64Code) throws Exception{
+        return StringUtils.isEmpty(base64Code) ? null :  Base64.getDecoder().decode(base64Code);
+    }
+
+
+    public static byte[] aesEncryptToBytes(String content, String encryptKey) throws Exception {
+        KeyGenerator kgen = KeyGenerator.getInstance("AES");
+        kgen.init(128);
+        Cipher cipher = Cipher.getInstance(ALGORITHMSTR);
+        cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(encryptKey.getBytes(), "AES"));
+
+        return cipher.doFinal(content.getBytes(StandardCharsets.UTF_8));
+    }
+
+
+    public static String aesEncrypt(String content, String encryptKey) throws Exception {
+        return base64Encode(aesEncryptToBytes(content, encryptKey));
+    }
+
+
+    public static String aesDecryptByBytes(byte[] encryptBytes, String decryptKey) throws Exception {
+        KeyGenerator kgen = KeyGenerator.getInstance("AES");
+        kgen.init(128);
+
+        Cipher cipher = Cipher.getInstance(ALGORITHMSTR);
+        cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(decryptKey.getBytes(), "AES"));
+        byte[] decryptBytes = cipher.doFinal(encryptBytes);
+        return new String(decryptBytes);
+    }
+
+
+
+    public static String aesDecrypt(String encryptStr, String decryptKey) throws Exception {
+        return StringUtils.isEmpty(encryptStr) ? null : aesDecryptByBytes(base64Decode(encryptStr), decryptKey);
+    }
+
+    /**
+     * 测试
+     */
+    public static void main(String[] args) {
+        String content = "123456";
+        System.out.println("加密前：" + content);
+        System.out.println("加密密钥和解密密钥：" + KEY);
+        String encrypt = aesEncrypt(content);
+        System.out.println("加密后：" + encrypt);
+        String decrypt = aesDecrypt(encrypt);
+        System.out.println("解密后：" + decrypt);
+    }
+}

+package com.ash.util;
+
+public interface AshConstant {
+
+    String AUTHORIZATION = "SID";
+
+    String REDIS_DIVISION = "_";
+
+    Integer sessionExprie=1440;
+
+    String UC_ALREADY_LOGIN = "ASH" + REDIS_DIVISION
+            + "ALREADY" + REDIS_DIVISION + "LOGIN";
+
+
+    String UC_LOGIN_SESSION = "ASH" + REDIS_DIVISION
+            + "LOGIN" + REDIS_DIVISION + "SESSION";
+
+
+}

+package com.ash.util;
+
+
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+
+public final class MD5Generator {
+
+    private static final String CHARSET = "UTF-8";
+    private static final String MD5 = "MD5";
+    private static final char[] HEX_DIGITS = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+    private MessageDigest digest;
+
+    public MD5Generator() {
+        try {
+            this.digest = MessageDigest.getInstance("MD5");
+        } catch (NoSuchAlgorithmException var2) {
+            var2.printStackTrace();
+        }
+
+    }
+
+    public void update(byte[] data, int offset, int len) {
+        if (this.digest != null && data != null) {
+            this.digest.update(data, offset, len);
+        }
+    }
+
+    public void update(byte[] data) {
+        if (data != null) {
+            this.update(data, 0, data.length);
+        }
+    }
+
+    public String getHexMD5() {
+        byte[] digestData = this.digest.digest();
+        return hexDigest(digestData);
+    }
+
+    public byte[] getMD5() {
+        return this.digest.digest();
+    }
+
+    public static String getHexMD5(String data) {
+        try {
+            MessageDigest e = MessageDigest.getInstance("MD5");
+            byte[] bytes = data.getBytes("UTF-8");
+            e.update(bytes);
+            byte[] byteDigest = e.digest();
+            return hexDigest(byteDigest).toLowerCase();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return null;
+        }
+    }
+
+    public static String hexDigest(byte[] byteDigest) {
+        char[] chars = new char[byteDigest.length * 2];
+
+        for (int i = 0; i < byteDigest.length; ++i) {
+            chars[i * 2] = HEX_DIGITS[byteDigest[i] >> 4 & 15];
+            chars[i * 2 + 1] = HEX_DIGITS[byteDigest[i] & 15];
+        }
+
+        return new String(chars);
+    }
+
+    public static void main(String[] args) {
+        String hexMD5 = MD5Generator.getHexMD5("Ahyj2023!@#");
+        System.out.println(hexMD5);
+    }
+}

+package com.ash.util;
+
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class RedisUtil {
+
+
+    @Resource
+    private RedisTemplate redisTemplate;
+
+    @SuppressWarnings("unchecked")
+    public void set(String key, Object value) {
+        redisTemplate.opsForValue().set(key, value);
+    }
+
+    @SuppressWarnings("unchecked")
+    public void set(String key, Object value, long timeout, TimeUnit unit) {
+        redisTemplate.opsForValue().set(key, value, timeout, unit);
+    }
+
+    @SuppressWarnings("unchecked")
+    public boolean setIfAbsent(String key, Object value, long timeout, TimeUnit unit) {
+        return Boolean.TRUE.equals(redisTemplate.opsForValue().setIfAbsent(key, value, timeout, unit));
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> T get(String key, Class<?> T) {
+        return (T) redisTemplate
+                .opsForValue().get(key);
+    }
+
+    @SuppressWarnings("unchecked")
+    public void delete(String key) {
+        redisTemplate.delete(key);
+    }
+
+    public String get(String key) {
+        return (String) redisTemplate
+                .opsForValue().get(key);
+    }
+
+    @SuppressWarnings("unchecked")
+    public Long decr(String key) {
+        return redisTemplate
+                .opsForValue().decrement(key);
+    }
+
+    @SuppressWarnings("unchecked")
+    public Long decr(String key, long delta) {
+        return redisTemplate
+                .opsForValue().decrement(key, delta);
+    }
+
+    @SuppressWarnings("unchecked")
+    public Long incr(String key) {
+        return redisTemplate
+                .opsForValue().increment(key);
+    }
+
+    @SuppressWarnings("unchecked")
+    public Long incr(String key, long delta) {
+        return redisTemplate
+                .opsForValue().increment(key, delta);
+    }
+
+    @SuppressWarnings("unchecked")
+    public void expire(String key, long time, TimeUnit unit) {
+        redisTemplate.expire(key, time, unit);
+    }
+
+    @SuppressWarnings("unchecked")
+    public Boolean setNx(String key, Object value) {
+        return redisTemplate.opsForValue().setIfAbsent(key, value);
+    }
+
+    @SuppressWarnings("unchecked")
+    public void setEx(String key, String value, long timeout, TimeUnit unit) {
+        redisTemplate.opsForValue().set(key, value, timeout, unit);
+    }
+
+    // ============================set=============================
+
+    /**
+     * 根据key获取Set中的所有值
+     *
+     * @param key 键
+     */
+    @SuppressWarnings("unchecked")
+    public Set<Object> sGet(String key) {
+        try {
+            return redisTemplate.opsForSet().members(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    /**
+     * 根据value从一个set中查询,是否存在
+     *
+     * @param key   键
+     * @param value 值
+     * @return true 存在 false不存在
+     */
+    @SuppressWarnings("unchecked")
+    public boolean sHasKey(String key, Object value) {
+        try {
+            return Boolean.TRUE.equals(redisTemplate.opsForSet().isMember(key, value));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    /**
+     * 将数据放入set缓存
+     *
+     * @param key    键
+     * @param values 值 可以是多个
+     * @return 成功个数
+     */
+    public long sSet(String key, Object... values) {
+        try {
+            return redisTemplate.opsForSet().add(key, values);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+
+    /**
+     * 将set数据放入缓存
+     *
+     * @param key    键
+     * @param time   时间(秒)
+     * @param values 值 可以是多个
+     * @return 成功个数
+     */
+    @SuppressWarnings("unchecked")
+    public long sSetAndTime(String key, long time, TimeUnit timeUnit, Object... values) {
+        try {
+            Long count = redisTemplate.opsForSet().add(key, values);
+            if (time > 0)
+                expire(key, time, timeUnit);
+            return count;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+
+
+    /**
+     * 移除值为value的
+     *
+     * @param key    键
+     * @param values 值 可以是多个
+     * @return 移除的个数
+     */
+    @SuppressWarnings("unchecked")
+    public long setRemove(String key, Object... values) {
+        try {
+            return redisTemplate.opsForSet().remove(key, values);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    // ===============================list=================================
+
+    /**
+     * 获取list缓存的内容
+     *
+     * @param key   键
+     * @param start 开始
+     * @param end   结束 0 到 -1代表所有值
+     */
+    @SuppressWarnings("unchecked")
+    public List<Object> lGet(String key, long start, long end) {
+        try {
+            return redisTemplate.opsForList().range(key, start, end);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    /**
+     * 获取list缓存的长度
+     *
+     * @param key 键
+     */
+    @SuppressWarnings("unchecked")
+    public long lGetListSize(String key) {
+        try {
+            return redisTemplate.opsForList().size(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+
+    /**
+     * 通过索引 获取list中的值
+     *
+     * @param key   键
+     * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推
+     */
+    @SuppressWarnings("unchecked")
+    public Object lGetIndex(String key, long index) {
+        try {
+            return redisTemplate.opsForList().index(key, index);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    /**
+     * 将list放入缓存
+     *
+     * @param key   键
+     * @param value 值
+     */
+    @SuppressWarnings("unchecked")
+    public boolean lSet(String key, Object value) {
+        try {
+            redisTemplate.opsForList().rightPush(key, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    /**
+     * 将list放入缓存
+     *
+     * @param key   键
+     * @param value 值
+     * @param time  时间(秒)
+     */
+    @SuppressWarnings("unchecked")
+    public boolean lSet(String key, Object value, long time) {
+        try {
+            redisTemplate.opsForList().rightPush(key, value);
+            if (time > 0)
+                expire(key, time, TimeUnit.SECONDS);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+
+    }
+
+
+    /**
+     * 将list放入缓存
+     *
+     * @param key   键
+     * @param value 值
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public boolean lSet(String key, List<Object> value) {
+        try {
+            redisTemplate.opsForList().rightPushAll(key, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+
+    }
+
+
+    /**
+     * 将list放入缓存
+     *
+     * @param key   键
+     * @param value 值
+     * @param time  时间(秒)
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public boolean lSet(String key, List<Object> value, long time) {
+        try {
+            redisTemplate.opsForList().rightPushAll(key, value);
+            if (time > 0)
+                expire(key, time, TimeUnit.SECONDS);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 根据索引修改list中的某条数据
+     *
+     * @param key   键
+     * @param index 索引
+     * @param value 值
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public boolean lUpdateIndex(String key, long index, Object value) {
+        try {
+            redisTemplate.opsForList().set(key, index, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 移除N个值为value
+     *
+     * @param key   键
+     * @param count 移除多少个
+     * @param value 值
+     * @return 移除的个数
+     */
+    @SuppressWarnings("unchecked")
+    public long lRemove(String key, long count, Object value) {
+        try {
+            return redisTemplate.opsForList().remove(key, count, value);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+
+    }
+
+}

@@ -24,6 +24,11 @@ spring:
       test-on-borrow: true
       test-on-return: true
       test-while-idle: true
+  redis:
+    cluster:
+      nodes: 10.9.1.252:16380
+    password: qixiao@123.com
+    timeout: 3000
   servlet:
     multipart:
       max-file-size: 100MB
@@ -34,5 +39,9 @@ logging:
   file:
     name: logs/ash.log
 ash:
- # errorFilePath: D:/data/errorData
+  # errorFilePath: D:/data/errorData
   errorFilePath: /web/errorData
+auth:
+  enable: false
+  white:
+    list: /login

@@ -31,23 +31,23 @@ create table `t_ash_warning_instance`
 
 create table `t_ash_warning_instance_analysis`
 (
-    id                  varchar(32) not null,
-    wi_id               varchar(32),
-    area                varchar(50),
-    amount              double,
-    sex                 varchar(50),
-    career              varchar(50),
-    rainage_method      varchar(50),
-    pay_method          varchar(50),
-    conform_status      varchar(50) DEFAULT 'UNCONFIRMED',
-    create_time         timestamp null,
-    create_by           varchar(32),
-    last_modify_time    timestamp null,
-    last_modify_by      varchar(32),
+    id               varchar(32) not null,
+    wi_id            varchar(32),
+    area             varchar(50),
+    amount           double,
+    sex              varchar(50),
+    career           varchar(50),
+    rainage_method   varchar(50),
+    pay_method       varchar(50),
+    conform_status   varchar(50) DEFAULT 'UNCONFIRMED',
+    create_time      timestamp null,
+    create_by        varchar(32),
+    last_modify_time timestamp null,
+    last_modify_by   varchar(32),
     primary key (id)
 ) comment = '警情分析结果' ENGINE = InnoDB;
 
-create index i_wia_wi on t_ash_warning_instance_analysis(wi_id);
+create index i_wia_wi on t_ash_warning_instance_analysis (wi_id);
 
 create table `t_ash_case`
 (
@@ -58,7 +58,7 @@ create table `t_ash_case`
     case_detail      varchar(5000),
     alarm_date       timestamp null,
     filing_date      timestamp null,
-    filing_unit varchar(200),
+    filing_unit      varchar(200),
     analysis_status  varchar(50) DEFAULT 'unanalysis',
     review_status    varchar(50) DEFAULT 'UNAUDITED',
     area             varchar(50),
@@ -96,7 +96,7 @@ create table `t_ash_case_analysis`
     rainage_method   varchar(50),
     rainage_detail   varchar(500),
     pay_method       varchar(50),
-    conform_status      varchar(50) DEFAULT 'UNCONFIRMED',
+    conform_status   varchar(50) DEFAULT 'UNCONFIRMED',
     create_time      timestamp null,
     create_by        varchar(32),
     last_modify_time timestamp null,
@@ -104,7 +104,7 @@ create table `t_ash_case_analysis`
     primary key (id)
 ) comment = '案件分析结果' ENGINE = InnoDB;
 
-create index i_case_ci on t_ash_case_analysis(case_id);
+create index i_case_ci on t_ash_case_analysis (case_id);
 
 create table `t_ash_file_data`
 (
@@ -118,3 +118,22 @@ create table `t_ash_file_data`
     primary key (id)
 ) comment = '文件数据' ENGINE = InnoDB;
 
+create table `t_ash_user`
+(
+    id               varchar(32) not null,
+    employee_code    varchar(50),
+    user_name        varchar(50),
+    login_name       varchar(50),
+    password         varchar(50),
+    status           varchar(50),
+    mobile           varchar(50),
+    sex              int,
+    create_time      timestamp null,
+    create_by        varchar(32),
+    last_modify_time timestamp null,
+    last_modify_by   varchar(32),
+    primary key (id)
+) comment = '用户表' ENGINE = InnoDB;
+
+create index i_user_l on t_ash_user(login_name);
+create unique index u_user_login_name on t_ash_user (login_name);
\ No newline at end of file