diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index b802cf49e..bb6dd58bd 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -49,7 +49,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://43.143.227.203:13306/soopin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://mysql:3306/soopin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: wzj password: A085F27A43B0 # # 从库数据源 @@ -98,9 +98,9 @@ spring: spring.data: redis: # 地址 - host: 43.143.227.203 + host: redis # 端口,默认为6379 - port: 16379 + port: 6379 # 数据库索引 database: 2 # 密码(如没有密码请注释掉) @@ -136,7 +136,7 @@ redisson: --- # RocketMQ 配置 rocketmq: # RocketMQ 服务器地址 - name-server: 43.143.227.203:9876 + name-server: rocketmq-namesrv:9876 # 生产者配置 producer: # 生产者组名 diff --git a/script/docker/docker.txt b/script/docker/docker.txt index a0eb8160e..3c34c03d3 100644 --- a/script/docker/docker.txt +++ b/script/docker/docker.txt @@ -1,3 +1,7 @@ + +docker network create prod + + docker run -d --name gitlab-runner --restart always \ -v /var/local/gitlab-runner/config:/etc/gitlab-runner \ -v /var/run/docker.sock:/var/run/docker.sock \ @@ -11,6 +15,7 @@ docker run -d --name gitlab-runner --restart always \ docker run -d \ --name mysql \ --restart always \ + --network prod \ -p 13306:3306 \ -e MYSQL_ROOT_PASSWORD=K9p@rS32qL7z \ -e TZ=Asia/Shanghai \ @@ -24,6 +29,7 @@ docker run -d \ docker run -d \ --name redis \ --restart always \ + --network prod \ -p 16379:6379 \ -v /usr/local/docker/redis/data:/data \ -v /usr/local/docker/redis/conf:/usr/local/etc/redis \ @@ -34,21 +40,25 @@ docker run -d \ docker run -d \ --name nginx \ --env TZ=Asia/Shanghai \ - -p 8000:80 \ - -p 7443:443 \ + -p 80:80 \ + -p 443:443 \ -v /usr/local/docker/nginx/cert:/etc/nginx/cert \ -v /usr/local/docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf \ -v /usr/local/docker/nginx/html:/etc/nginx/html \ -v /usr/local/docker/nginx/log:/var/log/nginx \ -v /usr/local/docker/nginx/upload:/var/upload/files \ + -v /usr/local/docker/nginx/download:/data/wzj/download/ \ + -v /usr/local/docker/nginx/ioslink:/data/wzj/ioslink \ + -v /usr/local/docker/nginx/dist:/data/wzj/dist \ --privileged \ - --network host \ + --network prod \ nginx //创建java docker run -d \ --name java \ --restart always \ -p 8880:8080 \ + --network prod \ -v /var/local/docker/java/data:/java \ -v /var/local/docker/java/logs:/logs \ -v /var/fs/cgroup:/sys/fs/cgroup:ro \ @@ -57,11 +67,10 @@ docker run -d \ -XX:+UseContainerSupport \ -XX:MaxMetaspaceSize=256m \ -XX:+HeapDumpOnOutOfMemoryError \ - -XX:HeapDumpPath=/var/log/java-app/heapdump.hprof \ - -Dlogging.file.path=/var/log/java-app \ + -XX:HeapDumpPath=/logs/java-app/heapdump.hprof \ + -Dlogging.file.path=/logs \ -Dfile.encoding=UTF-8 \ - -Dprofile=dev" \ - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 \ + -Dprofile=prod" \ --health-interval=30s \ --health-timeout=5s \ --health-retries=3 \ @@ -85,6 +94,7 @@ docker run -d \ docker run -d \ --name minio \ --restart always \ + --network prod \ -p 9000:9000 \ -p 9001:9001 \ -e TZ=Asia/Shanghai \ @@ -105,7 +115,7 @@ docker network create rocketmq-single-network docker run -d --name rocketmq-namesrv \ - --network rocketmq-single-network \ + --network prod \ -p 9876:9876 \ -v /usr/local/docker/rocketmq/namesrv/logs:/root/logs \ -v /usr/local/docker/rocketmq/namesrv/store:/root/store \ @@ -115,7 +125,7 @@ docker run -d --name rocketmq-namesrv \ docker run -d \ --name rocketmq-broker \ - --network rocketmq-single-network \ + --network prod \ -p 10911:10911 \ -p 10909:10909 \ -v /usr/local/docker/rocketmq/broker/logs:/root/logs \ @@ -130,7 +140,7 @@ docker run -d \ docker run -d \ --name rocketmq-console \ - --network rocketmq-single-network \ + --network prod \ -p 8081:8080 \ -e "JAVA_OPTS=-Drocketmq.namesrv.addr=rocketmq-namesrv:9876 -Dcom.rocketmq.sendMessageWithVIPChannel=false" \ --restart=always \ diff --git a/script/docker/nginx/conf/nginx.conf b/script/docker/nginx/conf/nginx.conf index fa19d2026..586516173 100644 --- a/script/docker/nginx/conf/nginx.conf +++ b/script/docker/nginx/conf/nginx.conf @@ -198,6 +198,18 @@ http { try_files $uri $uri/ /admin/index.html; } + location /.well-known/apple-app-site-association { + alias /data/wzj/ioslink/.well-known/apple-app-site-association; + default_type application/json; + } + location ^~ /download/ { + alias /data/wzj/download/; + sendfile on; + autoindex_exact_size on; + charset utf-8,gbk; + #default_type application/vnd.android.package-archive; + #add_header Content-Disposition 'attachment'; + } location ^~ /busniess {