接口

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/AppletUser.java

@@ -76,4 +76,8 @@ public class AppletUser implements Serializable {
     @Excel(name = "佣金", width = 15)
     @Schema(description = "佣金")
     private java.math.BigDecimal commission;
+    /**邀请人*/
+    @Excel(name = "邀请人", width = 15)
+    @Schema(description = "邀请人")
+    private String inviter;
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiBooksController.java

@@ -10,11 +10,13 @@ import org.jeecg.config.shiro.IgnoreAuth;
 import org.jeecg.modules.applet.service.AppletApiBooksService;
 import org.jeecg.modules.demo.appletBooks.entity.AppletBooks;
 import org.jeecg.modules.demo.appletCategorize.entity.AppletCategorize;
+import org.jeecg.modules.demo.appletCourse.entity.AppletCourse;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+
 /**
  * @Description: 书籍管理
  * @Author: jeecg-boot
@@ -52,17 +54,17 @@ public class AppletApiBooksController {
     }
 
 
-
     /**
      * 查询书桌列表
      *
      * @return 查询书桌列表
      */
+
     @Operation(summary = "查询书桌列表", description = "查询书桌列表")
     @GetMapping(value = "/stand")
     public Result<IPage<AppletBooks>> stand(@Parameter(description = "搜素关键字") String title,
-                                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         log.info("查询书桌列表");
         Page<AppletBooks> booksPage = new Page<>(pageNo, pageSize);
         IPage<AppletBooks> list = appletApiBooksService
@@ -94,11 +96,17 @@ public class AppletApiBooksController {
         return Result.OK();
     }
 
-
-    @Operation(summary = "获取课程列表【待开发】", description = "根据书籍id获取课程列表")
+    //TODO 需删除 @IgnoreAuth
+    @IgnoreAuth
+    @Operation(summary = "获取课程列表", description = "根据书籍id获取课程列表")
     @GetMapping(value = "/course")
-    public Result<?> course() {
-        return Result.OK();
+    public Result<IPage<AppletCourse>> course(@Parameter(description = "书籍id") String id,
+                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        Page<AppletCourse> coursePage = new Page<>(pageNo, pageSize);
+        IPage<AppletCourse> Courses = appletApiBooksService
+                .getCourses(coursePage, id);
+        return Result.OK(Courses);
     }
 
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiIndexController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.applet.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
@@ -10,6 +11,7 @@ import org.jeecg.modules.applet.service.AppletApiIndexService;
 import org.jeecg.modules.demo.appletBanner.entity.AppletBanner;
 import org.jeecg.modules.demo.appletConfig.entity.AppletConfig;
 import org.jeecg.modules.demo.appletLink.entity.AppletLink;
+import org.jeecg.modules.demo.appletRegistration.entity.AppletRegistration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,7 +25,7 @@ import java.util.List;
  * @Date: 2025-01-XX
  * @Version: V1.0
  */
-@Tag(name="小程序首页", description="小程序首页")
+@Tag(name = "小程序首页", description = "小程序首页")
 @RestController
 @RequestMapping("/appletApi/index")
 @Slf4j
@@ -35,6 +37,7 @@ public class AppletApiIndexController {
 
     /**
      * 查询轮播图
+     *
      * @return 查询轮播图
      */
     @Operation(summary = "查询轮播图", description = "查询轮播图")
@@ -46,9 +49,10 @@ public class AppletApiIndexController {
         return Result.OK(list);
     }
 
+    @IgnoreAuth
     @Operation(summary = "首页底部内容链接", description = "首页底部内容链接")
     @GetMapping(value = "/link")
-    @IgnoreAuth
+
     public Result<List<AppletLink>> link() {
         log.info("查询首页底部内容链接");
         List<AppletLink> list = appletApiIndexService.getLink();
@@ -56,4 +60,22 @@ public class AppletApiIndexController {
     }
 
 
+    @IgnoreAuth
+    @Operation(summary = "首页底部内容链接详情", description = "首页底部内容链接详情")
+    @GetMapping(value = "/linkDetails")
+
+    public Result<AppletLink> linkDetails(@Parameter(description = "链接id") String id) {
+        log.info("查询首页底部内容链接详情");
+        AppletLink deta = appletApiIndexService.linkDetails(id);
+        return Result.OK(deta);
+    }
+
+
+    @Operation(summary = "首页底部内容添加报名", description = "首页底部内容添加报名")
+    @GetMapping(value = "/linkSignup")
+    public Result<AppletRegistration> linkSignup(AppletRegistration appletRegistration) {
+        log.info("首页底部内容添加报名");
+        appletApiIndexService.linkSignup(appletRegistration);
+        return Result.OK();
+    }
 } 

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiMemberController.java

@@ -5,33 +5,53 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.IgnoreAuth;
+import org.jeecg.modules.applet.service.AppletApiCouponService;
+import org.jeecg.modules.applet.service.AppletApiVipService;
+import org.jeecg.modules.demo.appletCoupon.entity.AppletCoupon;
+import org.jeecg.modules.demo.appletCoupon.service.IAppletCouponService;
+import org.jeecg.modules.demo.appletVip.entity.AppletVip;
+import org.jeecg.modules.demo.appletVip.service.IAppletVipService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @Slf4j
 @Tag(name = "会员", description = "会员")
 @RestController
 @RequestMapping("/appletApi/member")
 public class AppletApiMemberController {
 
-    @Operation(summary = "获取会员列表【待开发】", description = "获取会员列表")
+    @Autowired
+    private AppletApiVipService appletApiVipService;
+    @Autowired
+    private AppletApiCouponService appletCouponService;
+
+
+    @Operation(summary = "获取会员列表", description = "获取会员列表")
     @GetMapping(value = "/list")
-    public Result<?> list() {
-        return Result.OK();
+    @IgnoreAuth
+    public Result<List<AppletVip>> list(AppletVip appletVip) {
+        List<AppletVip> vipList = appletApiVipService.getList(appletVip);
+        return Result.OK(vipList);
     }
 
+
     @Operation(summary = "开通会员【待开发】", description = "开通会员")
     @PostMapping(value = "/open")
     public Result<?> open() {
         return Result.OK();
     }
-
-    @Operation(summary = "获取优惠劵【待开发】", description = "获取优惠劵")
+    @IgnoreAuth
+    @Operation(summary = "获取优惠劵", description = "获取优惠劵")
     @GetMapping(value = "/coupon")
-    public Result<?> coupon() {
-        return Result.OK();
+    public Result<List<AppletCoupon>> coupon(AppletCoupon appletCoupon) {
+        List<AppletCoupon> couponList = appletCouponService.getcoupon(appletCoupon);
+        return Result.OK(couponList);
     }
 
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiPromotionController.java

@@ -1,20 +1,29 @@
 package org.jeecg.modules.applet.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.common.system.vo.AppletUser;
+import org.jeecg.config.shiro.IgnoreAuth;
+import org.jeecg.modules.applet.service.AppletApiWaterService;
+import org.jeecg.modules.demo.appletWater.entity.AppletWater;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @Slf4j
-@Tag(name = "推广管", description = "推广管")
+@Tag(name = "推广官", description = "推广官")
 @RestController
 @RequestMapping("/appletApi/promotion")
 public class AppletApiPromotionController {
+    @Autowired
+    private AppletApiWaterService appletApiWaterService;
 
     @Operation(summary = "获取推广二维码【待开发】", description = "获取推广二维码")
     @GetMapping(value = "/qrCode")
@@ -24,16 +33,26 @@ public class AppletApiPromotionController {
 
     @Operation(summary = "我的团队【待开发】", description = "我的团队")
     @GetMapping(value = "/team")
-    public Result<?> team() {
-        return Result.OK();
+    public Result<IPage<AppletUser>> team(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        Page<AppletUser> page = new Page<>(pageNo, pageSize);
+        IPage<AppletUser> UserList = appletApiWaterService.getTeam(page);
+        return Result.OK(UserList);
     }
 
-    @Operation(summary = "佣金流水【待开发】", description = "佣金流水")
+
+    @IgnoreAuth
+    @Operation(summary = "佣金流水", description = "佣金流水")
     @GetMapping(value = "/water")
-    public Result<?> water() {
-        return Result.OK();
+    public Result<IPage<AppletWater>> water(
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        Page<AppletWater> waterPage = new Page<>(pageNo, pageSize);
+        IPage<AppletWater> list = appletApiWaterService.getWater(waterPage);
+        return Result.OK(list);
     }
 
+
     @Operation(summary = "提现【待开发】", description = "提现")
     @PostMapping(value = "/withdraw")
     public Result<?> withdraw() {

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiBooksService.java

@@ -3,13 +3,13 @@ package org.jeecg.modules.applet.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.demo.appletBooks.entity.AppletBooks;
+import org.jeecg.modules.demo.appletCourse.entity.AppletCourse;
 
 import java.util.List;
 
 public interface AppletApiBooksService {
     /**
      * 分页列表查询
-     *
      */
     IPage<AppletBooks> getBooks(Page<AppletBooks> page, String title, String category, String label);
 
@@ -33,4 +33,14 @@ public interface AppletApiBooksService {
      * @return 删除书桌
      */
     void delStand(String id);
+
+
+
+    /**
+     * 获取课程列表
+     *
+     * @param id
+     * @return
+     */
+    IPage<AppletCourse> getCourses(Page<AppletCourse> coursePage, String id);
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiCouponService.java

@@ -0,0 +1,9 @@
+package org.jeecg.modules.applet.service;
+
+import org.jeecg.modules.demo.appletCoupon.entity.AppletCoupon;
+
+import java.util.List;
+
+public interface AppletApiCouponService {
+    List<AppletCoupon> getcoupon(AppletCoupon appletCoupon);
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiIndexService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.applet.service;
 
 import org.jeecg.modules.demo.appletBanner.entity.AppletBanner;
 import org.jeecg.modules.demo.appletLink.entity.AppletLink;
+import org.jeecg.modules.demo.appletRegistration.entity.AppletRegistration;
 
 import java.util.List;
 
@@ -23,4 +24,15 @@ public interface AppletApiIndexService {
      * @return
      */
     List<AppletLink> getLink();
+
+    /**
+     * 首页底部内容链接详情
+     */
+    AppletLink linkDetails(String id);
+
+    /**
+     * 添加报名信息
+     * @param appletRegistration
+     */
+    void linkSignup(AppletRegistration appletRegistration);
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiVipService.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.applet.service;
+
+import org.jeecg.modules.demo.appletVip.entity.AppletVip;
+
+import java.util.List;
+
+public interface AppletApiVipService {
+
+    /**
+     * 获取会员列表
+     *
+     * @param appletVip
+     */
+    List<AppletVip> getList(AppletVip appletVip);
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiWaterService.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.applet.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.system.vo.AppletUser;
+import org.jeecg.modules.demo.appletWater.entity.AppletWater;
+
+import java.util.List;
+
+public interface AppletApiWaterService {
+
+
+
+    /**
+     * 流水列表
+     * @return
+     */
+    IPage<AppletWater> getWater(Page<AppletWater> waterPage);
+
+    /**
+     * 我的团队
+     * @param page
+     * @return
+     */
+    IPage<AppletUser> getTeam(Page<AppletUser> page);
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiBooksServiceImpl.java

@@ -13,6 +13,8 @@ import org.jeecg.modules.demo.appletBookStand.entity.AppletBookStand;
 import org.jeecg.modules.demo.appletBookStand.service.IAppletBookStandService;
 import org.jeecg.modules.demo.appletBooks.entity.AppletBooks;
 import org.jeecg.modules.demo.appletBooks.service.IAppletBooksService;
+import org.jeecg.modules.demo.appletCourse.entity.AppletCourse;
+import org.jeecg.modules.demo.appletCourse.service.IAppletCourseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -27,7 +29,18 @@ public class AppletApiBooksServiceImpl implements AppletApiBooksService {
     private IAppletBooksService appletBooksService;
     @Autowired
     private IAppletBookStandService appletBookStandService;
+    @Autowired
+    private IAppletCourseService appletCourseService;
 
+    /**
+     * 查询书籍列表
+     *
+     * @param page
+     * @param title
+     * @param category
+     * @param label
+     * @return
+     */
     @Override
     public IPage<AppletBooks> getBooks(Page<AppletBooks> page, String title, String category, String label) {
         return appletBooksService
@@ -35,9 +48,17 @@ public class AppletApiBooksServiceImpl implements AppletApiBooksService {
                 .like(StringUtil.isNotEmpty(title), AppletBooks::getBooksName, title)
                 .eq(StringUtil.isNotEmpty(category), AppletBooks::getBooksClassification, category)
                 .like(StringUtil.isNotEmpty(label), AppletBooks::getBooksLabel, label)
+                .eq(AppletBooks::getStatus, "Y")
                 .page(page);
     }
 
+    /**
+     * 查询书桌列表
+     *
+     * @param booksPage
+     * @param title
+     * @return
+     */
     @Override
     public IPage<AppletBooks> getBooksStand(Page<AppletBooks> booksPage, String title) {
         String userId = AppletUserUtil.getCurrentAppletUserId();
@@ -51,10 +72,16 @@ public class AppletApiBooksServiceImpl implements AppletApiBooksService {
         return appletBooksService
                 .lambdaQuery()
                 .in(AppletBooks::getId)
+                .eq(AppletBooks::getStatus, "Y")
                 .like(StringUtil.isNotEmpty(title), AppletBooks::getBooksName, title)
                 .page(booksPage);
     }
 
+    /**
+     * 添加入书桌
+     *
+     * @param id
+     */
     @Override
     public void addStand(String id) {
         String userId = AppletUserUtil.getCurrentAppletUserId();
@@ -62,7 +89,7 @@ public class AppletApiBooksServiceImpl implements AppletApiBooksService {
                 .eq(AppletBookStand::getUserId, userId)
                 .eq(AppletBookStand::getBookId, id).one();
 
-        if (one == null){
+        if (one == null) {
             AppletBookStand appletBookStand = new AppletBookStand();
             appletBookStand.setUserId(userId);
             appletBookStand.setBookId(id);
@@ -70,9 +97,15 @@ public class AppletApiBooksServiceImpl implements AppletApiBooksService {
         }
     }
 
+    /**
+     * 删除书桌
+     *
+     * @param id
+     */
+
     @Override
     public void delStand(String id) {
-        if (StringUtil.isBlank(id)){
+        if (StringUtil.isBlank(id)) {
             throw new JeecgBootException("id不能为空");
         }
         String userId = AppletUserUtil.getCurrentAppletUserId();
@@ -80,4 +113,28 @@ public class AppletApiBooksServiceImpl implements AppletApiBooksService {
                 .eq(AppletBookStand::getUserId, userId)
                 .in(AppletBookStand::getBookId, Arrays.asList(id.split(","))));
     }
+
+
+    /**
+     * 获取课程列表
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public IPage<AppletCourse> getCourses(Page<AppletCourse> coursePage, String id) {
+//         先验证书籍是否存在
+        AppletBooks book = appletBooksService.getById(id);
+        if (book == null) {
+            throw new JeecgBootException("书籍不存在");
+        }
+        // 根据书籍ID查询关联的课程列表
+        IPage<AppletCourse> pageResult = appletCourseService
+                .lambdaQuery()
+                .eq(AppletCourse::getBookId, id)
+                .page(coursePage);
+
+        return pageResult;
+    }
+
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiCouponServiceImpl.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.applet.service.impl;
+
+import org.jeecg.modules.applet.service.AppletApiCouponService;
+import org.jeecg.modules.demo.appletCoupon.entity.AppletCoupon;
+import org.jeecg.modules.demo.appletCoupon.service.IAppletCouponService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.objenesis.SpringObjenesis;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AppletApiCouponServiceImpl implements AppletApiCouponService {
+    @Autowired
+    private IAppletCouponService appletCouponService;
+
+    /**
+     * 获取优惠卷
+     *
+     * @param appletCoupon
+     * @return
+     */
+    @Override
+    public List<AppletCoupon> getcoupon(AppletCoupon appletCoupon) {
+        return appletCouponService.list();
+    }
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiIndexServiceImpl.java

@@ -1,10 +1,14 @@
 package org.jeecg.modules.applet.service.impl;
 
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.util.AppletUserUtil;
 import org.jeecg.modules.applet.service.AppletApiIndexService;
 import org.jeecg.modules.demo.appletBanner.entity.AppletBanner;
 import org.jeecg.modules.demo.appletBanner.service.IAppletBannerService;
 import org.jeecg.modules.demo.appletLink.entity.AppletLink;
 import org.jeecg.modules.demo.appletLink.service.IAppletLinkService;
+import org.jeecg.modules.demo.appletRegistration.entity.AppletRegistration;
+import org.jeecg.modules.demo.appletRegistration.service.IAppletRegistrationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +23,9 @@ public class AppletApiIndexServiceImpl implements AppletApiIndexService {
     @Autowired
     private IAppletLinkService appletLinkService;
 
+    @Autowired
+    private IAppletRegistrationService appletRegistrationService;
+
     /***
      * 轮播图
      * @return
@@ -37,4 +44,28 @@ public class AppletApiIndexServiceImpl implements AppletApiIndexService {
     public List<AppletLink> getLink() {
         return appletLinkService.list();
     }
+
+    /**
+     * 首页底部内容链接详情
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public AppletLink linkDetails(String id) {
+        return appletLinkService.getById(id);
+    }
+
+    /**
+     * 添加报名信息
+     *
+     * @param appletRegistration
+     */
+    @Override
+    public void linkSignup(AppletRegistration appletRegistration) {
+        String userId = AppletUserUtil.getCurrentAppletUserId();
+        appletRegistration.setUserId(userId);
+        appletRegistrationService.save(appletRegistration);
+
+    }
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiVipServiceImpl.java

@@ -0,0 +1,43 @@
+package org.jeecg.modules.applet.service.impl;
+
+import org.jeecg.modules.applet.service.AppletApiVipService;
+import org.jeecg.modules.demo.appletVip.entity.AppletSetmeal;
+import org.jeecg.modules.demo.appletVip.entity.AppletVip;
+import org.jeecg.modules.demo.appletVip.service.IAppletSetmealService;
+import org.jeecg.modules.demo.appletVip.service.IAppletVipService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class AppletApiVipServiceImpl implements AppletApiVipService {
+    @Autowired
+    private IAppletVipService appletApiVipService;
+    @Autowired
+    private IAppletSetmealService appletSetmealService;
+
+    /**
+     * 查询会员列表
+     *
+     * @param appletVip
+     * @return
+     */
+    @Override
+    public List<AppletVip> getList(AppletVip appletVip) {
+//        return appletApiVipService.lambdaQuery()
+//                .eq(appletVip.getTitle() != null, AppletVip::getTitle, appletVip.getTitle())
+//                .eq(appletVip.getImg() != null , AppletVip::getImg, appletVip.getImg())
+//                .eq(appletVip.getContent() != null, AppletVip::getContent, appletVip.getContent())
+//                .list();
+        List<AppletVip> list = appletApiVipService.list();
+        for (AppletVip vip : list) {
+            vip.setSetmeals(appletSetmealService
+                            .lambdaQuery()
+                            .eq(AppletSetmeal::getVipId,vip.getId())
+                    .list());
+        }
+        return list;
+    }
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiWaterServiceImpl.java

@@ -0,0 +1,50 @@
+package org.jeecg.modules.applet.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.api.IAppletUserService;
+import org.jeecg.common.system.util.AppletUserUtil;
+import org.jeecg.common.system.vo.AppletUser;
+import org.jeecg.modules.applet.service.AppletApiWaterService;
+import org.jeecg.modules.demo.appletWater.entity.AppletWater;
+import org.jeecg.modules.demo.appletWater.service.IAppletWaterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AppletApiWaterServiceImpl implements AppletApiWaterService {
+    @Autowired
+    private IAppletWaterService appletWaterService;
+    @Autowired
+    private IAppletUserService appletUserService;
+
+
+    /**
+     * 流水列表
+     *
+     * @return
+     */
+    @Override
+    public IPage<AppletWater> getWater(Page<AppletWater> waterPage) {
+        String userId = AppletUserUtil.getCurrentAppletUserId();
+        return appletWaterService.lambdaQuery()
+                .eq(AppletWater::getUser, userId)
+                .page(waterPage);
+
+    }
+
+    /**
+     * 我的团队
+     * @param page
+     * @return
+     */
+    @Override
+    public IPage<AppletUser> getTeam(Page<AppletUser> page) {
+        String userId = AppletUserUtil.getCurrentAppletUserId();
+        return appletUserService.lambdaQuery()
+                .eq(AppletUser::getInviter, userId)
+                .page(page);
+    }
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/appletBackground/appletUser/controller/AppletUserController.java

@@ -72,7 +72,6 @@ public class AppletUserController extends JeecgController<AppletUser, IAppletUse
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody AppletUser appletUser) {
 		appletUserService.save(appletUser);
-
 		return Result.OK("添加成功！");
 	}
 	

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletLink/entity/AppletLink.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,51 +23,69 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 首页底部内容链接
  * @Author: jeecg-boot
- * @Date:   2025-09-10
+ * @Date: 2025-09-10
  * @Version: V1.0
  */
 @Data
 @TableName("applet_link")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="首页底部内容链接")
+@Schema(description = "首页底部内容链接")
 public class AppletLink implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private java.lang.String id;
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @Schema(description = "创建人")
     private java.lang.String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建日期")
     private java.util.Date createTime;
-	/**更新人*/
+    /**
+     * 更新人
+     */
     @Schema(description = "更新人")
     private java.lang.String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新日期")
     private java.util.Date updateTime;
-	/**所属部门*/
+    /**
+     * 所属部门
+     */
     @Schema(description = "所属部门")
     private java.lang.String sysOrgCode;
-	/**图片*/
-	@Excel(name = "图片", width = 15)
+    /**
+     * 图片
+     */
+    @Excel(name = "图片", width = 15)
     @Schema(description = "图片")
     private java.lang.String img;
-	/**类型*/
-	@Excel(name = "类型", width = 15, dicCode = "applet_content_type")
-	@Dict(dicCode = "applet_content_type")
-    @Schema(description = "类型")
+    /**
+     * 类型
+     */
+    @Excel(name = "类型", width = 15, dicCode = "applet_content_type")
+    @Dict(dicCode = "applet_content_type")
+    @Schema(description = "类型 普通:0 个人语境定制方案:1 个人语境定制方案:2")
     private java.lang.String type;
-	/**内容*/
-	@Excel(name = "内容", width = 15)
+    /**
+     * 内容
+     */
+    @Excel(name = "内容", width = 15)
     @Schema(description = "内容")
     private java.lang.String content;
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletLink/service/IAppletLinkService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.demo.appletLink.service;
 
 import org.jeecg.modules.demo.appletLink.entity.AppletLink;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.demo.appletRegistration.entity.AppletRegistration;
 
 /**
  * @Description: 首页底部内容链接
@@ -11,4 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IAppletLinkService extends IService<AppletLink> {
 
+
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletLink/service/impl/AppletLinkServiceImpl.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.appletLink.service.impl;
 import org.jeecg.modules.demo.appletLink.entity.AppletLink;
 import org.jeecg.modules.demo.appletLink.mapper.AppletLinkMapper;
 import org.jeecg.modules.demo.appletLink.service.IAppletLinkService;
+import org.jeecg.modules.demo.appletRegistration.entity.AppletRegistration;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class AppletLinkServiceImpl extends ServiceImpl<AppletLinkMapper, AppletLink> implements IAppletLinkService {
 
+
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletRegistration/entity/AppletRegistration.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,54 +23,88 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 报名表
  * @Author: jeecg-boot
- * @Date:   2025-09-10
+ * @Date: 2025-09-10
  * @Version: V1.0
  */
 @Data
 @TableName("applet_registration")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@Schema(description="报名表")
+@Schema(description = "报名表")
 public class AppletRegistration implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private java.lang.String id;
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @Schema(description = "创建人")
     private java.lang.String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建日期")
     private java.util.Date createTime;
-	/**更新人*/
+    /**
+     * 更新人
+     */
     @Schema(description = "更新人")
     private java.lang.String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新日期")
     private java.util.Date updateTime;
-	/**所属部门*/
+    /**
+     * 所属部门
+     */
     @Schema(description = "所属部门")
     private java.lang.String sysOrgCode;
-	/**姓名*/
-	@Excel(name = "姓名", width = 15)
+    /**
+     * 姓名
+     */
+    @Excel(name = "姓名", width = 15)
     @Schema(description = "姓名")
     private java.lang.String name;
-	/**联系方式*/
-	@Excel(name = "联系方式", width = 15)
+    /**
+     * 联系方式
+     */
+    @Excel(name = "联系方式", width = 15)
     @Schema(description = "联系方式")
     private java.lang.String phone;
-	/**个人期待*/
-	@Excel(name = "个人期待", width = 15)
+    /**
+     * 个人期待
+     */
+    @Excel(name = "个人期待", width = 15)
     @Schema(description = "个人期待")
     private java.lang.String looking;
-	/**文化背景*/
-	@Excel(name = "文化背景", width = 15)
+    /**
+     * 文化背景
+     */
+    @Excel(name = "文化背景", width = 15)
     @Schema(description = "文化背景")
     private java.lang.String background;
+
+    /**
+     * 用户
+     */
+    @Excel(name = "用户", width = 15)
+    @Schema(description = "用户")
+    private java.lang.String userId;
+
+    /**
+     * 链接
+     */
+    @Excel(name = "链接", width = 15)
+    @Schema(description = "链接")
+    private java.lang.String linkId;
 }

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/apiclient_cert.pem

@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIENDCCAxygAwIBAgIUS2ctG8sgsiCB/WxeyqfBJ3rxt3IwDQYJKoZIhvcNAQEL
+MIIEJDCCAwygAwIBAgIUVbbvbM183EFQQTjmsLfj7iMgmmUwDQYJKoZIhvcNAQEL
 BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
 FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMjUwNjIwMDg1MTE2WhcNMzAwNjE5MDg1MTE2WjCBjTETMBEGA1UEAwwK
-MTcxMTAzMDQ2OTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTkwNwYDVQQL
-DDDlvJjlpKrohb7ooavvvIjkuIrmtbfvvInljLvnlpfnp5HmioDmnInpmZDlhazl
-j7gxCzAJBgNVBAYTAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN4LlVj/OWVE0T1W7ZpOqDDLYtbHOPWY8VbvJdsH
-imHaYfLVB2ouaN8FDNHATHvInj2D0BwxnFuWcusJr8k5Pyu/eEkGmsvWSLefY6dd
-qrF7F/eZCber2UTJ8Q69gUSSaXAhZ3bkppKP+JcNSRtaswqT/pLMjRrx4MLZbyTa
-pTqsEGDRSpXG1694vgv8MOD3YdmTLwJ+4paS7QZ5wZypPWLnK7/5haTJWoeLy6G4
-ZOdBHqnksh3uQ7DQQEl0mx4i+bQdIDN2V4qAvQJM3CQlVJbYBqIPqRQJdH1Cqpvh
-vtwTjD4UuZw9gX1vVKBnitE85r2qXmpTgIigPtHkIemKWXsCAwEAAaOBuTCBtjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGE
-aHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0
-MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFC
-NjU0MjJFMTJCMjdBOUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEB
-CwUAA4IBAQCBwGs4zHnrTAuGMIxknKqU1Z1ZpYGRRomZBZrygMOBwPkPOHOYAgyu
-8+JBPTtYp9Nq25nYpcM8GXHFwAGB28Z8jvRnAXVg/VMRTFmrTEI1mg1NZF1PNo0f
-wFJT/71ZU6uT1vJBUVLbPvfIHmnue6Uk56JAqUZNaJPyup7LDC01x9MsCzsHFimZ
-b4D9g3hhTVvfuChXQE4xpysUP2GgRRtY13w9bxwLYoR1NVGPC9un9Dpszs20ExNt
-flSQiw4pIdJlKHaFclD03tlFctH9pl24b10WsNVzpsq1akIjLFscykq+ERzWVn/w
-YtGglgy+OG1fPFna3xapR/k7MDcIQ2QO
+Q0EwHhcNMjUwODI1MDYzODUzWhcNMzAwODI0MDYzODUzWjB+MRMwEQYDVQQDDAox
+NzI0OTkzNTA4MRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xKjAoBgNVBAsM
+Iea3seWcs+W4guWbm+mbtuaWh+WMluaciemZkOWFrOWPuDELMAkGA1UEBhMCQ04x
+ETAPBgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAx0c5o9xw1Ip90yk6aihsKprVrMeXRupmGAs0btACzq6FmcaXDBg2pBI+8gxr
+6q9NotZ7cq/iihDXvte5xFPewcRWw4kfqiP9cg5Bo4HY7VAD1V7N3jpd+8dmcfNs
+vC/lfGsisYzqBZxna5PmEQ149xdAG3/bp3hePr9/5XFA+DwJacszOIP4hSGCkZz3
+Da/OMu3z477gRew49uswgyZV0rmgWPq62mhe03UhROcrsuIMi7puz3B3jUOV6SML
+RNC65xpvg6+aa23sjY4q3fApd9aYqelpLCv21NZ7GNP/aaQWOupKxpbow641dLPc
+kxShIjNSaIbPAgI31bLLqKyg3QIDAQABo4G5MIG2MAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgP4MIGbBgNVHR8EgZMwgZAwgY2ggYqggYeGgYRodHRwOi8vZXZjYS5pdHJ1
+cy5jb20uY24vcHVibGljL2l0cnVzY3JsP0NBPTFCRDQyMjBFNTBEQkMwNEIwNkFE
+Mzk3NTQ5ODQ2QzAxQzNFOEVCRDImc2c9SEFDQzQ3MUI2NTQyMkUxMkIyN0E5RDMz
+QTg3QUQxQ0RGNTkyNkUxNDAzNzEwDQYJKoZIhvcNAQELBQADggEBAEObeaGOrXg5
+vtpcuwDFySk/RUPPjPGUCnPZYCw0vCo6c13GtLj87h/P6PsT0PUzWAiLu/eHg0WT
+keiscRsChdjr9jWYFbE2o+zf0WMGeZio3Zzn9tuZmfNzqMWdvRcd+a98iF6fHQ/c
+mY1rSqX7wNifut/cuWiss/h/usVUfn9f117faSUKEYrBzmYgGUCuzsKORijR46ai
+dGOQ6xa7otmtmyhw1c5OBWBBJkPeiQL4rbN/0wK5OTuWuMaSiQQBJZJ0qDZxKqQZ
+2DryEOE0ZqYqWJmiPT1B80d9AqrO/2if7YOD+3rvgAAFLKbOVYXrftKf3Wwf3ort
+02XbsId5ml0=
 -----END CERTIFICATE-----

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/apiclient_key.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDeC5VY/zllRNE9
-Vu2aTqgwy2LWxzj1mPFW7yXbB4ph2mHy1QdqLmjfBQzRwEx7yJ49g9AcMZxblnLr
-Ca/JOT8rv3hJBprL1ki3n2OnXaqxexf3mQm3q9lEyfEOvYFEkmlwIWd25KaSj/iX
-DUkbWrMKk/6SzI0a8eDC2W8k2qU6rBBg0UqVxteveL4L/DDg92HZky8CfuKWku0G
-ecGcqT1i5yu/+YWkyVqHi8uhuGTnQR6p5LId7kOw0EBJdJseIvm0HSAzdleKgL0C
-TNwkJVSW2AaiD6kUCXR9Qqqb4b7cE4w+FLmcPYF9b1SgZ4rRPOa9ql5qU4CIoD7R
-5CHpill7AgMBAAECggEBAJteHY1dYKrUgVhbV/wt54/k8G76jYeEEfLTeXiOCS05
-ImpI11xbxvOuU+78kEfY86h1cAwaRp7rYdPGPmMdlG8nFaJ7ZZsVgGJDu/YjG0n+
-qKGOSvdi3q88Ylj/DtGNZQuZxAy0Jz3MUZRYLnxedYMEVRAg4ucksjGE9TkjaJPo
-/XEJBgPFAAS0p802cLD+P6rn08IQXOws8hvempRbwhtHbhmnKzytf54tQxqD0CJ6
-b9QZW0wourw7PTnIA1Ss7XmJ0YV0i5Fdc9aUP7nvBqdW44cvq21zOOjJ4o4SyaXO
-l0qyfvwoTla6xqjW5gIVltlBD8Jp8ZEyTX9q7rdEtQkCgYEA/Xtg/zxOmE5i2xdV
-+ZhYS+axTdPBRs31ZMifMNsgjRyblzgzdxA6qt7XS7fSdXJ2h2oZetU5jOHITt7z
-Q/D7GTfe9yrFqYrRo8Ckj8zgAPuZwGA6Vjkr+SoLNwnWiFo6OrGUGrrGRT1dk7t0
-rsD+e0V66sAfiMXLrRV/OsWWsi0CgYEA4EBCSFG+TILW7Gheev4FmEXl48jf8m7u
-nKQwgyEPn1CE/q1K6V+Rrq8R45HEPxtSZuPUwR1la3pLFnCFnE6fMT7sFcF77JuZ
-eem29NJoL7yBvCezPoRXxBaXTWLL7MOCgOBTb+N5Ty46ECWMDUSxwCK45nZTaLIZ
-oJ1ykujTC0cCgYEAnQURp+oesaBVAmzpOC0T/SiRiqly375zlZPlcOk8t80R4NHS
-p52pCfHyohfjyhc2r1mdIQb2mHvAjoLzZJHhqdR/TNL1ELpKdMq/5cg+tr0kmBPD
-72eJAtb1jYmNmHdz/KnGGey7J2cFEZ+cfyhUO95lbwfGQP5t1fEsGCcP250CgYB7
-iss5XldRfW98VE9gwNtCNZfd8sd1nymzgDz9sNQTd9+dEslHYpA2xVo8ngyYm6u8
-5V1Leq9qE7iURy9EmofXMIwNvEdSZbKa2Ggj3lrpmZd7mf+EvJJBhBSc3IXuDROz
-fmJZLN+jAJuaU6Uhliu65yYoSR3QevXlZ3g8eSnzdwKBgBxoA1/79eW/vIlypk3G
-ujEToMVY1e0JQTIe+ns0BgxG/iP1zHSJXUqzCUCirArgiQUxXMhV5oO5VApgxQ/e
-Aeb/jw7Rr0V3+/tx6KzBqRej5rtNB7YBj5XDtIypHjEhgCJXgqUUeIY1pu01l7F8
-8H+Jh6L0yQ+oslN1Uf9BLRrq
------END PRIVATE KEY-----

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -149,9 +149,9 @@ spring:
           slow-sql-millis: 5000
       datasource:
         master:
-          url: jdbc:mysql://110.40.223.77:3306/base?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://175.178.47.147/multipleculture?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: r=lRyE-l
+          password: R2p$M9*X
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -162,7 +162,7 @@ spring:
   #redis 配置
   redis:
     database: 1
-    host: 110.40.223.77
+    host: 175.178.47.147
     port: 6379
     password: 'Abc.123456'
 #mybatis plus 设置
@@ -226,10 +226,10 @@ jeecg:
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
-    accessKey: LTAI5tRbkjEJmdibzfCT8ymy
-    secretKey: gE6BnsfaEGk23Zv2lOUvkvaWwhS6BV
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: petualmedical
+    accessKey: LTAI5tQzgwJQK7hd7zFKJbLm
+    secretKey: siB6FGNXDgSrLao5xvdNb4OCbQOt8d
+    endpoint: oss-cn-beijing.aliyuncs.com
+    bucketName: multipleculture
     # 短信模板
     sms-template:
       # 签名
@@ -329,8 +329,8 @@ justauth:
 ##配置微信##爱简收旧衣按件回收小程序
 wechat:
   mpAppId: wx24736a3864e8f0e9 # 微信小程序appid
-  mpAppSecret: 19427a20219ab25b187e4179aea3a5f4 # 微信小程序密钥
-  merchantId: 1711030469 # 商户号
+  mpAppSecret: 7a530b7bba042128e76bcfdbaedd7e71 # 微信小程序密钥
+  merchantId: 1724993508 # 商户号
   privateKeyPath: jeecg-system-start/src/main/resources/apiclient_key.pem #本地私钥路径
   publicKeyPath: jeecg-system-start/src/main/resources/pub_key.pem #本地公钥路径
 #  privateKeyPath: /data/app-test/hly/cerFile/apiclient_key.pem #线上私钥路径