diff --git a/deploy_backend.sh b/deploy_backend.sh index d36f80011..27dafe1aa 100644 --- a/deploy_backend.sh +++ b/deploy_backend.sh @@ -3,7 +3,7 @@ imageName="mall" echo "==========打包=========" -mvn clean package -Dmaven.test.skip=true +mvn clean package -P prod -Dmaven.test.skip=true echo "==========上传服务器=========" scp ruoyi-admin/target/ruoyi-admin.jar root@192.144.217.65:/root/mall/ scp Dockerfile root@192.144.217.65:/root/mall/ diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java index eb6b013aa..f57a30ece 100644 --- a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java +++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppOrderController.java @@ -117,6 +117,11 @@ public class AppOrderController extends BaseController { lqw.eq(AppOrder::getCancelTime, appOrder.getCancelTime()); } lqw.orderByDesc(AppOrder::getCreateTime); + + if (isMiniUser()) { + lqw.eq(AppOrder::getUserId, getLoginUser().getUser().getUserId()); + } + List list = iAppOrderService.list(lqw); for (AppOrder order : list) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); diff --git a/mini-app/src/baseDefine.js b/mini-app/src/baseDefine.js index 52864696c..68752e700 100644 --- a/mini-app/src/baseDefine.js +++ b/mini-app/src/baseDefine.js @@ -4,9 +4,9 @@ * */ -export const baseUrl = 'http://36.1.50.18:18989/' +// export const baseUrl = 'http://36.1.50.18:18989/' // export const baseUrl = 'http://127.0.0.1:18989/' -// export const baseUrl = 'https://mall.xiao4r.com/api/' +export const baseUrl = 'https://mall.xiao4r.com/api/' export const imgbaseUrl = 'https://www.xiao4r.com/xiao4rstatic/img/winery/' diff --git a/mini-app/src/components/mall/tab/mall-home.wpy b/mini-app/src/components/mall/tab/mall-home.wpy index 6f9e18be9..67bc76e31 100644 --- a/mini-app/src/components/mall/tab/mall-home.wpy +++ b/mini-app/src/components/mall/tab/mall-home.wpy @@ -180,7 +180,7 @@ module.exports.parseImage = parseImage;
-
+
{{item.type === 1 ? '每日精选' : '热门活动'}}
diff --git a/mini-app/src/pages/mall/goods/goods-detail.wpy b/mini-app/src/pages/mall/goods/goods-detail.wpy index 4b3b39f49..ca48baec1 100644 --- a/mini-app/src/pages/mall/goods/goods-detail.wpy +++ b/mini-app/src/pages/mall/goods/goods-detail.wpy @@ -33,9 +33,10 @@ module.exports.parseImage = parseImage; - - +
+ {{goodsItem.goodsName}} + {{goodsItem.goodsAlias}} +
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 9d5b24ab3..78721cf57 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -58,13 +58,14 @@ spring: # redis 配置 redis: # 地址 - host: 175.24.17.162 + host: 172.21.0.15 # 端口，默认为6379 port: 6379 # 密码 - password: 26616494 + password: Hopesoft # 连接超时时间 timeout: 10s + database: 5 lettuce: pool: # 连接池中的最小空闲连接 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java index 3136d5ed8..bc4c6986c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java @@ -1,5 +1,6 @@ package com.ruoyi.common.utils; +import cn.hutool.core.util.StrUtil; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -96,4 +97,33 @@ public class SecurityUtils { throw new CustomException("获取用户部门信息异常", HttpStatus.UNAUTHORIZED); } } + + + /** + * 如果是小程序用户 + **/ + public static Boolean isMiniUser() { + try { + return getLoginUser().getUsername().contains("mini-"); + } catch (Exception e) { + throw new CustomException("获取用户来源异常", HttpStatus.UNAUTHORIZED); + } + } + + /** + * 获取小程序openId + **/ + public static String getMiniOpenId() { + try { + if (isMiniUser()) { + return getLoginUser().getUsername().split("-")[1]; + } else { + return StrUtil.EMPTY; + } + + + } catch (Exception e) { + throw new CustomException("获取用户来源异常", HttpStatus.UNAUTHORIZED); + } + } } diff --git a/ruoyi-ui/src/views/winery/order/index.vue b/ruoyi-ui/src/views/winery/order/index.vue index e015cbdfb..62acbf4cf 100644 --- a/ruoyi-ui/src/views/winery/order/index.vue +++ b/ruoyi-ui/src/views/winery/order/index.vue @@ -129,10 +129,12 @@ - - + + + +