From 26f95a620e2bd75519c710fcf59b211fa70de45c Mon Sep 17 00:00:00 2001 From: haicuan139 Date: Mon, 23 Dec 2019 12:18:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?UserFavoriteServiceProvider=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=98=AF=E5=90=A6=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E8=BF=87=E6=95=B0=E6=8D=AE=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jpress/service/UserFavoriteService.java | 8 ++++++++ .../provider/UserFavoriteServiceProvider.java | 20 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/jpress-service-api/src/main/java/io/jpress/service/UserFavoriteService.java b/jpress-service-api/src/main/java/io/jpress/service/UserFavoriteService.java index 87d780aff..6921560d7 100644 --- a/jpress-service-api/src/main/java/io/jpress/service/UserFavoriteService.java +++ b/jpress-service-api/src/main/java/io/jpress/service/UserFavoriteService.java @@ -176,4 +176,12 @@ public interface UserFavoriteService { public Page paginateByUserIdAndType(int pagePara, int pagesize, Long id, String type); + + boolean isFav(Long userId, String type, Long id); + + boolean isProductFav(Long userId, Long id); + + boolean isArticleFav(Long userId, Long id); + + } \ No newline at end of file diff --git a/jpress-service-provider/src/main/java/io/jpress/service/provider/UserFavoriteServiceProvider.java b/jpress-service-provider/src/main/java/io/jpress/service/provider/UserFavoriteServiceProvider.java index 3bdf9be56..28384cc3c 100644 --- a/jpress-service-provider/src/main/java/io/jpress/service/provider/UserFavoriteServiceProvider.java +++ b/jpress-service-provider/src/main/java/io/jpress/service/provider/UserFavoriteServiceProvider.java @@ -14,4 +14,24 @@ public class UserFavoriteServiceProvider extends JbootServiceBase public Page paginateByUserIdAndType(int page, int pagesize, Long userId, String type) { return paginateByColumns(page,pagesize, Columns.create("user_id",userId).eq("type",type),"id desc"); } + /** + * 是否收藏了 + * @param userId + * @param type + * @param id + * @return + */ + @Override + public boolean isFav(Long userId, String type, Long id){ + return findCountByColumns(Columns.create("user_id",userId).eq("type",type).eq("type_id",id)) >0; + } + + @Override + public boolean isProductFav(Long userId, Long id){ + return isFav(userId,"product",id); + } + @Override + public boolean isArticleFav(Long userId, Long id){ + return isFav(userId,"article",id); + } } \ No newline at end of file -- Gitee From c0b2232e63a194ca737d0469ae70d373e32e37f7 Mon Sep 17 00:00:00 2001 From: haicuan139 Date: Mon, 23 Dec 2019 12:24:46 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=94=B6?= =?UTF-8?q?=E8=97=8Ftype=E5=B8=B8=E9=87=8F=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=8F=AF=E4=BB=A5=E9=87=8D=E5=A4=8D=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/jpress/model/UserFavorite.java | 3 ++- .../main/java/io/jpress/web/front/CartController.java | 7 ++++--- .../java/io/jpress/module/product/model/Product.java | 4 ++-- .../module/product/controller/ProductController.java | 11 +++++++---- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/jpress-model/src/main/java/io/jpress/model/UserFavorite.java b/jpress-model/src/main/java/io/jpress/model/UserFavorite.java index 8b60313d9..6831105cb 100644 --- a/jpress-model/src/main/java/io/jpress/model/UserFavorite.java +++ b/jpress-model/src/main/java/io/jpress/model/UserFavorite.java @@ -8,7 +8,8 @@ import io.jpress.model.base.BaseUserFavorite; */ @Table(tableName = "user_favorite", primaryKey = "id") public class UserFavorite extends BaseUserFavorite { - + public static final String FAV_TYPE_PRODUCT = "product"; + public static final String FAV_TYPE_ARTICLE = "article"; private static final long serialVersionUID = 1L; diff --git a/jpress-web/src/main/java/io/jpress/web/front/CartController.java b/jpress-web/src/main/java/io/jpress/web/front/CartController.java index 58c7521ca..9131a6703 100644 --- a/jpress-web/src/main/java/io/jpress/web/front/CartController.java +++ b/jpress-web/src/main/java/io/jpress/web/front/CartController.java @@ -144,17 +144,18 @@ public class CartController extends UcenterControllerBase { } - public void doRemoveSelectedItemsToFavorites() { + public void doRemoveSelectedItemsToFavorites() { List userCarts = cartService.findSelectedListByUserId(getLoginedUser().getId()); if (userCarts != null) { for (UserCart cart : userCarts) { - favoriteService.save(cart.toFavorite()); + if (!favoriteService.isProductFav(cart.getUserId(),cart.getProductId())){ + favoriteService.save(cart.toFavorite()); + } cartService.delete(cart); } } renderOkJson(); } - /** * 对某个购物车商品 +1 */ diff --git a/module-product/module-product-model/src/main/java/io/jpress/module/product/model/Product.java b/module-product/module-product-model/src/main/java/io/jpress/module/product/model/Product.java index 08b49d567..7d6e10dba 100644 --- a/module-product/module-product-model/src/main/java/io/jpress/module/product/model/Product.java +++ b/module-product/module-product-model/src/main/java/io/jpress/module/product/model/Product.java @@ -123,7 +123,7 @@ public class Product extends BaseProduct { userCart.setUserId(userId); userCart.setSellerId(this.getUserId()); userCart.setProductId(getId()); - userCart.setProductType("product"); + userCart.setProductType(UserFavorite.FAV_TYPE_PRODUCT); userCart.setProductTypeText("商品"); userCart.setProductPrice(this.getPrice()); userCart.setProductCount(1); @@ -154,7 +154,7 @@ public class Product extends BaseProduct { public UserFavorite toFavorite(Long userId) { UserFavorite favorite = new UserFavorite(); favorite.setUserId(userId); - favorite.setType("product"); + favorite.setType(UserFavorite.FAV_TYPE_PRODUCT); favorite.setTypeText("商品"); favorite.setTypeId(String.valueOf(getId())); favorite.setTitle(getTitle()); diff --git a/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/ProductController.java b/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/ProductController.java index 014f12f38..061744cf2 100644 --- a/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/ProductController.java +++ b/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/ProductController.java @@ -295,13 +295,16 @@ public class ProductController extends TemplateControllerBase { } - @Before(ProductValidate.class) + @Before(ProductValidate.class) public void doAddFavorite() { Product product = ProductValidate.getThreadLocalProduct(); User user = getLoginedUser(); - favoriteService.save(product.toFavorite(user.getId())); - - renderOkJson(); + if (!favoriteService.isProductFav(user.getId(),product.getId())){ + favoriteService.save(product.toFavorite(user.getId())); + renderOkJson(); + }else { + renderFailJson("已经收藏过了!"); + } } /** -- Gitee From c1ad07cec5ee6b23f2d9db33fbd6b1b6d62a6eef Mon Sep 17 00:00:00 2001 From: haicuan139 Date: Mon, 23 Dec 2019 12:52:22 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E6=97=B6=E7=9A=84=E6=96=87=E7=AB=A0=E5=92=8C=E5=95=86?= =?UTF-8?q?=E5=93=81=E7=9A=84=E6=96=87=E6=9C=AC=E6=8F=8F=E8=BF=B0=E5=B8=B8?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jpress-model/src/main/java/io/jpress/model/UserFavorite.java | 4 +++- .../src/main/java/io/jpress/module/product/model/Product.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jpress-model/src/main/java/io/jpress/model/UserFavorite.java b/jpress-model/src/main/java/io/jpress/model/UserFavorite.java index 6831105cb..7a28b96ee 100644 --- a/jpress-model/src/main/java/io/jpress/model/UserFavorite.java +++ b/jpress-model/src/main/java/io/jpress/model/UserFavorite.java @@ -10,7 +10,9 @@ import io.jpress.model.base.BaseUserFavorite; public class UserFavorite extends BaseUserFavorite { public static final String FAV_TYPE_PRODUCT = "product"; public static final String FAV_TYPE_ARTICLE = "article"; + public static final String FAV_TYPE_ARTICLE_TEXT = "文章"; + public static final String FAV_TYPE_PRODUCT_TEXT = "商品"; private static final long serialVersionUID = 1L; - + } diff --git a/module-product/module-product-model/src/main/java/io/jpress/module/product/model/Product.java b/module-product/module-product-model/src/main/java/io/jpress/module/product/model/Product.java index 7d6e10dba..e86e21ec6 100644 --- a/module-product/module-product-model/src/main/java/io/jpress/module/product/model/Product.java +++ b/module-product/module-product-model/src/main/java/io/jpress/module/product/model/Product.java @@ -124,7 +124,7 @@ public class Product extends BaseProduct { userCart.setSellerId(this.getUserId()); userCart.setProductId(getId()); userCart.setProductType(UserFavorite.FAV_TYPE_PRODUCT); - userCart.setProductTypeText("商品"); + userCart.setProductTypeText(UserFavorite.FAV_TYPE_PRODUCT_TEXT); userCart.setProductPrice(this.getPrice()); userCart.setProductCount(1); userCart.setProductTitle(getTitle()); @@ -155,7 +155,7 @@ public class Product extends BaseProduct { UserFavorite favorite = new UserFavorite(); favorite.setUserId(userId); favorite.setType(UserFavorite.FAV_TYPE_PRODUCT); - favorite.setTypeText("商品"); + favorite.setTypeText(UserFavorite.FAV_TYPE_PRODUCT_TEXT); favorite.setTypeId(String.valueOf(getId())); favorite.setTitle(getTitle()); favorite.setSummary(getSummary()); -- Gitee From ce40b7dd7f06d47943e123cd94cde04dd0e1536e Mon Sep 17 00:00:00 2001 From: haicuan139 Date: Mon, 23 Dec 2019 14:36:31 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jpress/service/UserFavoriteService.java | 6 +++- .../provider/UserFavoriteServiceProvider.java | 28 ++++++++++++++++++- .../product/controller/ProductController.java | 3 +- .../controller/ProductUCenterController.java | 2 +- 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/jpress-service-api/src/main/java/io/jpress/service/UserFavoriteService.java b/jpress-service-api/src/main/java/io/jpress/service/UserFavoriteService.java index 6921560d7..a33197e57 100644 --- a/jpress-service-api/src/main/java/io/jpress/service/UserFavoriteService.java +++ b/jpress-service-api/src/main/java/io/jpress/service/UserFavoriteService.java @@ -177,6 +177,10 @@ public interface UserFavoriteService { public Page paginateByUserIdAndType(int pagePara, int pagesize, Long id, String type); + boolean doDelFavorite(Long id); + + boolean doAddToFavorite(UserFavorite favorite); + boolean isFav(Long userId, String type, Long id); boolean isProductFav(Long userId, Long id); @@ -184,4 +188,4 @@ public interface UserFavoriteService { boolean isArticleFav(Long userId, Long id); -} \ No newline at end of file +} diff --git a/jpress-service-provider/src/main/java/io/jpress/service/provider/UserFavoriteServiceProvider.java b/jpress-service-provider/src/main/java/io/jpress/service/provider/UserFavoriteServiceProvider.java index 28384cc3c..c3ddf94a4 100644 --- a/jpress-service-provider/src/main/java/io/jpress/service/provider/UserFavoriteServiceProvider.java +++ b/jpress-service-provider/src/main/java/io/jpress/service/provider/UserFavoriteServiceProvider.java @@ -14,6 +14,32 @@ public class UserFavoriteServiceProvider extends JbootServiceBase public Page paginateByUserIdAndType(int page, int pagesize, Long userId, String type) { return paginateByColumns(page,pagesize, Columns.create("user_id",userId).eq("type",type),"id desc"); } + + + /** + * 移除收藏 + * @param id + * @return + */ + @Override + public boolean doDelFavorite(Long id){ + UserFavorite userFavorite = findById(id); + return delete(userFavorite); + } + + /** + * 添加收藏 + * @param favorite + * @return + */ + @Override + public boolean doAddToFavorite(UserFavorite favorite){ + if (isFav(favorite.getUserId(),favorite.getType(),Long.parseLong(String.valueOf(favorite.getTypeId())))){ + return false; + } + return favorite.save(); + } + /** * 是否收藏了 * @param userId @@ -34,4 +60,4 @@ public class UserFavoriteServiceProvider extends JbootServiceBase public boolean isArticleFav(Long userId, Long id){ return isFav(userId,"article",id); } -} \ No newline at end of file +} diff --git a/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/ProductController.java b/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/ProductController.java index 061744cf2..d00281b79 100644 --- a/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/ProductController.java +++ b/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/ProductController.java @@ -299,8 +299,7 @@ public class ProductController extends TemplateControllerBase { public void doAddFavorite() { Product product = ProductValidate.getThreadLocalProduct(); User user = getLoginedUser(); - if (!favoriteService.isProductFav(user.getId(),product.getId())){ - favoriteService.save(product.toFavorite(user.getId())); + if (favoriteService.doAddToFavorite(product.toFavorite(user.getId()))){ renderOkJson(); }else { renderFailJson("已经收藏过了!"); diff --git a/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/ProductUCenterController.java b/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/ProductUCenterController.java index 17b6aa864..d0a134cde 100644 --- a/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/ProductUCenterController.java +++ b/module-product/module-product-web/src/main/java/io/jpress/module/product/controller/ProductUCenterController.java @@ -93,4 +93,4 @@ public class ProductUCenterController extends UcenterControllerBase { renderJson(commentService.delete(comment) ? OK : FAIL); } -} \ No newline at end of file +} -- Gitee From 96b9b05ecf99f1025052c0277613227f9dd51523 Mon Sep 17 00:00:00 2001 From: haicuan139 Date: Mon, 23 Dec 2019 14:36:57 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E6=97=B6=E7=9A=84=E6=96=87=E7=AB=A0=E5=92=8C=E5=95=86?= =?UTF-8?q?=E5=93=81=E7=9A=84=E6=96=87=E6=9C=AC=E6=8F=8F=E8=BF=B0=E5=B8=B8?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/jpress/commons/utils/JpressCookieUtil.java | 13 +++++++++++++ .../java/io/jpress/web/admin/_AdminController.java | 3 ++- .../java/io/jpress/web/front/CartController.java | 6 ++---- .../java/io/jpress/web/front/OauthController.java | 3 ++- .../java/io/jpress/web/front/UserController.java | 3 ++- .../web/wechat/WechatAuthorizationController.java | 3 ++- .../webapp/WEB-INF/views/admin/setting/reg.html | 10 ++++++++++ 7 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 jpress-commons/src/main/java/io/jpress/commons/utils/JpressCookieUtil.java diff --git a/jpress-commons/src/main/java/io/jpress/commons/utils/JpressCookieUtil.java b/jpress-commons/src/main/java/io/jpress/commons/utils/JpressCookieUtil.java new file mode 100644 index 000000000..10ee519c1 --- /dev/null +++ b/jpress-commons/src/main/java/io/jpress/commons/utils/JpressCookieUtil.java @@ -0,0 +1,13 @@ +package io.jpress.commons.utils; + +import com.jfinal.core.Controller; +import io.jboot.utils.CookieUtil; +import io.jpress.JPressConsts; +import io.jpress.JPressOptions; + +public class JpressCookieUtil { + public static void put(Controller controller, Long userid){ + int maxAgeInSeconds = JPressOptions.getAsInt("maxAgeInSeconds",604800); + CookieUtil.put(controller, JPressConsts.COOKIE_UID, String.valueOf(userid),maxAgeInSeconds); + } +} diff --git a/jpress-web/src/main/java/io/jpress/web/admin/_AdminController.java b/jpress-web/src/main/java/io/jpress/web/admin/_AdminController.java index 86ae4a3bf..1ec20c770 100644 --- a/jpress-web/src/main/java/io/jpress/web/admin/_AdminController.java +++ b/jpress-web/src/main/java/io/jpress/web/admin/_AdminController.java @@ -26,6 +26,7 @@ import io.jboot.web.validate.EmptyValidate; import io.jboot.web.validate.Form; import io.jpress.JPressConfig; import io.jpress.JPressConsts; +import io.jpress.commons.utils.JpressCookieUtil; import io.jpress.core.module.ModuleListener; import io.jpress.core.module.ModuleManager; import io.jpress.model.User; @@ -98,7 +99,7 @@ public class _AdminController extends AdminControllerBase { Ret ret = userService.doValidateUserPwd(loginUser, pwd); if (ret.isOk()) { - CookieUtil.put(this, JPressConsts.COOKIE_UID, loginUser.getId()); + JpressCookieUtil.put(this,loginUser.getId()); } renderJson(ret); diff --git a/jpress-web/src/main/java/io/jpress/web/front/CartController.java b/jpress-web/src/main/java/io/jpress/web/front/CartController.java index 9131a6703..a4ba65f3a 100644 --- a/jpress-web/src/main/java/io/jpress/web/front/CartController.java +++ b/jpress-web/src/main/java/io/jpress/web/front/CartController.java @@ -148,9 +148,7 @@ public class CartController extends UcenterControllerBase { List userCarts = cartService.findSelectedListByUserId(getLoginedUser().getId()); if (userCarts != null) { for (UserCart cart : userCarts) { - if (!favoriteService.isProductFav(cart.getUserId(),cart.getProductId())){ - favoriteService.save(cart.toFavorite()); - } + favoriteService.doAddToFavorite(cart.toFavorite()); cartService.delete(cart); } } @@ -192,7 +190,7 @@ public class CartController extends UcenterControllerBase { userCart.setProductCount(userCart.getProductCount() - 1); cartService.update(userCart); } - + renderJson(Ret.ok().set("shouldPayPrice", new DecimalFormat("0.00").format(userCart.getShouldPayPrice()))); } diff --git a/jpress-web/src/main/java/io/jpress/web/front/OauthController.java b/jpress-web/src/main/java/io/jpress/web/front/OauthController.java index 4f2a4b5fd..786be26a4 100644 --- a/jpress-web/src/main/java/io/jpress/web/front/OauthController.java +++ b/jpress-web/src/main/java/io/jpress/web/front/OauthController.java @@ -26,6 +26,7 @@ import io.jpress.commons.oauth2.Oauth2Controller; import io.jpress.commons.oauth2.OauthConnector; import io.jpress.commons.oauth2.OauthUser; import io.jpress.commons.oauth2.connector.*; +import io.jpress.commons.utils.JpressCookieUtil; import io.jpress.model.User; import io.jpress.service.UserOpenidService; import io.jpress.service.UserService; @@ -108,7 +109,7 @@ public class OauthController extends Oauth2Controller { } - CookieUtil.put(this, JPressConsts.COOKIE_UID, dbUser.getId()); + JpressCookieUtil.put(this,dbUser.getId()); String gotoUrl = JPressOptions.get("login_goto_url","/ucenter"); redirect(gotoUrl); } diff --git a/jpress-web/src/main/java/io/jpress/web/front/UserController.java b/jpress-web/src/main/java/io/jpress/web/front/UserController.java index 0a3edc62d..d6bea7a9b 100644 --- a/jpress-web/src/main/java/io/jpress/web/front/UserController.java +++ b/jpress-web/src/main/java/io/jpress/web/front/UserController.java @@ -28,6 +28,7 @@ import io.jboot.web.validate.Form; import io.jpress.JPressConsts; import io.jpress.JPressOptions; import io.jpress.commons.sms.SmsKit; +import io.jpress.commons.utils.JpressCookieUtil; import io.jpress.model.User; import io.jpress.service.UserService; import io.jpress.web.base.TemplateControllerBase; @@ -109,7 +110,7 @@ public class UserController extends TemplateControllerBase { Ret ret = userService.doValidateUserPwd(loginUser, pwd); if (ret.isOk()) { - CookieUtil.put(this, JPressConsts.COOKIE_UID, loginUser.getId()); + JpressCookieUtil.put(this,loginUser.getId()); } String gotoUrl = JPressOptions.get("login_goto_url","/ucenter"); diff --git a/jpress-web/src/main/java/io/jpress/web/wechat/WechatAuthorizationController.java b/jpress-web/src/main/java/io/jpress/web/wechat/WechatAuthorizationController.java index a09c89647..aa4355c20 100644 --- a/jpress-web/src/main/java/io/jpress/web/wechat/WechatAuthorizationController.java +++ b/jpress-web/src/main/java/io/jpress/web/wechat/WechatAuthorizationController.java @@ -27,6 +27,7 @@ import io.jboot.utils.StrUtil; import io.jboot.web.controller.annotation.RequestMapping; import io.jpress.JPressConsts; import io.jpress.JPressOptions; +import io.jpress.commons.utils.JpressCookieUtil; import io.jpress.model.User; import io.jpress.model.UserOpenid; import io.jpress.service.UserOpenidService; @@ -149,7 +150,7 @@ public class WechatAuthorizationController extends ControllerBase { return; } - CookieUtil.put(this, JPressConsts.COOKIE_UID, userId); + JpressCookieUtil.put(this,userId); redirect(StrUtil.urlDecode(gotoUrl)); } diff --git a/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html b/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html index 8e86302e5..1632ae2f9 100755 --- a/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html +++ b/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html @@ -35,6 +35,16 @@ +
+ +
+ +

默认有效期为7天（604800）

+
+
+
-- Gitee From 8537c3ee65a0a3caf873e81d04d6650553aec9e9 Mon Sep 17 00:00:00 2001 From: haicuan139 Date: Mon, 23 Dec 2019 14:38:43 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86Cookie=E6=9C=89=E6=95=88=E6=9C=9F?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/jpress/commons/utils/JpressCookieUtil.java | 13 ------------- .../java/io/jpress/web/admin/_AdminController.java | 3 +-- .../java/io/jpress/web/front/CartController.java | 6 ++++-- .../java/io/jpress/web/front/OauthController.java | 3 +-- .../java/io/jpress/web/front/UserController.java | 3 +-- .../web/wechat/WechatAuthorizationController.java | 3 +-- .../webapp/WEB-INF/views/admin/setting/reg.html | 10 ---------- 7 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 jpress-commons/src/main/java/io/jpress/commons/utils/JpressCookieUtil.java diff --git a/jpress-commons/src/main/java/io/jpress/commons/utils/JpressCookieUtil.java b/jpress-commons/src/main/java/io/jpress/commons/utils/JpressCookieUtil.java deleted file mode 100644 index 10ee519c1..000000000 --- a/jpress-commons/src/main/java/io/jpress/commons/utils/JpressCookieUtil.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.jpress.commons.utils; - -import com.jfinal.core.Controller; -import io.jboot.utils.CookieUtil; -import io.jpress.JPressConsts; -import io.jpress.JPressOptions; - -public class JpressCookieUtil { - public static void put(Controller controller, Long userid){ - int maxAgeInSeconds = JPressOptions.getAsInt("maxAgeInSeconds",604800); - CookieUtil.put(controller, JPressConsts.COOKIE_UID, String.valueOf(userid),maxAgeInSeconds); - } -} diff --git a/jpress-web/src/main/java/io/jpress/web/admin/_AdminController.java b/jpress-web/src/main/java/io/jpress/web/admin/_AdminController.java index 1ec20c770..86ae4a3bf 100644 --- a/jpress-web/src/main/java/io/jpress/web/admin/_AdminController.java +++ b/jpress-web/src/main/java/io/jpress/web/admin/_AdminController.java @@ -26,7 +26,6 @@ import io.jboot.web.validate.EmptyValidate; import io.jboot.web.validate.Form; import io.jpress.JPressConfig; import io.jpress.JPressConsts; -import io.jpress.commons.utils.JpressCookieUtil; import io.jpress.core.module.ModuleListener; import io.jpress.core.module.ModuleManager; import io.jpress.model.User; @@ -99,7 +98,7 @@ public class _AdminController extends AdminControllerBase { Ret ret = userService.doValidateUserPwd(loginUser, pwd); if (ret.isOk()) { - JpressCookieUtil.put(this,loginUser.getId()); + CookieUtil.put(this, JPressConsts.COOKIE_UID, loginUser.getId()); } renderJson(ret); diff --git a/jpress-web/src/main/java/io/jpress/web/front/CartController.java b/jpress-web/src/main/java/io/jpress/web/front/CartController.java index a4ba65f3a..9131a6703 100644 --- a/jpress-web/src/main/java/io/jpress/web/front/CartController.java +++ b/jpress-web/src/main/java/io/jpress/web/front/CartController.java @@ -148,7 +148,9 @@ public class CartController extends UcenterControllerBase { List userCarts = cartService.findSelectedListByUserId(getLoginedUser().getId()); if (userCarts != null) { for (UserCart cart : userCarts) { - favoriteService.doAddToFavorite(cart.toFavorite()); + if (!favoriteService.isProductFav(cart.getUserId(),cart.getProductId())){ + favoriteService.save(cart.toFavorite()); + } cartService.delete(cart); } } @@ -190,7 +192,7 @@ public class CartController extends UcenterControllerBase { userCart.setProductCount(userCart.getProductCount() - 1); cartService.update(userCart); } - + renderJson(Ret.ok().set("shouldPayPrice", new DecimalFormat("0.00").format(userCart.getShouldPayPrice()))); } diff --git a/jpress-web/src/main/java/io/jpress/web/front/OauthController.java b/jpress-web/src/main/java/io/jpress/web/front/OauthController.java index 786be26a4..4f2a4b5fd 100644 --- a/jpress-web/src/main/java/io/jpress/web/front/OauthController.java +++ b/jpress-web/src/main/java/io/jpress/web/front/OauthController.java @@ -26,7 +26,6 @@ import io.jpress.commons.oauth2.Oauth2Controller; import io.jpress.commons.oauth2.OauthConnector; import io.jpress.commons.oauth2.OauthUser; import io.jpress.commons.oauth2.connector.*; -import io.jpress.commons.utils.JpressCookieUtil; import io.jpress.model.User; import io.jpress.service.UserOpenidService; import io.jpress.service.UserService; @@ -109,7 +108,7 @@ public class OauthController extends Oauth2Controller { } - JpressCookieUtil.put(this,dbUser.getId()); + CookieUtil.put(this, JPressConsts.COOKIE_UID, dbUser.getId()); String gotoUrl = JPressOptions.get("login_goto_url","/ucenter"); redirect(gotoUrl); } diff --git a/jpress-web/src/main/java/io/jpress/web/front/UserController.java b/jpress-web/src/main/java/io/jpress/web/front/UserController.java index d6bea7a9b..0a3edc62d 100644 --- a/jpress-web/src/main/java/io/jpress/web/front/UserController.java +++ b/jpress-web/src/main/java/io/jpress/web/front/UserController.java @@ -28,7 +28,6 @@ import io.jboot.web.validate.Form; import io.jpress.JPressConsts; import io.jpress.JPressOptions; import io.jpress.commons.sms.SmsKit; -import io.jpress.commons.utils.JpressCookieUtil; import io.jpress.model.User; import io.jpress.service.UserService; import io.jpress.web.base.TemplateControllerBase; @@ -110,7 +109,7 @@ public class UserController extends TemplateControllerBase { Ret ret = userService.doValidateUserPwd(loginUser, pwd); if (ret.isOk()) { - JpressCookieUtil.put(this,loginUser.getId()); + CookieUtil.put(this, JPressConsts.COOKIE_UID, loginUser.getId()); } String gotoUrl = JPressOptions.get("login_goto_url","/ucenter"); diff --git a/jpress-web/src/main/java/io/jpress/web/wechat/WechatAuthorizationController.java b/jpress-web/src/main/java/io/jpress/web/wechat/WechatAuthorizationController.java index aa4355c20..a09c89647 100644 --- a/jpress-web/src/main/java/io/jpress/web/wechat/WechatAuthorizationController.java +++ b/jpress-web/src/main/java/io/jpress/web/wechat/WechatAuthorizationController.java @@ -27,7 +27,6 @@ import io.jboot.utils.StrUtil; import io.jboot.web.controller.annotation.RequestMapping; import io.jpress.JPressConsts; import io.jpress.JPressOptions; -import io.jpress.commons.utils.JpressCookieUtil; import io.jpress.model.User; import io.jpress.model.UserOpenid; import io.jpress.service.UserOpenidService; @@ -150,7 +149,7 @@ public class WechatAuthorizationController extends ControllerBase { return; } - JpressCookieUtil.put(this,userId); + CookieUtil.put(this, JPressConsts.COOKIE_UID, userId); redirect(StrUtil.urlDecode(gotoUrl)); } diff --git a/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html b/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html index 1632ae2f9..8e86302e5 100755 --- a/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html +++ b/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html @@ -35,16 +35,6 @@
-
- -
- -

默认有效期为7天（604800）

-
-
-
-- Gitee