From f096052cc74b12d0e77fc889b43a4f924227a5be Mon Sep 17 00:00:00 2001 From: Lynne Date: Mon, 30 Sep 2019 00:06:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?add=20docker=E9=85=8D=E7=BD=AE=E5=92=8C?= =?UTF-8?q?=E5=BF=AB=E9=80=9F=E5=90=AF=E5=8A=A8mysql=20docker=20shell?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 0 docker/docker-mysql/conf.d/config-file.cnf | 36 +++++++++++++++++++ docker/run_docker_mysql.sh | 7 ++++ .../src/main/resources/application-druid.yml | 2 +- .../src/main/resources/application.yml | 2 +- ruoyi-admin/src/main/resources/logback.xml | 2 +- 6 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 Dockerfile create mode 100644 docker/docker-mysql/conf.d/config-file.cnf create mode 100755 docker/run_docker_mysql.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..e69de29bb diff --git a/docker/docker-mysql/conf.d/config-file.cnf b/docker/docker-mysql/conf.d/config-file.cnf new file mode 100644 index 000000000..11d9eac98 --- /dev/null +++ b/docker/docker-mysql/conf.d/config-file.cnf @@ -0,0 +1,36 @@ +[client] +default-character-set=utf8 + +[mysql] +default-character-set=utf8 + +[mysqld] +## 默认字符集 utf8 +init_connect='SET collation_connection = utf8_unicode_ci' +init_connect='SET NAMES utf8' +character-set-server=utf8 +collation-server=utf8_unicode_ci + +# 表名不区分大小写 +lower_case_table_names=1 +#server-id=1 +datadir=/var/lib/mysql +#socket=/var/lib/mysql/mysqlx.sock +#symbolic-links=0 +# sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES + +## Mysql 最大连接数，直接影响 Mysql 应用的并发处理能力（ 500~1000 是个比较合适的值，注意每建立的连接都会占用一定的内存空间，直到连接被关闭才释放内存 ） +max_connections = 1000 + +## 连接超时时间为 20 秒 +connect_timeout = 20 + +## 网络传输中一次消息量的最大值，默认 4M ，必须设为 1024 的整倍数 +max_allowed_packet = 16M + +## Innodb 存储引擎核心参数，用于缓存 Innodb 表的索引、数据（ 默认 128M ，单独使用 Innodb 存储引擎且单一 Mysql 服务时建议设为物理内存的 70% - 80 % ） +innodb_buffer_pool_size = 512M + +[mysqld_safe] +log-error=/var/log/mysqld.log +pid-file=/var/run/mysqld/mysqld.pid diff --git a/docker/run_docker_mysql.sh b/docker/run_docker_mysql.sh new file mode 100755 index 000000000..95affe69b --- /dev/null +++ b/docker/run_docker_mysql.sh @@ -0,0 +1,7 @@ +docker run --name mysql \ + --restart=always \ + -p 3306:3306 \ + -v /opt/docker-mysql/conf.d:/etc/mysql/conf.d \ + -v /opt/docker-mysql/var/lib/mysql:/var/lib/mysql \ + -e MYSQL_ROOT_PASSWORD=123456 \ + -d mysql:5.7 diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index d69c66d27..d9d9a0766 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -8,7 +8,7 @@ spring: master: url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: password + password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 92a78b141..998edb092 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为80 - port: 80 + port: 8080 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index d69a57207..54a1f2ed7 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + From 8e8dbe4303fec40b00541e26930b4e7cdabbc18f Mon Sep 17 00:00:00 2001 From: Lynne Date: Mon, 30 Sep 2019 08:57:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Dockerfile=E5=92=8Cdocker?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=88=9B=E5=BB=BAmysql=E5=AE=B9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 13 +++++++++++++ docker/docker-mysql/conf.d/config-file.cnf | 8 +++----- docker/run_docker_mysql.sh | 8 ++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index e69de29bb..99427eb28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -0,0 +1,13 @@ +# +#基于阿里定制openjdk版本 +FROM registry.cn-hangzhou.aliyuncs.com/dragonwell/dragonwell8:8.0.0-GA_alpine_x86_64_8u212-b04 +#FROM daocloud.io/library/centos:7.6.1810 +COPY ruoyi-admin/target/ruoyi-admin.jar /opt + +ENV TZ "Asia/Shanghai" +ENV LANG en_US.UTF-8 +#java内存依据业务和服务器配置适当调整，Xmx一般1G~2G左右，如果要求高并发建议设置Xms=Xmx +ENV JAVA_OPTS "-server -Xms128M -Xmx1024M -XX:PermSize=128M -XX:MaxPermSize=512M" + +EXPOSE 80 +CMD ["java", "-jar","/opt/ruoyi-admin.jar"] \ No newline at end of file diff --git a/docker/docker-mysql/conf.d/config-file.cnf b/docker/docker-mysql/conf.d/config-file.cnf index 11d9eac98..581a5c49d 100644 --- a/docker/docker-mysql/conf.d/config-file.cnf +++ b/docker/docker-mysql/conf.d/config-file.cnf @@ -12,12 +12,10 @@ character-set-server=utf8 collation-server=utf8_unicode_ci # 表名不区分大小写 -lower_case_table_names=1 -#server-id=1 +lower_case_table_names=1 + +#数据库数据存储目录 datadir=/var/lib/mysql -#socket=/var/lib/mysql/mysqlx.sock -#symbolic-links=0 -# sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES ## Mysql 最大连接数，直接影响 Mysql 应用的并发处理能力（ 500~1000 是个比较合适的值，注意每建立的连接都会占用一定的内存空间，直到连接被关闭才释放内存 ） max_connections = 1000 diff --git a/docker/run_docker_mysql.sh b/docker/run_docker_mysql.sh index 95affe69b..2ea41298e 100755 --- a/docker/run_docker_mysql.sh +++ b/docker/run_docker_mysql.sh @@ -1,3 +1,11 @@ +echo "创建Mysql5.7服务docker容器，Mysql服务做了基础的性能优化" +echo "请将docker-mysql目录提前拷贝到/opt目录下，数据保存到/opt/docker-mysql目录" +echo "数据库初始化密码：123456" +echo "第一次创建容器后需要进入docker登陆mysql导入初始化SQL脚本" +echo "登陆docker命令如：docker exec -it mysql sh" +echo "登陆mysql命令如：mysql -uroot -p123456" +echo "导入数据命令如：>source ry_xxx.sql" +echo "导入数据命令如：>source quartz.sql" docker run --name mysql \ --restart=always \ -p 3306:3306 \