From affef6b8b40ed0d228e6c4ffa510702c1716d2d2 Mon Sep 17 00:00:00 2001
From: yangfuhai <fuhai999@gmail.com>
Date: Wed, 7 Oct 2020 11:36:34 +0800
Subject: [PATCH 1/2] v3.3.0 release (^.^)YYa!!

---
 README.md                                                      | 2 ++
 jpress-commons/src/main/java/io/jpress/JPressConsts.java       | 2 +-
 .../main/webapp/WEB-INF/views/admin/_layout/_left_menu.html    | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 42dbaf01c..f2b677781 100644
--- a/README.md
+++ b/README.md
@@ -191,6 +191,8 @@ wget https://gitee.com/JPressProjects/jpress/raw/master/install.sh && bash insta
 - 4、在开发工具，右键运行 `starter/src/main/java/io.jpress.Starter` 下的 `main()` 方法
 - 5、通过浏览器访问 `http://127.0.0.1:8080`，进行自动安装
 
+> Press下载、导入、运行视频教程，链接: https://pan.baidu.com/s/1bqbQ9_HjF95EW4qrQvOSag 提取码: 5jw8 
+
 
 > 可能遇到的问题： 
 > 
diff --git a/jpress-commons/src/main/java/io/jpress/JPressConsts.java b/jpress-commons/src/main/java/io/jpress/JPressConsts.java
index de5c96b1c..749b770c4 100644
--- a/jpress-commons/src/main/java/io/jpress/JPressConsts.java
+++ b/jpress-commons/src/main/java/io/jpress/JPressConsts.java
@@ -23,7 +23,7 @@ package io.jpress;
  */
 public class JPressConsts {
 
-    public static final String VERSION = "v3.2.5";
+    public static final String VERSION = "v3.3.0";
     public static final String VERSION_CODE = "25";
 
     /**
diff --git a/jpress-web/src/main/webapp/WEB-INF/views/admin/_layout/_left_menu.html b/jpress-web/src/main/webapp/WEB-INF/views/admin/_layout/_left_menu.html
index def702498..d2e96933d 100755
--- a/jpress-web/src/main/webapp/WEB-INF/views/admin/_layout/_left_menu.html
+++ b/jpress-web/src/main/webapp/WEB-INF/views/admin/_layout/_left_menu.html
@@ -25,6 +25,9 @@
                 </li>
                 #end
             #end
+
+
+
             <li class="header">基础</li>
             #for(group : systemMenuGroups)
                 #hasPermission(group.permission)
-- 
Gitee


From 856f8424f46a7bb6390e18635da7081c9d2e09cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=83=98=E7=84=99=E5=87=89=E6=84=8F?=
 <bakecool@foxmail.com>
Date: Wed, 11 Nov 2020 10:39:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=96=B0=E5=A2=9E=E6=88=96=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=97=B6=E5=AF=B9=E5=90=8D=E7=A7=B0=E5=92=8Cslug=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/controller/_ProductCategoryController.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/_ProductCategoryController.java b/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/_ProductCategoryController.java
index 15d1b7085..0d5bb8a5b 100644
--- a/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/_ProductCategoryController.java
+++ b/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/_ProductCategoryController.java
@@ -72,10 +72,14 @@ public class _ProductCategoryController extends AdminControllerBase {
 
 
 
+    @EmptyValidate({
+        @Form(name = "category.title", message = "分类名称不能为空"),
+        @Form(name = "category.slug", message = "slug 不能为空")
+    })
     public void doSave() {
         ProductCategory entry = getModel(ProductCategory.class, "category");
         saveCategory(entry);
-        renderJson(Ret.ok().set("id", entry.getId()));
+        // renderJson(Ret.ok().set("id", entry.getId()));
     }
 
 
-- 
Gitee