Merge remote-tracking branch 'origin/master'

cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java

@@ -1,8 +1,11 @@
 package com.czg.controller.admin;
 
+import cn.hutool.http.server.HttpServerRequest;
+import cn.hutool.http.server.HttpServerResponse;
 import com.czg.account.dto.SysLoginDTO;
 import com.czg.account.service.AuthorizationService;
 import com.czg.account.service.PermissionService;
+import com.czg.account.service.ShopTableService;
 import com.czg.account.vo.LoginVO;
 import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.annotation.SaStaffCheckPermission;
@@ -10,9 +13,12 @@ import com.czg.config.RabbitPublisher;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -54,9 +60,13 @@ public class AuthorizationController {
 
     @Resource
     RabbitPublisher rabbitPublisher;
+    @Resource
+    ShopTableService shopTableService;
     @GetMapping("test")
-    public CzgResult<?> login() {
-        rabbitPublisher.sendOrderPrintMsg("552");
+    public CzgResult<?> login(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        shopTableService.createQrCode(1L, 1, response, request);
+
+//        rabbitPublisher.sendOrderPrintMsg("552");
 //        printMqListener.orderPrint("1");
 //        return CzgResult.success(Map.of("token", StpKit.USER.getShopId()));
         return CzgResult.success();

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopTableServiceImpl.java

@@ -183,6 +183,7 @@ public class ShopTableServiceImpl extends ServiceImpl<ShopTableMapper, ShopTable
 
         downloadFile(request, response, new File(tempZipPath), true);
 
+        log.info("桌码生成成功");
 
         if (dir.exists()) {
             for (File file : Objects.requireNonNull(dir.listFiles())) {