From 6fe5ffeebd0035ab14fe3608495b5180837060e6 Mon Sep 17 00:00:00 2001
From: "moshowgame@126.com" <moshowgame@126.com>
Date: Wed, 10 Oct 2018 16:16:14 +0800
Subject: [PATCH] new stable cdn

---
 README.md                                     |  1 +
 .../src/main/resources/static/js/index-new.js |  8 +--
 .../templates/common/common-import.ftl        | 59 +++++++++----------
 3 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 6ce2bbc..659d8bd 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ SpringBootCodeGenerator
 <tr><td>CSDN博客</td> <td>http://blog.csdn.net/moshowgame</td></tr>
 <tr><td></td> <td></td></tr>
 <tr><td>更新日期</td> <td>更新内容</td></tr>
+<tr><td>20181010<td>CDN变更，修复CDN不稳定导致网页js报错问题。</td></tr>
 <tr><td>20181003<td>新增element-ui/bootstrap生成。</td></tr>
 <tr><td>20181002<td>修复公共CDN之Layer.js404问题，导致项目无法生成。</td></tr>
 <tr><td>20180927<td>优化COMMENT提取逻辑，支持多种复杂情况的注释（感谢@raodeming的反馈）。</td></tr>
diff --git a/generator-web/src/main/resources/static/js/index-new.js b/generator-web/src/main/resources/static/js/index-new.js
index 23fa8f8..0ee5b20 100644
--- a/generator-web/src/main/resources/static/js/index-new.js
+++ b/generator-web/src/main/resources/static/js/index-new.js
@@ -43,7 +43,7 @@ $(function () {
             dataType: "json",
             success: function (data) {
                 if (data.code == 200) {
-                    /*layer.open({
+                    layer.open({
                         icon: '1',
                         content: "代码生成成功",
                         end: function () {
@@ -53,15 +53,15 @@ $(function () {
                             genCodeArea.setSize('auto', 'auto');
 
                         }
-                    });*/
+                    });
                     codeData = data.data;
                     genCodeArea.setValue(codeData.swaggerui);
                     genCodeArea.setSize('auto', 'auto');
                 } else {
-                    /*layer.open({
+                    layer.open({
                         icon: '2',
                         content: (data.msg || '代码生成失败')
-                    });*/
+                    });
                 }
             }
         });
diff --git a/generator-web/src/main/resources/templates/common/common-import.ftl b/generator-web/src/main/resources/templates/common/common-import.ftl
index 96c761f..2c2d9dc 100644
--- a/generator-web/src/main/resources/templates/common/common-import.ftl
+++ b/generator-web/src/main/resources/templates/common/common-import.ftl
@@ -5,23 +5,23 @@
 
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<!-- Tell the browser to be responsive to screen width -->
-<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-<!-- Bootstrap 4 -->
-<link href="https://cdn.bootcss.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet">
-<!-- Font Awesome -->
-<link href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
-<!-- Ionicons -->
-<link href="https://cdn.bootcss.com/ionicons/4.1.2/css/ionicons.min.css" rel="stylesheet">
+    <!-- Tell the browser to be responsive to screen width -->
+    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <!-- Bootstrap 4 -->
+    <link href="//cdn.staticfile.org/twitter-bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet">
+    <!-- Font Awesome -->
+    <link href="//cdn.staticfile.org/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+    <!-- Ionicons -->
+    <link href="//cdn.staticfile.org/ionicons/4.1.2/css/ionicons.min.css" rel="stylesheet">
 
-<link href="https://cdn.bootcss.com/codemirror/5.38.0/codemirror.min.css" rel="stylesheet">
+    <link href="//cdn.staticfile.org/codemirror/5.38.0/codemirror.min.css" rel="stylesheet">
 
-<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-<!--[if lt IE 9]>
-<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-<![endif]-->
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+    <script src="//cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
+    <script src="//cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
 
 <script>var base_url = '${request.contextPath}';</script>
 
@@ -29,22 +29,19 @@
 
 <#macro commonScript>
 
-<!-- jQuery -->
-<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script>
-<!-- Bootstrap -->
-<script src="https://cdn.bootcss.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
-<!-- FastClick -->
-<script src="https://cdn.bootcss.com/fastclick/1.0.6/fastclick.min.js"></script>
-<#-- jquery.slimscroll -->
-<script src="https://cdn.bootcss.com/jQuery-slimScroll/1.3.8/jquery.slimscroll.min.js"></script>
-<#-- layer -->
-<#--<script src="https://cdn.bootcss.com/layer/3.1.0/layer.js"></script>-->
-<#--<script src="http://res.layui.com/layui/dist/layui.js""></script>-->
-<script src="https://cdn.bootcss.com/codemirror/5.38.0/codemirror.min.js"></script>
-<script src="https://cdn.bootcss.com/codemirror/5.38.0/addon/display/placeholder.min.js"></script>
-<script src="https://cdn.bootcss.com/codemirror/5.38.0/mode/clike/clike.min.js"></script>
-<script src="https://cdn.bootcss.com/codemirror/5.38.0/mode/sql/sql.min.js"></script>
-<script src="https://cdn.bootcss.com/codemirror/5.38.0/mode/xml/xml.min.js"></script>
+    <!-- jQuery -->
+    <script src="//cdn.staticfile.org/jquery/3.3.1/jquery.min.js"></script>
+    <!-- Bootstrap -->
+    <script src="//cdn.staticfile.org/twitter-bootstrap/4.1.1/js/bootstrap.min.js"></script>
+    <!-- FastClick -->
+    <script src="//cdn.staticfile.org/fastclick/1.0.6/fastclick.min.js"></script>
+    <script src="//cdn.staticfile.org/jQuery-slimScroll/1.3.8/jquery.slimscroll.min.js"></script>
+    <script src="//cdn.staticfile.org/layer/2.3/layer.js"></script>
+    <script src="//cdn.staticfile.org/codemirror/5.38.0/codemirror.min.js"></script>
+    <script src="//cdn.staticfile.org/codemirror/5.38.0/addon/display/placeholder.min.js"></script>
+    <script src="//cdn.staticfile.org/codemirror/5.38.0/mode/clike/clike.min.js"></script>
+    <script src="//cdn.staticfile.org/codemirror/5.38.0/mode/sql/sql.min.js"></script>
+    <script src="//cdn.staticfile.org/codemirror/5.38.0/mode/xml/xml.min.js"></script>
 </#macro>