fix 工作流部分移除@Autowired和@Resource注解,改用构造器注入 fix 修复"我的流程"流程分类显示错误问题 fix 修复流程模块分页错误bug update 图片上传 文件上传 支持并发上传 update 组件ImageUpload支持多图同时选择上传 udpate 组件fileUpload支持多文件同时选择上传 update qiniu 7.9.2 => 7.9.3 update minio 8.3.5 => 8.3.7 update 优化 R 默认返回 msg update 增加 用户注册 用户类型默认值 update 增加用户登出日志 update 更新 多用户多设备的注释说明 update 优化 是否为管理员的判断 update 优化 页面若未匹配到字典标签则返回原字典值 update 调整用户登录 将日志调整到最后 防止获取不到用户警告 update 优化随机数生成方式 避免容易生成两个相同随机数的问题 fix 修复代码生成 基于路径生成 路径为空问题 fix 恢复误删 @Async 注解线程池配置类 fix 修复 minio 适配 https 导致的问题 fix 修复分页组件请求两次问题
172 lines
4.2 KiB
YAML
172 lines
4.2 KiB
YAML
version: '3'
|
||
|
||
services:
|
||
mysql:
|
||
image: mysql:8.0.27
|
||
container_name: mysql
|
||
environment:
|
||
# 时区上海
|
||
TZ: Asia/Shanghai
|
||
# root 密码
|
||
MYSQL_ROOT_PASSWORD: root
|
||
# 初始化数据库(后续的初始化sql会在这个库执行)
|
||
MYSQL_DATABASE: ry-vue
|
||
ports:
|
||
- "3306:3306"
|
||
volumes:
|
||
# 数据挂载
|
||
- /docker/mysql/data/:/var/lib/mysql/
|
||
# 配置挂载
|
||
- /docker/mysql/conf/:/etc/mysql/conf.d/
|
||
command:
|
||
# 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配)
|
||
--default-authentication-plugin=mysql_native_password
|
||
--character-set-server=utf8mb4
|
||
--collation-server=utf8mb4_general_ci
|
||
--explicit_defaults_for_timestamp=true
|
||
--lower_case_table_names=1
|
||
privileged: true
|
||
restart: always
|
||
networks:
|
||
ruoyi_net:
|
||
ipv4_address: 172.30.0.36
|
||
|
||
nginx-web:
|
||
image: nginx:1.21.3
|
||
container_name: nginx-web
|
||
environment:
|
||
# 时区上海
|
||
TZ: Asia/Shanghai
|
||
ports:
|
||
- "80:80"
|
||
- "443:443"
|
||
volumes:
|
||
# 证书映射
|
||
- /docker/nginx/cert:/etc/nginx/cert
|
||
# 配置文件映射
|
||
- /docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf
|
||
# 页面目录
|
||
- /docker/nginx/html:/usr/share/nginx/html
|
||
# 日志目录
|
||
- /docker/nginx/log:/var/log/nginx
|
||
privileged: true
|
||
restart: always
|
||
networks:
|
||
- ruoyi_net
|
||
|
||
redis:
|
||
image: redis:6.2.6
|
||
container_name: redis
|
||
ports:
|
||
- "6379:6379"
|
||
environment:
|
||
# 时区上海
|
||
TZ: Asia/Shanghai
|
||
volumes:
|
||
# 配置文件
|
||
- /docker/redis/conf:/redis/config:rw
|
||
# 数据文件
|
||
- /docker/redis/data/:/redis/data/:rw
|
||
command: "redis-server /redis/config/redis.conf"
|
||
privileged: true
|
||
restart: always
|
||
networks:
|
||
ruoyi_net:
|
||
ipv4_address: 172.30.0.48
|
||
|
||
minio:
|
||
image: minio/minio:RELEASE.2021-10-27T16-29-42Z
|
||
container_name: minio
|
||
ports:
|
||
# api 端口
|
||
- "9000:9000"
|
||
# 控制台端口
|
||
- "9001:9001"
|
||
environment:
|
||
# 时区上海
|
||
TZ: Asia/Shanghai
|
||
# 管理后台用户名
|
||
MINIO_ACCESS_KEY: ruoyi
|
||
# 管理后台密码,最小8个字符
|
||
MINIO_SECRET_KEY: ruoyi123
|
||
# https需要指定域名
|
||
MINIO_SERVER_URL: ""
|
||
volumes:
|
||
# 映射当前目录下的data目录至容器内/data目录
|
||
- /docker/minio/data:/data
|
||
# 映射配置目录
|
||
- /docker/minio/config:/root/.minio/
|
||
command: server --address ':9000' --console-address ':9001' /data # 指定容器中的目录 /data
|
||
privileged: true
|
||
restart: always
|
||
networks:
|
||
ruoyi_net:
|
||
ipv4_address: 172.30.0.54
|
||
|
||
ruoyi-server1:
|
||
image: ruoyi/ruoyi-server:4.0.1
|
||
container_name: ruoyi-server1
|
||
environment:
|
||
# 时区上海
|
||
TZ: Asia/Shanghai
|
||
volumes:
|
||
# 配置文件
|
||
- /docker/server1/logs/:/ruoyi/server/logs/
|
||
privileged: true
|
||
restart: always
|
||
networks:
|
||
ruoyi_net:
|
||
ipv4_address: 172.30.0.60
|
||
|
||
ruoyi-server2:
|
||
image: "ruoyi/ruoyi-server:4.0.1"
|
||
container_name: ruoyi-server2
|
||
environment:
|
||
# 时区上海
|
||
TZ: Asia/Shanghai
|
||
volumes:
|
||
# 配置文件
|
||
- /docker/server2/logs/:/ruoyi/server/logs/
|
||
privileged: true
|
||
restart: always
|
||
networks:
|
||
ruoyi_net:
|
||
ipv4_address: 172.30.0.61
|
||
|
||
ruoyi-monitor-admin:
|
||
image: ruoyi/ruoyi-monitor-admin:4.0.1
|
||
container_name: ruoyi-monitor-admin
|
||
environment:
|
||
# 时区上海
|
||
TZ: Asia/Shanghai
|
||
volumes:
|
||
# 配置文件
|
||
- /docker/monitor/logs/:/ruoyi/monitor/logs
|
||
privileged: true
|
||
restart: always
|
||
networks:
|
||
ruoyi_net:
|
||
ipv4_address: 172.30.0.90
|
||
|
||
ruoyi-xxl-job-admin:
|
||
image: ruoyi/ruoyi-xxl-job-admin:4.0.1
|
||
container_name: ruoyi-xxl-job-admin
|
||
environment:
|
||
# 时区上海
|
||
TZ: Asia/Shanghai
|
||
volumes:
|
||
# 配置文件
|
||
- /docker/xxljob/logs/:/ruoyi/xxljob/logs
|
||
privileged: true
|
||
restart: always
|
||
networks:
|
||
ruoyi_net:
|
||
ipv4_address: 172.30.0.92
|
||
|
||
networks:
|
||
ruoyi_net:
|
||
driver: bridge
|
||
ipam:
|
||
config:
|
||
- subnet: 172.30.0.0/16
|