diff --git a/yudao-admin-vue3/.env.dev b/yudao-admin-vue3/.env.dev index 232f1c6..6b6c061 100644 --- a/yudao-admin-vue3/.env.dev +++ b/yudao-admin-vue3/.env.dev @@ -4,12 +4,12 @@ NODE_ENV=production VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn' +VITE_BASE_URL='https://zysc.fjptzykj.com' # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务 VITE_UPLOAD_TYPE=server # 上传路径 -VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload' +VITE_UPLOAD_URL='https://zysc.fjptzykj.com/admin-api/infra/file/upload' # 接口地址 VITE_API_URL=/admin-api @@ -30,7 +30,7 @@ VITE_BASE_PATH=/ VITE_OUT_DIR=dist # 商城H5会员端域名 -VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' +VITE_MALL_H5_DOMAIN='https://zysc.fjptzykj.com' # 验证码的开关 -VITE_APP_CAPTCHA_ENABLE=true +VITE_APP_CAPTCHA_ENABLE=false diff --git a/yudao-admin-vue3/.env.prod b/yudao-admin-vue3/.env.prod index 842ba61..37dced9 100644 --- a/yudao-admin-vue3/.env.prod +++ b/yudao-admin-vue3/.env.prod @@ -4,12 +4,12 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='https://zysc.fjptzykj.com' # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务 VITE_UPLOAD_TYPE=server # 上传路径 -VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='https://zysc.fjptzykj.com/admin-api/infra/file/upload' # 接口地址 VITE_API_URL=/admin-api @@ -30,4 +30,7 @@ VITE_BASE_PATH=/ VITE_OUT_DIR=dist-prod # 商城H5会员端域名 -VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' +VITE_MALL_H5_DOMAIN='https://zysc.fjptzykj.com' + +# 验证码的开关 +VITE_APP_CAPTCHA_ENABLE=false diff --git a/yudao-admin-vue3/src/assets/imgs/login-bg.png b/yudao-admin-vue3/src/assets/imgs/login-bg.png new file mode 100644 index 0000000..296812f Binary files /dev/null and b/yudao-admin-vue3/src/assets/imgs/login-bg.png differ diff --git a/yudao-admin-vue3/src/assets/imgs/pic-bg-min.png b/yudao-admin-vue3/src/assets/imgs/pic-bg-min.png new file mode 100644 index 0000000..be6ea4a Binary files /dev/null and b/yudao-admin-vue3/src/assets/imgs/pic-bg-min.png differ diff --git a/yudao-admin-vue3/src/layout/components/Logo/src/Logo.vue b/yudao-admin-vue3/src/layout/components/Logo/src/Logo.vue index d241130..8b6ffd4 100644 --- a/yudao-admin-vue3/src/layout/components/Logo/src/Logo.vue +++ b/yudao-admin-vue3/src/layout/components/Logo/src/Logo.vue @@ -67,7 +67,7 @@ watch( to="/" >
- + diff --git a/yudao-admin-vue3/src/views/Login/Login.vue b/yudao-admin-vue3/src/views/Login/Login.vue index fa9e652..9274ea1 100644 --- a/yudao-admin-vue3/src/views/Login/Login.vue +++ b/yudao-admin-vue3/src/views/Login/Login.vue @@ -9,7 +9,7 @@ >
- + {{ underlineToHump(appStore.getTitle) }}
@@ -33,7 +33,7 @@ class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end" >
- + {{ underlineToHump(appStore.getTitle) }}
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java index 78e35d6..796ebad 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/category/ProductCategoryDO.java @@ -27,7 +27,7 @@ public class ProductCategoryDO extends BaseDO { /** * 限定分类层级 */ - public static final int CATEGORY_LEVEL = 2; + public static final int CATEGORY_LEVEL = 1; /** * 分类编号 diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java index 3a6cb2d..9b145b0 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java @@ -126,6 +126,9 @@ public class ProductSpuServiceImpl implements ProductSpuService { private void validateCategory(Long id) { categoryService.validateCategory(id); // 校验层级 + System.out.println(categoryService.getCategoryLevel(id)); + System.out.println(CATEGORY_LEVEL); + System.out.println(categoryService.getCategoryLevel(id) < CATEGORY_LEVEL); if (categoryService.getCategoryLevel(id) < CATEGORY_LEVEL) { throw exception(SPU_SAVE_FAIL_CATEGORY_LEVEL_ERROR); } diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index a76b565..46fdb48 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -200,8 +200,10 @@ wx: miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档 # appid: wx62056c0d5e8db250 # 测试号（牛希尧提供的） # secret: 333ae72f41552af1e998fe1f54e1584a - appid: wx63c280fe3248a3e7 # wenhualian的接口测试号 - secret: 6f270509224a7ae1296bbf1c8cb97aed +# appid: wx63c280fe3248a3e7 # wenhualian的接口测试号 +# secret: 6f270509224a7ae1296bbf1c8cb97aed + appid: wxe88f237df9dae1e9 # 众悦科技 + secret: 18182ef4aacdefd65b5c8063f7b5254e # appid: wxc4598c446f8a9cb3 # 测试号（Kongdy 提供的） # secret: 4a1a04e07f6a4a0751b39c3064a92c8b config-storage: