日志增加shopId，改动打印机，增加注册时默认四种支付方式

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

@@ -113,7 +113,7 @@ public class AuthorizationController {
 
         }};
         // 保存在线信息
-        onlineUserService.save(jwtUserDto, token, request);
+        onlineUserService.save(jwtUserDto, token, request,byAccount.getId());
 
         if (loginProperties.isSingleLogin()) {
             //踢掉之前已经登录的token
@@ -142,7 +142,7 @@ public class AuthorizationController {
         String token = tokenProvider.createToken(authentication);
         final JwtUserDto jwtUserDto = (JwtUserDto) authentication.getPrincipal();
         // 保存在线信息
-        onlineUserService.save(jwtUserDto, token,request);
+        onlineUserService.save(jwtUserDto, token,request,null);
         // 返回 token 与 用户信息
         TbShopInfo byAccount = tbShopInfoRepository.findByAccount(jwtUserDto.getUsername());
         Map<String, Object> authInfo = new HashMap<String, Object>(2) {{

eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/OnlineUserService.java

@@ -50,14 +50,14 @@ public class OnlineUserService {
      * @param token /
      * @param request /
      */
-    public void save(JwtUserDto jwtUserDto, String token, HttpServletRequest request){
+    public void save(JwtUserDto jwtUserDto, String token, HttpServletRequest request,Integer shopId){
         String dept = jwtUserDto.getUser().getDept().getName();
         String ip = StringUtils.getIp(request);
         String browser = StringUtils.getBrowser(request);
         String address = StringUtils.getCityInfo(ip);
         OnlineUserDto onlineUserDto = null;
         try {
-            onlineUserDto = new OnlineUserDto(jwtUserDto.getUsername(), jwtUserDto.getUser().getNickName(), dept, browser , ip, address, EncryptUtils.desEncrypt(token), new Date());
+            onlineUserDto = new OnlineUserDto(shopId,jwtUserDto.getUsername(), jwtUserDto.getUser().getNickName(), dept, browser , ip, address, EncryptUtils.desEncrypt(token), new Date());
         } catch (Exception e) {
             log.error(e.getMessage(),e);
         }

eladmin-system/src/main/java/cn/ysk/cashier/config/security/service/dto/OnlineUserDto.java

@@ -24,10 +24,13 @@ import java.util.Date;
  * 在线用户
  * @author Zheng Jie
  */
-@Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class OnlineUserDto {
+    /**
+     * shopId
+     */
+    private Integer shopId;
 
     /**
      * 用户名
@@ -69,5 +72,80 @@ public class OnlineUserDto {
      */
     private Date loginTime;
 
+    public Integer getShopId() {
+        return shopId;
+    }
 
+    public void setShopId(Integer shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getDept() {
+        return dept;
+    }
+
+    public void setDept(String dept) {
+        this.dept = dept;
+    }
+
+    public String getBrowser() {
+        return browser;
+    }
+
+    public void setBrowser(String browser) {
+        this.browser = browser;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public Date getLoginTime() {
+        return loginTime;
+    }
+
+    public void setLoginTime(Date loginTime) {
+        this.loginTime = loginTime;
+    }
+
+//    @Override
+//    public String toString() {
+//        return
+//    }
 }