EasyJava2017
diff --git a/‎src/main/kotlin/com/light/saber/service/CrawKnowledgeService.kt
Lines changed: 7 additions & 23 deletions b/‎src/main/kotlin/com/light/saber/service/CrawKnowledgeService.kt
Lines changed: 7 additions & 23 deletions
diff --git a/‎src/main/kotlin/com/light/saber/webclient/CrawlerWebClient.kt
Lines changed: 1 addition & 0 deletions b/‎src/main/kotlin/com/light/saber/webclient/CrawlerWebClient.kt
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/main/resources/static/assets/logo.jpg
131 KB b/‎src/main/resources/static/assets/logo.jpg
131 KB
diff --git a/‎src/main/resources/templates/common/head.ftl
Lines changed: 6 additions & 1 deletion b/‎src/main/resources/templates/common/head.ftl
Lines changed: 6 additions & 1 deletion
@@ -4,8 +4,6 @@ import com.light.saber.dao.CrawSourceDao
 import com.light.saber.dao.KnowledgeDao
 import com.light.saber.model.Knowledge
 import com.light.saber.webclient.CrawlerWebClient
-import kotlinx.coroutines.experimental.CommonPool
-import kotlinx.coroutines.experimental.launch
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
@@ -25,9 +23,7 @@ class CrawKnowledgeService {
         简书专题URLs.forEach {
             for (page in 1..100) {
                 try {
-                    launch(CommonPool) {
-                        crawJianShuArticles(page, it.url)
-                    }
+                    crawJianShuArticles(page, it.url)
                 } catch (e: Exception) {
 
                 }
@@ -40,9 +36,7 @@ class CrawKnowledgeService {
     fun doCrawSegmentFaultKnowledge() {
         for (page in 1..803) {
             try {
-                launch(CommonPool) {
-                    crawSegmentFault(page)
-                }
+                crawSegmentFault(page)
             } catch (e: Exception) {
 
             }
@@ -53,9 +47,7 @@ class CrawKnowledgeService {
     fun doCrawOSChinaKnowledge() {
         for (page in 1..560) {
             try {
-                launch(CommonPool) {
-                    crawOSChina(page)
-                }
+                crawOSChina(page)
             } catch (e: Exception) {
 
             }
@@ -65,9 +57,7 @@ class CrawKnowledgeService {
     fun doCrawImportNewKnowledge() {
         for (page in 1..135) {
             try {
-                launch(CommonPool) {
-                    crawImportNew(page)
-                }
+                crawImportNew(page)
             } catch (e: Exception) {
 
             }
@@ -77,9 +67,7 @@ class CrawKnowledgeService {
     fun doCrawITEyeKnowledge() {
         for (page in 1..10000) {
             try {
-                launch(CommonPool) {
-                    crawITEye(page)
-                }
+                crawITEye(page)
             } catch (e: Exception) {
 
             }
@@ -89,9 +77,7 @@ class CrawKnowledgeService {
     fun doCrawCNBlogKnowledge() {
         for (page in 1..200) {
             try {
-                launch(CommonPool) {
-                    crawCNBlog(page)
-                }
+                crawCNBlog(page)
             } catch (e: Exception) {
 
             }
@@ -101,9 +87,7 @@ class CrawKnowledgeService {
     fun doCrawInfoQKnowledge() {
         for (page in 0..40) {
             try {
-                launch(CommonPool) {
-                    crawInfoQ(page)
-                }
+                crawInfoQ(page)
             } catch (e: Exception) {
 
             }
 
@@ -22,6 +22,7 @@ object CrawlerWebClient {
         return webClient as WebClient
     }
 
+    @Synchronized
     fun getPageHtmlText(url: String): String? {
         webClient = instanceWebClient(3000)
         try {
 
@@ -2,7 +2,11 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <!-- 强制让文档与设备的宽度保持1：1 -->
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no">
+    <meta http-equiv=”X-UA-Compatible” content=”IE=edge,chrome=1″/>
+    <link href="/assets/logo.jpg" rel="shortcut icon" type="image/x-icon"/>
     <title>MicroTek</title>
     <link rel="stylesheet" href="/assets/layui/css/layui.css">
     <script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.js"></script>
@@ -11,6 +15,7 @@
 <div class="layui-layout layui-layout-admin">
     <div class="layui-header">
         <div class="layui-logo">
+            <img src="/assets/logo.jpg" style="height: 2.5em ;width: 2.5em">
             <a href="/" style="color: #009688;font-size: 1.2em;">微技 GD</a>
         </div>
         <!-- 头部区域（可配合layui已有的水平导航） -->
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ object CrawlerWebClient {`
`22`	`22`	`return webClient as WebClient`
`23`	`23`	`}`
`24`	`24`
	`25`	`+ @Synchronized`
`25`	`26`	`fun getPageHtmlText(url: String): String? {`
`26`	`27`	`webClient = instanceWebClient(3000)`
`27`	`28`	`try {`