From 1c67a8eaf07a2c714dce354085b51841da77d8d0 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Thu, 28 Jul 2022 16:45:52 +0800 Subject: [PATCH 1/4] update dbconfig --- mallinkNeuPosAdmin/src/main/resources/application-dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkNeuPosAdmin/src/main/resources/application-dev.yml b/mallinkNeuPosAdmin/src/main/resources/application-dev.yml index a909bab7c..926b2193d 100644 --- a/mallinkNeuPosAdmin/src/main/resources/application-dev.yml +++ b/mallinkNeuPosAdmin/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ spring: include: rabbitMQ # JDBC datasource: - url: jdbc:mysql://rm-2zen3rya8g4zur77cco.mysql.rds.aliyuncs.com:3306/smart_pos_platform_catering_db?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - username: fmposdb - password: fmposdb@2021User + url: jdbc:mysql://101.200.130.134:3306:3306/smart_pos_platform_catering_db?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true + username: root + password: fm2020test type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat From 17f8bd0b20019695d02b14ecd97eadea425d17d9 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Thu, 28 Jul 2022 16:53:30 +0800 Subject: [PATCH 2/4] fix neupos dbconfig --- mallinkNeuPosAdmin/src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkNeuPosAdmin/src/main/resources/application-dev.yml b/mallinkNeuPosAdmin/src/main/resources/application-dev.yml index 926b2193d..8612ce375 100644 --- a/mallinkNeuPosAdmin/src/main/resources/application-dev.yml +++ b/mallinkNeuPosAdmin/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ spring: include: rabbitMQ # JDBC datasource: - url: jdbc:mysql://101.200.130.134:3306:3306/smart_pos_platform_catering_db?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true username: root password: fm2020test type: com.alibaba.druid.pool.DruidDataSource From 94560205974dedbb5cb48d69594872360882d53b Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Thu, 28 Jul 2022 18:28:32 +0800 Subject: [PATCH 3/4] fix bug --- mallinkNeuPosAdmin/src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkNeuPosAdmin/src/main/resources/application-dev.yml b/mallinkNeuPosAdmin/src/main/resources/application-dev.yml index 8612ce375..5ced33eac 100644 --- a/mallinkNeuPosAdmin/src/main/resources/application-dev.yml +++ b/mallinkNeuPosAdmin/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ spring: include: rabbitMQ # JDBC datasource: - url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&nullCatalogMeansCurrent=true username: root password: fm2020test type: com.alibaba.druid.pool.DruidDataSource From ad616fd96fd605212f69f221a9854f66ee8b4551 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Thu, 28 Jul 2022 18:36:54 +0800 Subject: [PATCH 4/4] fix --- mallinkNeuPosAdmin/src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkNeuPosAdmin/src/main/resources/application-dev.yml b/mallinkNeuPosAdmin/src/main/resources/application-dev.yml index 5ced33eac..8612ce375 100644 --- a/mallinkNeuPosAdmin/src/main/resources/application-dev.yml +++ b/mallinkNeuPosAdmin/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ spring: include: rabbitMQ # JDBC datasource: - url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://101.200.130.134:3306/smart_pos_platform_catering_db?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true username: root password: fm2020test type: com.alibaba.druid.pool.DruidDataSource