From 87a060280a438f6c2f7eb15195269c327e1703e2 Mon Sep 17 00:00:00 2001
From: xiongxiaoyang <xiongxiaoyang@xiongxiaoyangdeMacBook-Air.local>
Date: Fri, 22 May 2020 11:49:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E5=B0=8F=E8=AF=B4/?=
 =?UTF-8?q?=E7=AB=A0=E8=8A=82=E5=8F=91=E5=B8=83=E8=A1=A8=E5=8D=95=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98=EF=BC=8C2.?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B0=8F=E8=AF=B4=E7=AB=A0=E8=8A=82=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E5=AD=97=E6=95=B0=E8=AE=A1=E7=AE=97=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C3.=E8=A7=A3=E5=86=B3=E4=B8=AA=E4=BA=BA=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E5=B0=8F=E8=AF=B4=E5=AD=97=E4=BD=93=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../novel/controller/AuthorController.java    |  8 ++-
 .../resources/templates/author/book_add.html  | 14 +++++-
 .../templates/author/content_add.html         | 49 +++++--------------
 3 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java b/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
index 97028e8..dac110b 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
@@ -55,7 +55,7 @@ public class AuthorController extends BaseController{
      * 发布小说
      * */
     @PostMapping("addBook")
-    public ResultBean addBook(Book book,HttpServletRequest request){
+    public ResultBean addBook(@RequestParam("bookDesc") String bookDesc,Book book,HttpServletRequest request){
 
         //查询作家信息
         Author author = authorService.queryAuthor(getUserDetails(request).getId());
@@ -67,6 +67,10 @@ public class AuthorController extends BaseController{
 
         }
 
+        //bookDesc不能使用book对象来接收，否则会自动去掉前面的空格
+        book.setBookDesc(bookDesc
+                .replaceAll("\\n","<br>")
+                .replaceAll("\\s","&nbsp;"));
         //发布小说
         bookService.addBook(book,author.getId(),author.getPenName());
 
@@ -109,6 +113,8 @@ public class AuthorController extends BaseController{
             return ResultBean.fail(ResponseStatus.AUTHOR_STATUS_FORBIDDEN);
         }
 
+        content = content.replaceAll("\\n","<br>")
+                .replaceAll("\\s","&nbsp;");
         //发布章节内容
         bookService.addBookContent(bookId,indexName,content,author.getId());
 
diff --git a/novel-front/src/main/resources/templates/author/book_add.html b/novel-front/src/main/resources/templates/author/book_add.html
index 0ae13e8..18366dd 100644
--- a/novel-front/src/main/resources/templates/author/book_add.html
+++ b/novel-front/src/main/resources/templates/author/book_add.html
@@ -130,33 +130,43 @@
 <script src="/javascript/header.js" type="text/javascript"></script>
 <script src="/javascript/user.js" type="text/javascript"></script>
 <script language="javascript" type="text/javascript">
+
+    var lock = false;
     function addBook() {
+        if(lock){
+            return;
+        }
+        lock = true;
+
 
 
         var bookName = $("#bookName").val();
         if(!bookName){
             $("#LabErr").html("小说名不能为空！");
+            lock = false;
             return;
         }
         if(bookName.length > 20){
             $("#LabErr").html("小说名太长！");
+            lock = false;
             return;
         }
 
         var picUrl = $("#picUrl").val();
         if(!picUrl){
             $("#LabErr").html("封面图片不能为空！");
+            lock = false;
             return;
         }
 
         var bookDesc = $("#bookDesc").val();
         if(!bookDesc){
             $("#LabErr").html("简介不能为空！");
+            lock = false;
             return;
         }
 
 
-
         $.ajax({
             type: "POST",
             url: "/author/addBook",
@@ -171,11 +181,13 @@
 
 
                 } else {
+                    lock = false;
                     $("#LabErr").html(data.msg);
                 }
 
             },
             error: function () {
+                lock = false;
                 layer.alert('网络异常');
             }
         })
diff --git a/novel-front/src/main/resources/templates/author/content_add.html b/novel-front/src/main/resources/templates/author/content_add.html
index ce6265d..6f34a71 100644
--- a/novel-front/src/main/resources/templates/author/content_add.html
+++ b/novel-front/src/main/resources/templates/author/content_add.html
@@ -58,10 +58,8 @@
                                 <b>章节名：</b>
                                 <li><input type="text" id="bookIndex" name="bookIndex" class="s_input" ></li>
                                 <b>章节内容：</b>
-                                <input type="hidden" id="bookContent" name="bookContent"  >
-                                <div style="width:600px" id="contentEditor">
-
-                                </div>
+                                <textarea name="bookContent" rows="30" cols="80" id="bookContent"
+                                          class="textarea"></textarea>
                                 <li style="margin-top: 10px"><input type="button" onclick="addBookContent()" name="btnRegister" value="提交"
                                            id="btnRegister" class="btn_red">
 
@@ -114,43 +112,18 @@
 <script src="/javascript/header.js" type="text/javascript"></script>
 <script src="/javascript/user.js" type="text/javascript"></script>
 <script src="/javascript/common.js" type="text/javascript"></script>
-<script type="text/javascript" src="/wangEditor/release/wangEditor.js"></script>
 
 <script language="javascript" type="text/javascript">
 
-    var E = window.wangEditor;
-    var editor2 = new E('#contentEditor');
-    // 自定义菜单配置
-    editor2.customConfig.menus = [
-        'head',  // 标题
-        'bold',  // 粗体
-        'fontSize',  // 字号
-        'fontName',  // 字体
-        'italic',  // 斜体
-        'underline',  // 下划线
-        'strikeThrough',  // 删除线
-        'foreColor',  // 文字颜色
-        //'backColor',  // 背景颜色
-        //'link',  // 插入链接
-        'list',  // 列表
-        'justify',  // 对齐方式
-        'quote',  // 引用
-        'emoticon',  // 表情
-        'image',  // 插入图片
-        //'table',  // 表格
-        //'video',  // 插入视频
-        //'code',  // 插入代码
-        'undo',  // 撤销
-        'redo'  // 重复
-    ];
-    editor2.customConfig.onchange = function (html) {
-        // html 即变化之后的内容
-        $("#bookContent").val(html);
-    }
-    editor2.create();
 
+    var lock = false;
     function addBookContent() {
 
+        if(lock){
+            return;
+        }
+        lock = true;
+
 
         var bookId = getSearchString("bookId");
 
@@ -158,12 +131,14 @@
         var indexName = $("#bookIndex").val();
         if(!indexName){
             $("#LabErr").html("章节名不能为空！");
+            lock = false;
             return;
         }
 
         var content = $("#bookContent").val();
-        if(!content && content.length<=13){
+        if(!content){
             $("#LabErr").html("章节内容不能为空！");
+            lock = false;
             return;
         }
 
@@ -182,11 +157,13 @@
 
 
                 } else {
+                    lock = false;
                     $("#LabErr").html(data.msg);
                 }
 
             },
             error: function () {
+                lock = false;
                 layer.alert('网络异常');
             }
         })