Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/utils/CodeUtil.java

@@ -155,7 +155,10 @@ public class CodeUtil {
 
             Doc doc = new SimpleDoc(fin, dof, das);
 
+//            ObservableSet<Printer> allPrinters = Printer.getAllPrinters();
+            logger.error("allPrinters", 111111);
             DocPrintJob job = ps.createPrintJob();
+            logger.error("allPrinters1", 2222222);
 
             job.print(doc, pras);
             fin.close();
@@ -199,11 +202,9 @@ public class CodeUtil {
 
         // 码图
         String replace1 = html.replace("images/yiweima.png", barCode).replace("images/erweima.png", qrCode);
-        logger.error("replace1", replace1);
         // 收 寄图
         String replace2 = replace1.replace("images/iconJi.png", pathName.concat("images/iconJi.png"))
                 .replace("images/iconShou.png", pathName.concat("images/iconShou.png"));
-        logger.error("replace2", replace2);
         String replace3 = replace2.replace("SF1010874393776", kylinOrderExpress.getMailno())
                 .replace("755W-BA-0123456789", kylinOrderExpress.getDestRouteLabel())
 
@@ -221,11 +222,9 @@ public class CodeUtil {
                 .replace("18510989999", jTel)
                 .replace("寄件地址北京市朝阳区摩登天空测试地址", jAddress)
                 ;
-        logger.error("replace3", replace3);
         Html2Image html2Image = Html2Image.fromHtml(replace3);
 
         String imgPath = pathName.concat("qrcode/img.png");
-        logger.error("imgPath", imgPath);
 
         html2Image.getImageRenderer().saveImage(imgPath);
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java

@@ -575,7 +575,6 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                             .eq(KylinOrderTickets::getOrderTicketsId, kylinOrderExpress.getOrderTicketsId())
             );
             String imgPath = codeUtil.html2img(kylinOrderExpress, jContact, jProvince.concat(jCity).concat(jAddress), jTel, orderInfo);
-            log.error("imgPath", imgPath);
             codeUtil.drawImage(imgPath, 1);
         }
         return ResponseDto.success();