Merge branch 'dev' of 47.100.44.39:tp-backend/tanpu-community into dev

community-service/src/main/java/com/tanpu/community/util/PagePdfGenUtils.java

@@ -20,21 +20,44 @@ public class PagePdfGenUtils {
         try {
             BrowserFetcher.downloadIfNotExist(null);
 
-            for (int i = 0;i < 5; i++) {
-                log.info("#####  start genPdf " + i);
-                Thread t = new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            genPdf("https://testtamper.tanpuyun.com/hangjiapc/#/billingPdf");
-                        } catch (Throwable e) {
-                            log.error("#### error", e);
-                            e.printStackTrace();
-                        }
+            ArrayList<String> argList = new ArrayList<>();
+            LaunchOptions options = new LaunchOptionsBuilder()
+                    .withExecutablePath("/usr/bin/google-chrome")
+                    .withArgs(argList)
+                    .withHeadless(true)
+                    .build();
+
+            argList.add("--no-sandbox");
+            argList.add("--disable-setuid-sandbox");
+            argList.add("--enable-logging=/data/logs/chrome22.log --v=1");
+            browser = Puppeteer.launch(options);
+
+//            for (int i = 0;i < 5; i++) {
+//                log.info("#####  start genPdf " + i);
+//                Thread t = new Thread(new Runnable() {
+//                    @Override
+//                    public void run() {
+//                        try {
+//                            genPdf("https://testtamper.tanpuyun.com/hangjiapc/#/billingPdf");
+//                        } catch (Throwable e) {
+//                            log.error("#### error", e);
+//                            e.printStackTrace();
+//                        }
+//                    }
+//                });
+//                t.start();
+//            }
+
+
+
+            isBrowserClosed = false;
+        } catch (Throwable t) {
+            log.error("error in init genPdf", t);
         }
-                });
-                t.start();
     }
+
+    public static void genPdf(String url) throws Throwable {
+
 //        ArrayList<String> argList = new ArrayList<>();
 //        LaunchOptions options = new LaunchOptionsBuilder()
 //                .withExecutablePath("/usr/bin/google-chrome")
@@ -44,28 +67,9 @@ public class PagePdfGenUtils {
 //
 //        argList.add("--no-sandbox");
 //        argList.add("--disable-setuid-sandbox");
-//            argList.add("--enable-logging=/data/logs/chrome22.log --v=1");
+//        argList.add("--enable-logging=/data/logs/chrome.log");
+//        argList.add("--v=2");
 //        browser = Puppeteer.launch(options);
-            isBrowserClosed = false;
-        } catch (Throwable t) {
-            log.error("error in init genPdf", t);
-        }
-    }
-
-    public static void genPdf(String url) throws Throwable {
-
-        ArrayList<String> argList = new ArrayList<>();
-        LaunchOptions options = new LaunchOptionsBuilder()
-                .withExecutablePath("/usr/bin/google-chrome")
-                .withArgs(argList)
-                .withHeadless(true)
-                .build();
-
-        argList.add("--no-sandbox");
-        argList.add("--disable-setuid-sandbox");
-        argList.add("--enable-logging=/data/logs/chrome.log");
-        argList.add("--v=2");
-        browser = Puppeteer.launch(options);
 
 
         Page page = browser.newPage();