diff --git a/.DS_Store b/.DS_Store index 7f96dc19c..73724f2a4 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/deploy/docker-compose.backend.yml b/deploy/docker-compose.backend.yml new file mode 100644 index 000000000..1bc66735f --- /dev/null +++ b/deploy/docker-compose.backend.yml @@ -0,0 +1,44 @@ +name: data-sync-s3 + +services: + backend: + build: + context: .. + dockerfile: deploy/Dockerfile.backend + image: data-sync-s3/backend:latest + restart: unless-stopped + ports: + - "38080:8080" + extra_hosts: + # Allows containers to reach services published on the Docker host. + - "host.docker.internal:host-gateway" + environment: + TZ: Asia/Shanghai + SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL: jdbc:mysql://${MYSQL_HOST:-host.docker.internal}:${MYSQL_PORT:-3306}/${MYSQL_DATABASE:-ry-vue}?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_USERNAME: ${MYSQL_USERNAME:-root} + SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_PASSWORD: ${MYSQL_PASSWORD} + SPRING_DATA_REDIS_HOST: ${REDIS_HOST:-host.docker.internal} + SPRING_DATA_REDIS_PORT: ${REDIS_PORT:-6379} + SPRING_DATA_REDIS_PASSWORD: ${REDIS_PASSWORD} + MYBATIS_ENCRYPTOR_ENABLE: "true" + MYBATIS_ENCRYPTOR_PASSWORD: ${MYBATIS_ENCRYPTOR_PASSWORD} + DWS_EXECUTABLE: /usr/local/bin/dws + DWS_PROFILE_ROOT: /var/lib/ruoyi-sync/dws + DWS_KEYCHAIN_ROOT: /var/lib/ruoyi-sync/dws-keychain + SYNC_SCHEDULER_ENABLED: "true" + JAVA_OPTS: -Xms256m -Xmx1024m -XX:+UseZGC -XX:+HeapDumpOnOutOfMemoryError + volumes: + - backend-logs:/app/logs + - dws-profiles:/var/lib/ruoyi-sync/dws + - dws-keychains:/var/lib/ruoyi-sync/dws-keychain + networks: + - 1panel-network + +networks: + 1panel-network: + external: true + +volumes: + backend-logs: + dws-profiles: + dws-keychains: diff --git a/ruoyi-admin/.DS_Store b/ruoyi-admin/.DS_Store new file mode 100644 index 000000000..d83a120e1 Binary files /dev/null and b/ruoyi-admin/.DS_Store differ diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index e581b182c..20761afdc 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -103,9 +103,9 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: root - password: root + url: jdbc:mysql://kfn-data-sync-s3-mysql:33306/data-sync-s3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: data-sync-s3 + password: PSGrMaQdZ8z7AfiJ # # 从库数据源 # slave: # lazy: true @@ -152,13 +152,13 @@ spring: spring.data: redis: # 地址 - host: localhost + host: kfn-data-sync-s3 # 端口,默认为6379 - port: 6379 + port: 36379 # 数据库索引 database: 0 # redis 密码必须配置 - password: ruoyi123 + password: redis_RpMMYK # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 052e058fd..cc2cb15dd 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -93,9 +93,9 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 10MB + max-file-size: 1000MB # 设置总上传的文件大小 - max-request-size: 20MB + max-request-size: 2000MB mvc: # 设置静态资源路径 防止所有请求都去查静态资源 static-path-pattern: /static/**