From fc06166da5ac902b4fa3318646dfaf459cd9bef7 Mon Sep 17 00:00:00 2001
From: "moshowgame@126.com" <moshowgame@126.com>
Date: Tue, 2 Oct 2018 01:15:56 +0800
Subject: [PATCH] fix layer cdn 404 issue

---
 README.md                                             |  1 +
 .../src/main/resources/static/js/index-new.js         | 11 +++++++----
 .../main/resources/templates/common/common-import.ftl |  3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index b0938c3..001e13b 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>20181002<td>修复公共CDN之Layer.js404问题，导致项目无法生成。</td></tr>
 <tr><td>20180927<td>优化COMMENT提取逻辑，支持多种复杂情况的注释（感谢@raodeming的反馈）。</td></tr>
 <tr><td>20180926<td>全新BeetlSQL模块，以及一些小细节优化（感谢@三叔同事的建议）。</td></tr>
 <tr><td>20180925<td>优化SQL表和字段备注的推断，包括pgsql/oralce的comment on column/table情况处理等。</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 4b5b5f6..e7a47f8 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,12 +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 e625b0e..96c761f 100644
--- a/generator-web/src/main/resources/templates/common/common-import.ftl
+++ b/generator-web/src/main/resources/templates/common/common-import.ftl
@@ -38,7 +38,8 @@
 <#-- 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="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>