ソースを参照

协议设置基本完成,补充系统用户实体信息,添加测试环境

Huanyi 1 週間 前
コミット
daf8c718ff
30 ファイル変更1283 行追加86 行削除
  1. 22 1
      pom.xml
  2. 10 0
      ruoyi-admin/pom.xml
  3. 11 0
      ruoyi-admin/src/main/java/com/yingpaipay/web/service/IAppletAuthService.java
  4. 19 0
      ruoyi-admin/src/main/java/com/yingpaipay/web/service/impl/AppletAuthServiceImpl.java
  5. 1 1
      ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java
  6. 1 1
      ruoyi-admin/src/main/resources/application-prod.yml
  7. 284 0
      ruoyi-admin/src/main/resources/application-test.yml
  8. 2 2
      ruoyi-admin/src/main/resources/application.yml
  9. 3 2
      ruoyi-admin/src/main/resources/logback-plus-dev.xml
  10. 1 0
      ruoyi-common/pom.xml
  11. 6 0
      ruoyi-common/ruoyi-common-bom/pom.xml
  12. 2 0
      ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java
  13. 15 0
      ruoyi-common/yingpaipay-common-wechat/pom.xml
  14. 1 0
      ruoyi-common/yingpaipay-common-wechat/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  15. 1 1
      ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
  16. 12 12
      ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml
  17. 66 66
      ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml
  18. 2 0
      ruoyi-modules/pom.xml
  19. 19 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java
  20. 101 0
      ruoyi-modules/yingpaipay-business/pom.xml
  21. 101 0
      ruoyi-modules/yingpaipay-setting/pom.xml
  22. 105 0
      ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/controller/AppletSettingController.java
  23. 47 0
      ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/AppletSetting.java
  24. 40 0
      ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/bo/AppletSettingBo.java
  25. 42 0
      ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/vo/AppletSettingVo.java
  26. 17 0
      ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/mapper/AppletSettingMapper.java
  27. 68 0
      ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/service/IAppletSettingService.java
  28. 146 0
      ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/service/impl/AppletSettingServiceImpl.java
  29. 135 0
      script/sql/business/create.sql
  30. 3 0
      script/sql/business/update.sql

+ 22 - 1
pom.xml

@@ -62,7 +62,7 @@
             <properties>
                 <!-- 环境标识,需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
-                <logging.level>info</logging.level>
+                <logging.level>debug</logging.level>
                 <monitor.username>ithuanyi</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
@@ -71,6 +71,15 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
         </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <profiles.active>test</profiles.active>
+                <logging.level>debug</logging.level>
+                <monitor.username>ithuanyi</monitor.username>
+                <monitor.password>123456</monitor.password>
+            </properties>
+        </profile>
         <profile>
             <id>prod</id>
             <properties>
@@ -336,6 +345,18 @@
                 <version>${revision}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.yingpaipay</groupId>
+                <artifactId>yingpaipay-setting</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.yingpaipay</groupId>
+                <artifactId>yingpaipay-business</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
             <!--  工作流模块  -->
             <dependency>
                 <groupId>org.dromara</groupId>

+ 10 - 0
ruoyi-admin/pom.xml

@@ -93,6 +93,16 @@
             <artifactId>ruoyi-workflow</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.yingpaipay</groupId>
+            <artifactId>yingpaipay-setting</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yingpaipay</groupId>
+            <artifactId>yingpaipay-business</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>

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

@@ -0,0 +1,11 @@
+package com.yingpaipay.web.service;
+
+/**
+ * @Author: Huanyi
+ * @CreateTime: 2025-11-26
+ * @Description:
+ * @Version: 1.0
+ */
+
+public interface IAppletAuthService {
+}

+ 19 - 0
ruoyi-admin/src/main/java/com/yingpaipay/web/service/impl/AppletAuthServiceImpl.java

@@ -0,0 +1,19 @@
+package com.yingpaipay.web.service.impl;
+
+import com.yingpaipay.web.service.IAppletAuthService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: Huanyi
+ * @CreateTime: 2025-11-26
+ * @Description:
+ * @Version: 1.0
+ */
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class AppletAuthServiceImpl implements IAppletAuthService {
+}

+ 1 - 1
ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java

@@ -22,7 +22,7 @@ public class DromaraApplication {
         SpringApplication application = new SpringApplication(DromaraApplication.class);
         application.setApplicationStartup(new BufferingApplicationStartup(2048));
         application.run(args);
-        log.warn("(♥◠‿◠)ノ゙  智能eTMF 启动成功   ლ(´ڡ`ლ)゙");
+        log.warn("(♥◠‿◠)ノ゙  智能eTMF系统 启动成功   ლ(´ڡ`ლ)゙");
     }
 
 }

