修改权限逻辑

This commit is contained in:
lcj
2025-09-15 10:57:19 +08:00
parent 1bc2743dc7
commit 70537f34c4
137 changed files with 5988 additions and 426 deletions

View File

@ -104,11 +104,11 @@ spring:
# redis通用配置 子服务可以自行配置进行覆盖
data:
redis:
host: localhost
port: 6379
host: 192.168.110.2
port: 9287
# redis 密码必须配置
password: ruoyi123
database: 0
password: syar23rdsaagdrsa
database: 20
# 需要使用数字
timeout: 10000
ssl.enabled: false
@ -290,7 +290,7 @@ seata:
# 多租户配置
tenant:
# 是否开启
enable: true
enable: false
# 排除表
excludes:
- sys_menu

View File

@ -2,21 +2,21 @@ datasource:
system-master:
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能
url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
username: root
password: password
url: jdbc:mysql://192.168.110.2:13386/xny-cloud-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
username: xny-cloud-dev
password: madMPGz7KjJEJR3M
gen:
url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
username: root
password: password
url: jdbc:mysql://192.168.110.2:13386/xny-cloud-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
username: xny-cloud-dev
password: madMPGz7KjJEJR3M
job:
url: jdbc:mysql://localhost:3306/ry-job?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
username: root
password: password
url: jdbc:mysql://192.168.110.2:13386/xny-job-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
username: xny-job-dev
password: aK2HmkXRL8yM7hXG
workflow:
url: jdbc:mysql://localhost:3306/ry-workflow?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root
password: password
url: jdbc:mysql://192.168.110.2:13386/xny-cloud-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: xny-cloud-dev
password: madMPGz7KjJEJR3M
# system-oracle:
# url: jdbc:oracle:thin:@//localhost:1521/XE
# username: ROOT

View File

@ -34,4 +34,4 @@ gen:
# 自动去除表前缀默认是false
autoRemovePre: false
# 表前缀(生成类名不会包含表前缀,多个用逗号分隔)
tablePrefix: sys_
tablePrefix: sys_,bus_

View File

@ -2,24 +2,21 @@ service.vgroupMapping.ruoyi-auth-group=default
service.vgroupMapping.ruoyi-system-group=default
service.vgroupMapping.ruoyi-resource-group=default
service.vgroupMapping.ruoyi-workflow-group=default
service.enableDegrade=false
service.disableGlobalTransaction=false
#Transaction storage configuration, only for the server. The file, DB, and redis configuration values are optional.
store.mode=db
store.lock.mode=db
store.session.mode=db
#Used for password encryption
#store.publicKey=
#These configurations are required if the `store mode` is `db`. If `store.mode,store.lock.mode,store.session.mode` are not equal to `db`, you can remove the configuration block.
store.db.datasource=hikari
store.db.dbType=mysql
store.db.driverClassName=com.mysql.cj.jdbc.Driver
store.db.url=jdbc:mysql://127.0.0.1:3306/ry-seata?useUnicode=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
store.db.user=root
store.db.password=root
store.db.url=jdbc:mysql://192.168.110.2:13386/xny-seata-dev?useUnicode=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
store.db.user=xny-seata-dev
store.db.password=iFePJ4rJrzHKAGbX
store.db.minConn=5
store.db.maxConn=30
store.db.globalTable=global_table
@ -28,7 +25,6 @@ store.db.distributedLockTable=distributed_lock
store.db.queryLimit=100
store.db.lockTable=lock_table
store.db.maxWait=5000
# redis 模式 store.mode=redis 开启 (控制台查询功能有限,不影响实际执行功能)
# store.redis.host=127.0.0.1
# store.redis.port=6379
@ -39,7 +35,6 @@ store.db.maxWait=5000
# store.redis.database=0
# store.redis.password=
# store.redis.queryLimit=100
#Transaction rule configuration, only for the server
server.recovery.committingRetryPeriod=1000
server.recovery.asynCommittingRetryPeriod=1000
@ -52,7 +47,6 @@ server.distributedLockExpireTime=10000
server.xaerNotaRetryTimeout=60000
server.session.branchAsyncQueueSize=5000
server.session.enableBranchAsyncRemove=false
#Transaction rule configuration, only for the client
client.rm.asyncCommitBufferLimit=10000
client.rm.lock.retryInterval=10
@ -82,20 +76,16 @@ client.undo.logTable=undo_log
client.undo.compress.enable=true
client.undo.compress.type=zip
client.undo.compress.threshold=64k
#For TCC transaction mode
tcc.fence.logTableName=tcc_fence_log
tcc.fence.cleanPeriod=1h
#Log rule configuration, for client and server
log.exceptionRate=100
#Metrics configuration, only for the server
metrics.enabled=false
metrics.registryType=compact
metrics.exporterList=prometheus
metrics.exporterPrometheusPort=9898
#For details about configuration items, see https://seata.io/zh-cn/docs/user/configurations.html
#Transport configuration, for client and server
transport.type=TCP

View File

