redis更改，登录部分修改

eladmin-system/src/main/java/cn/ysk/cashier/config/RelaxedQueryCharsConnectorCustomizer

@@ -1,16 +0,0 @@
-package cn.ysk.cashier.config;
-
-import org.apache.catalina.connector.Connector;
-import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author bearBoy80
- */
-@Configuration(proxyBeanMethods = false)
-public class RelaxedQueryCharsConnectorCustomizer implements TomcatConnectorCustomizer {
-    @Override
-    public void customize(Connector connector) {
-        connector.setProperty("relaxedQueryChars", "[]{}");
-    }
-}

eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java

@@ -91,6 +91,7 @@ public class AuthorizationController {
         if (StringUtils.isBlank(authUser.getCode()) || !authUser.getCode().equalsIgnoreCase(code)) {
             throw new BadRequestException("验证码错误");
         }
+        //生成token
         UsernamePasswordAuthenticationToken authenticationToken =
                 new UsernamePasswordAuthenticationToken(authUser.getUsername(), password);
         Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);
@@ -101,10 +102,11 @@ public class AuthorizationController {
         // SecurityContextHolder.getContext().setAuthentication(authentication);
         String token = tokenProvider.createToken(authentication);
         final JwtUserDto jwtUserDto = (JwtUserDto) authentication.getPrincipal();
-        // 保存在线信息
-        onlineUserService.save(jwtUserDto, token, request);
         // 返回 token 与 用户信息
         TbShopInfo byAccount = tbShopInfoRepository.findByAccount(jwtUserDto.getUsername());
+        //校验商户商户激活是否到期（未激活）
+
+
         Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
             put("token", properties.getTokenStartWith() + token);
             put("user", jwtUserDto);
@@ -113,6 +115,9 @@ public class AuthorizationController {
             }
 
         }};
+        // 保存在线信息
+        onlineUserService.save(jwtUserDto, token, request);
+
         if (loginProperties.isSingleLogin()) {
             //踢掉之前已经登录的token
             onlineUserService.checkLoginOnUser(authUser.getUsername(), token);