+ 1 - 1
ruoyi-admin/src/main/resources/application-prod.yml

@@ -50,7 +50,7 @@ spring:
                     driverClassName: com.mysql.cj.jdbc.Driver
                     # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
                     # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-                    url: jdbc:mysql://{客户服务器IP}:3306/intelligent_etmf_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+                    url: jdbc:mysql://{客户服务器}:3306/intelligent_etmf_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
                     username: root
                     password: {客户密码}
             #        # 从库数据源

+ 284 - 0
ruoyi-admin/src/main/resources/application-test.yml

@@ -0,0 +1,284 @@
+--- # 监控中心配置
+spring.boot.admin.client:
+    # 增加客户端开关
+    enabled: false
+    url: http://localhost:9090/admin
+    instance:
+        service-host-type: IP
+        metadata:
+            username: ${spring.boot.admin.client.username}
+            userpassword: ${spring.boot.admin.client.password}
+    username: @monitor.username@
+    password: @monitor.password@
+
+--- # snail-job 配置
+snail-job:
+    enabled: false
+    # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
+    group: "ruoyi_group"
+    # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表
+    token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
+    server:
+        host: 127.0.0.1
+        port: 17888
+    # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段
+    namespace: ${spring.profiles.active}
+    # 随主应用端口漂移
+    port: 2${server.port}
+    # 客户端ip指定
+    host:
+
+--- # 数据源配置
+spring:
+    datasource:
+        type: com.zaxxer.hikari.HikariDataSource
+        # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
+        dynamic:
+            # 性能分析插件(有性能损耗 不建议生产环境使用)
+            p6spy: true
+            # 设置默认的数据源或者数据源组,默认值即为 master
+            primary: master
+            # 严格模式 匹配不到数据源则报错
+            strict: true
+            datasource:
+                # 主库数据源
+                master:
+                    type: ${spring.datasource.type}
+                    driverClassName: com.mysql.cj.jdbc.Driver
+                    # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
+                    # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
+                    url: jdbc:mysql://{客户服务器}:3306/intelligent_etmf_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+                    username: root
+                    password: {客户密码}
+            #        # 从库数据源
+            #        slave:
+            #          lazy: true
+            #          type: ${spring.datasource.type}
+            #          driverClassName: com.mysql.cj.jdbc.Driver
+            #          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+            #          username:
+            #          password:
+            #        oracle:
+            #          type: ${spring.datasource.type}
+            #          driverClassName: oracle.jdbc.OracleDriver
+            #          url: jdbc:oracle:thin:@//localhost:1521/XE
+            #          username: ROOT
+            #          password: root
+            #        postgres:
+            #          type: ${spring.datasource.type}
+            #          driverClassName: org.postgresql.Driver
+            #          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+            #          username: root
+            #          password: root
+            #        sqlserver:
+            #          type: ${spring.datasource.type}
+            #          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+            #          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
+            #          username: SA
+            #          password: root
+            hikari:
+                # 最大连接池数量
+                maxPoolSize: 20
+                # 最小空闲线程数量
+                minIdle: 10
+                # 配置获取连接等待超时的时间
+                connectionTimeout: 30000
+                # 校验超时时间
+                validationTimeout: 5000
+                # 空闲连接存活最大时间,默认10分钟
+                idleTimeout: 600000
+                # 此属性控制池中连接的最长生命周期,值0表示无限生命周期,默认30分钟
+                maxLifetime: 1800000
+                # 多久检查一次连接的活性
+                keepaliveTime: 30000
+
+--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
+spring.data:
+    redis:
+        # 地址
+        host: 127.0.0.1
+        # 端口,默认为6379
+        port: 6379
+        # 数据库索引
+        database: 14
+#        # redis 密码必须配置
+#        password: ruoyi123
+        # 连接超时时间
+        timeout: 10s
+        # 是否开启ssl
+        ssl.enabled: false
+
+# redisson 配置
+redisson:
+    # redis key前缀
+    keyPrefix:
+    # 线程池数量
+    threads: 4
+    # Netty线程池数量
+    nettyThreads: 8
+    # 单节点配置
+    singleServerConfig:
+        # 客户端名称 不能用中文
+        clientName: intelligent-etmf-system
+        # 最小空闲连接数
+        connectionMinimumIdleSize: 8
+        # 连接池大小
+        connectionPoolSize: 32
+        # 连接空闲超时,单位:毫秒
+        idleConnectionTimeout: 10000
+        # 命令等待超时,单位:毫秒
+        timeout: 3000
+        # 发布和订阅连接池大小
+        subscriptionConnectionPoolSize: 50
+
+--- # mail 邮件发送
+mail:
+    enabled: false
+    host: smtp.163.com
+    port: 465
+    # 是否需要用户名密码验证
+    auth: true
+    # 发送方,遵循RFC-822标准
+    from: xxx@163.com
+    # 用户名(注意:如果使用foxmail邮箱,此处user为qq号)
+    user: xxx@163.com
+    # 密码(注意,某些邮箱需要为SMTP服务单独设置密码,详情查看相关帮助)
+    pass: xxxxxxxxxx
+    # 使用 STARTTLS安全连接,STARTTLS是对纯文本通信协议的扩展。
+    starttlsEnable: true
+    # 使用SSL安全连接
+    sslEnable: true
+    # SMTP超时时长,单位毫秒,缺省值不超时
+    timeout: 0
+    # Socket连接超时值,单位毫秒,缺省值不超时
+    connectionTimeout: 0
+
+--- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商
+# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置,可以配置多个同时使用
+sms:
+    # 配置源类型用于标定配置来源(interface,yaml)
+    config-type: yaml
+    # 用于标定yml中的配置是否开启短信拦截,接口配置不受此限制
+    restricted: true
+    # 短信拦截限制单手机号每分钟最大发送,只对开启了拦截的配置有效
+    minute-max: 1
+    # 短信拦截限制单手机号每日最大发送量,只对开启了拦截的配置有效
+    account-max: 30
+    # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中
+    blends:
+        # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可
+        # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户
+        config1:
+            # 框架定义的厂商名称标识,标定此配置是哪个厂商,详细请看厂商标识介绍部分
+            supplier: alibaba
+            # 有些称为accessKey有些称之为apiKey,也有称为sdkKey或者appId。
+            access-key-id: 您的accessKey
+            # 称为accessSecret有些称之为apiSecret
+            access-key-secret: 您的accessKeySecret
+            signature: 您的短信签名
+            sdk-app-id: 您的sdkAppId
+        config2:
+            # 厂商标识,标定此配置是哪个厂商,详细请看厂商标识介绍部分
+            supplier: tencent
+            access-key-id: 您的accessKey
+            access-key-secret: 您的accessKeySecret
+            signature: 您的短信签名
+            sdk-app-id: 您的sdkAppId
+
+logging:
+    config: classpath:logback-plus-dev.xml
+
+captcha:
+    # 是否启用验证码校验
+    enable: false
+    # 验证码类型 math 数组计算 char 字符验证
+    type: MATH
+    # line 线段干扰 circle 圆圈干扰 shear 扭曲干扰
+    category: CIRCLE
+    # 数字验证码位数
+    numberLength: 1
+    # 字符验证码长度
+    charLength: 4
+
+--- # 三方授权
+justauth:
+    # 前端外网访问地址
+    address: http://localhost:80
+    type:
+        maxkey:
+            # maxkey 服务器地址
+            # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据
+            server-url: http://sso.maxkey.top
+            client-id: 876892492581044224
+            client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8
+            redirect-uri: ${justauth.address}/social-callback?source=maxkey
+        topiam:
+            # topiam 服务器地址
+            server-url: http://127.0.0.1:1898/api/v1/authorize/y0q************spq***********8ol
+            client-id: 449c4*********937************759
+            client-secret: ac7***********1e0************28d
+            redirect-uri: ${justauth.address}/social-callback?source=topiam
+            scopes: [ openid, email, phone, profile ]
+        qq:
+            client-id: 10**********6
+            client-secret: 1f7d08**********5b7**********29e
+            redirect-uri: ${justauth.address}/social-callback?source=qq
+            union-id: false
+        weibo:
+            client-id: 10**********6
+            client-secret: 1f7d08**********5b7**********29e
+            redirect-uri: ${justauth.address}/social-callback?source=weibo
+        gitee:
+            client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98
+            client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac
+            redirect-uri: ${justauth.address}/social-callback?source=gitee
+        dingtalk:
+            client-id: 10**********6
+            client-secret: 1f7d08**********5b7**********29e
+            redirect-uri: ${justauth.address}/social-callback?source=dingtalk
+        baidu:
+            client-id: 10**********6
+            client-secret: 1f7d08**********5b7**********29e
+            redirect-uri: ${justauth.address}/social-callback?source=baidu
+        csdn:
+            client-id: 10**********6
+            client-secret: 1f7d08**********5b7**********29e
+            redirect-uri: ${justauth.address}/social-callback?source=csdn
+        coding:
+            client-id: 10**********6
+            client-secret: 1f7d08**********5b7**********29e
+            redirect-uri: ${justauth.address}/social-callback?source=coding
+            coding-group-name: xx
+        oschina:
+            client-id: 10**********6
+            client-secret: 1f7d08**********5b7**********29e
+            redirect-uri: ${justauth.address}/social-callback?source=oschina
+        alipay_wallet:
+            client-id: 10**********6
+            client-secret: 1f7d08**********5b7**********29e
+            redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet
+            alipay-public-key: MIIB**************DAQAB
+        wechat_open:
+            client-id: 10**********6
+            client-secret: 1f7d08**********5b7**********29e
+            redirect-uri: ${justauth.address}/social-callback?source=wechat_open
+        wechat_mp:
+            client-id: 10**********6
+            client-secret: 1f7d08**********5b7**********29e
+            redirect-uri: ${justauth.address}/social-callback?source=wechat_mp
+        wechat_enterprise:
+            client-id: 10**********6
+            client-secret: 1f7d08**********5b7**********29e
+            redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise
+            agent-id: 1000002
+        gitlab:
+            client-id: 10**********6
+            client-secret: 1f7d08**********5b7**********29e
+            redirect-uri: ${justauth.address}/social-callback?source=gitlab
+        gitea:
+            # 前端改动 https://gitee.com/JavaLionLi/plus-ui/pulls/204
+            # gitea 服务器地址
+            server-url: https://demo.gitea.com
+            client-id: 10**********6
+            client-secret: 1f7d08**********5b7**********29e
+            redirect-uri: ${justauth.address}/social-callback?source=gitea

