给小程序前端做了一点适配

ruoyi-admin/src/main/java/com/yingpaipay/web/domain/vo/AppletUserInfoVo.java

@@ -16,4 +16,6 @@ public class AppletUserInfoVo {
 
     private String avatar;
 
+    private String phoneNumber;
+
 }

ruoyi-admin/src/main/java/com/yingpaipay/web/service/IAppletAuthService.java

@@ -3,13 +3,6 @@ package com.yingpaipay.web.service;
 import com.yingpaipay.web.domain.bo.AppletLoginBo;
 import com.yingpaipay.web.domain.vo.AppletLoginVo;
 
-/**
- * @Author: Huanyi
- * @CreateTime: 2025-11-26
- * @Description:
- * @Version: 1.0
- */
-
 public interface IAppletAuthService {
     AppletLoginVo login(AppletLoginBo bo);
 }

ruoyi-admin/src/main/java/com/yingpaipay/web/service/impl/AppletUserServiceImpl.java

@@ -38,6 +38,7 @@ public class AppletUserServiceImpl implements IAppletUserService {
         SysUser sysUser = userMapper.selectById(LoginHelper.getUserId());
         AppletUserInfoVo vo = new AppletUserInfoVo();
         vo.setNickname(sysUser.getNickName());
+        vo.setPhoneNumber(sysUser.getPhonenumber());
         if (sysUser.getAvatar() != null) {
             vo.setAvatar(ossService.getById(sysUser.getAvatar()).getUrl());
         }

ruoyi-admin/src/main/resources/i18n/messages_en_US.properties

@@ -79,3 +79,4 @@ applet.auth.nostrategy=The method is not supported.
 document.folder.restrictionerror=The sum of the same level cannot exceed the maximum limit of the parent lavel.
 
 document.document.audit.documentnotfound=The document is not found.
+document.document.download.notfound=The document is not found.

ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -79,3 +79,4 @@ applet.auth.nostrategy=该方式不支持
 document.folder.restrictionerror=子层级最大层级数相加不得大于父级的最大层级数
 
 document.document.audit.documentnotfound=对应文档未找到
+document.document.download.notfound=所属文档未找到

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/impl/CommonProjectService.java

@@ -49,4 +49,8 @@ public class CommonProjectService {
                 .like(StringUtils.isNotBlank(code), Project::getCode, code)
         );
     }
+
+    public Project queryById(Long projectId) {
+        return baseMapper.selectById(projectId);
+    }
 }

ruoyi-modules/yingpaipay-business/src/main/java/com/yingpaipay/business/service/impl/DocumentServiceImpl.java

@@ -383,7 +383,7 @@ public class DocumentServiceImpl implements IDocumentService {
                 storage.download(sysOss.getFileName(), fos, null);
             }
 
-            File processedFile = WatermarkUtils.processFile(tempFile, "123456");
+            File processedFile = WatermarkUtils.processFile(tempFile, buildRemark(ossId));
 
             FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
             response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
@@ -408,6 +408,15 @@ public class DocumentServiceImpl implements IDocumentService {
         }
     }
 
