From 5daec2ee1d44595b3eb9648a7f753df6202c74d7 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 25 Dec 2024 13:52:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82erp=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/1schema.sql | 1 + .../src/main/resources/application.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/db/1schema.sql b/db/1schema.sql index bb106ca6e..1da69a9b3 100644 --- a/db/1schema.sql +++ b/db/1schema.sql @@ -34,3 +34,4 @@ create database `pjcloudx_canteen` default character set utf8mb4 collate utf8mb4 create database `pjcloudx_erp` default character set utf8mb4 collate utf8mb4_general_ci; create database `pjcloudx_supermarket` default character set utf8mb4 collate utf8mb4_general_ci; create database `pjcloudx_supermarket_erp` default character set utf8mb4 collate utf8mb4_general_ci; +create database `pjcloudx_wallet` default character set utf8mb4 collate utf8mb4_general_ci; diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml index 7728cb158..8914641d5 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml +++ b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml @@ -16,10 +16,10 @@ spring: import: - optional:nacos:application-@profiles.active@.yml - optional:nacos:${spring.application.name}-@profiles.active@.yml - datasource: - type: com.alibaba.druid.pool.DruidDataSource - druid: - driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: root - url: jdbc:mysql://pjcloud-mysql:3306/pjcloudx_supermarket_erp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true +# datasource: +# type: com.alibaba.druid.pool.DruidDataSource +# druid: +# driver-class-name: com.mysql.cj.jdbc.Driver +# username: root +# password: root +# url: jdbc:mysql://pjcloud-mysql:3306/pjcloudx_supermarket_erp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true