+ 2 - 2
ruoyi-admin/src/main/resources/application.yml

@@ -24,11 +24,10 @@ server:
 logging:
     level:
         org.dromara: @logging.level@
-        com.yingpaipay: @logging.level@
         org.springframework: warn
         org.mybatis.spring.mapper: error
         org.apache.fury: warn
-
+        com.yingpaipay: @logging.level@
 
 # 用户配置
 user:
@@ -127,6 +126,7 @@ tenant:
         - sys_oss
         - sys_dict_data
         - sys_dict_type
+        - applet_setting
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

+ 3 - 2
ruoyi-admin/src/main/resources/logback-plus-dev.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <!-- 控制台日志格式(带颜色) -->
+    <property name="log.path" value="./logs"/>
     <property name="console.log.pattern"
-              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n"/>
+              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
+    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>

+ 1 - 0
ruoyi-common/pom.xml

@@ -34,6 +34,7 @@
         <module>ruoyi-common-tenant</module>
         <module>ruoyi-common-websocket</module>
         <module>ruoyi-common-sse</module>
+        <module>yingpaipay-common-wechat</module>
     </modules>
 
     <artifactId>ruoyi-common</artifactId>

+ 6 - 0
ruoyi-common/ruoyi-common-bom/pom.xml

@@ -179,6 +179,12 @@
                 <version>${revision}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.yingpaipay</groupId>
+                <artifactId>yingpaipay-common-wechat</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

+ 2 - 0
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java

@@ -86,4 +86,6 @@ public interface CacheNames {
      */
     String ONLINE_TOKEN = "online_tokens";
 
+    String APPLET_SETTING = "applet_setting";
+
 }

+ 15 - 0
ruoyi-common/yingpaipay-common-wechat/pom.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <groupId>com.yingpaipay</groupId>
+    <artifactId>yingpaipay-common-wechat</artifactId>
+
+</project>

+ 1 - 0
ruoyi-common/yingpaipay-common-wechat/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+

+ 1 - 1
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ spring:
   boot:
     admin:
       ui:
-        title: RuoYi-Vue-Plus服务监控中心
+        title: 服务监控中心
       context-path: /admin
   # 忽略无用警告
   thymeleaf:

+ 12 - 12
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml

@@ -14,21 +14,21 @@
         </encoder>
     </appender>
 
-    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
+<!--    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
+<!--        <file>${log.path}.log</file>-->
+<!--        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
+<!--            <fileNamePattern>${log.path}.%d{yyyy-MM-dd}.log</fileNamePattern>-->
+<!--            &lt;!&ndash; 日志最大的历史 60天 &ndash;&gt;-->
+<!--            <maxHistory>60</maxHistory>-->
+<!--        </rollingPolicy>-->
+<!--        <encoder>-->
+<!--            <pattern>${log.pattern}</pattern>-->
+<!--        </encoder>-->
+<!--    </appender>-->
 
     <root level="info">
         <appender-ref ref="console"/>
-        <appender-ref ref="file"/>
+<!--        <appender-ref ref="file"/>-->
     </root>
 
 </configuration>

+ 66 - 66
ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml

@@ -14,80 +14,80 @@
         </encoder>
     </appender>
 
-    <!-- 控制台输出 -->
-    <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/console.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大 1天 -->
-            <maxHistory>1</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-            <charset>utf-8</charset>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-        </filter>
-    </appender>
+<!--    &lt;!&ndash; 控制台输出 &ndash;&gt;-->
+<!--    <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
+<!--        <file>${log.path}/console.log</file>-->
+<!--        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
+<!--            &lt;!&ndash; 日志文件名格式 &ndash;&gt;-->
+<!--            <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern>-->
+<!--            &lt;!&ndash; 日志最大 1天 &ndash;&gt;-->
+<!--            <maxHistory>1</maxHistory>-->
+<!--        </rollingPolicy>-->
+<!--        <encoder>-->
+<!--            <pattern>${log.pattern}</pattern>-->
+<!--            <charset>utf-8</charset>-->
+<!--        </encoder>-->
+<!--        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">-->
+<!--            &lt;!&ndash; 过滤的级别 &ndash;&gt;-->
+<!--            <level>INFO</level>-->
+<!--        </filter>-->
+<!--    </appender>-->
 
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</FileNamePattern>
-            <MaxHistory>60</MaxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
+<!--    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
+<!--        <file>${log.path}/info.log</file>-->
+<!--        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
+<!--            <FileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</FileNamePattern>-->
+<!--            <MaxHistory>60</MaxHistory>-->
+<!--        </rollingPolicy>-->
+<!--        <encoder>-->
+<!--            <pattern>${log.pattern}</pattern>-->
+<!--        </encoder>-->
+<!--        <filter class="ch.qos.logback.classic.filter.LevelFilter">-->
+<!--            <level>INFO</level>-->
+<!--            <onMatch>ACCEPT</onMatch>-->
+<!--            <onMismatch>DENY</onMismatch>-->
+<!--        </filter>-->
+<!--    </appender>-->
 
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log
-            </FileNamePattern>
-            <MaxHistory>60</MaxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
+<!--    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
+<!--        <file>${log.path}/error.log</file>-->
+<!--        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
+<!--            <FileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log-->
+<!--            </FileNamePattern>-->
+<!--            <MaxHistory>60</MaxHistory>-->
+<!--        </rollingPolicy>-->
+<!--        <encoder>-->
+<!--            <pattern>${log.pattern}</pattern>-->
+<!--        </encoder>-->
+<!--        <filter class="ch.qos.logback.classic.filter.LevelFilter">-->
+<!--            <level>ERROR</level>-->
+<!--            <onMatch>ACCEPT</onMatch>-->
+<!--            <onMismatch>DENY</onMismatch>-->
+<!--        </filter>-->
+<!--    </appender>-->
 
-    <appender name ="async_info" class= "ch.qos.logback.classic.AsyncAppender">
-        <discardingThreshold >100</discardingThreshold>
-        <queueSize>1024</queueSize>
-        <appender-ref ref ="file_info"/>
-    </appender>
+<!--    <appender name ="async_info" class= "ch.qos.logback.classic.AsyncAppender">-->
+<!--        <discardingThreshold >100</discardingThreshold>-->
+<!--        <queueSize>1024</queueSize>-->
+<!--        <appender-ref ref ="file_info"/>-->
+<!--    </appender>-->
 
-    <appender name ="async_error" class= "ch.qos.logback.classic.AsyncAppender">
-        <discardingThreshold >100</discardingThreshold>
-        <queueSize>1024</queueSize>
-        <appender-ref ref ="file_error"/>
-    </appender>
+<!--    <appender name ="async_error" class= "ch.qos.logback.classic.AsyncAppender">-->
+<!--        <discardingThreshold >100</discardingThreshold>-->
+<!--        <queueSize>1024</queueSize>-->
+<!--        <appender-ref ref ="file_error"/>-->
+<!--    </appender>-->
 
