From 821e37c374b309877c6db88e285d02ede9344ccc Mon Sep 17 00:00:00 2001 From: 77 <77@77.com> Date: Thu, 11 Apr 2024 21:58:58 +0800 Subject: [PATCH] 123 --- .../com/ruoyi/test/business/UserTest.java | 2 +- .../java/com/ruoyi/test/business/YxTest.java | 2 +- .../cai/service/impl/AccountServiceImpl.java | 4 +- .../src/main/resources/application-dev.yml | 83 +++-------------- .../src/main/resources/application-prod.yml | 89 +++---------------- 5 files changed, 30 insertions(+), 150 deletions(-) diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/business/UserTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/business/UserTest.java index 9fb77358..c50cb613 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/business/UserTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/business/UserTest.java @@ -58,7 +58,7 @@ public class UserTest { public void refreshIm(){ List list = userService.list(); for (User user : list) { - this.register(user.getId(),user.getImToken(),user.getNickname()); +// this.register(user.getId(),user.getImToken(),user.getNickname()); imManager.updateImInfo(user.getId(),user.getAvatar(),user.getNickname(),user.getGender()); } } diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/business/YxTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/business/YxTest.java index fd38fcf5..60079add 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/business/YxTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/business/YxTest.java @@ -23,7 +23,7 @@ public class YxTest { public void test(){ GetUnifoReq req = new GetUnifoReq(); List list = new ArrayList<>(); - list.add("1087"); + list.add("1067"); req.setAccids(JSON.toJSONString(list)); YxUpdateUinfoR uinfos = imUserRefClient.getUinfos(req); log.info(JSON.toJSONString(uinfos)); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java index bcd9e7ab..19ab21fe 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java @@ -380,10 +380,10 @@ public class AccountServiceImpl extends ServiceImpl impl Long tractId = IdManager.nextId(); // 记录消费方的流水 if(payCoin != 0){ - accountChangeLogService.saveLogNoAdmin(fromUser.getId(),fromUser.getUsercode(), AccountChangeCodeEnum.VIDEO_COIN_OUT, payCoin, tractId); + accountChangeLogService.saveLogNoAdmin(fromUser.getId(),fromUser.getUsercode(), AccountChangeCodeEnum.VIDEO_COIN_OUT, -payCoin, tractId); } if(payIncome != 0){ - accountChangeLogService.saveLogNoAdmin(fromUser.getId(),fromUser.getUsercode(), AccountChangeCodeEnum.VIDEO_INCOME_COIN_OUT,payIncome,tractId); + accountChangeLogService.saveLogNoAdmin(fromUser.getId(),fromUser.getUsercode(), AccountChangeCodeEnum.VIDEO_INCOME_COIN_OUT,-payIncome,tractId); } // 记录接收方的流水 if(anchorAmount != 0){ diff --git a/ruoyi-websocket-boot/src/main/resources/application-dev.yml b/ruoyi-websocket-boot/src/main/resources/application-dev.yml index e8f8a600..d0def9ac 100644 --- a/ruoyi-websocket-boot/src/main/resources/application-dev.yml +++ b/ruoyi-websocket-boot/src/main/resources/application-dev.yml @@ -12,23 +12,6 @@ xxl.job: # 执行器开关 enabled: false - # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。 - admin-addresses: http://localhost:9100/xxl-job-admin - # 执行器通讯TOKEN：非空时启用 - access-token: xxl-job - executor: - # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册 - appname: xxl-job-executor - # 28080 端口 随着主应用端口飘逸 避免集群冲突 - port: 2${server.port} - # 执行器注册：默认IP:PORT - address: - # 执行器IP：默认自动获取IP - ip: - # 执行器运行日志文件存储磁盘路径 - logpath: ./logs/xxl-job - # 执行器日志文件保存天数：大于3生效 - logretentiondays: 30 --- # 数据源配置 spring: @@ -117,62 +100,24 @@ redisson: --- # 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://wind.kim/doc/start 文档地址 各个厂商可同时使用 -sms: - # 阿里云 dysmsapi.aliyuncs.com - alibaba: - #请求地址 默认为 dysmsapi.aliyuncs.com 如无特殊改变可以不用设置 - requestUrl: dysmsapi.aliyuncs.com - #阿里云的accessKey - accessKeyId: xxxxxxx - #阿里云的accessKeySecret - accessKeySecret: xxxxxxx - #短信签名 - signature: 测试 - tencent: - #请求地址默认为 sms.tencentcloudapi.com 如无特殊改变可不用设置 - requestUrl: sms.tencentcloudapi.com - #腾讯云的accessKey - accessKeyId: xxxxxxx - #腾讯云的accessKeySecret - accessKeySecret: xxxxxxx - #短信签名 - signature: 测试 - #短信sdkAppId - sdkAppId: appid - #地域信息默认为 ap-guangzhou 如无特殊改变可不用设置 - territory: ap-guangzhou spring: rabbitmq: - addresses: 124.222.254.188 #ip地址 + addresses: 127.0.0.1 #ip地址 username: admin # 账号 password: 383200134 # 密码 port: 5672 - virtual-host: /cai-dev + virtual-host: /cai agora: - app-id: app - key: 627b8e17b0c616c1346cba2d87e10251 - secret: c47628fe2538 + app-id: 58ff3a37d91d48c7a8ef7a56fb8f62d0 + key: 0cca1a53262c4c74b0a8c653a9b7540e + secret: 4a4f734285f34aea86cef63b2a186f27 yunxin: - app-key: 748496374b04344194c68b53e411e09c - app-secret: 77c09917d2de + app-key: 0aaefeb8a80a9889987c5346244b58e2 + app-secret: 470345ca2832 +springdoc: + api-docs: + enabled: false +knife4j: + enable: false +cai: + enable-api-encryption: false diff --git a/ruoyi-websocket-boot/src/main/resources/application-prod.yml b/ruoyi-websocket-boot/src/main/resources/application-prod.yml index 55edbf87..d9e0778f 100644 --- a/ruoyi-websocket-boot/src/main/resources/application-prod.yml +++ b/ruoyi-websocket-boot/src/main/resources/application-prod.yml @@ -1,37 +1,10 @@ --- # 临时文件存储位置 避免临时文件被系统清理报错 spring.servlet.multipart.location: /ruoyi/server/temp ---- # 监控中心配置 -#spring.boot.admin.client: -# # 增加客户端开关 -# enabled: false -# url: http://localhost:9090/admin -# instance: -# service-host-type: IP -# username: ruoyi -# password: 123456 - --- # xxl-job 配置 xxl.job: # 执行器开关 enabled: false - # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。 - admin-addresses: http://localhost:9100/xxl-job-admin - # 执行器通讯TOKEN：非空时启用 - access-token: xxl-job - executor: - # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册 - appname: xxl-job-executor - # 28080 端口 随着主应用端口飘逸 避免集群冲突 - port: 2${server.port} - # 执行器注册：默认IP:PORT - address: - # 执行器IP：默认自动获取IP - ip: - # 执行器运行日志文件存储磁盘路径 - logpath: ./logs/xxl-job - # 执行器日志文件保存天数：大于3生效 - logretentiondays: 30 --- # 数据源配置 spring: @@ -120,51 +93,6 @@ redisson: --- # 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://wind.kim/doc/start 文档地址 各个厂商可同时使用 -sms: - # 阿里云 dysmsapi.aliyuncs.com - alibaba: - #请求地址 默认为 dysmsapi.aliyuncs.com 如无特殊改变可以不用设置 - requestUrl: dysmsapi.aliyuncs.com - #阿里云的accessKey - accessKeyId: xxxxxxx - #阿里云的accessKeySecret - accessKeySecret: xxxxxxx - #短信签名 - signature: 测试 - tencent: - #请求地址默认为 sms.tencentcloudapi.com 如无特殊改变可不用设置 - requestUrl: sms.tencentcloudapi.com - #腾讯云的accessKey - accessKeyId: xxxxxxx - #腾讯云的accessKeySecret - accessKeySecret: xxxxxxx - #短信签名 - signature: 测试 - #短信sdkAppId - sdkAppId: appid - #地域信息默认为 ap-guangzhou 如无特殊改变可不用设置 - territory: ap-guangzhou spring: rabbitmq: addresses: 127.0.0.1 #ip地址 @@ -173,9 +101,16 @@ spring: port: 5672 virtual-host: /cai agora: - app-id: app - key: key - secret: secret + app-id: 58ff3a37d91d48c7a8ef7a56fb8f62d0 + key: 0cca1a53262c4c74b0a8c653a9b7540e + secret: 4a4f734285f34aea86cef63b2a186f27 yunxin: - app-key: 748496374b04344194c68b53e411e09c - app-secret: 77c09917d2de + app-key: 0aaefeb8a80a9889987c5346244b58e2 + app-secret: 470345ca2832 +springdoc: + api-docs: + enabled: false +knife4j: + enable: false +cai: + enable-api-encryption: false