+    private String buildRemark(Long ossId) {
+        Document document = baseMapper.selectOne(Wrappers.lambdaQuery(Document.class).eq(Document::getOssId, ossId));
+        if (document == null) {
+            throw new BusinessException(MessageUtils.message("document.document.download.notfound"));
+        }
+        Project project = projectService.queryById(document.getProjectId());
+        return project.getCode() + ":" + document.getId();
+    }
+
     @Override
     public TableDataInfo<DocumentVo> listOnSearch(DocumentSearchBo bo, PageQuery pageQuery) {
         List<Long> projectIds = new ArrayList<>();

ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/controller/AppletSettingController.java → ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/controller/AggrementSettingController.java

@@ -3,8 +3,10 @@ package com.yingpaipay.setting.controller;
 import java.util.List;
 
 import cn.dev33.satoken.annotation.SaIgnore;
-import com.yingpaipay.setting.domain.vo.AppletSettingPrivacyVo;
-import com.yingpaipay.setting.domain.vo.AppletSettingUserVo;
+import com.yingpaipay.setting.domain.bo.AgreementSettingBo;
+import com.yingpaipay.setting.domain.vo.AgreementSettingPrivacyVo;
+import com.yingpaipay.setting.domain.vo.AgreementSettingUserVo;
+import com.yingpaipay.setting.domain.vo.AgreementSettingVo;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
@@ -20,13 +22,11 @@ import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import com.yingpaipay.setting.domain.vo.AppletSettingVo;
-import com.yingpaipay.setting.domain.bo.AppletSettingBo;
-import com.yingpaipay.setting.service.IAppletSettingService;
+import com.yingpaipay.setting.service.IAgreementSettingService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
- * 小程序设置
+ * 协议设置
  *
  * @author Huanyi
  * @date 2025-11-28
@@ -34,72 +34,72 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/setting/applet")
-public class AppletSettingController extends BaseController {
+@RequestMapping("/setting/agreement")
+public class AggrementSettingController extends BaseController {
 
-    private final IAppletSettingService appletSettingService;
+    private final IAgreementSettingService appletSettingService;
 
     /**
-     * 查询小程序设置列表
+     * 查询协议设置列表
      */
-    @SaCheckPermission("setting:applet:list")
+    @SaCheckPermission("setting:agreement:list")
     @GetMapping("/list")
-    public TableDataInfo<AppletSettingVo> list(AppletSettingBo bo, PageQuery pageQuery) {
+    public TableDataInfo<AgreementSettingVo> list(AgreementSettingBo bo, PageQuery pageQuery) {
         return appletSettingService.queryPageList(bo, pageQuery);
     }
 
     /**
-     * 导出小程序设置列表
+     * 导出协议设置列表
      */
-    @SaCheckPermission("setting:applet:export")
-    @Log(title = "小程序设置", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("setting:agreement:export")
+    @Log(title = "协议设置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(AppletSettingBo bo, HttpServletResponse response) {
-        List<AppletSettingVo> list = appletSettingService.queryList(bo);
-        ExcelUtil.exportExcel(list, "小程序设置", AppletSettingVo.class, response);
+    public void export(AgreementSettingBo bo, HttpServletResponse response) {
+        List<AgreementSettingVo> list = appletSettingService.queryList(bo);
+        ExcelUtil.exportExcel(list, "协议设置", AgreementSettingVo.class, response);
     }
 
     /**
-     * 获取小程序设置详细信息
+     * 获取协议设置详细信息
      *
      * @param id 主键
      */
-    @SaCheckPermission("setting:applet:query")
+    @SaCheckPermission("setting:agreement:query")
     @GetMapping("/{id}")
-    public R<AppletSettingVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<AgreementSettingVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
         return R.ok(appletSettingService.queryById(id));
     }
 
     /**
-     * 新增小程序设置
+     * 新增协议设置
      */
-    @SaCheckPermission("setting:applet:add")
-    @Log(title = "小程序设置", businessType = BusinessType.INSERT)
+    @SaCheckPermission("setting:agreement:add")
+    @Log(title = "协议设置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody AppletSettingBo bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AgreementSettingBo bo) {
         return toAjax(appletSettingService.insertByBo(bo));
     }
 
     /**
-     * 修改小程序设置
+     * 修改协议设置
      */
-    @SaCheckPermission("setting:applet:edit")
-    @Log(title = "小程序设置", businessType = BusinessType.UPDATE)
+    @SaCheckPermission("setting:agreement:edit")
+    @Log(title = "协议设置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AppletSettingBo bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AgreementSettingBo bo) {
         return toAjax(appletSettingService.updateByBo(bo));
     }
 
     /**
-     * 删除小程序设置
+     * 删除协议设置
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("setting:applet:remove")
-    @Log(title = "小程序设置", businessType = BusinessType.DELETE)
+    @SaCheckPermission("setting:agreement:remove")
+    @Log(title = "协议设置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
@@ -108,14 +108,14 @@ public class AppletSettingController extends BaseController {
 
     @SaIgnore
     @GetMapping("/user")
-    public R<AppletSettingUserVo> getUser() {
-        return R.ok(new AppletSettingUserVo(appletSettingService.queryById(1L).getUserAgreement()));
+    public R<AgreementSettingUserVo> getUser() {
+        return R.ok(new AgreementSettingUserVo(appletSettingService.queryById(1L).getUserAgreement()));
     }
 
     @SaIgnore
     @GetMapping("/privacy")
-    public R<AppletSettingPrivacyVo> getPrivacy() {
-        return R.ok(new AppletSettingPrivacyVo(appletSettingService.queryById(1L).getPrivacyAgreement()));
+    public R<AgreementSettingPrivacyVo> getPrivacy() {
+        return R.ok(new AgreementSettingPrivacyVo(appletSettingService.queryById(1L).getPrivacyAgreement()));
     }
 
 }

ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/AppletSetting.java → ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/AgreementSetting.java

@@ -15,8 +15,8 @@ import java.io.Serial;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("applet_setting")
-public class AppletSetting extends TenantEntity {
+@TableName("agreement_setting")
+public class AgreementSetting extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/bo/AppletSettingBo.java → ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/bo/AgreementSettingBo.java

@@ -1,8 +1,7 @@
 package com.yingpaipay.setting.domain.bo;
 
-import com.yingpaipay.setting.domain.AppletSetting;
+import com.yingpaipay.setting.domain.AgreementSetting;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
@@ -17,8 +16,8 @@ import jakarta.validation.constraints.*;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = AppletSetting.class, reverseConvertGenerate = false)
-public class AppletSettingBo extends BaseEntity {
+@AutoMapper(target = AgreementSetting.class, reverseConvertGenerate = false)
+public class AgreementSettingBo extends BaseEntity {
 
     /**
      * 序号

ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/vo/AppletSettingPrivacyVo.java → ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/vo/AgreementSettingPrivacyVo.java

@@ -12,7 +12,7 @@ import lombok.Data;
 
 @Data
 @AllArgsConstructor
-public class AppletSettingPrivacyVo {
+public class AgreementSettingPrivacyVo {
 
     private String content;
 

ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/vo/AppletSettingUserVo.java → ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/vo/AgreementSettingUserVo.java

@@ -12,7 +12,7 @@ import lombok.Data;
 
 @Data
 @AllArgsConstructor
-public class AppletSettingUserVo {
+public class AgreementSettingUserVo {
 
     private String content;
 

ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/vo/AppletSettingVo.java → ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/vo/AgreementSettingVo.java

@@ -1,17 +1,12 @@
 package com.yingpaipay.setting.domain.vo;
 
-import com.yingpaipay.setting.domain.AppletSetting;
+import com.yingpaipay.setting.domain.AgreementSetting;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
-import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-
 
 
 /**
@@ -22,8 +17,8 @@ import java.util.Date;
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = AppletSetting.class)
-public class AppletSettingVo implements Serializable {
+@AutoMapper(target = AgreementSetting.class)
+public class AgreementSettingVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/mapper/AppletSettingMapper.java

@@ -1,8 +1,8 @@
 package com.yingpaipay.setting.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.yingpaipay.setting.domain.AppletSetting;
-import com.yingpaipay.setting.domain.vo.AppletSettingVo;
+import com.yingpaipay.setting.domain.AgreementSetting;
+import com.yingpaipay.setting.domain.vo.AgreementSettingVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
@@ -12,6 +12,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @date 2025-11-28
  */
 @InterceptorIgnore(tenantLine = "true")
-public interface AppletSettingMapper extends BaseMapperPlus<AppletSetting, AppletSettingVo> {
+public interface AppletSettingMapper extends BaseMapperPlus<AgreementSetting, AgreementSettingVo> {
 
 }

ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/service/IAppletSettingService.java → ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/service/IAgreementSettingService.java

@@ -1,8 +1,7 @@
 package com.yingpaipay.setting.service;
 
-import com.yingpaipay.setting.domain.vo.AppletSettingUserVo;
-import com.yingpaipay.setting.domain.vo.AppletSettingVo;
-import com.yingpaipay.setting.domain.bo.AppletSettingBo;
+import com.yingpaipay.setting.domain.bo.AgreementSettingBo;
+import com.yingpaipay.setting.domain.vo.AgreementSettingVo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 
@@ -15,7 +14,7 @@ import java.util.List;
  * @author Huanyi
  * @date 2025-11-28
  */
-public interface IAppletSettingService {
+public interface IAgreementSettingService {
 
     /**
      * 查询小程序设置
@@ -23,7 +22,7 @@ public interface IAppletSettingService {
      * @param id 主键
      * @return 小程序设置
      */
-    AppletSettingVo queryById(Long id);
+    AgreementSettingVo queryById(Long id);
 
     /**
      * 分页查询小程序设置列表
@@ -32,7 +31,7 @@ public interface IAppletSettingService {
      * @param pageQuery 分页参数
      * @return 小程序设置分页列表
      */
-    TableDataInfo<AppletSettingVo> queryPageList(AppletSettingBo bo, PageQuery pageQuery);
+    TableDataInfo<AgreementSettingVo> queryPageList(AgreementSettingBo bo, PageQuery pageQuery);
 
     /**
      * 查询符合条件的小程序设置列表
@@ -40,7 +39,7 @@ public interface IAppletSettingService {
      * @param bo 查询条件
      * @return 小程序设置列表
      */
-    List<AppletSettingVo> queryList(AppletSettingBo bo);
+    List<AgreementSettingVo> queryList(AgreementSettingBo bo);
 
     /**
      * 新增小程序设置
@@ -48,7 +47,7 @@ public interface IAppletSettingService {
      * @param bo 小程序设置
      * @return 是否新增成功
      */
-    Boolean insertByBo(AppletSettingBo bo);
+    Boolean insertByBo(AgreementSettingBo bo);
 
     /**
      * 修改小程序设置
@@ -56,7 +55,7 @@ public interface IAppletSettingService {
      * @param bo 小程序设置
      * @return 是否修改成功
      */
-    Boolean updateByBo(AppletSettingBo bo);
+    Boolean updateByBo(AgreementSettingBo bo);
 
     /**
      * 校验并批量删除小程序设置信息

ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/service/impl/AppletSettingServiceImpl.java → ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/service/impl/AgreementSettingServiceImpl.java

@@ -1,6 +1,8 @@
 package com.yingpaipay.setting.service.impl;
 
-import com.yingpaipay.setting.domain.vo.AppletSettingUserVo;
+import com.yingpaipay.setting.domain.AgreementSetting;
+import com.yingpaipay.setting.domain.bo.AgreementSettingBo;
+import com.yingpaipay.setting.domain.vo.AgreementSettingVo;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -11,14 +13,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
-import com.yingpaipay.setting.domain.bo.AppletSettingBo;
-import com.yingpaipay.setting.domain.vo.AppletSettingVo;
-import com.yingpaipay.setting.domain.AppletSetting;
 import com.yingpaipay.setting.mapper.AppletSettingMapper;
-import com.yingpaipay.setting.service.IAppletSettingService;
+import com.yingpaipay.setting.service.IAgreementSettingService;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -35,7 +34,7 @@ import java.util.Collection;
 @Slf4j
 @RequiredArgsConstructor
 @Service
-public class AppletSettingServiceImpl implements IAppletSettingService {
+public class AgreementSettingServiceImpl implements IAgreementSettingService {
 
     private final AppletSettingMapper baseMapper;
 
@@ -45,9 +44,9 @@ public class AppletSettingServiceImpl implements IAppletSettingService {
      * @param id 主键
      * @return 小程序设置
      */
-    @Cacheable(cacheNames = CacheNames.SETTING, key = "'applet'")
+    @Cacheable(cacheNames = CacheNames.SETTING, key = "'agreement'")
     @Override
-    public AppletSettingVo queryById(Long id){
+    public AgreementSettingVo queryById(Long id){
         return baseMapper.selectVoById(id);
     }
 
@@ -59,9 +58,9 @@ public class AppletSettingServiceImpl implements IAppletSettingService {
      * @return 小程序设置分页列表
      */
     @Override
-    public TableDataInfo<AppletSettingVo> queryPageList(AppletSettingBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<AppletSetting> lqw = buildQueryWrapper(bo);
-        Page<AppletSettingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+    public TableDataInfo<AgreementSettingVo> queryPageList(AgreementSettingBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AgreementSetting> lqw = buildQueryWrapper(bo);
+        Page<AgreementSettingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -72,17 +71,17 @@ public class AppletSettingServiceImpl implements IAppletSettingService {
      * @return 小程序设置列表
      */
     @Override
-    public List<AppletSettingVo> queryList(AppletSettingBo bo) {
-        LambdaQueryWrapper<AppletSetting> lqw = buildQueryWrapper(bo);
+    public List<AgreementSettingVo> queryList(AgreementSettingBo bo) {
+        LambdaQueryWrapper<AgreementSetting> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
     }
 
-    private LambdaQueryWrapper<AppletSetting> buildQueryWrapper(AppletSettingBo bo) {
+    private LambdaQueryWrapper<AgreementSetting> buildQueryWrapper(AgreementSettingBo bo) {
         Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<AppletSetting> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(AppletSetting::getId);
-        lqw.eq(StringUtils.isNotBlank(bo.getUserAgreement()), AppletSetting::getUserAgreement, bo.getUserAgreement());
-        lqw.eq(StringUtils.isNotBlank(bo.getPrivacyAgreement()), AppletSetting::getPrivacyAgreement, bo.getPrivacyAgreement());
+        LambdaQueryWrapper<AgreementSetting> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(AgreementSetting::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getUserAgreement()), AgreementSetting::getUserAgreement, bo.getUserAgreement());
+        lqw.eq(StringUtils.isNotBlank(bo.getPrivacyAgreement()), AgreementSetting::getPrivacyAgreement, bo.getPrivacyAgreement());
         return lqw;
     }
 
@@ -93,8 +92,8 @@ public class AppletSettingServiceImpl implements IAppletSettingService {
      * @return 是否新增成功
      */
     @Override
-    public Boolean insertByBo(AppletSettingBo bo) {
-        AppletSetting add = MapstructUtils.convert(bo, AppletSetting.class);
+    public Boolean insertByBo(AgreementSettingBo bo) {
+        AgreementSetting add = MapstructUtils.convert(bo, AgreementSetting.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
@@ -109,10 +108,10 @@ public class AppletSettingServiceImpl implements IAppletSettingService {
      * @param bo 小程序设置
      * @return 是否修改成功
      */
-    @CacheEvict(cacheNames = CacheNames.SETTING, key = "'applet'")
+    @CachePut(cacheNames = CacheNames.SETTING, key = "'agreement'")
     @Override
-    public Boolean updateByBo(AppletSettingBo bo) {
-        AppletSetting update = MapstructUtils.convert(bo, AppletSetting.class);
+    public Boolean updateByBo(AgreementSettingBo bo) {
+        AgreementSetting update = MapstructUtils.convert(bo, AgreementSetting.class);
         if (StringUtils.isNotBlank(update.getUserAgreement())) {
             update.setUserAgreement(new String(Base64.getDecoder().decode(update.getUserAgreement()), StandardCharsets.UTF_8));
         }
@@ -126,7 +125,7 @@ public class AppletSettingServiceImpl implements IAppletSettingService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(AppletSetting entity){
+    private void validEntityBeforeSave(AgreementSetting entity){
         //TODO 做一些数据校验,如唯一约束
     }
 

ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/service/impl/AiSettingServiceImpl.java

@@ -6,7 +6,7 @@ import com.yingpaipay.setting.service.IAiSettingService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.CacheNames;
-import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
@@ -23,7 +23,7 @@ public class AiSettingServiceImpl implements IAiSettingService {
         return baseMapper.selectById(1L);
     }
 
-    @CacheEvict(cacheNames = CacheNames.SETTING, key = "'ai'")
+    @CachePut(cacheNames = CacheNames.SETTING, key = "'ai'")
     @Override
     public boolean edit(AiSetting request) {
         return baseMapper.updateById(request) > 0;

script/sql/business/create.sql

@@ -155,14 +155,14 @@ CREATE TABLE `applet_setting`
 
 CREATE TABLE `ai_setting`
 (
-    `id` bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '序号',
-    `enabled_flag`      tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否开启',
-    `create_dept`       bigint(20) COMMENT '创建部门',
-    `create_by`         bigint(20) COMMENT '创建者',
-    `create_time`       datetime COMMENT '创建时间',
-    `update_by`         bigint(20) COMMENT '更新者',
-    `update_time`       datetime COMMENT '更新时间',
-    `del_flag`          char(1) DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
-    `tenant_id`         varchar(40) COMMENT '租户id'
+    `id`           bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '序号',
+    `enabled_flag` tinyint(1)                  NOT NULL DEFAULT 0 COMMENT '是否开启',
+    `create_dept`  bigint(20) COMMENT '创建部门',
+    `create_by`    bigint(20) COMMENT '创建者',
+    `create_time`  datetime COMMENT '创建时间',
+    `update_by`    bigint(20) COMMENT '更新者',
+    `update_time`  datetime COMMENT '更新时间',
+    `del_flag`     char(1)                              DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
+    `tenant_id`    varchar(40) COMMENT '租户id'
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='AI设置';