Commit dfa4610a authored by 胡定国's avatar 胡定国

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

parents b3fd3578 5eab9278
...@@ -20,32 +20,36 @@ public class PagePdfGenUtils { ...@@ -20,32 +20,36 @@ public class PagePdfGenUtils {
try { try {
BrowserFetcher.downloadIfNotExist(null); BrowserFetcher.downloadIfNotExist(null);
for (int i = 0;i < 5; i++) { ArrayList<String> argList = new ArrayList<>();
log.info("##### start genPdf " + i); LaunchOptions options = new LaunchOptionsBuilder()
Thread t = new Thread(new Runnable() { .withExecutablePath("/usr/bin/google-chrome")
@Override .withArgs(argList)
public void run() { .withHeadless(true)
try { .build();
genPdf("https://testtamper.tanpuyun.com/hangjiapc/#/billingPdf");
} catch (Throwable e) { argList.add("--no-sandbox");
log.error("#### error", e); argList.add("--disable-setuid-sandbox");
e.printStackTrace(); argList.add("--enable-logging=/data/logs/chrome22.log --v=1");
} browser = Puppeteer.launch(options);
}
}); // for (int i = 0;i < 5; i++) {
t.start(); // log.info("##### start genPdf " + i);
} // Thread t = new Thread(new Runnable() {
// ArrayList<String> argList = new ArrayList<>(); // @Override
// LaunchOptions options = new LaunchOptionsBuilder() // public void run() {
// .withExecutablePath("/usr/bin/google-chrome") // try {
// .withArgs(argList) // genPdf("https://testtamper.tanpuyun.com/hangjiapc/#/billingPdf");
// .withHeadless(true) // } catch (Throwable e) {
// .build(); // log.error("#### error", e);
// // e.printStackTrace();
// argList.add("--no-sandbox"); // }
// argList.add("--disable-setuid-sandbox"); // }
// argList.add("--enable-logging=/data/logs/chrome22.log --v=1"); // });
// browser = Puppeteer.launch(options); // t.start();
// }
isBrowserClosed = false; isBrowserClosed = false;
} catch (Throwable t) { } catch (Throwable t) {
log.error("error in init genPdf", t); log.error("error in init genPdf", t);
...@@ -54,18 +58,18 @@ public class PagePdfGenUtils { ...@@ -54,18 +58,18 @@ public class PagePdfGenUtils {
public static void genPdf(String url) throws Throwable { public static void genPdf(String url) throws Throwable {
ArrayList<String> argList = new ArrayList<>(); // ArrayList<String> argList = new ArrayList<>();
LaunchOptions options = new LaunchOptionsBuilder() // LaunchOptions options = new LaunchOptionsBuilder()
.withExecutablePath("/usr/bin/google-chrome") // .withExecutablePath("/usr/bin/google-chrome")
.withArgs(argList) // .withArgs(argList)
.withHeadless(true) // .withHeadless(true)
.build(); // .build();
//
argList.add("--no-sandbox"); // argList.add("--no-sandbox");
argList.add("--disable-setuid-sandbox"); // argList.add("--disable-setuid-sandbox");
argList.add("--enable-logging=/data/logs/chrome.log"); // argList.add("--enable-logging=/data/logs/chrome.log");
argList.add("--v=2"); // argList.add("--v=2");
browser = Puppeteer.launch(options); // browser = Puppeteer.launch(options);
Page page = browser.newPage(); Page page = browser.newPage();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment