Merge remote-tracking branch 'origin/master'

# Conflicts:
#	docker/copy.sh

.gitignore

@@ -44,3 +44,4 @@ nbdist/
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
+docker

docker/copy.sh

@@ -9,8 +9,9 @@ usage() {
 
 # copy sql
 echo "begin copy sql "
-cp ../sql/ry_20240629.sql ./mysql/db
-cp ../sql/ry_config_20240902.sql ./mysql/db
+cp ../sql/ry_*.sql ./mysql/db
+cp ../sql/ry_config_*.sql ./mysql/db
+cp ../sql/ry_seata_*.sql ./mysql/db
 
 # copy html
 echo "begin copy html "

docker/docker-compose.yml

@@ -27,6 +27,7 @@ services:
       - ./mysql/conf:/etc/mysql/conf.d
       - ./mysql/logs:/logs
       - ./mysql/data:/var/lib/mysql
+      - ./mysql/db:/docker-entrypoint-initdb.d
     command: [
           'mysqld',
           '--innodb-buffer-pool-size=80M',

ruoyi-auth/Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:8-jdk
+LABEL maintainer=duhongming
+
+
+#docker run -e PARAMS="--server.port 9090"
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY target/*.jar /app.jar
+EXPOSE 8080
+
+ENTRYPOINT ["/bin/sh","-c","java -jar app.jar ${PARAMS}"]

ruoyi-gateway/Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:8-jdk
+LABEL maintainer=duhongming
+
+
+#docker run -e PARAMS="--server.port 9090"
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY target/*.jar /app.jar
+EXPOSE 8080
+
+ENTRYPOINT ["/bin/sh","-c","java -jar app.jar ${PARAMS}"]

ruoyi-modules/ruoyi-file/Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:8-jdk
+LABEL maintainer=duhongming
+
+
+#docker run -e PARAMS="--server.port 9090"
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY target/*.jar /app.jar
+EXPOSE 8080
+
+ENTRYPOINT ["/bin/sh","-c","java -jar app.jar ${PARAMS}"]

ruoyi-modules/ruoyi-gen/Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:8-jdk
+LABEL maintainer=duhongming
+
+
+#docker run -e PARAMS="--server.port 9090"
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY target/*.jar /app.jar
+EXPOSE 8080
+
+ENTRYPOINT ["/bin/sh","-c","java -jar app.jar ${PARAMS}"]

ruoyi-modules/ruoyi-job/Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:8-jdk
+LABEL maintainer=duhongming
+
+
+#docker run -e PARAMS="--server.port 9090"
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY target/*.jar /app.jar
+EXPOSE 8080
+
+ENTRYPOINT ["/bin/sh","-c","java -jar app.jar ${PARAMS}"]

ruoyi-modules/ruoyi-system/Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:8-jdk
+LABEL maintainer=duhongming
+
+
+#docker run -e PARAMS="--server.port 9090"
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY target/*.jar /app.jar
+EXPOSE 8080
+
+ENTRYPOINT ["/bin/sh","-c","java -jar app.jar ${PARAMS}"]

ruoyi-visual/ruoyi-monitor/Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:8-jdk
+LABEL maintainer=duhongming
+
+
+#docker run -e PARAMS="--server.port 9090"
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY target/*.jar /app.jar
+EXPOSE 8080
+
+ENTRYPOINT ["/bin/sh","-c","java -jar app.jar ${PARAMS}"]