-    <!-- SnailJob appender -->
-    <appender name="snail_log_server_appender" class="com.aizuda.snailjob.server.common.appender.SnailJobServerLogbackAppender">
-    </appender>
+<!--    &lt;!&ndash; SnailJob appender &ndash;&gt;-->
+<!--    <appender name="snail_log_server_appender" class="com.aizuda.snailjob.server.common.appender.SnailJobServerLogbackAppender">-->
+<!--    </appender>-->
 
     <!-- 控制台输出日志级别 -->
     <root level="info">
         <appender-ref ref="console" />
-        <appender-ref ref="file_console" />
-        <appender-ref ref="async_info" />
-        <appender-ref ref="async_error" />
-        <appender-ref ref="snail_log_server_appender" />
+<!--        <appender-ref ref="file_console" />-->
+<!--        <appender-ref ref="async_info" />-->
+<!--        <appender-ref ref="async_error" />-->
+<!--        <appender-ref ref="snail_log_server_appender" />-->
     </root>
 </configuration>

+ 2 - 0
ruoyi-modules/pom.xml

@@ -15,6 +15,8 @@
         <module>ruoyi-job</module>
         <module>ruoyi-system</module>
         <module>ruoyi-workflow</module>
+        <module>yingpaipay-setting</module>
+        <module>yingpaipay-business</module>
     </modules>
 
     <artifactId>ruoyi-modules</artifactId>

+ 19 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java

