Merge branch 'hive2.0' into api

935090232@qq.com

2021-01-26 ae2efe9a1b627fcfbe61020e9e0a82470a3959d7

 zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java

@@ -33,7 +33,7 @@
    private RedisClient redisClient;

    @Value("${login_private_key}")
    private String privateKey;
    private static String privateKey;

    @Value("${evn}")
    private String evn;
@@ -41,12 +41,12 @@
    @Autowired
    private SysUsersDao sysUsersDao;

    private final String TOKEN_HEADER = "Authorization";
    private final String TOKEN_START_WITH = "Bearer ";
    private static final String TOKEN_HEADER = "Authorization";
    private static final String TOKEN_START_WITH = "Bearer ";

    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
        if ("dev".equals(evn)) {
       if ("dev".equals(evn)) {
            SysUsers sysUsers = sysUsersDao.selectById(1012L);
            request.getSession().setAttribute(MatrixConstance.LOGIN_KEY, sysUsers);
            return true;
@@ -95,7 +95,7 @@
     * @param request
     * @return
     */
    private String resolveToken(HttpServletRequest request) {
    public static String resolveToken(HttpServletRequest request) {
        String headToken = request.getHeader(TOKEN_HEADER);
        String sb = request.getRequestURI();