update

README.md

@@ -2,9 +2,14 @@
 
 # 小说精品屋-plus
 
+[![Github stars](https://img.shields.io/github/stars/201206030/novel-plus?logo=github)](https://github.com/201206030/novel-plus)
+[![Github forks](https://img.shields.io/github/forks/201206030/novel-plus?logo=github)](https://github.com/201206030/novel-plus)
+[![Gitee star](https://gitee.com/novel_dev_team/novel-plus/badge/star.svg?theme=gitee)](https://gitee.com/novel_dev_team/novel-plus)
+[![Gitee fork](https://gitee.com/novel_dev_team/novel-plus/badge/fork.svg?theme=gitee)](https://gitee.com/novel_dev_team/novel-plus)
+
 #### 官网
 
-https://xiongxyang.gitee.io/home/
+https://xiongxyang.gitee.io
 
 #### 新项目：小说精品屋-微服务版
 
@@ -254,7 +259,7 @@ docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)
 
 #### QQ交流群
 
-[点击前往官网查看](https://xiongxyang.gitee.io/home/service.htm)
+[点击前往官网查看](https://xiongxyang.gitee.io/service.htm)
 
 问问题的三要素
 

novel-admin/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel-admin</artifactId>
-    <version>3.3.0</version>
+    <version>3.5.0</version>
     <packaging>jar</packaging>
 
     <name>novel-admin</name>

novel-admin/src/main/java/com/java2nb/AdminApplication.java

@@ -2,20 +2,18 @@ package com.java2nb;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-//关闭SpringSecurity的功能
+
-@EnableAutoConfiguration(exclude = {
-        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
-})
 @EnableTransactionManagement
 @ServletComponentScan
 @MapperScan("com.java2nb.*.dao")
-@SpringBootApplication
+@SpringBootApplication(exclude = {
+        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
+})
 @EnableCaching
 public class AdminApplication {
     public static void main(String[] args) {

novel-admin/src/main/resources/application-dev.yml

@@ -9,8 +9,8 @@ logging:
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.jdbc.Driver
+    driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
     password: test123456
     #password:

novel-admin/src/main/resources/application-prod.yml

@@ -1,16 +1,19 @@
 java2nb:
-  uploadPath: /var/java2nb/uploaded_files/
+  uploadPath: /var/pic/
+  username: admin
+  password: 111111
 logging:
   level:
     root: error
-    com.java2nb: info
+    com.java2nb: error
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/java2nb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: java2nb
+    username: root
-    password: java2nb1019
+    password: test123456
+    #password:
     initialSize: 1
     minIdle: 3
     maxActive: 20
@@ -34,18 +37,18 @@ spring:
     # 合并多个DruidDataSource的监控数据
     #useGlobalDataSourceStat: true
   redis:
-      host: 127.0.0.1
+    host: 127.0.0.1
-      port: 6379
+    port: 6379
-      password:
+    password: test
-      # 连接超时时间（毫秒）
+    # 连接超时时间（毫秒）
-      timeout: 10000
+    timeout: 10000
-      jedis:
+    jedis:
-        pool:
+      pool:
-          # 连接池中的最大空闲连接
+        # 连接池中的最大空闲连接
-          max-idle: 8
+        max-idle: 8
-          # 连接池中的最小空闲连接
+        # 连接池中的最小空闲连接
-          min-idle: 10
+        min-idle: 10
-          # 连接池最大连接数（使用负值表示没有限制）
+        # 连接池最大连接数（使用负值表示没有限制）
-          max-active: 100
+        max-active: 100
-          # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        # 连接池最大阻塞等待时间（使用负值表示没有限制）
-          max-wait: -1
+        max-wait: -1

novel-admin/src/main/resources/banner.txt

@@ -1,6 +1,15 @@
-     __                     ________       ___.
+${AnsiColor.CYAN}
-    |__|____ ___  _______   \_____  \  ____\_ |__
+
-    |  \__  \\  \/ /\__  \   /  ____/ /    \| __ \
+--------------------------------------------------------------------------------
-    |  |/ __ \\   /  / __ \_/       \|   |  \ \_\ \
+${AnsiColor.RED}
-/\__|  (____  /\_/  (____  /\_______ \___|  /___  /
+||   / |  / /
-\______|    \/           \/         \/    \/    \/
+||  /  | / /  ___     //  ___      ___      _   __
+|| / /||/ / //___) ) // //   ) ) //   ) ) // ) )  ) )
+||/ / |  / //       // //       //   / / // / /  / /
+|  /  | / ((____   // ((____   ((___/ / // / /  / /   小说精品屋欢迎您！！！
+
+                                               -------Powered By XXY
+${AnsiColor.CYAN}
+--------------------------------------------------------------------------------
+${AnsiColor.BRIGHT_YELLOW}
+::: Spring-Boot ${spring-boot.formatted-version} :::

novel-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>3.4.1</version>
+        <version>3.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

novel-common/src/main/resources/application-common-dev.yml

@@ -71,8 +71,3 @@ sharding:
 
 
 
-pic:
-  save:
-    type: 2 #图片保存方式, 1不保存，使用爬取的网络图片 ，2保存在自己的存储介质
-    storage: local #存储介质，local：本地，OSS：阿里云对象存储，fastDfs：分布式文件系统
-    path: /var/pic  #图片保存路径

novel-common/src/main/resources/application-common-prod.yml

@@ -0,0 +1,82 @@
+spring:
+  profiles:
+    include: [common]
+  main:
+    allow-bean-definition-overriding: true
+  #Redis服务器IP
+  redis:
+    host: 127.0.0.1
+    #Redis服务器连接端口
+    port: 6379
+    #Redis服务器连接密码
+    password: test
+    jedis:
+      pool:
+        #连接池最大连接数（使用负值表示没有限制）
+        max-active: 8
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: 1
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-idle: 8
+        #连接池中的最小空闲连接
+        min-idle: 0
+    #连接超时时间（毫秒）
+    timeout: 30000
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/novel_biz?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: test123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+
+####使用shardingJdbc时，
+####所有的jdbcType都不能是LONGVARCHAR,否则会导致java.io.NotSerializableException: java.io.StringReader错误
+##### 应该替换所有的 LONGVARCHAR 类型为VARCHAR
+
+sharding:
+  jdbc:
+    datasource:
+      names: ds0 #,ds1
+      ds0:
+        type: com.zaxxer.hikari.HikariDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        jdbc-url: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: root
+        password: test123456
+    #      ds1:
+    #        type: com.alibaba.druid.pool.DruidDataSource
+    #        driver-class-name: com.mysql.jdbc.Driver
+    #        url: jdbc:mysql://localhost:3306/novel_plus2
+    #        username: root
+    #        password: test123456
+    config:
+      sharding:
+        props:
+          sql.show: true
+        tables:
+          book_content:  #book_content表
+            key-generator-column-name: id  #主键
+            actual-data-nodes: ds${0}.book_content${0..9}  #数据节点
+            #            database-strategy:  #分库策略
+            #              inline:
+            #                sharding-column: book_id
+            #                algorithm-expression: ds${book_id % 10}
+            table-strategy:  #分表策略
+              inline:
+                shardingColumn: index_id
+                algorithm-expression: book_content${index_id % 10}
+
+
+logging:
+  level:
+    root: error
+    com.java2nb: error
+
+
+
+
+
+
+
+
+

novel-common/src/main/resources/application-common-test.yml

@@ -1,17 +0,0 @@
-spring:
-  profiles:
-    include: [common]
-  datasource:
-    url: jdbc:mysql://127.0.0.1:3306/novel_biz?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: root
-    driver-class-name: com.mysql.cj.jdbc.Driver
-
-
-pic:
-  save:
-    type: 2  #图片保存方式, 1不保存，使用网络图片 ，2本地保存
-    path: /var/pic  #图片保存路径
-
-
-

novel-common/src/main/resources/banner.txt

@@ -0,0 +1,15 @@
+${AnsiColor.CYAN}
+
+--------------------------------------------------------------------------------
+${AnsiColor.RED}
+||   / |  / /
+||  /  | / /  ___     //  ___      ___      _   __
+|| / /||/ / //___) ) // //   ) ) //   ) ) // ) )  ) )
+||/ / |  / //       // //       //   / / // / /  / /
+|  /  | / ((____   // ((____   ((___/ / // / /  / /   小说精品屋欢迎您！！！
+
+                                               -------Powered By XXY
+${AnsiColor.CYAN}
+--------------------------------------------------------------------------------
+${AnsiColor.BRIGHT_YELLOW}
+::: Spring-Boot ${spring-boot.formatted-version} :::

novel-crawl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>3.4.1</version>
+        <version>3.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

novel-crawl/src/main/resources/application-prod.yml

@@ -0,0 +1,3 @@
+spring:
+    profiles:
+        include: [common-prod]

novel-front/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>3.4.1</version>
+        <version>3.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

novel-front/src/main/resources/application-dev.yml

@@ -1,3 +1,10 @@
 spring:
-    profiles:
+  profiles:
-        include: [common-dev]
+    include: [common-dev]
+
+
+pic:
+  save:
+    type: 1 #图片保存方式, 1不保存，使用爬取的网络图片 ，2保存在自己的存储介质
+    storage: local #存储介质，local：本地，OSS：阿里云对象存储，fastDfs：分布式文件系统
+    path: /Users/xiongxiaoyang/java  #图片保存路径

novel-front/src/main/resources/application-prod.yml

@@ -0,0 +1,24 @@
+spring:
+  profiles:
+    include: [common-prod]
+
+  #静态文件路径配置
+  resources:
+    static-locations: file:${user.dir}/templates/${templates.name}/static/
+  #thymeleaf模版路径配置
+  thymeleaf:
+    prefix: file:${user.dir}/templates/${templates.name}/html/
+    suffix: .html
+
+#模版配置
+templates:
+  name: orange
+
+
+pic:
+  save:
+    type: 2 #图片保存方式, 1不保存，使用爬取的网络图片 ，2保存在自己的存储介质
+    storage: local #存储介质，local：本地，OSS：阿里云对象存储，fastDfs：分布式文件系统
+    path: /var/pic  #图片保存路径
+
+

novel-front/src/main/resources/application-test.yml

@@ -1,3 +0,0 @@
-spring:
-    profiles:
-        include: [common-test]

novel-front/src/main/resources/application-website.yml

@@ -3,7 +3,7 @@ website:
   #网站名
   name: 小说精品屋
   #域名
-  domain: xiongxyang.gitee.io/home
+  domain: xiongxyang.gitee.io
   #SEO关键词
   keyword: ${website.name},小说,小说CMS,原创文学系统,开源小说系统,免费小说建站程序
   #SEO描述

novel-front/src/main/resources/application.yml

@@ -25,13 +25,7 @@ spring:
     jest:
       uris: http://192.168.0.105:9200
 
-  #thymeleaf模版路径配置
+
-  thymeleaf:
-    prefix: file:${user.dir}/templates/${templates.name}/html/
-    suffix: .html
-  #静态文件路径配置
-  resources:
-    static-locations: file:${user.dir}/templates/${templates.name}/static/
 
 redisson:
   singleServerConfig:
@@ -76,9 +70,7 @@ book:
 
 
 
-#模版配置
+
-templates:
-  name: orange
 
 
 

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

@@ -25,7 +25,14 @@
             <div class="my_info cf">
                 <div class="my_info_txt">
                     <ul class="mytab_list">
-                        <li><i class="tit">我的头像</i><a href="javascript:void(0);"><img id="imgLogo" class="user_img" alt="我的头像" src="/images/man.png" /></a></li>
+                        <li ><i class="tit">我的头像</i>
+                            <a style="position: relative" >
+                                <img id="imgLogo" class="user_img" alt="我的头像" src="/images/man.png" />
+                                <input class="opacity" onchange="picChange()" type="file" id="file0" name="file" title="点击上传图片" style="z-index: 100;cursor: pointer;left: 0px; top: -25px; width: 60px; height: 80px; opacity: 0; position: absolute;  "/>
+
+                            </a>
+
+                        </li>
                         <li><i class="tit">我的昵称</i><a href="/user/set_name.html" id="my_name"></a></li>
                         <li style="display:none"><i class="tit">电子邮箱</i><a href="javascript:void(0);"></a></li>
                         <li><i class="tit">我的性别</i><a href="/user/set_sex.html" id="my_sex"></a></li>
@@ -42,6 +49,7 @@
 </div>
 <div th:replace="common/js :: js"></div>
 <script src="/javascript/user.js" type="text/javascript"></script>
+<script src="/javascript/ajaxfileupload.js" type="text/javascript"></script>
 <script type="text/javascript">
     //查询用户信息
     $.ajax({
@@ -82,6 +90,58 @@
             layer.alert('网络异常');
         }
     })
+
+
+    function picChange() {
+        var file = $("#file0").val(); //文件名称
+        if (file != "") {
+
+            $.ajaxFileUpload({
+                url : "/file/upload", //用于文件上传的服务器端请求地址
+                secureuri : false, //是否需要安全协议，一般设置为false
+                fileElementId : "file0", //文件上传域的ID
+                dataType : "json", //返回值类型 一般设置为json
+                type : "post",
+                success : function(data) { //服务器成功响应处理函数
+                    if (data.code == 200) {
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/user/updateUserInfo",
+                            data: {'userPhoto':data.data},
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.code == 200) {
+                                    window.location.href = '/user/setup.html';
+
+                                } else if (data.code == 1001) {
+                                    //未登录
+                                    location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+
+                                } else {
+                                    layer.alert(data.msg);
+                                }
+
+                            },
+                            error: function () {
+                                layer.alert('网络异常');
+                            }
+                        })
+
+                    }else {
+                        layer.alert('图片上传失败');
+                    }
+
+                }
+
+            });
+        } else {
+            alert("请选择上传文件！");
+        }
+
+
+
+    }
 </script>
 </body>
 </html>

pom.xml

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

templates/orange/html/user/setup.html

@@ -25,7 +25,14 @@
             <div class="my_info cf">
                 <div class="my_info_txt">
                     <ul class="mytab_list">
-                        <li><i class="tit">我的头像</i><a href="javascript:void(0);"><img id="imgLogo" class="user_img" alt="我的头像" src="/images/man.png" /></a></li>
+                        <li ><i class="tit">我的头像</i>
+                            <a style="position: relative" >
+                                <img id="imgLogo" class="user_img" alt="我的头像" src="/images/man.png" />
+                                <input class="opacity" onchange="picChange()" type="file" id="file0" name="file" title="点击上传图片" style="z-index: 100;cursor: pointer;left: 0px; top: -25px; width: 60px; height: 80px; opacity: 0; position: absolute;  "/>
+
+                            </a>
+
+                        </li>
                         <li><i class="tit">我的昵称</i><a href="/user/set_name.html" id="my_name"></a></li>
                         <li style="display:none"><i class="tit">电子邮箱</i><a href="javascript:void(0);"></a></li>
                         <li><i class="tit">我的性别</i><a href="/user/set_sex.html" id="my_sex"></a></li>
@@ -42,6 +49,7 @@
 </div>
 <div th:replace="common/js :: js"></div>
 <script src="/javascript/user.js" type="text/javascript"></script>
+<script src="/javascript/ajaxfileupload.js" type="text/javascript"></script>
 <script type="text/javascript">
     //查询用户信息
     $.ajax({
@@ -82,6 +90,58 @@
             layer.alert('网络异常');
         }
     })
+
+
+    function picChange() {
+        var file = $("#file0").val(); //文件名称
+        if (file != "") {
+
+            $.ajaxFileUpload({
+                url : "/file/upload", //用于文件上传的服务器端请求地址
+                secureuri : false, //是否需要安全协议，一般设置为false
+                fileElementId : "file0", //文件上传域的ID
+                dataType : "json", //返回值类型 一般设置为json
+                type : "post",
+                success : function(data) { //服务器成功响应处理函数
+                    if (data.code == 200) {
+
+                        $.ajax({
+                            type: "POST",
+                            url: "/user/updateUserInfo",
+                            data: {'userPhoto':data.data},
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.code == 200) {
+                                    window.location.href = '/user/setup.html';
+
+                                } else if (data.code == 1001) {
+                                    //未登录
+                                    location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+
+                                } else {
+                                    layer.alert(data.msg);
+                                }
+
+                            },
+                            error: function () {
+                                layer.alert('网络异常');
+                            }
+                        })
+
+                    }else {
+                        layer.alert('图片上传失败');
+                    }
+
+                }
+
+            });
+        } else {
+            alert("请选择上传文件！");
+        }
+
+
+
+    }
 </script>
 </body>
 </html>