diff --git a/README.md b/README.md index 1dea1e2..0b0c63d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -## 沐雪社区： +## 浅枫沐雪： -**项目名称：** 沐雪社区开源版 +**项目名称：** 浅枫沐雪开源版 **项目描述：** diff --git a/src/main/java/cn/allms/controller/admin/TypeController.java b/src/main/java/cn/allms/controller/admin/TypeController.java index 4da19c4..0b052c7 100644 --- a/src/main/java/cn/allms/controller/admin/TypeController.java +++ b/src/main/java/cn/allms/controller/admin/TypeController.java @@ -101,6 +101,7 @@ public class TypeController { if (type1 != null) { result.rejectValue("name","nameError","不能添加重复的分类"); } + if (result.hasErrors()) { return "admin/types-input"; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 5f6247e..5c3c6ed 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,7 +2,7 @@ spring: datasource: driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/mx-blog?useUnicode=true&characterEncoding=utf-8 + url: jdbc:mysql://127.0.0.1:3306/mx-blog?useUnicode=true&characterEncoding=utf-8&useSSL=false username: root password: josxy jpa: diff --git a/src/main/resources/favicon.ico b/src/main/resources/favicon.ico index 5ac7781..1921e43 100644 Binary files a/src/main/resources/favicon.ico and b/src/main/resources/favicon.ico differ diff --git a/src/main/resources/i18n/message.properties b/src/main/resources/i18n/message.properties index 60d4871..367b13c 100644 --- a/src/main/resources/i18n/message.properties +++ b/src/main/resources/i18n/message.properties @@ -8,11 +8,11 @@ index.aboutme=\u7AD9\u957F\u4FE1\u606F #\u5E95\u90E8\u5BFC\u822A\u680F\u4FE1\u606F -index.email=\u90AE\u7BB1:yerenping@aliyun.com -index.qq=QQ:1515177029 +index.email=\u90AE\u7BB1:qfmx520@163.com +index.qq=QQ:745719461 index.about=\u4F5C\u8005\u662F\u4E00\u540Dspringboot\u7231\u597D\u8005,\u662F\u4E00\u540D\u6B63\u5728\u52AA\u529B\u594B\u6597\u7684\u5B66\u751F,\u4E3B\u8981\u5B66\u4E60JavaEE\u5F00\u53D1,Web\u524D\u7AEF\u7B49\u6280\u672F.\u4F5C\u8005\u662F\u4E2A\u559C\u6B22\u65C5\u884C\u7684\u5B69\u5B50,\u76EE\u6807\u662F\u6E38\u904D\u5168\u4E16\u754C\uFF01 -index.copyright=Copy \u00A9 2019 - 2020 \u4F5C\u8005:\u5C0F\u5C0F\u53F6\u513F \u6B64\u7AD9\u4EC5\u4F9B\u4E2A\u4EBA\u6240\u6709 \u5982\u6709\u7591\u95EE\u8054\u7CFB\u4F5C\u8005 +index.copyright=copy @ 2020 - 2021 \u4f5c\u8005:\u6d45\u67ab\u6c90\u96ea \u6b64\u7ad9\u4ec5\u4f9b\u4e2a\u4eba\u6240\u6709 \u5982\u6709\u7591\u95ee\u8054\u7cfb\u4f5c\u8005 #\u4E8C\u7EF4\u7801\u626B\u7801\u9605\u8BFB\u5730\u5740 -blog.serurl=172.20.10.6:8080 \ No newline at end of file +blog.serurl=127.0.0.1:80 \ No newline at end of file diff --git a/src/main/resources/i18n/message_en_US.properties b/src/main/resources/i18n/message_en_US.properties index b1e5e99..332d87f 100644 --- a/src/main/resources/i18n/message_en_US.properties +++ b/src/main/resources/i18n/message_en_US.properties @@ -8,10 +8,10 @@ index.aboutme=About Me #\u5E95\u90E8\u5BFC\u822A\u680F\u4FE1\u606F -index.email=Email:yerenping@aliyun.com -index.qq=QQ:1515177029 +index.email=Email:qfmx520@163.com +index.qq=QQ:745719461 index.about=The author is a springboot enthusiast, a struggling student who mainly studies JavaEE development,Web front end and other technologies. -index.copyright=Copy \u00A9 2019-2020 author: xiao xiao ye er this site is for individuals only if you have any questions to contact the author +index.copyright=copy @ 2020 - 2021 \u4f5c\u8005:\u6d45\u67ab\u6c90\u96ea \u6b64\u7ad9\u4ec5\u4f9b\u4e2a\u4eba\u6240\u6709 \u5982\u6709\u7591\u95ee\u8054\u7cfb\u4f5c\u8005 diff --git a/src/main/resources/i18n/message_zh_CN.properties b/src/main/resources/i18n/message_zh_CN.properties index 0c93d49..1ad3f34 100644 --- a/src/main/resources/i18n/message_zh_CN.properties +++ b/src/main/resources/i18n/message_zh_CN.properties @@ -8,10 +8,10 @@ index.aboutme=\u7AD9\u957F\u4FE1\u606F #\u5E95\u90E8\u5BFC\u822A\u680F\u4FE1\u606F -index.email=\u90AE\u7BB1:yerenping@aliyun.com -index.qq=QQ:1515177029 +index.email=\u90AE\u7BB1:qfmx520@163.com +index.qq=QQ:745719461 index.about=\u4F5C\u8005\u662F\u4E00\u540Dspringboot\u7231\u597D\u8005,\u662F\u4E00\u540D\u6B63\u5728\u52AA\u529B\u594B\u6597\u7684\u5B66\u751F,\u4E3B\u8981\u5B66\u4E60JavaEE\u5F00\u53D1,Web\u524D\u7AEF\u7B49\u6280\u672F.\u4F5C\u8005\u662F\u4E2A\u559C\u6B22\u65C5\u884C\u7684\u5B69\u5B50,\u76EE\u6807\u662F\u6E38\u904D\u5168\u4E16\u754C\uFF01 -index.copyright=Copy \u00A9 2019 - 2020 \u4F5C\u8005:\u5C0F\u5C0F\u53F6\u513F \u6B64\u7AD9\u4EC5\u4F9B\u4E2A\u4EBA\u6240\u6709 \u5982\u6709\u7591\u95EE\u8054\u7CFB\u4F5C\u8005 +index.copyright=copy @ 2020 - 2021 \u4f5c\u8005:\u6d45\u67ab\u6c90\u96ea \u6b64\u7ad9\u4ec5\u4f9b\u4e2a\u4eba\u6240\u6709 \u5982\u6709\u7591\u95ee\u8054\u7cfb\u4f5c\u8005 #\u4E8C\u7EF4\u7801\u626B\u7801\u9605\u8BFB\u5730\u5740 blog.serurl=172.20.10.6:8080 \ No newline at end of file diff --git a/src/main/resources/static/images/QQ.png b/src/main/resources/static/images/QQ.png new file mode 100644 index 0000000..fdb0ae1 Binary files /dev/null and b/src/main/resources/static/images/QQ.png differ diff --git a/src/main/resources/static/images/WeChat.jpg b/src/main/resources/static/images/WeChat.jpg index 43c414a..a8b472f 100644 Binary files a/src/main/resources/static/images/WeChat.jpg and b/src/main/resources/static/images/WeChat.jpg differ diff --git a/src/main/resources/static/images/tp.png b/src/main/resources/static/images/tp.png new file mode 100644 index 0000000..8a22ee2 Binary files /dev/null and b/src/main/resources/static/images/tp.png differ diff --git a/src/main/resources/templates/_fragments.html b/src/main/resources/templates/_fragments.html index b5f67bf..9c510ff 100644 --- a/src/main/resources/templates/_fragments.html +++ b/src/main/resources/templates/_fragments.html @@ -27,7 +27,7 @@