@@ -103,6 +103,25 @@ public class SysUser extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 微信的 {@code open ID}
+     * @Author: Huanyi
+     */
+    private String wechatOpenId;
+
+    /**
+     * 微信的 {@code union ID}
+     * @Author: Huanyi
+     */
+    private String wechatUnionId;
+
+    /**
+     * 是否允许微信小程序登录:
+     * <li>0 -> 允许</li>
+     * <li>1 -> 禁止</li>
+     * @Author: Huanyi
+     */
+    private Integer appletStatus;
 
     public SysUser(Long userId) {
         this.userId = userId;

+ 101 - 0
ruoyi-modules/yingpaipay-business/pom.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <groupId>com.yingpaipay</groupId>
+    <artifactId>yingpaipay-business</artifactId>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-translation</artifactId>
+        </dependency>
+
+        <!-- OSS功能模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-oss</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <!-- excel-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <!-- SMS功能模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-tenant</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sensitive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-encrypt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-websocket</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sse</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

+ 101 - 0
ruoyi-modules/yingpaipay-setting/pom.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <groupId>com.yingpaipay</groupId>
+    <artifactId>yingpaipay-setting</artifactId>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-translation</artifactId>
+        </dependency>
+
+        <!-- OSS功能模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-oss</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <!-- excel-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <!-- SMS功能模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-tenant</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sensitive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-encrypt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-websocket</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sse</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

+ 105 - 0
ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/controller/AppletSettingController.java

@@ -0,0 +1,105 @@
+package com.yingpaipay.setting.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+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 org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 小程序设置
+ *
+ * @author Huanyi
+ * @date 2025-11-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/setting/applet")
+public class AppletSettingController extends BaseController {
+
+    private final IAppletSettingService appletSettingService;
+
+    /**
+     * 查询小程序设置列表
+     */
+    @SaCheckPermission("setting:applet:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppletSettingVo> list(AppletSettingBo bo, PageQuery pageQuery) {
+        return appletSettingService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出小程序设置列表
+     */
+    @SaCheckPermission("setting:applet: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);
+    }
+
+    /**
+     * 获取小程序设置详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("setting:applet:query")
+    @GetMapping("/{id}")
+    public R<AppletSettingVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(appletSettingService.queryById(id));
+    }
+
+    /**
+     * 新增小程序设置
+     */
+    @SaCheckPermission("setting:applet:add")
+    @Log(title = "小程序设置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AppletSettingBo bo) {
+        return toAjax(appletSettingService.insertByBo(bo));
+    }
+
+    /**
+     * 修改小程序设置
+     */
+    @SaCheckPermission("setting:applet:edit")
+    @Log(title = "小程序设置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AppletSettingBo bo) {
+        return toAjax(appletSettingService.updateByBo(bo));
+    }
+
+    /**
+     * 删除小程序设置
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("setting:applet:remove")
+    @Log(title = "小程序设置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(appletSettingService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

+ 47 - 0
ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/AppletSetting.java

@@ -0,0 +1,47 @@
+package com.yingpaipay.setting.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 小程序设置对象 applet_setting
+ *
+ * @author Huanyi
+ * @date 2025-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("applet_setting")
+public class AppletSetting extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 用户协议
+     */
+    private String userAgreement;
+
+    /**
+     * 隐私协议
+     */
+    private String privacyAgreement;
+
+    /**
+     * 删除标志(0代表存在 1代表删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

+ 40 - 0
ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/bo/AppletSettingBo.java

@@ -0,0 +1,40 @@
+package com.yingpaipay.setting.domain.bo;
+
+import com.yingpaipay.setting.domain.AppletSetting;
+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;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 小程序设置业务对象 applet_setting
+ *
+ * @author Huanyi
+ * @date 2025-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = AppletSetting.class, reverseConvertGenerate = false)
+public class AppletSettingBo extends BaseEntity {
+
+    /**
+     * 序号
+     */
+    @NotNull(message = "序号不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 用户协议
+     */
+    private String userAgreement;
+
+    /**
+     * 隐私协议
+     */
+    private String privacyAgreement;
+
+
+}

+ 42 - 0
ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/domain/vo/AppletSettingVo.java

@@ -0,0 +1,42 @@
+package com.yingpaipay.setting.domain.vo;
+
+import com.yingpaipay.setting.domain.AppletSetting;
+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;
+
+
+
+/**
+ * 小程序设置视图对象 applet_setting
+ *
+ * @author Huanyi
+ * @date 2025-11-28
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppletSetting.class)
+public class AppletSettingVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户协议
+     */
+    private String userAgreement;
+
+    /**
+     * 隐私协议
+     */
+    private String privacyAgreement;
+
+
+}

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

@@ -0,0 +1,17 @@
+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 org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 小程序设置Mapper接口
+ *
+ * @author Huanyi
+ * @date 2025-11-28
+ */
+@InterceptorIgnore(tenantLine = "true")
+public interface AppletSettingMapper extends BaseMapperPlus<AppletSetting, AppletSettingVo> {
+
+}

+ 68 - 0
ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/service/IAppletSettingService.java

@@ -0,0 +1,68 @@
+package com.yingpaipay.setting.service;
+
+import com.yingpaipay.setting.domain.vo.AppletSettingVo;
+import com.yingpaipay.setting.domain.bo.AppletSettingBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 小程序设置Service接口
+ *
+ * @author Huanyi
+ * @date 2025-11-28
+ */
+public interface IAppletSettingService {
+
+    /**
+     * 查询小程序设置
+     *
+     * @param id 主键
+     * @return 小程序设置
+     */
+    AppletSettingVo queryById(Long id);
+
+    /**
+     * 分页查询小程序设置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 小程序设置分页列表
+     */
+    TableDataInfo<AppletSettingVo> queryPageList(AppletSettingBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的小程序设置列表
+     *
+     * @param bo 查询条件
+     * @return 小程序设置列表
+     */
+    List<AppletSettingVo> queryList(AppletSettingBo bo);
+
+    /**
+     * 新增小程序设置
+     *
+     * @param bo 小程序设置
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(AppletSettingBo bo);
+
+    /**
+     * 修改小程序设置
+     *
+     * @param bo 小程序设置
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(AppletSettingBo bo);
+
+    /**
+     * 校验并批量删除小程序设置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 146 - 0
ruoyi-modules/yingpaipay-setting/src/main/java/com/yingpaipay/setting/service/impl/AppletSettingServiceImpl.java

@@ -0,0 +1,146 @@
+package com.yingpaipay.setting.service.impl;
+
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.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 java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 小程序设置Service业务层处理
+ *
+ * @author Huanyi
+ * @date 2025-11-28
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppletSettingServiceImpl implements IAppletSettingService {
+
+    private final AppletSettingMapper baseMapper;
+
+    /**
+     * 查询小程序设置
+     *
+     * @param id 主键
+     * @return 小程序设置
+     */
+    @Cacheable(cacheNames = CacheNames.APPLET_SETTING, key = "#id")
+    @Override
+    public AppletSettingVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询小程序设置列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 小程序设置分页列表
+     */
+    @Override
+    public TableDataInfo<AppletSettingVo> queryPageList(AppletSettingBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppletSetting> lqw = buildQueryWrapper(bo);
+        Page<AppletSettingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的小程序设置列表
+     *
+     * @param bo 查询条件
+     * @return 小程序设置列表
+     */
+    @Override
+    public List<AppletSettingVo> queryList(AppletSettingBo bo) {
+        LambdaQueryWrapper<AppletSetting> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppletSetting> buildQueryWrapper(AppletSettingBo 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());
+        return lqw;
+    }
+
+    /**
+     * 新增小程序设置
+     *
+     * @param bo 小程序设置
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(AppletSettingBo bo) {
+        AppletSetting add = MapstructUtils.convert(bo, AppletSetting.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改小程序设置
+     *
+     * @param bo 小程序设置
+     * @return 是否修改成功
+     */
+    @CacheEvict(cacheNames = CacheNames.APPLET_SETTING, key = "#bo.id")
+    @Override
+    public Boolean updateByBo(AppletSettingBo bo) {
+        AppletSetting update = MapstructUtils.convert(bo, AppletSetting.class);
+        if (StringUtils.isNotBlank(update.getUserAgreement())) {
+            update.setUserAgreement(new String(Base64.getDecoder().decode(update.getUserAgreement()), StandardCharsets.UTF_8));
+        }
+        if (StringUtils.isNotBlank(update.getPrivacyAgreement())) {
+            update.setPrivacyAgreement(new String(Base64.getDecoder().decode(update.getPrivacyAgreement()), StandardCharsets.UTF_8));
+        }
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppletSetting entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除小程序设置信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

+ 135 - 0
script/sql/business/create.sql

@@ -0,0 +1,135 @@
+CREATE TABLE `project`
+(
+    `id`          bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '序号',
+    `name`        varchar(128)                NOT NULL COMMENT '名称',
+    `icon`        bigint                      NOT NULL COMMENT '图标',
+    `status`      tinyint(1)                  NOT NULL DEFAULT 0 COMMENT '状态',
+    `note`        varchar(255) 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 ='项目';
+
+CREATE TABLE `country`
+(
+    `id`          bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '序号',
+    `project_id`  bigint unsigned             NOT NULL COMMENT '所属项目',
+    `status`      tinyint(1)                  NOT NULL DEFAULT 0 COMMENT '状态',
+    `note`        varchar(255) 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 ='国家';
+
+CREATE TABLE `center`
+(
+    `id`          bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '序号',
+    `country_id`  bigint unsigned             NOT NULL COMMENT '所属国家',
+    `name`        varchar(128)                NOT NULL COMMENT '名称',
+    `icon`        bigint                      NOT NULL COMMENT '图标',
+    `status`      tinyint(1)                  NOT NULL DEFAULT 0 COMMENT '状态',
+    `note`        varchar(255) 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 ='中心';
+
+CREATE TABLE `folder`
+(
+    `id`          bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '序号',
+    `parent_id`   bigint unsigned             NOT NULL COMMENT '父级',
+    `parent_type` tinyint(1)                  NOT NULL COMMENT '父级类型',
+    `type`        tinyint(1)                  NOT NULL COMMENT '层级类型',
+    `name`        varchar(128)                NOT NULL COMMENT '名称',
+    `status`      tinyint(1)                  NOT NULL DEFAULT 0 COMMENT '状态',
+    `note`        varchar(255) 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 ='文件夹';
+
+CREATE TABLE `file`
+(
+    `id`                 bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '序号',
+    `parent_id`          bigint unsigned             NOT NULL COMMENT '所属父级',
+    `type`               tinyint(1)                  NOT NULL COMMENT '文档类型',
+    `file_specification` char(1)                     NOT NULL COMMENT '文档标识',
+    `name`               varchar(128)                NOT NULL COMMENT '名称',
+    `status`             tinyint(1)                  NOT NULL DEFAULT 0 COMMENT '状态',
+    `auditor_id`         bigint(1)                   NOT NULL COMMENT '审核人',
+    `reject_reason`      varchar(255) COMMENT '驳回原因',
+    `audit_time`         datetime COMMENT '审核时间',
+    `note`               varchar(255) 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 ='文档';
+
+CREATE TABLE `file_audit_log`
+(
+    `id`          bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '序号',
+    `file_id`     bigint unsigned             NOT NULL COMMENT '文件',
+    `auditor_id`  bigint unsigned             NOT NULL COMMENT '审核人',
+    `status`      tinyint(1)                  NOT NULL 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 ='文档审核记录';
+
+CREATE TABLE `project_setting`
+(
+    `id`          bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT 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 ='设置';
+
+CREATE TABLE `applet_setting`
+(
+    `id`                bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '序号',
+    `user_agreement`    text COMMENT '用户协议',
+    `privacy_agreement` text 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 ='微信小程序设置';

+ 3 - 0
script/sql/business/update.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `sys_user` ADD COLUMN `wechat_open_id` varchar(128) COMMENT '微信的 open ID';
+ALTER TABLE `sys_user` ADD COLUMN `wechat_union_id` varchar(128) COMMENT '微信的 union ID';
+ALTER TABLE `sys_user` ADD COLUMN `applet_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否允许微信小程序登录(0 -> 允许; 1 -> 禁止)';