From 083a8771d2b10c24e845919106d1fb632e5bda2f Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Wed, 18 Dec 2024 12:26:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(web):=20=E6=9B=B4=E6=96=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E9=85=8D=E7=BD=AE=E5=B9=B6=E8=BF=81=E7=A7=BB?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 .idea/dataSources.xml 中的数据源配置，更新为新的 MySQL 数据源
- 更新 DataResourceController 中的属性名称，以适应新的数据库结构
- 修改 CsvResourceFormat、JsonLineResourceFormat 和 JsonResourceFormat 类中的属性名称
- 更新 application.yml 中的数据库配置，使用新的 MySQL 数据源
- 在 pom.xml 中添加 MySQL 连接器依赖，以支持新的数据库
---
 .idea/dataSources.xml                                |  4 ++--
 gringotts-web/pom.xml                                |  4 ++++
 .../domain/controller/DataResourceController.java    | 12 ++++++------
 .../web/domain/entity/format/CsvResourceFormat.java  |  2 +-
 .../domain/entity/format/JsonLineResourceFormat.java |  2 +-
 .../web/domain/entity/format/JsonResourceFormat.java |  2 +-
 gringotts-web/src/main/resources/application.yml     |  8 ++++----
 7 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 4f81532..6d1b44e 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -13,11 +13,11 @@
       </jdbc-additional-properties>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
-    <data-source source="LOCAL" name="homeless" uuid="9af017b2-2a8b-45b4-899c-ef4fb185b77c">
+    <data-source source="LOCAL" name="gringotts@132.122.1.185" uuid="91feafc5-32a2-4c28-93a7-b39754851328">
       <driver-ref>mysql.8</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://frp-air.top:43458</jdbc-url>
+      <jdbc-url>jdbc:mysql://132.122.1.185:31000/gringotts</jdbc-url>
       <jdbc-additional-properties>
         <property name="com.intellij.clouds.kubernetes.db.host.port" />
         <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
diff --git a/gringotts-web/pom.xml b/gringotts-web/pom.xml
index e2b341b..5fad3e2 100644
--- a/gringotts-web/pom.xml
+++ b/gringotts-web/pom.xml
@@ -34,6 +34,10 @@
             <version>${hibernate.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/DataResourceController.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/DataResourceController.java
index 6f1969e..08cf84d 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/DataResourceController.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/controller/DataResourceController.java
@@ -174,18 +174,18 @@ public class DataResourceController extends SimpleControllerSupport<DataResource
         break;
       case JSON:
         JsonResourceFormat jsonFormat = (JsonResourceFormat) dataResource.getFormat();
-        item.setJsonSchemaText(jsonFormat.getSchema());
-        item.setJsonSchema(mapper.readValue(jsonFormat.getSchema(), Map.class));
+        item.setJsonSchemaText(jsonFormat.getJsonSchema());
+        item.setJsonSchema(mapper.readValue(jsonFormat.getJsonSchema(), Map.class));
         break;
       case JSON_LINE:
         JsonLineResourceFormat jsonLineFormat = (JsonLineResourceFormat) dataResource.getFormat();
-        item.setJsonLineSchemaText(jsonLineFormat.getSchema());
-        item.setJsonLineSchema(mapper.readValue(jsonLineFormat.getSchema(), Map.class));
+        item.setJsonLineSchemaText(jsonLineFormat.getJsonSchema());
+        item.setJsonLineSchema(mapper.readValue(jsonLineFormat.getJsonSchema(), Map.class));
         break;
       case CSV:
         CsvResourceFormat csvFormat = (CsvResourceFormat) dataResource.getFormat();
-        item.setCsvSchemaText(csvFormat.getSchema());
-        item.setCsvSchema(mapper.readValue(csvFormat.getSchema(), Map.class));
+        item.setCsvSchemaText(csvFormat.getCsvSchema());
+        item.setCsvSchema(mapper.readValue(csvFormat.getCsvSchema(), Map.class));
         break;
     }
     if (ObjectUtil.isNotNull(dataResource.getExample())) {
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/CsvResourceFormat.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/CsvResourceFormat.java
index 5e278bf..c87837a 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/CsvResourceFormat.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/CsvResourceFormat.java
@@ -28,7 +28,7 @@ import org.hibernate.annotations.Where;
 @SQLDelete(sql = "update " + Constants.TABLE_PREFIX + "resource_format" + " set deleted = true where id = ?")
 @Where(clause = LogicDeleteIdOnlyEntity.LOGIC_DELETE_CLAUSE)
 public class CsvResourceFormat extends ResourceFormat {
-  private String schema;
+  private String csvSchema;
 
   @Override
   public Type getFormatType() {
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonLineResourceFormat.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonLineResourceFormat.java
index a19d70c..ecb9dbc 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonLineResourceFormat.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonLineResourceFormat.java
@@ -28,7 +28,7 @@ import org.hibernate.annotations.Where;
 @SQLDelete(sql = "update " + Constants.TABLE_PREFIX + "resource_format" + " set deleted = true where id = ?")
 @Where(clause = LogicDeleteIdOnlyEntity.LOGIC_DELETE_CLAUSE)
 public class JsonLineResourceFormat extends ResourceFormat {
-  private String schema;
+  private String jsonSchema;
 
   @Override
   public Type getFormatType() {
diff --git a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonResourceFormat.java b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonResourceFormat.java
index 35a7cfa..99dc420 100644
--- a/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonResourceFormat.java
+++ b/gringotts-web/src/main/java/com/eshore/gringotts/web/domain/entity/format/JsonResourceFormat.java
@@ -28,7 +28,7 @@ import org.hibernate.annotations.Where;
 @SQLDelete(sql = "update " + Constants.TABLE_PREFIX + "resource_format" + " set deleted = true where id = ?")
 @Where(clause = LogicDeleteIdOnlyEntity.LOGIC_DELETE_CLAUSE)
 public class JsonResourceFormat extends ResourceFormat {
-  private String schema;
+  private String jsonSchema;
 
   @Override
   public Type getFormatType() {
diff --git a/gringotts-web/src/main/resources/application.yml b/gringotts-web/src/main/resources/application.yml
index d57d449..03c5e70 100644
--- a/gringotts-web/src/main/resources/application.yml
+++ b/gringotts-web/src/main/resources/application.yml
@@ -6,10 +6,10 @@ spring:
   profiles:
     include: common,metrics,encrypt
   datasource:
-    url: jdbc:h2:./database;DATABASE_TO_LOWER=TRUE;CASE_INSENSITIVE_IDENTIFIERS=TRUE
-    username: lanyuanxiaoyao
-    password: lanyuanxiaoyao
-    driver-class-name: org.h2.Driver
+    url: jdbc:mysql://132.122.1.185:31000/gringotts
+    username: iap
+    password: SLvwP6@SM2J*SbUw_iap
+    driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     generate-ddl: true
     show-sql: true