Merge remote-tracking branch 'base-version/main' into dev
# Conflicts: # sql/mysql/ruoyi-vue-pro.sql # zt-module-infra/zt-module-infra-api/src/main/java/com/zt/plat/module/infra/api/websocket/WebSocketSenderApi.java # zt-module-infra/zt-module-infra-server/src/main/resources/application-dev.yaml
This commit is contained in:
@@ -142,9 +142,9 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
|
||||
key-prefix: wa # Redis Key 的前缀
|
||||
http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
|
||||
|
||||
--- #################### 芋道相关配置 ####################
|
||||
--- #################### ZT相关配置 ####################
|
||||
|
||||
# 芋道配置项,设置当前项目所有自定义的配置
|
||||
# ZT配置项,设置当前项目所有自定义的配置
|
||||
zt:
|
||||
pay:
|
||||
order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
|
||||
@@ -183,7 +183,7 @@ justauth:
|
||||
timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟
|
||||
|
||||
|
||||
--- #################### iot相关配置 TODO 芋艿:再瞅瞅 ####################
|
||||
--- #################### iot相关配置 TODO ZT:再瞅瞅 ####################
|
||||
iot:
|
||||
emq:
|
||||
# 账号
|
||||
|
||||
@@ -144,7 +144,7 @@ logging:
|
||||
com.zt.plat.module.iot.dal.mysql: debug
|
||||
com.zt.plat.module.iot.dal.tdengine: DEBUG
|
||||
com.zt.plat.module.ai.dal.mysql: debug
|
||||
org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿:先禁用,Spring Boot 3.X 存在部分错误的 WARN 提示
|
||||
org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO ZT:先禁用,Spring Boot 3.X 存在部分错误的 WARN 提示
|
||||
|
||||
debug: false
|
||||
|
||||
@@ -176,9 +176,9 @@ wx:
|
||||
key-prefix: wa # Redis Key 的前缀
|
||||
http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
|
||||
|
||||
--- #################### 芋道相关配置 ####################
|
||||
--- #################### ZT相关配置 ####################
|
||||
|
||||
# 芋道配置项,设置当前项目所有自定义的配置
|
||||
# ZT配置项,设置当前项目所有自定义的配置
|
||||
zt:
|
||||
# 附件加密相关配置
|
||||
AES:
|
||||
@@ -229,7 +229,7 @@ justauth:
|
||||
prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::
|
||||
timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟
|
||||
|
||||
--- #################### iot相关配置 TODO 芋艿【IOT】:再瞅瞅 ####################
|
||||
--- #################### iot相关配置 TODO ZT【IOT】:再瞅瞅 ####################
|
||||
pf4j:
|
||||
# pluginsDir: /tmp/
|
||||
pluginsDir: ../plugins
|
||||
|
||||
@@ -67,7 +67,7 @@ springdoc:
|
||||
default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档
|
||||
|
||||
knife4j:
|
||||
enable: false # TODO 芋艿:需要关闭增强,具体原因见:https://github.com/xiaoymin/knife4j/issues/874
|
||||
enable: false # TODO ZT:需要关闭增强,具体原因见:https://github.com/xiaoymin/knife4j/issues/874
|
||||
setting:
|
||||
language: zh_cn
|
||||
|
||||
@@ -76,7 +76,6 @@ iwork:
|
||||
app-id:
|
||||
client-public-key:
|
||||
user-id:
|
||||
workflow-id:
|
||||
paths:
|
||||
register: /api/ec/dev/auth/regist
|
||||
apply-token: /api/ec/dev/auth/applytoken
|
||||
@@ -100,6 +99,8 @@ iwork:
|
||||
sync-department:
|
||||
sync-job-title:
|
||||
sync-user:
|
||||
workflow:
|
||||
seal-workflow-id:
|
||||
|
||||
eplat:
|
||||
share:
|
||||
@@ -179,7 +180,7 @@ aj:
|
||||
cache-number: 1000 # local 缓存的阈值,达到这个值,清除缓存
|
||||
timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行
|
||||
type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选
|
||||
water-mark: 芋道源码 # 右下角水印文字(我的水印),可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode,Linux 可能需要转 unicode
|
||||
water-mark: ZT源码 # 右下角水印文字(我的水印),可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode,Linux 可能需要转 unicode
|
||||
interference-options: 0 # 滑动干扰项(0/1/2)
|
||||
req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false
|
||||
req-get-lock-limit: 5 # 验证失败 5 次,get接口锁定
|
||||
@@ -298,7 +299,7 @@ zt:
|
||||
# base-url: https://suno-55ishh05u-status2xxs-projects.vercel.app
|
||||
base-url: http://127.0.0.1:3001
|
||||
|
||||
--- #################### 芋道相关配置 ####################
|
||||
--- #################### ZT相关配置 ####################
|
||||
|
||||
zt:
|
||||
info:
|
||||
@@ -332,7 +333,7 @@ zt:
|
||||
topic: ${spring.application.name}-websocket # 消息发送的 Kafka Topic
|
||||
consumer-group: ${spring.application.name}-websocket-consumer # 消息发送的 Kafka Consumer Group
|
||||
swagger:
|
||||
title: 芋道快速开发平台
|
||||
title: ZT快速开发平台
|
||||
description: 提供管理后台、用户 App 的所有功能
|
||||
version: ${zt.info.version}
|
||||
url: ${zt.web.admin-ui.url}
|
||||
@@ -427,7 +428,7 @@ onlyoffice:
|
||||
callback-base-url: http://172.16.46.62:30081 # 应用服务回调地址,OnlyOffice需要能访问到
|
||||
jwt-secret: P@ssword25 # JWT 密钥
|
||||
|
||||
# 插件配置 TODO 芋艿:【IOT】需要处理下
|
||||
# 插件配置 TODO ZT:【IOT】需要处理下
|
||||
pf4j:
|
||||
pluginsDir: /Users/anhaohao/code/gitee/ruoyi-vue-pro/plugins # 插件目录
|
||||
|
||||
|
||||
Reference in New Issue
Block a user