From d28233e90a37eb2c6e3deaf04f64716984546328 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 27 Dec 2024 16:50:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9Emerchant=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97sql=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/200pjcloudx_merchant.sql                              | 2 ++
 .../main/java/merchant/{App.java => MerchantApp.java}    | 6 +++---
 .../src/main/resources/application.yml                   | 9 +--------
 3 files changed, 6 insertions(+), 11 deletions(-)
 create mode 100644 db/200pjcloudx_merchant.sql
 rename pjcloud-merchant/pjcloud-merchant-biz/src/main/java/merchant/{App.java => MerchantApp.java} (85%)

diff --git a/db/200pjcloudx_merchant.sql b/db/200pjcloudx_merchant.sql
new file mode 100644
index 000000000..309c3d9b2
--- /dev/null
+++ b/db/200pjcloudx_merchant.sql
@@ -0,0 +1,2 @@
+-- 建标语句
+create database `pjcloudx_merchant` default character set utf8mb4 collate utf8mb4_general_ci;
\ No newline at end of file
diff --git a/pjcloud-merchant/pjcloud-merchant-biz/src/main/java/merchant/App.java b/pjcloud-merchant/pjcloud-merchant-biz/src/main/java/merchant/MerchantApp.java
similarity index 85%
rename from pjcloud-merchant/pjcloud-merchant-biz/src/main/java/merchant/App.java
rename to pjcloud-merchant/pjcloud-merchant-biz/src/main/java/merchant/MerchantApp.java
index 943c22acb..c24afdca0 100644
--- a/pjcloud-merchant/pjcloud-merchant-biz/src/main/java/merchant/App.java
+++ b/pjcloud-merchant/pjcloud-merchant-biz/src/main/java/merchant/MerchantApp.java
@@ -12,13 +12,13 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
  * <p>
  * 项目启动类
  */
-@EnableOpenApi("pjcloud-merchant")
+@EnableOpenApi("merchant")
 @EnablePjcloudFeignClients
 @EnableDiscoveryClient
 @EnablePjcloudResourceServer
 @SpringBootApplication
-public class App {
+public class MerchantApp {
     public static void main(String[] args) {
-        SpringApplication.run(App.class, args);
+        SpringApplication.run(MerchantApp.class, args);
     }
 }
diff --git a/pjcloud-merchant/pjcloud-merchant-biz/src/main/resources/application.yml b/pjcloud-merchant/pjcloud-merchant-biz/src/main/resources/application.yml
index b97d1f43f..d4e63e272 100644
--- a/pjcloud-merchant/pjcloud-merchant-biz/src/main/resources/application.yml
+++ b/pjcloud-merchant/pjcloud-merchant-biz/src/main/resources/application.yml
@@ -9,17 +9,10 @@ spring:
       username: @nacos.username@
       password: @nacos.password@
       discovery:
-        server-addr: pjcloud-register:8848
+        server-addr: ${NACOS_HOST:pjcloud-register}:${NACOS_PORT:8848}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
   config:
     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_demo?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true