Merge pull request '后台配置文件调整' (#2) from zzw-one into master

Reviewed-on: #2

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

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

yudao-admin-vue3/src/layout/components/Logo/src/Logo.vue

@@ -67,7 +67,7 @@ watch(
       to="/"
     >
       <img
-        class="h-[calc(var(--logo-height)-10px)] w-[calc(var(--logo-height)-10px)]"
+        class=" w-[calc(var(--logo-height)-10px)]"
         src="@/assets/imgs/logo.png"
       />
       <div

yudao-admin-vue3/src/views/Home/Index.vue

@@ -99,7 +99,7 @@
         </el-skeleton>
       </el-card>
 
-      <!-- <el-card shadow="never" class="mt-8px">
+      <el-card shadow="never" class="mt-8px">
         <el-skeleton :loading="loading" animated>
           <el-row :gutter="20" justify="space-between">
             <el-col :xl="10" :lg="10" :md="24" :sm="24" :xs="24">
@@ -118,7 +118,7 @@
             </el-col>
           </el-row>
         </el-skeleton>
-      </el-card> -->
+      </el-card>
     </el-col>
     <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-8px">
       <el-card shadow="never">

yudao-admin-vue3/src/views/Login/Login.vue

@@ -9,7 +9,7 @@
       >
         <!-- 左上角的 logo + 系统标题 -->
         <div class="relative flex items-center text-white">
-          <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/zy-logo.jpg" />
+          <img alt="" class="mr-10px  w-48px" src="@/assets/imgs/zy-logo.jpg" />
           <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
         </div>
         <!-- 左边的背景图 + 欢迎语 -->
@@ -33,7 +33,7 @@
           class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
         >
           <div class="flex items-center at-2xl:hidden at-xl:hidden">
-            <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" />
+            <img alt="" class="mr-10px  w-48px" src="@/assets/imgs/logo.png" />
             <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
           </div>
           <div class="flex items-center justify-end space-x-10px">

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;
 
     /**
      * 分类编号

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);
         }

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的接口测试号
+#    appid: wx63c280fe3248a3e7 # wenhualian的接口测试号
-    secret: 6f270509224a7ae1296bbf1c8cb97aed
+#    secret: 6f270509224a7ae1296bbf1c8cb97aed
+    appid: wxe88f237df9dae1e9 # 众悦科技
+    secret: 18182ef4aacdefd65b5c8063f7b5254e
 #    appid: wxc4598c446f8a9cb3 # 测试号（Kongdy 提供的）
 #    secret: 4a1a04e07f6a4a0751b39c3064a92c8b
     config-storage: