From 6f9980286b6bba56a76129c8983ae4eeeb7917e7 Mon Sep 17 00:00:00 2001
From: "yadong.zhang" <yadong.zhang0415@gmail.com>
Date: Fri, 12 Oct 2018 22:50:58 +0800
Subject: [PATCH] =?UTF-8?q?:pencil2:=20=E4=BF=AE=E6=94=B9cdn=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E3=80=81=E5=8E=BB=E6=8E=89yuicompressor=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blog-admin/pom.xml                            | 59 -------------------
 .../templates/article/publish-md.ftl          | 10 ++--
 .../src/main/resources/templates/index.ftl    |  2 +-
 blog-web/pom.xml                              | 56 ------------------
 .../src/main/resources/templates/article.ftl  | 10 ++--
 .../main/resources/templates/guestbook.ftl    | 10 ++--
 6 files changed, 16 insertions(+), 131 deletions(-)

diff --git a/blog-admin/pom.xml b/blog-admin/pom.xml
index 761d19e..2a518c1 100644
--- a/blog-admin/pom.xml
+++ b/blog-admin/pom.xml
@@ -41,47 +41,6 @@
 					<useDefaultDelimiters>false</useDefaultDelimiters>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>net.alchim31.maven</groupId>
-				<artifactId>yuicompressor-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>compress</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<!-- 读取js,css文件采用UTF-8编码 -->
-					<encoding>UTF-8</encoding>
-					<!-- 不显示js可能的错误 -->
-					<jswarn>false</jswarn>
-					<!-- 若存在已压缩的文件，会先对比源文件是否有改动  有改动便压缩，无改动就不压缩 -->
-					<force>false</force>
-					<!-- 在指定的列号后插入新行 -->
-					<linebreakpos>-1</linebreakpos>
-					<!-- 压缩之前先执行聚合文件操作 -->
-					<preProcessAggregates>true</preProcessAggregates>
-					<!-- 压缩后保存的文件后缀：true=无后缀 ，false=有后缀-min -->
-					<nosuffix>true</nosuffix>
-					<!-- 源目录，即需压缩的根目录 -->
-					<sourceDirectory>src/main/resources/static/assets</sourceDirectory>
-					<!-- 目标输出目录 -->
-					<outputDirectory>target/classes/static/assets</outputDirectory>
-					<!-- 压缩js和css文件 -->
-					<includes>
-						<include>**/*.js</include>
-						<include>**/*.css</include>
-					</includes>
-					<!-- 以下目录和文件不会被压缩 -->
-					<excludes>
-						<exclude>**/*.min.js</exclude>
-						<exclude>**/*.min.css</exclude>
-						<exclude>**/jquery-form.js</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -93,24 +52,6 @@
 				</configuration>
 			</plugin>
 		</plugins>
-		<!-- 打包的时候放开 -->
-		<!--<resources>
-			<resource>
-				<filtering>true</filtering>
-				<directory>src/main/resources</directory>
-				<includes>
-					<include>static/assets/images/**</include>
-					&lt;!&ndash;<include>%regex[static/assets/js/(jquery-form|wangEditor\.min)\.js]</include>&ndash;&gt;
-					<include>static/assets/js/jquery-form.js</include>
-					<include>static/assets/js/wangEditor.min.js</include>
-					<include>static/assets/css/jquery-confirm.min.css</include>
-					<include>templates/**</include>
-					<include>*.yml</include>
-					<include>*.txt</include>
-					<include>*.xml</include>
-				</includes>
-			</resource>
-		</resources>-->
 	</build>
 
 
diff --git a/blog-admin/src/main/resources/templates/article/publish-md.ftl b/blog-admin/src/main/resources/templates/article/publish-md.ftl
index 80448bf..6aaf33c 100644
--- a/blog-admin/src/main/resources/templates/article/publish-md.ftl
+++ b/blog-admin/src/main/resources/templates/article/publish-md.ftl
@@ -1,8 +1,8 @@
 <#include "/include/macros.ftl">
 <@header>
-    <link href="https://cdn.bootcss.com/simplemde/1.11.2/simplemde.min.css" rel="stylesheet">
-	<link href="https://cdn.bootcss.com/github-markdown-css/2.10.0/github-markdown.min.css" rel="stylesheet">
-	<link href="https://cdn.bootcss.com/highlight.js/9.12.0/styles/github.min.css" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/simplemde/1.11.2/simplemde.min.css" rel="stylesheet">
+	<link href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/2.10.0/github-markdown.min.css" rel="stylesheet">
+	<link href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github.min.css" rel="stylesheet">
     <style>
         .CodeMirror, .CodeMirror-scroll {
             min-height: 130px;
@@ -213,8 +213,8 @@
 <!--上传图片弹框-->
 <@footer>
 
-	<script type="text/javascript" src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
-	<script type="text/javascript" src="https://cdn.bootcss.com/simplemde/1.11.2/simplemde.min.js"></script>
+	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/simplemde/1.11.2/simplemde.min.js"></script>
     <script type="text/javascript" src="/assets/js/inline-attachment.js"></script>
     <script type="text/javascript" src="/assets/js/codemirror.inline-attachment.js"></script>
     <script src="/assets/js/jquery.smartWizard.js"></script>
diff --git a/blog-admin/src/main/resources/templates/index.ftl b/blog-admin/src/main/resources/templates/index.ftl
index 3405aa5..7bf6cd9 100644
--- a/blog-admin/src/main/resources/templates/index.ftl
+++ b/blog-admin/src/main/resources/templates/index.ftl
@@ -280,7 +280,7 @@
 </div>
 </div>
 <@footer>
-<script src="https://cdn.bootcss.com/echarts/4.1.0/echarts.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/echarts/4.1.0/echarts.min.js"></script>
 <script src="/assets/js/zhyd.echarts.js"></script>
 <script>
     init_echarts();
diff --git a/blog-web/pom.xml b/blog-web/pom.xml
index eeb364d..95763ac 100644
--- a/blog-web/pom.xml
+++ b/blog-web/pom.xml
@@ -39,46 +39,6 @@
 					<useDefaultDelimiters>false</useDefaultDelimiters>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>net.alchim31.maven</groupId>
-				<artifactId>yuicompressor-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>compress</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<!-- 读取js,css文件采用UTF-8编码 -->
-					<encoding>UTF-8</encoding>
-					<!-- 不显示js可能的错误 -->
-					<jswarn>false</jswarn>
-					<!-- 若存在已压缩的文件，会先对比源文件是否有改动  有改动便压缩，无改动就不压缩 -->
-					<force>false</force>
-					<!-- 在指定的列号后插入新行 -->
-					<linebreakpos>-1</linebreakpos>
-					<!-- 压缩之前先执行聚合文件操作 -->
-					<preProcessAggregates>true</preProcessAggregates>
-					<!-- 压缩后保存的文件后缀：true=无后缀 ，false=有后缀-min -->
-					<nosuffix>true</nosuffix>
-					<!-- 源目录，即需压缩的根目录 -->
-					<sourceDirectory>src/main/resources/static</sourceDirectory>
-					<!-- 目标输出目录 -->
-					<outputDirectory>target/classes/static</outputDirectory>
-					<!-- 压缩js和css文件 -->
-					<includes>
-						<include>**/*.js</include>
-						<include>**/*.css</include>
-					</includes>
-					<!-- 以下目录和文件不会被压缩 -->
-					<excludes>
-						<exclude>**/*.min.js</exclude>
-						<exclude>**/*.min.css</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -90,22 +50,6 @@
 				</configuration>
 			</plugin>
 		</plugins>
-		<!-- 打包的时候放开 -->
-		<!--
-		<resources>
-			<resource>
-				<filtering>true</filtering>
-				<directory>src/main/resources</directory>
-				&lt;!&ndash; includes和excludes冲突时，以excludes为准 &ndash;&gt;
-				<includes>
-					<include>templates/**</include>
-					<include>static/img/**</include>
-					<include>*.yml</include>
-					<include>*.txt</include>
-					<include>*.xml</include>
-				</includes>
-			</resource>
-		</resources>-->
 	</build>
 
 
diff --git a/blog-web/src/main/resources/templates/article.ftl b/blog-web/src/main/resources/templates/article.ftl
index 2c79021..d7e9f02 100644
--- a/blog-web/src/main/resources/templates/article.ftl
+++ b/blog-web/src/main/resources/templates/article.ftl
@@ -3,9 +3,9 @@
     keywords="${article.keywords?if_exists},${config.siteName}"
     description="${article.description?if_exists}"
     canonical="/article/${article.id}">
-    <link href="https://cdn.bootcss.com/simplemde/1.11.2/simplemde.min.css" rel="stylesheet">
-	<link href="https://cdn.bootcss.com/github-markdown-css/2.10.0/github-markdown.min.css" rel="stylesheet">
-	<link href="https://cdn.bootcss.com/highlight.js/9.12.0/styles/github.min.css" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/simplemde/1.11.2/simplemde.min.css" rel="stylesheet">
+	<link href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/2.10.0/github-markdown.min.css" rel="stylesheet">
+	<link href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github.min.css" rel="stylesheet">
     <style>
         .CodeMirror {
             padding: 0px;
@@ -235,6 +235,6 @@
 </div>
 <@footer>
     <script src="https://v1.hitokoto.cn/?encode=js&c=d&select=%23hitokoto" defer></script>
-    <script type="text/javascript" src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
-	<script type="text/javascript" src="https://cdn.bootcss.com/simplemde/1.11.2/simplemde.min.js"></script>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/simplemde/1.11.2/simplemde.min.js"></script>
 </@footer>
\ No newline at end of file
diff --git a/blog-web/src/main/resources/templates/guestbook.ftl b/blog-web/src/main/resources/templates/guestbook.ftl
index 32372a1..c3df74e 100644
--- a/blog-web/src/main/resources/templates/guestbook.ftl
+++ b/blog-web/src/main/resources/templates/guestbook.ftl
@@ -4,9 +4,9 @@
     keywords="${config.siteName},留言板,原创博客留言,个人原创网站,个人技术博客"
     description="我的留言板,欢迎给我的个人原创博客留言 - ${config.siteName}"
     canonical="/guestbook">
-    <link href="https://cdn.bootcss.com/simplemde/1.11.2/simplemde.min.css" rel="stylesheet">
-	<link href="https://cdn.bootcss.com/github-markdown-css/2.10.0/github-markdown.min.css" rel="stylesheet">
-	<link href="https://cdn.bootcss.com/highlight.js/9.12.0/styles/github.min.css" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/simplemde/1.11.2/simplemde.min.css" rel="stylesheet">
+	<link href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/2.10.0/github-markdown.min.css" rel="stylesheet">
+	<link href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github.min.css" rel="stylesheet">
     <style>
         .CodeMirror {
             padding: 0px;
@@ -67,7 +67,7 @@
 <@footer>
     <script src="https://v1.hitokoto.cn/?encode=js&c=d&select=%23hitokoto" defer></script>
 
-    <script type="text/javascript" src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
-	<script type="text/javascript" src="https://cdn.bootcss.com/simplemde/1.11.2/simplemde.min.js"></script>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/simplemde/1.11.2/simplemde.min.js"></script>
 </@footer>
 </@compress>
\ No newline at end of file
-- 
GitLab