From 66ad0cd6c05154565191cfac0731fdb07dd4beb0 Mon Sep 17 00:00:00 2001 From: pader Date: Sun, 16 May 2021 18:44:43 +0800 Subject: [PATCH] Fixed mysql ssl for 5.7 --- README.md | 2 +- README_ZH.md | 2 +- build/conf/application.properties | 4 ++-- env/nacos-standlone-mysql.env | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bf6ea0e..70c213e 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ Run the following command: | MYSQL_SERVICE_USER | username of database | | | MYSQL_SERVICE_PASSWORD | password of database | | | MYSQL_DATABASE_NUM | It indicates the number of database | default :**1** | -| MYSQL_SERVICE_DB_PARAM | Database url parameter | default : **characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true** | +| MYSQL_SERVICE_DB_PARAM | Database url parameter | default : **characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false** | | JVM_XMS | -Xms | default :1g | | JVM_XMX | -Xmx | default :1g | | JVM_XMN | -Xmn | default :512m | diff --git a/README_ZH.md b/README_ZH.md index 00e82f5..cbfd68a 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -154,7 +154,7 @@ | MYSQL_SERVICE_DB_NAME | 数据库库名 | | | MYSQL_SERVICE_USER | 数据库用户名 | | | MYSQL_SERVICE_PASSWORD | 数据库用户密码 | | -| MYSQL_SERVICE_DB_PARAM | 数据库连接参数 | default : **characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true** | +| MYSQL_SERVICE_DB_PARAM | 数据库连接参数 | default : **characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false** | | MYSQL_DATABASE_NUM | It indicates the number of database | 默认 :**1** | | JVM_XMS | -Xms | 默认 :1g | | JVM_XMX | -Xmx | 默认 :1g | diff --git a/build/conf/application.properties b/build/conf/application.properties index 65b0750..2337667 100644 --- a/build/conf/application.properties +++ b/build/conf/application.properties @@ -8,8 +8,8 @@ nacos.cmdb.eventTaskInterval=10 nacos.cmdb.labelTaskInterval=300 nacos.cmdb.loadDataAtStart=false db.num=${MYSQL_DATABASE_NUM:1} -db.url.0=jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT:3306}/${MYSQL_SERVICE_DB_NAME}?${MYSQL_SERVICE_DB_PARAM:characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true} -db.url.1=jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT:3306}/${MYSQL_SERVICE_DB_NAME}?${MYSQL_SERVICE_DB_PARAM:characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true} +db.url.0=jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT:3306}/${MYSQL_SERVICE_DB_NAME}?${MYSQL_SERVICE_DB_PARAM:characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false} +db.url.1=jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT:3306}/${MYSQL_SERVICE_DB_NAME}?${MYSQL_SERVICE_DB_PARAM:characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false} db.user=${MYSQL_SERVICE_USER} db.password=${MYSQL_SERVICE_PASSWORD} ### The auth system to use, currently only 'nacos' is supported: diff --git a/env/nacos-standlone-mysql.env b/env/nacos-standlone-mysql.env index fc444c0..a724d15 100644 --- a/env/nacos-standlone-mysql.env +++ b/env/nacos-standlone-mysql.env @@ -6,4 +6,4 @@ MYSQL_SERVICE_DB_NAME=nacos_devtest MYSQL_SERVICE_PORT=3306 MYSQL_SERVICE_USER=nacos MYSQL_SERVICE_PASSWORD=nacos -MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&&useSSL=false \ No newline at end of file +MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false \ No newline at end of file