@ -24,13 +24,13 @@ services:
--explicit_defaults_for_timestamp=true
--lower_case_table_names=1
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
nacos:
image: ruoyi/ruoyi-nacos:2.4.1
container_name: nacos
ports:
- "8848:8848"
- "18848:18848"
- "9848:9848"
- "9849:9849"
environment:
@ -38,10 +38,10 @@ services:
JAVA_OPTS: "-Xms256m -Xmx512m"
volumes:
# 日志目录 注意集群模式下 日志目录不能一致 需要区分例如 nacos1 nacos2
- /docker/nacos/logs/:/root/nacos/logs
- /mnt/disk2/docker/nacos/logs/:/root/nacos/logs
# 集群配置文件 集群所有nacos都必须使用此文件
- /docker/nacos/conf/cluster.conf:/root/nacos/conf/cluster.conf
network_mode: "host"
- /mnt/disk2/docker/nacos/conf/cluster.conf:/root/nacos/conf/cluster.conf
network_mode: "xny-cloud"
redis:
image: redis:7.2.8
@ -58,7 +58,7 @@ services:
- /docker/redis/data/:/redis/data/
command: "redis-server /redis/config/redis.conf"
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
minio:
# minio 最后一个未阉割版本 不能再进行升级 在往上的版本功能被阉割
@ -92,13 +92,13 @@ services:
- /docker/minio/config:/root/.minio/
command: server --address ':9000' --console-address ':9001' /data # 指定容器中的目录 /data
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
seata-server:
image: ruoyi/ruoyi-seata-server:2.4.1
container_name: seata-server
ports:
- "7091:7091"
- "17091:17091"
- "8091:8091"
environment:
TZ: Asia/Shanghai
@ -110,7 +110,7 @@ services:
# skywalking 探针
- /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
nginx-web:
image: nginx:1.22.1
@ -131,7 +131,7 @@ services:
# 日志目录
- /docker/nginx/log:/var/log/nginx
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
sentinel:
image: ruoyi/ruoyi-sentinel-dashboard:2.4.1
@ -146,7 +146,7 @@ services:
# skywalking 探针
- /docker/skywalking/agent/:/ruoyi/skywalking/agent
restart: always
network_mode: "host"
network_mode: "xny-cloud"
ruoyi-monitor:
image: ruoyi/ruoyi-monitor:2.4.1
@ -155,14 +155,14 @@ services:
# 时区上海
TZ: Asia/Shanghai
ports:
- "9100:9100"
- "19100:19100"
volumes:
# 配置文件
- /docker/ruoyi-monitor/logs/:/ruoyi/monitor/logs
# skywalking 探针
- /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
ruoyi-snailjob-server:
image: ruoyi/ruoyi-snailjob-server:2.4.1
@ -176,7 +176,7 @@ services:
volumes:
- /docker/snailjob/logs/:/ruoyi/snailjob/logs
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
ruoyi-gateway:
image: ruoyi/ruoyi-gateway:2.4.1
@ -185,14 +185,14 @@ services:
# 时区上海
TZ: Asia/Shanghai
ports:
- "8080:8080"
- "18899:18899"
volumes:
# 配置文件
- /docker/ruoyi-gateway/logs/:/ruoyi/gateway/logs
# skywalking 探针
- /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
ruoyi-auth:
image: ruoyi/ruoyi-auth:2.4.1
@ -208,7 +208,7 @@ services:
# skywalking 探针
- /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
ruoyi-system:
image: ruoyi/ruoyi-system:2.4.1
@ -217,14 +217,14 @@ services:
# 时区上海
TZ: Asia/Shanghai
ports:
- "9201:9201"
- "19201:19201"
volumes:
# 配置文件
- /docker/ruoyi-system/logs/:/ruoyi/system/logs
# skywalking 探针
- /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
ruoyi-gen:
image: ruoyi/ruoyi-gen:2.4.1
@ -233,14 +233,14 @@ services:
# 时区上海
TZ: Asia/Shanghai
ports:
- "9202:9202"
- "19202:19202"
volumes:
# 配置文件
- /docker/ruoyi-gen/logs/:/ruoyi/gen/logs
# skywalking 探针
- /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
ruoyi-job:
image: ruoyi/ruoyi-job:2.4.1
@ -258,7 +258,7 @@ services:
# skywalking 探针
- /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
ruoyi-resource:
image: ruoyi/ruoyi-resource:2.4.1
@ -267,14 +267,14 @@ services:
# 时区上海
TZ: Asia/Shanghai
ports:
- "9204:9204"
- "19204:19204"
volumes:
# 配置文件
- /docker/ruoyi-resource/logs/:/ruoyi/resource/logs
# skywalking 探针
- /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
ruoyi-workflow:
image: ruoyi/ruoyi-workflow:2.4.1
@ -283,19 +283,19 @@ services:
# 时区上海
TZ: Asia/Shanghai
ports:
- "9205:9205"
- "19205:19205"
volumes:
# 配置文件
- /docker/ruoyi-workflow/logs/:/ruoyi/workflow/logs
# skywalking 探针
- /docker/skywalking/agent/:/ruoyi/skywalking/agent
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
#################################################################################################
#################################### 以下为扩展根据需求搭建 #########################################
#################################################################################################
#################################################################################################
#################################### 以下为扩展根据需求搭建 #########################################
#################################################################################################
elasticsearch:
image: elasticsearch:7.17.6
@ -313,7 +313,7 @@ services:
- /docker/elk/elasticsearch/plugins:/usr/share/elasticsearch/plugins
- /docker/elk/elasticsearch/data:/usr/share/elasticsearch/data
- /docker/elk/elasticsearch/logs:/usr/share/elasticsearch/logs
network_mode: "host"
network_mode: "xny-cloud"
kibana:
image: kibana:7.17.6
@ -330,7 +330,7 @@ services:
# SERVER_PUBLICBASEURL: https://kibana.cloud.com
volumes:
- /docker/elk/kibana/config/kibana.yml:/usr/share/kibana/config/kibana.yml
network_mode: "host"
network_mode: "xny-cloud"
logstash:
image: logstash:7.17.6
@ -342,7 +342,7 @@ services:
- /docker/elk/logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml
depends_on:
- elasticsearch
network_mode: "host"
network_mode: "xny-cloud"
rmqnamesrv:
image: apache/rocketmq:5.2.0
@ -354,7 +354,7 @@ services:
command: sh mqnamesrv
volumes:
- /docker/rocketmq/namesrv/logs:/home/rocketmq/logs/rocketmqlogs
network_mode: "host"
network_mode: "xny-cloud"
rmqbroker1:
image: apache/rocketmq:5.2.0
@ -375,7 +375,7 @@ services:
- /docker/rocketmq/broker1/logs:/home/rocketmq/logs/rocketmqlogs
- /docker/rocketmq/broker1/store:/home/rocketmq/store
privileged: true
network_mode: "host"
network_mode: "xny-cloud"
rmqconsole:
image: apacherocketmq/rocketmq-dashboard:latest
@ -386,7 +386,7 @@ services:
JAVA_OPTS: -Dserver.port=19876 -Drocketmq.namesrv.addr=127.0.0.1:9876 -Dcom.rocketmq.sendMessageWithVIPChannel=false
depends_on:
- rmqnamesrv
network_mode: "host"
network_mode: "xny-cloud"
rabbitmq:
container_name: rabbitmq
@ -401,7 +401,7 @@ services:
volumes:
- /docker/rabbitmq/log:/var/log/rabbitmq
- /docker/rabbitmq/data:/var/lib/rabbitmq
network_mode: "host"
network_mode: "xny-cloud"
zookeeper:
image: 'bitnami/zookeeper:3.8.0'
@ -417,7 +417,7 @@ services:
ZOO_ENABLE_ADMIN_SERVER: "no"
# 自带控制台的端口
ZOO_ADMIN_SERVER_PORT_NUMBER: 8080
network_mode: "host"
network_mode: "xny-cloud"
kafka:
image: 'bitnami/kafka:3.6.2'
@ -438,7 +438,7 @@ services:
- /docker/kafka/data:/bitnami/kafka/data
depends_on:
- zookeeper
network_mode: "host"
network_mode: "xny-cloud"
kafka-manager:
image: sheepkiller/kafka-manager:latest
@ -453,7 +453,7 @@ services:
KM_ARGS: -Dhttp.port=19092
depends_on:
- kafka
network_mode: "host"
network_mode: "xny-cloud"
sky-oap:
image: apache/skywalking-oap-server:9.7.0
@ -470,7 +470,7 @@ services:
SW_STORAGE: elasticsearch
SW_STORAGE_ES_CLUSTER_NODES: 127.0.0.1:9200
TZ: Asia/Shanghai
network_mode: "host"
network_mode: "xny-cloud"
sky-ui:
image: apache/skywalking-ui:9.7.0
@ -483,7 +483,7 @@ services:
TZ: Asia/Shanghai
depends_on:
- sky-oap
network_mode: "host"
network_mode: "xny-cloud"
prometheus:
image: prom/prometheus:v2.40.1
@ -492,7 +492,7 @@ services:
- "9090:9090"
volumes:
- /docker/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
network_mode: "host"
network_mode: "xny-cloud"
grafana:
image: grafana/grafana:9.2.4
@ -508,7 +508,7 @@ services:
volumes:
- /docker/grafana/grafana.ini:/etc/grafana/grafana.ini
- /docker/grafana:/var/lib/grafana
network_mode: "host"
network_mode: "xny-cloud"
shardingproxy:
image: apache/shardingsphere-proxy:5.4.0
@ -521,4 +521,4 @@ services:
- /docker/shardingproxy/ext-lib:/opt/shardingsphere-proxy/ext-lib
environment:
- JVM_OPTS="-Djava.awt.headless=true"
network_mode: "host"
network_mode: "xny-cloud"

View File

@ -47,7 +47,7 @@ scrape_configs:
username: ruoyi
password: 123456
http_sd_configs:
- url: 'http://127.0.0.1:9100/actuator/prometheus/sd'
- url: 'http://192.168.110.2:19100/actuator/prometheus/sd'
# monitor 监控的账号密码
basic_auth:
username: ruoyi