diff --git a/admin-ui/src/router/index.js b/admin-ui/src/router/index.js index f00014c..4cf50bc 100644 --- a/admin-ui/src/router/index.js +++ b/admin-ui/src/router/index.js @@ -129,20 +129,6 @@ export const dynamicRoutes = [ meta: { title: '字典数据', activeMenu: '/system/dict' } } ] - }, - { - path: '/system/oss-config', - component: Layout, - hidden: true, - permissions: ['monitor:job:list'], - children: [ - { - path: 'index', - component: () => import('@/views/system/oss/config'), - name: 'OssConfig', - meta: { title: '配置管理', activeMenu: '/system/oss'} - } - ] } ] diff --git a/admin-ui/src/views/system/oss/config.vue b/admin-ui/src/views/system/oss/config.vue deleted file mode 100644 index 4f2efa1..0000000 --- a/admin-ui/src/views/system/oss/config.vue +++ /dev/null @@ -1,382 +0,0 @@ - - - diff --git a/admin-ui/src/views/system/oss/index.vue b/admin-ui/src/views/system/oss/index.vue deleted file mode 100644 index 27e0632..0000000 --- a/admin-ui/src/views/system/oss/index.vue +++ /dev/null @@ -1,374 +0,0 @@ - - - diff --git a/ruoyi-admin/src/main/resources/application-local.yml.template b/ruoyi-admin/src/main/resources/application-local.yml.template index 34bb80b..01962e2 100644 --- a/ruoyi-admin/src/main/resources/application-local.yml.template +++ b/ruoyi-admin/src/main/resources/application-local.yml.template @@ -25,7 +25,7 @@ ruoyi: enable-storage: true # 启用存储 access-key: ${ruoyi.name} secret-key: ${ruoyi.name}1415926 - end-point: http://192.168.3.222:9000 + end-point: http://192.168.3.222:9000/files bucket-name: files domain: "/files/" # 访问域名,注意“/”结尾,例如:http://minio.abc.com/abc/ base-path: "" # 基础路径 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index a40cc6e..36546c6 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -11,7 +11,7 @@ ruoyi: max-height: 1500 th-width: 200 th-height: 200 - watermark: classpath:/watermark.png + watermark: /server/config/watermark.png default-platform: minio #默认使用的存储平台 local-plus: - platform: local # 存储平台标识 diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index a1a5ff8..9ce10a2 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -125,11 +125,11 @@ services: container_name: server1 restart: always image: registry.cn-hangzhou.aliyuncs.com/awl/base2024-api:0.1 - links: - - db - - redis - - minio - - mongodb + # links: + # - db + # - redis + # - minio + # - mongodb ports: - "28080:8080" volumes: @@ -150,6 +150,7 @@ services: TZ: Asia/Shanghai ports: - "80:80" + # - "443:443" volumes: # 证书映射 @@ -160,9 +161,9 @@ services: - ./nginx/html/:/usr/share/nginx/html/ # 日志目录 - ./nginx/log/:/var/log/nginx/ - links: - - server1 - - minio + # links: + # - server1 + # - minio privileged: true # network_mode: host networks: diff --git a/script/docker/docker环境.md b/script/docker/docker环境.md index 7e6b3c9..ea4fe3e 100644 --- a/script/docker/docker环境.md +++ b/script/docker/docker环境.md @@ -2,6 +2,8 @@ ## 1. 安装与配置 +宿主主机:`host.docker.internal` + ### 1.1. 官方自动化安装脚本 - Debian diff --git a/script/docker/nginx/conf/nginx.conf b/script/docker/nginx/conf/nginx.conf index 1ab66c5..7445abb 100644 --- a/script/docker/nginx/conf/nginx.conf +++ b/script/docker/nginx/conf/nginx.conf @@ -33,6 +33,15 @@ http { } + upstream monitor-admin { + server 127.0.0.1:9090; + } + + upstream xxljob-admin { + server 127.0.0.1:9100; + } + + server { listen 80; server_name localhost; @@ -60,7 +69,10 @@ http { # return 200 '{"msg":"演示模式,不允许操作","code":500}'; # } - + # 限制外网访问内网 actuator 相关路径 + location ~ ^(/[^/]*)?/actuator(/.*)?$ { + return 403; + } location / { root /usr/share/nginx/html; @@ -73,7 +85,6 @@ http { proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header REMOTE-HOST $remote_addr; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; @@ -84,12 +95,12 @@ http { proxy_pass http://server/; } + # 反向代理minio,需要创建一个files的存储桶 location /files/ { - proxy_set_header Host $http_host; + proxy_set_header Host minio:9000; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header REMOTE-HOST $remote_addr; add_header X-Cache $upstream_cache_status; #Set Nginx Cache set $static_fileLNaRCRJo 0; diff --git a/script/docker/server1/config/application-prod.yml b/script/docker/server1/config/application-prod.yml index d91f048..36546c6 100644 --- a/script/docker/server1/config/application-prod.yml +++ b/script/docker/server1/config/application-prod.yml @@ -1,14 +1,44 @@ # 项目相关配置 ruoyi: # 是否是开发模式 - dev: true + dev: false - # 本地文件存储配置 - upload: - # 资源访问前缀 - pre: /false - # 物理保存地址 - save-path: /server/upload + + + # 文件存储配置 + file: + max-width: 1500 + max-height: 1500 + th-width: 200 + th-height: 200 + watermark: /server/config/watermark.png + default-platform: minio #默认使用的存储平台 + local-plus: + - platform: local # 存储平台标识 + enable-storage: true #启用存储 + enable-access: true #启用访问(线上请使用 Nginx 配置,效率更高) + path-patterns: /upload/** # 访问路径 + storage-path: /server/upload/ # 存储路径 + domain: "/upload/" # 访问域名,例如:“http://127.0.0.1:8030/file/”,注意后面要和 path-patterns 保持一致,“/”结尾,本地存储建议使用相对路径,方便后期更换域名 + base-path: "" # 基础路径 + minio: + - platform: minio + enable-storage: true # 启用存储 + access-key: ${ruoyi.name} + secret-key: ${ruoyi.name}1415926 + end-point: http://minio:9000 + bucket-name: files + domain: "/files/" # 访问域名,注意“/”结尾,例如:http://minio.abc.com/abc/ + base-path: "" # 基础路径 + aliyun-oss: + - platform: aliyun # 存储平台标识 + enable-storage: true # 启用存储 + access-key: XXXXXXXXXXXXXXXXXXXXXX + secret-key: XXXXXXXXXXXXXXXXXXXXXXXXXXXX + end-point: https://oss-cn-shenzhen.aliyuncs.com + bucket-name: base2024 + domain: "https://base2024.oss-cn-shenzhen.aliyuncs.com/" # 访问域名,注意“/”结尾,例如:https://abc.oss-cn-shanghai.aliyuncs.com/ + base-path: "" # 基础路径 --- # 临时文件存储位置 避免临时文件被系统清理报错 diff --git a/script/docker/server1/config/watermark.png b/script/docker/server1/config/watermark.png new file mode 100644 index 0000000..aec18b5 Binary files /dev/null and b/script/docker/server1/config/watermark.png differ