From e34aa929f330da3a81b5070e7f60bb9d0ef3dad5 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Fri, 23 Aug 2024 10:39:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-test.yml        | 14 ++++++--------
 .../scale/controller/wx/WxActivityController.java  |  4 ++++
 .../org/dromara/scale/domain/bo/ActivityBo.java    |  6 ++++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index a6653a4..9cd1633 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -259,16 +259,14 @@ justauth:
 
 wx:
   pay:
-    appId: #微信公众号或者小程序等的appid
-    mchId: #微信支付商户号
-    mchKey: #微信支付商户密钥
-    subAppId: #服务商模式下的子商户公众账号ID
-    subMchId: #服务商模式下的子商户号
-    keyPath: # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
+    appId: wx2e09db4124332242
+    mchId: 1646701170
+    mchKey: Mozhekejiyouxiangongsi6296296296
+    keyPath: /usr/local/mental/certs
   miniapp:
     configs:
-      - appid: #微信小程序的appid
-        secret: #微信小程序的Secret
+      - appid: wx2e09db4124332242
+        secret: ca069319b37b0909e65367c802c53d29
         token: #微信小程序消息服务器配置的token
         aesKey: #微信小程序消息服务器配置的EncodingAESKey
         msgDataFormat: JSON
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java
index fed852e..eb514d8 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java
@@ -1,6 +1,7 @@
 package org.dromara.scale.controller.wx;
 
 import lombok.RequiredArgsConstructor;
+import org.dromara.scale.service.IActivityService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -18,4 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/wx/activity")
 public class WxActivityController {
 
+    private final IActivityService activityService;
+
+
 }
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityBo.java
index 7ea0c21..c61a44f 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityBo.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ActivityBo.java
@@ -41,12 +41,15 @@ public class ActivityBo extends BaseEntity {
     @NotBlank(message = "活动详情不能为空", groups = { AddGroup.class, EditGroup.class })
     private String activityDetails;
 
+    /**
+     * 活动封面
+     */
+    @NotNull(message = "活动封面不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long cover;
 
     /**
      * 浏览量
      */
-    @NotNull(message = "浏览量不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long viewNums;
 
     /**
@@ -64,7 +67,6 @@ public class ActivityBo extends BaseEntity {
     /**
      * 活动状态
      */
-    @NotNull(message = "活动状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer status;