build(deps): bump org.apache.shiro:shiro-core in /novel-admin

Bumps [org.apache.shiro:shiro-core](https://github.com/apache/shiro) from 1.11.0 to 1.13.0.
- [Release notes](https://github.com/apache/shiro/releases)
- [Changelog](https://github.com/apache/shiro/blob/main/RELEASE-NOTES)
- [Commits](https://github.com/apache/shiro/compare/shiro-root-1.11.0...shiro-root-1.13.0)

---
updated-dependencies:
- dependency-name: org.apache.shiro:shiro-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

README.md

@@ -67,7 +67,7 @@ novel-plus -- 父工程
 
 ## 演示视频
 
-https://www.bilibili.com/video/BV1Zo4y187Mi
+https://www.bilibili.com/video/BV18e41197xs
 
 ## 增值服务
 

doc/sql/Dockerfile

@@ -0,0 +1,2 @@
+FROM mysql:8.0
+COPY novel_plus.sql /docker-entrypoint-initdb.d/init.sql

doc/sql/novel_plus.sql

@@ -1,20 +1,7 @@
-/*
-Navicat MySQL Data Transfer
+CREATE database if NOT EXISTS `novel_plus` default character set utf8mb4 collate utf8mb4_unicode_ci;
+use `novel_plus`;
 
-Source Server         : localhost
-Source Server Version : 50725
-Source Host           : localhost:3306
-Source Database       : novel_plus
-
-Target Server Type    : MYSQL
-Target Server Version : 50725
-File Encoding         : 65001
-
-Date: 2020-05-18 13:59:04
-*/
-
-SET
-FOREIGN_KEY_CHECKS=0;
+SET NAMES utf8mb4;
 
 -- ----------------------------
 -- Table structure for author

novel-admin/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel-admin</artifactId>
-    <version>4.2.0</version>
+    <version>4.3.0-RC1</version>
     <packaging>jar</packaging>
 
     <name>novel-admin</name>
@@ -103,7 +103,7 @@
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
-            <version>1.11.0</version>
+            <version>1.13.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
@@ -296,6 +296,9 @@
                                 <zip destfile='${project.build.directory}/build/${project.artifactId}.zip'>
                                     <zipfileset filemode="755" dir='${project.build.directory}/build/'/>
                                 </zip>
+
+                                <copy file="${basedir}/src/main/build/docker/Dockerfile"
+                                      tofile="${project.build.directory}/build/Dockerfile"/>
                             </tasks>
                         </configuration>
                     </execution>

novel-admin/src/main/build/docker/Dockerfile

@@ -1,9 +1,9 @@
 FROM openjdk:8
-ADD novel-admin-4.2.0.jar /root
+ADD novel-admin.jar /root
 ENV dburl=""
 ENV username=""
 ENV	password=""
 ENV redishost = ""
 ENV redisport = ""
 ENV redispwd = ""
-ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-admin-4.2.0.jar"]
+ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-admin.jar"]

novel-admin/src/main/java/com/java2nb/novel/controller/FriendLinkController.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -83,7 +84,7 @@ public class FriendLinkController {
     @ResponseBody
     @PostMapping("/save")
     @RequiresPermissions("novel:friendLink:add")
-    public R save(FriendLinkDO friendLink) {
+    public R save(@Validated FriendLinkDO friendLink) {
         if (friendLinkService.save(friendLink) > 0) {
             redisTemplate.delete(CacheKey.INDEX_LINK_KEY);
             return R.ok();
@@ -98,7 +99,7 @@ public class FriendLinkController {
     @ResponseBody
     @RequestMapping("/update")
     @RequiresPermissions("novel:friendLink:edit")
-    public R update(FriendLinkDO friendLink) {
+    public R update(@Validated FriendLinkDO friendLink) {
         friendLinkService.update(friendLink);
         redisTemplate.delete(CacheKey.INDEX_LINK_KEY);
         return R.ok();

novel-admin/src/main/java/com/java2nb/novel/domain/FriendLinkDO.java

@@ -1,163 +1,175 @@
 package com.java2nb.novel.domain;
 
-import java.io.Serializable;
-
-
-import java.math.BigDecimal;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.java2nb.common.jsonserializer.LongToStringSerializer;
-
-
+import org.hibernate.validator.constraints.URL;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
- * 
- * 
  * @author xiongxy
  * @email 1179705413@qq.com
  * @date 2023-04-14 15:12:25
  */
 public class FriendLinkDO implements Serializable {
-	private static final long serialVersionUID = 1L;
 
-	
-	//主键
-			private Integer id;
-	//链接名
-			private String linkName;
-	//链接url
-			private String linkUrl;
-	//排序号
-			private Integer sort;
-	//是否开启，0：不开启，1：开启
-			private Integer isOpen;
-	//创建人id
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long createUserId;
-	//创建时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date createTime;
-	//更新者用户id
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long updateUserId;
-	//更新时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date updateTime;
+    private static final long serialVersionUID = 1L;
 
-	/**
-	 * 设置：主键
-	 */
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：主键
-	 */
-	public Integer getId() {
-		return id;
-	}
-	/**
-	 * 设置：链接名
-	 */
-	public void setLinkName(String linkName) {
-		this.linkName = linkName;
-	}
-	/**
-	 * 获取：链接名
-	 */
-	public String getLinkName() {
-		return linkName;
-	}
-	/**
-	 * 设置：链接url
-	 */
-	public void setLinkUrl(String linkUrl) {
-		this.linkUrl = linkUrl;
-	}
-	/**
-	 * 获取：链接url
-	 */
-	public String getLinkUrl() {
-		return linkUrl;
-	}
-	/**
-	 * 设置：排序号
-	 */
-	public void setSort(Integer sort) {
-		this.sort = sort;
-	}
-	/**
-	 * 获取：排序号
-	 */
-	public Integer getSort() {
-		return sort;
-	}
-	/**
-	 * 设置：是否开启，0：不开启，1：开启
-	 */
-	public void setIsOpen(Integer isOpen) {
-		this.isOpen = isOpen;
-	}
-	/**
-	 * 获取：是否开启，0：不开启，1：开启
-	 */
-	public Integer getIsOpen() {
-		return isOpen;
-	}
-	/**
-	 * 设置：创建人id
-	 */
-	public void setCreateUserId(Long createUserId) {
-		this.createUserId = createUserId;
-	}
-	/**
-	 * 获取：创建人id
-	 */
-	public Long getCreateUserId() {
-		return createUserId;
-	}
-	/**
-	 * 设置：创建时间
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	/**
-	 * 获取：创建时间
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-	/**
-	 * 设置：更新者用户id
-	 */
-	public void setUpdateUserId(Long updateUserId) {
-		this.updateUserId = updateUserId;
-	}
-	/**
-	 * 获取：更新者用户id
-	 */
-	public Long getUpdateUserId() {
-		return updateUserId;
-	}
-	/**
-	 * 设置：更新时间
-	 */
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	/**
-	 * 获取：更新时间
-	 */
-	public Date getUpdateTime() {
-		return updateTime;
-	}
+
+    //主键
+    private Integer id;
+    //链接名
+    private String linkName;
+    //链接url
+    @URL
+    private String linkUrl;
+    //排序号
+    private Integer sort;
+    //是否开启，0：不开启，1：开启
+    private Integer isOpen;
+    //创建人id
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long createUserId;
+    //创建时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    //更新者用户id
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long updateUserId;
+    //更新时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 设置：主键
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取：主键
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 设置：链接名
+     */
+    public void setLinkName(String linkName) {
+        this.linkName = linkName;
+    }
+
+    /**
+     * 获取：链接名
+     */
+    public String getLinkName() {
+        return linkName;
+    }
+
+    /**
+     * 设置：链接url
+     */
+    public void setLinkUrl(String linkUrl) {
+        this.linkUrl = linkUrl;
+    }
+
+    /**
+     * 获取：链接url
+     */
+    public String getLinkUrl() {
+        return linkUrl;
+    }
+
+    /**
+     * 设置：排序号
+     */
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    /**
+     * 获取：排序号
+     */
+    public Integer getSort() {
+        return sort;
+    }
+
+    /**
+     * 设置：是否开启，0：不开启，1：开启
+     */
+    public void setIsOpen(Integer isOpen) {
+        this.isOpen = isOpen;
+    }
+
+    /**
+     * 获取：是否开启，0：不开启，1：开启
+     */
+    public Integer getIsOpen() {
+        return isOpen;
+    }
+
+    /**
+     * 设置：创建人id
+     */
+    public void setCreateUserId(Long createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    /**
+     * 获取：创建人id
+     */
+    public Long getCreateUserId() {
+        return createUserId;
+    }
+
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置：更新者用户id
+     */
+    public void setUpdateUserId(Long updateUserId) {
+        this.updateUserId = updateUserId;
+    }
+
+    /**
+     * 获取：更新者用户id
+     */
+    public Long getUpdateUserId() {
+        return updateUserId;
+    }
+
+    /**
+     * 设置：更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取：更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
 }

novel-admin/src/main/resources/templates/novel/friendLink/add.html

@@ -23,7 +23,7 @@
                             <div class="col-sm-8">
                                 <input id="linkUrl" name="linkUrl"
                                        class="form-control"
-                                       type="text" required>
+                                       type="url" required>
 
                             </div>
                         </div>

novel-admin/src/main/resources/templates/novel/friendLink/edit.html

@@ -26,7 +26,7 @@
                                 <input id="linkUrl" name="linkUrl"
                                        th:value="${friendLink.linkUrl}"
                                        class="form-control"
-                                       type="text" required>
+                                       type="url" required>
                             </div>
                         </div>
                         <div class="form-group">

novel-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>4.2.0</version>
+        <version>4.3.0-RC1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

novel-common/src/main/java/com/java2nb/novel/entity/User.java

@@ -14,43 +14,48 @@ public class User {
     private Long id;
 
 
-    @NotBlank(groups = {AddGroup.class},message="手机号不能为空！")
-    @Pattern(groups = {AddGroup.class},regexp="^1[3|4|5|6|7|8|9][0-9]{9}$",message="手机号格式不正确！")
+    @NotBlank(groups = {AddGroup.class}, message = "手机号不能为空！")
+    @Pattern(groups = {AddGroup.class}, regexp = "^1[3|4|5|6|7|8|9][0-9]{9}$", message = "手机号格式不正确！")
+    @Null(groups = {UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String username;
 
-    @NotBlank(groups = {AddGroup.class},message="密码不能为空！")
+    @NotBlank(groups = {AddGroup.class}, message = "密码不能为空！")
     @Null(groups = {UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String password;
 
     @Null(groups = {AddGroup.class})
+    @Pattern(groups = {
+        UpdateGroup.class}, regexp = "[\u4E00-\u9FA5A-Za-z0-9_]{1,11}", message = "昵称格式不正确！")
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String nickName;
 
     @Null(groups = {AddGroup.class})
+    @Pattern(groups = {
+        UpdateGroup.class}, regexp = "^/localPic/\\d{4}/\\d{2}/\\d{2}/[A-Za-z0-9]+\\.(jpg|jpeg|swf|gif|png|JPG|JPEG|SWF|GIF|PNG)$", message = "只能上传图片格式的文件！")
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String userPhoto;
 
     @Null(groups = {AddGroup.class})
-    @Min(value = 0,groups = {UpdateGroup.class})
-    @Max(value = 1,groups = {UpdateGroup.class})
+    @Min(value = 0, groups = {UpdateGroup.class})
+    @Max(value = 1, groups = {UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Byte userSex;
 
-    @Null(groups = {AddGroup.class,UpdateGroup.class})
+    @Null(groups = {AddGroup.class, UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Long accountBalance;
 
-    @Null(groups = {AddGroup.class,UpdateGroup.class})
+    @Null(groups = {AddGroup.class, UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Byte status;
 
-    @Null(groups = {AddGroup.class,UpdateGroup.class})
+    @Null(groups = {AddGroup.class, UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Date createTime;
 
-    @Null(groups = {AddGroup.class,UpdateGroup.class})
+    @Null(groups = {AddGroup.class, UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Date updateTime;
 

novel-crawl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>4.2.0</version>
+        <version>4.3.0-RC1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -72,6 +72,9 @@
                                 <zip destfile='${project.build.directory}/build/${project.artifactId}.zip'>
                                     <zipfileset filemode="755" dir='${project.build.directory}/build/'/>
                                 </zip>
+
+                                <copy file="${basedir}/src/main/build/docker/Dockerfile"
+                                      tofile="${project.build.directory}/build/Dockerfile"/>
                             </tasks>
                         </configuration>
                     </execution>

novel-crawl/src/main/build/docker/Dockerfile

@@ -1,9 +1,9 @@
 FROM openjdk:8
-ADD novel-crawl-4.2.0.jar /root
+ADD novel-crawl.jar /root
 ENV dburl=""
 ENV username=""
 ENV	password=""
 ENV redishost = ""
 ENV redisport = ""
 ENV redispwd = ""
-ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-crawl-4.2.0.jar"]
+ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-crawl.jar"]

novel-crawl/src/main/resources/static/css/base.css

@@ -331,7 +331,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
 }
 
 .logo {
-    width: 198px;
+    width: 160px;
     float: left;
     padding: 23px 130px 0 0;
     display: block

novel-front/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>4.2.0</version>
+        <version>4.3.0-RC1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -98,6 +98,9 @@
                                 <zip destfile='${project.build.directory}/build/${project.artifactId}.zip'>
                                     <zipfileset filemode="755" dir='${project.build.directory}/build/'/>
                                 </zip>
+
+                                <copy file="${basedir}/src/main/build/docker/Dockerfile"
+                                      tofile="${project.build.directory}/build/Dockerfile"/>
                             </tasks>
                         </configuration>
                     </execution>

novel-front/src/main/build/docker/Dockerfile

@@ -1,9 +1,9 @@
 FROM openjdk:8
-ADD novel-front-4.2.0.jar /root
+ADD novel-front.jar /root
 ENV dburl=""
 ENV username=""
 ENV	password=""
 ENV redishost = ""
 ENV redisport = ""
 ENV redispwd = ""
-ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-front-4.2.0.jar"]
+ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-front.jar"]

novel-front/src/main/resources/static/css/base.css

@@ -331,7 +331,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
 }
 
 .logo {
-    width: 198px;
+    width: 160px;
     float: left;
     padding: 23px 130px 0 0;
     display: block

novel-front/src/main/resources/static/mobile/js/common.js

@@ -109,7 +109,7 @@ if (!token) {
         location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
     }
 
-    $(".user_link").html("<a href=\"/user/login.html\">登录</a>｜<a href=\"/user/register.html\">注册</a>");
+    // $(".user_link").html("<a href=\"/user/login.html\">登录</a>｜<a href=\"/user/register.html\">注册</a>");
 } else {
     $.ajax({
         type: "POST",
@@ -118,10 +118,10 @@ if (!token) {
         dataType: "json",
         success: function (data) {
             if (data.code == 200) {
-                $(".user_link").html("<a href=\"/user/userinfo.html\"><i style=\"font-size: 20px;\" class=\"layui-icon \n" +
-                    "\">&#xe66f;" +
-                    "\n" +
-                    "</i></a>");
+                // $(".user_link").html("<a href=\"/user/userinfo.html\"><i style=\"font-size: 20px;\" class=\"layui-icon \n" +
+                //     "\">&#xe66f;" +
+                //     "\n" +
+                //     "</i></a>");
                 if ("/user/login.html" == window.location.pathname) {
                     var orginUrl = getSearchString("originUrl");
                     window.location.href = orginUrl == undefined || orginUrl.isBlank() ? "/" : orginUrl;
@@ -137,7 +137,7 @@ if (!token) {
                 if (needLoginPath.indexOf(window.location.pathname) != -1) {
                     location.href = '/user/login.html';
                 }
-                $(".user_link").html("<a href=\"/user/login.html\">登录</a>｜<a href=\"/user/register.html\">注册</a>");
+                // $(".user_link").html("<a href=\"/user/login.html\">登录</a>｜<a href=\"/user/register.html\">注册</a>");
             }
         },
         error: function () {

novel-front/src/main/resources/templates/mobile/book/book_content.html

@@ -241,7 +241,7 @@
     </div>
     <div id="chaptercontent" class="Readarea ReadAjax_content screen_container"
          style="color: rgb(0, 0, 0); font-size: 20px;" th:if="${!needBuy}">
-        <p style="width:100%;text-alight:center; overflow: auto;-webkit-overflow-scrolling:touch;">&nbsp;&nbsp;&nbsp;&nbsp;
+        <p style="width:100%;text-alight:center; overflow: auto;-webkit-overflow-scrolling:touch;">
             <span
                     th:utext="${bookContent.content}"></span></p>
     </div>

novel-front/src/main/resources/templates/mobile/common/js.html

@@ -1,3 +1,3 @@
 <script th:fragment="js" src="/mobile/js/jquery-1.9.1.js"></script>
 <script th:fragment="js" src="/mobile/layui/layui.all.js"></script>
-<script th:fragment="js" src="/mobile/js/common.js"></script>
+<script th:fragment="js" src="/mobile/js/common.js?v2"></script>

novel-front/src/main/resources/templates/mobile/index.html

@@ -41,18 +41,16 @@
         }
 
         .user_link {
-            position: relative;
-            display: inline-block;
             vertical-align: middle;
-            line-height: 50px;
-            padding: 0 5px;
-            color: #fff;
+            line-height: 40px;
             float: right;
+            color: #3eaf7c;
+            padding: 11px 12px 0;
         }
 
         .user_link a {
 
-            color: #fff;
+            color: #3eaf7c;
         }
 
     </style>
@@ -64,92 +62,39 @@
 
 <!-- 你的HTML代码 -->
 <a name="top"></a>
-<ul class="layui-nav app" lay-filter="" style="display:none;padding:0 10px;text-align: center">
-    <li class="layui-nav-item"><a>分类</a>
-        <dl class="layui-nav-child">
-            <dd><a href="/book/book_ranking.html?catId=1&sort=last_index_update_time">玄幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=2&sort=last_index_update_time">修真小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=3&sort=last_index_update_time">都市小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=4&sort=last_index_update_time">历史小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=6&sort=last_index_update_time">网游小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=5&sort=last_index_update_time">科幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=7&sort=last_index_update_time">女频小说</a></dd>
-        </dl>
-    </li>
-    <li class="layui-nav-item"><a>全本</a>
-        <dl class="layui-nav-child">
-            <dd><a href="/book/book_ranking.html?bookStatus=1">全部小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=1">玄幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=2">修真小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=3">都市小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=4">历史小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=6">网游小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=5">科幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=7">女频小说</a></dd>
-        </dl>
-    </li>
-    <li class="layui-nav-item"><a>排行</a>
-        <dl class="layui-nav-child">
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count">全部小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=1">玄幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=2">修真小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=3">都市小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=4">历史小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=6">网游小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=5">科幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=7">女频小说</a></dd>
-        </dl>
-    </li>
-    <li class="user_link"></li>
+<div style="height: 40px;">
+    <div style="line-height: 50px;width: 120px;float:left;padding-left: 10px"><img style="width: 150px;"
+                                                                                   th:src="${application.website.logo}">
+    </div>
+    <div class="user_link">
+        <a style="padding-right: 3px" href="/user/favorites.html">
+            <svg t="1693622464904" class="icon" viewBox="0 0 1097 1024" version="1.1"
+                 xmlns="http://www.w3.org/2000/svg" p-id="3653" width="23px" height="23px">
+                <path d="M998.58390632 852.14701166H126.84569332A41.51236 41.51236 0 0 0 85.33333332 893.65937166v62.26854a41.51236 41.51236 0 0 0 41.51236 41.51236h871.738213a41.51236 41.51236 0 0 0 41.51236-41.51236v-62.26854a41.51236 41.51236 0 0 0-41.51236-41.51236z m-29.293426 83.014048h-813.172704a8.537246 8.537246 0 0 1-8.537246-8.537246v-3.681687a8.537246 8.537246 0 0 1 8.537246-8.537247h813.172704a8.537246 8.537246 0 0 1 8.537246 8.537247v3.681687a8.537246 8.537246 0 0 1-8.537246 8.537246zM126.84569332 810.63465166h124.537079a41.51236 41.51236 0 0 0 41.51236-41.51236V229.47228566a41.51236 41.51236 0 0 0-41.51236-41.51236H126.84569332A41.51236 41.51236 0 0 0 85.33333332 229.47228566v539.650006a41.51236 41.51236 0 0 0 41.51236 41.51236zM156.72605532 246.49342066h64.883071a12.805869 12.805869 0 0 1 12.805869 12.805869v479.995998a12.805869 12.805869 0 0 1-12.805869 12.80587H156.72605532a12.805869 12.805869 0 0 1-12.80587-12.80587V259.29928966a12.805869 12.805869 0 0 1 12.80587-12.805869z m239.939305 564.141231h124.53708a41.51236 41.51236 0 0 0 41.51236-41.51236V278.62548066l291.653674 510.335237 0.266789 0.480221a41.619075 41.619075 0 0 0 56.826045 15.527116l107.932136-62.962191A42.600859 42.600859 0 0 0 1034.18422332 684.02729066L727.73976932 147.49337866l-0.266789-0.48022a41.619075 41.619075 0 0 0-56.826045-15.527116l-107.932135 62.962191V84.17902666A41.51236 41.51236 0 0 0 521.20244032 42.66666666h-124.53708a41.51236 41.51236 0 0 0-41.51236 41.51236v684.943265a41.51236 41.51236 0 0 0 41.51236 41.51236z m296.295802-597.938055a3.735045 3.735045 0 0 1 5.122348 1.376631l259.841761 454.608363a12.805869 12.805869 0 0 1-4.663471 17.415982l-56.271124 32.825712a12.805869 12.805869 0 0 1-17.544041-4.663471L624.11894332 267.59109066a12.805869 12.805869 0 0 1 4.663471-17.415983zM426.49236432 101.20016166h64.883072a12.805869 12.805869 0 0 1 12.805869 12.805869v625.289257a12.805869 12.805869 0 0 1-12.805869 12.80587h-64.883072a12.805869 12.805869 0 0 1-12.805869-12.80587V114.00603066a12.805869 12.805869 0 0 1 12.805869-12.805869z m0 0"
+                      p-id="3654" fill="#3eaf7c"></path>
+            </svg>
+        </a>
+        <a href="/user/userinfo.html">
+            <svg t="1698639187751" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
+                 p-id="4190" width="23" height="23">
+                <path d="M704 329.152C704 209.365333 622.848 128 512 128s-192 81.365333-192 201.152C320 454.762667 407.146667 554.666667 512 554.666667s192-99.904 192-225.514667z m42.666667 0C746.666667 476.714667 642.176 597.333333 512 597.333333s-234.666667-120.618667-234.666667-268.181333C277.333333 181.546667 381.824 85.333333 512 85.333333s234.666667 96.213333 234.666667 243.818667zM512.106667 640c408.96 0 404.864 256.512 404.864 256.512 3.093333 23.274667-13.482667 42.154667-37.098667 42.154667H144.32c-23.573333 0-41.088-19.136-37.077333-42.154667 0 0-4.096-256.512 404.864-256.512zM149.909333 896l0.064 3.861333-0.704 3.968c0.682667-3.882667-2.837333-7.829333-4.949333-7.829333H879.872c-2.154667 0-5.504 3.818667-5.205333 6.144l-0.426667-3.157333 0.064-3.157334c0-0.853333-0.128-3.349333-0.533333-7.125333a161.813333 161.813333 0 0 0-4.266667-23.082667 192.96 192.96 0 0 0-35.242667-71.104C780.330667 725.461333 678.634667 682.666667 512.106667 682.666667c-166.549333 0-268.224 42.794667-322.176 111.850666a192.96 192.96 0 0 0-35.242667 71.104c-2.176 8.426667-3.541333 16.192-4.266667 23.082667a81.045333 81.045333 0 0 0-0.512 7.296z"
+                      fill="#3eaf7c" p-id="4191"></path>
+            </svg>
+        </a>
 
-</ul>
-<ul class="layui-nav pc" lay-filter="" style="padding:0 36px;text-align: center">
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=1&sort=last_index_update_time">玄幻小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=2&sort=last_index_update_time">修真小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=3&sort=last_index_update_time">都市小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=4&sort=last_index_update_time">历史小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=6&sort=last_index_update_time">网游小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=5&sort=last_index_update_time">科幻小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=7&sort=last_index_update_time">女频小说</a></li>
-    <li class="layui-nav-item"><a>完本小说</a>
-        <dl class="layui-nav-child"> <!-- 二级菜单 -->
-            <dd><a href="/book/book_ranking.html?bookStatus=1">全部小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=1">玄幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=2">修真小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=3">都市小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=4">历史小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=6">网游小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=5">科幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?bookStatus=1&catId=7">女频小说</a></dd>
-        </dl>
-    </li>
-    <li class="layui-nav-item"><a>小说排行</a>
-        <dl class="layui-nav-child"> <!-- 二级菜单 -->
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count">全部小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=1">玄幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=2">修真小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=3">都市小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=4">历史小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=6">网游小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=5">科幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=7">女频小说</a></dd>
-        </dl>
-    </li>
-    <li class="user_link"></li>
+    </div>
+</div>
 
 
-</ul>
-
-
-<div class="layui-container">
+<div class="layui-container" style="padding-left: 2%">
     <div class="layui-row">
 
-        <div class="layui-col-xs10 layui-col-sm10 layui-col-md11 layui-col-lg11" style="padding-top:1%">
+        <div class="layui-col-xs10 layui-col-sm10 layui-col-md11 layui-col-lg11">
             <input id="title" type="text" name="title" required lay-verify="required" placeholder="请输入书名·作者"
                    autocomplete="off"
                    class="layui-input">
         </div>
-        <div class="layui-col-xs1" style="padding: 1%">
+        <div class="layui-col-xs1" style="padding: 0 1% 1%">
             <button onclick="searchBooks()" class="layui-btn" lay-submit lay-filter="formDemo">搜索</button>
         </div>
     </div>

novel-front/src/main/resources/templates/mobile/pay/index.html

@@ -5,7 +5,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title th:text="${application.website.name}+'列表'"></title>
+    <title th:text="${application.website.name}+'充值'"></title>
 
     <meta name="keywords"
           th:content="${application.website.name}+',精品小说,弹幕网站,弹幕,弹幕小说网站,免费小说,小说阅读,小说排行,轻小说,txt小说下载,电子书下载,动漫轻小说,日本轻小说'">

novel-front/src/main/resources/templates/mobile/user/login.html

@@ -25,19 +25,20 @@
     </a>
     </div>
 </div>
-<form lay-filter="loginForm" id="form1" style="height: 500px;padding-top:30px;padding-right: 20px" class="layui-form" action="">
+<form lay-filter="loginForm" id="form1" style="height: 500px;padding-top:30px;padding-right: 20px" class="layui-form"
+      action="">
     <input type="hidden" id="bookIdHidden" name="bookId" th:value="${bookId}"/>
     <div class="layui-form-item">
         <label class="layui-form-label">手机号码</label>
         <div class="layui-input-inline">
-            <input name="txtUName" type="text" id="txtUName"  placeholder="请输入手机号"
+            <input name="txtUName" type="text" id="txtUName" placeholder="请输入手机号"
                    autocomplete="off" class="layui-input">
         </div>
     </div>
     <div class="layui-form-item">
         <label class="layui-form-label">密码</label>
         <div class="layui-input-inline">
-            <input name="txtPassword" type="password" id="txtPassword"  placeholder="请输入密码"
+            <input name="txtPassword" type="password" id="txtPassword" placeholder="请输入密码"
                    autocomplete="off" class="layui-input">
         </div>
 
@@ -49,8 +50,8 @@
     </div>
     <div class="layui-form-item">
         <div class="layui-input-block">
-            <input type="button" value="登录" id="btnLogin" class="layui-btn" />
-            <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+            <input type="button" value="登录" id="btnLogin" class="layui-btn"/>
+            <a class="layui-btn layui-btn-primary" href="/user/register.html">注册</a>
         </div>
     </div>
 </form>
@@ -62,25 +63,25 @@
 <div th:replace="mobile/common/js :: js">
 </div>
 <script type="text/javascript">
-    $("#form1").css("min-height",($(window).height() - 140)+"px")
-    if(localStorage.getItem("autoLogin")==1){
-        $("#autoLogin").prop("checked",'true');
-        layui.form.render('checkbox','loginForm');
-    }else{
+    $("#form1").css("min-height", ($(window).height() - 140) + "px")
+    if (localStorage.getItem("autoLogin") == 1) {
+        $("#autoLogin").prop("checked", 'true');
+        layui.form.render('checkbox', 'loginForm');
+    } else {
         $("#autoLogin").removeAttr("checked");
     }
     $("#btnLogin").click(function () {
         var username = $("#txtUName").val();
-        if(username.isBlank()){
+        if (username.isBlank()) {
             layer.alert("手机号不能为空！");
             return;
         }
-        if(!username.isPhone()){
+        if (!username.isPhone()) {
             layer.alert("手机号格式不正确！");
             return;
         }
         var password = $("#txtPassword").val();
-        if(password.isBlank()){
+        if (password.isBlank()) {
             layer.alert("密码不能为空！");
             return;
         }
@@ -91,12 +92,12 @@
             dataType: "json",
             success: function (data) {
                 if (data.code == 200) {
-                    if($("#autoLogin").is(':checked')){
-                        $.cookie('Authorization', data.data.token, { expires: 7 ,path: '/'  });
-                        localStorage.setItem("autoLogin","1");
-                    }else {
-                        $.cookie('Authorization', data.data.token,{ path: '/'  });
-                        localStorage.setItem("autoLogin","0");
+                    if ($("#autoLogin").is(':checked')) {
+                        $.cookie('Authorization', data.data.token, {expires: 7, path: '/'});
+                        localStorage.setItem("autoLogin", "1");
+                    } else {
+                        $.cookie('Authorization', data.data.token, {path: '/'});
+                        localStorage.setItem("autoLogin", "0");
                     }
                     var orginUrl = getSearchString("originUrl");
                     window.location.href = orginUrl == undefined || orginUrl.isBlank() ? "/" : orginUrl;
@@ -114,5 +115,4 @@
 </script>
 
 
-
 </html>

novel-front/src/main/resources/templates/mobile/user/register.html

@@ -25,20 +25,21 @@
     </a>
     </div>
 </div>
-<form lay-filter="loginForm" id="form1" style="height: 500px;padding-top:30px;padding-right: 20px" class="layui-form" action="">
+<form lay-filter="loginForm" id="form1" style="height: 500px;padding-top:30px;padding-right: 20px" class="layui-form"
+      action="">
     <input type="hidden" id="bookIdHidden" name="bookId" th:value="${bookId}"/>
 
     <div class="layui-form-item">
         <label class="layui-form-label">手机号码</label>
         <div class="layui-input-inline">
-            <input name="txtUName" type="text" id="txtUName"  placeholder="请输入手机号"
+            <input name="txtUName" type="text" id="txtUName" placeholder="请输入手机号"
                    autocomplete="off" class="layui-input">
         </div>
     </div>
     <div class="layui-form-item">
         <label class="layui-form-label">密码</label>
         <div class="layui-input-inline">
-            <input name="txtPassword" type="password" id="txtPassword"  placeholder="请输入密码"
+            <input name="txtPassword" type="password" id="txtPassword" placeholder="请输入密码"
                    autocomplete="off" class="layui-input">
         </div>
 
@@ -46,7 +47,7 @@
     <div class="layui-form-item ">
         <label class="layui-form-label">验证码</label>
         <div class="layui-input-inline">
-            <input name="txtUName" type="text" id="TxtChkCode"  placeholder="请输入验证码"
+            <input name="txtUName" type="text" id="TxtChkCode" placeholder="请输入验证码"
                    autocomplete="off" class="layui-input">
         </div>
         <div class="layui-input-inline"><img
@@ -55,8 +56,8 @@
     </div>
     <div class="layui-form-item">
         <div class="layui-input-block">
-            <input type="button" value="注册" id="btnRegister" class="layui-btn" />
-            <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+            <input type="button" value="注册" id="btnRegister" class="layui-btn"/>
+            <a class="layui-btn layui-btn-primary" href="/user/login.html">登录</a>
         </div>
     </div>
 </form>
@@ -68,9 +69,9 @@
 <div th:replace="mobile/common/js :: js">
 </div>
 <script type="text/javascript">
-    $("#form1").css("min-height",($(window).height() - 140)+"px")
+    $("#form1").css("min-height", ($(window).height() - 140) + "px")
     $("#chkd").click();
-   
+
     $("#btnRegister").click(function () {
         var username = $("#txtUName").val();
         if (username.isBlank()) {
@@ -94,12 +95,12 @@
         $.ajax({
             type: "POST",
             url: "/user/register",
-            data: {"username": username, "password": password,"velCode":velCode},
+            data: {"username": username, "password": password, "velCode": velCode},
             dataType: "json",
             success: function (data) {
                 if (data.code == 200) {
                     $.cookie('Authorization', data.data.token, {path: '/'});
-                    window.location.href="/";
+                    window.location.href = "/";
                 } else {
                     layer.alert(data.msg);
                 }
@@ -111,6 +112,7 @@
         })
 
     })
+
     //获取验证码
     function getVerify(obj) {
         obj.src = "/file/getVerify?" + Math.random();
@@ -118,5 +120,4 @@
 </script>
 
 
-
 </html>

novel-front/src/main/resources/templates/user/set_name.html

@@ -27,7 +27,7 @@
                 <div class="my_info_txt">
                     <ul class="mytab_list">
                         <li><i class="tit">我的昵称</i><input name="txtNiceName" type="text" value="15171695474"
-                                                          maxlength="20" id="txtNiceName" class="s_input"
+                                                          maxlength="11" id="txtNiceName" class="s_input"
                                                           placeholder=""/></li>
                         <li><i class="tit">&nbsp;</i>用户名只能包括汉字、英文字母、数字和下划线</li>
                         <li><i class="tit">&nbsp;</i><input type="button" onclick="updateName()" name="btn" value="修改"

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel</artifactId>
-    <version>4.2.0</version>
+    <version>4.3.0-RC1</version>
     <modules>
         <module>novel-common</module>
         <module>novel-front</module>

templates/green/static/css/base.css

@@ -331,7 +331,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
 }
 
 .logo {
-    width: 198px;
+    width: 160px;
     float: left;
     padding: 23px 130px 0 0;
     display: block