From c35017d748b9fd93fa3d9b9c09a271e303ded0a2 Mon Sep 17 00:00:00 2001
From: hwf452 <hwf452@163.com>
Date: Sat, 1 Mar 2025 20:20:32 +0800
Subject: [PATCH] rr

---
 .idea/workspace.xml | 33 +++++++++++++++++++++------------
 mydb/initialize.go  |  4 ++--
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 855b203..b28da0b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,18 +4,8 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9f8c3ce4-c378-4191-b7a4-3d5acbc0ebbc" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/models/Order.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/models/Product.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/models/User.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mydb/initialize.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/utils/RandomNumber.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/go.mod" beforeDir="false" afterPath="$PROJECT_DIR$/go.mod" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/go.sum" beforeDir="false" afterPath="$PROJECT_DIR$/go.sum" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/install_go.sh" beforeDir="false" afterPath="$PROJECT_DIR$/install_go.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/main.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/models/Temperature.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/Temperature.go" afterDir="false" />
+    <list default="true" id="9f8c3ce4-c378-4191-b7a4-3d5acbc0ebbc" name="Changes" comment="数据库改用orm框架 gorm">
+      <change beforePath="$PROJECT_DIR$/mydb/initialize.go" beforeDir="false" afterPath="$PROJECT_DIR$/mydb/initialize.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -30,7 +20,20 @@
     </option>
   </component>
   <component name="GOROOT" url="file://$USER_HOME$/sdk_go/go1.21.3" />
+  <component name="Git.Pull.Settings">
+    <option name="OPTIONS">
+      <set>
+        <option value="REBASE" />
+      </set>
+    </option>
+  </component>
   <component name="Git.Settings">
+    <option name="PUSH_TAGS">
+      <GitPushTagMode>
+        <option name="argument" value="--follow-tags" />
+        <option name="title" value="Current Branch" />
+      </GitPushTagMode>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="GoLibraries">
@@ -43,6 +46,7 @@
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
     <property name="DefaultGoTemplateProperty" value="Go File" />
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
@@ -85,6 +89,11 @@
       </map>
     </option>
   </component>
+  <component name="VcsManagerConfiguration">
+    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
+    <MESSAGE value="数据库改用orm框架 gorm" />
+    <option name="LAST_COMMIT_MESSAGE" value="数据库改用orm框架 gorm" />
+  </component>
   <component name="VgoProject">
     <integration-enabled>true</integration-enabled>
   </component>
diff --git a/mydb/initialize.go b/mydb/initialize.go
index e30f7a7..4652a74 100644
--- a/mydb/initialize.go
+++ b/mydb/initialize.go
@@ -17,8 +17,8 @@ var DB *gorm.DB
 
 func initDatabase() {
 
-	//dsn := "root:Skyinno251,@tcp(192.168.2.18:3306)/gorm?charset=utf8mb4&parseTime=True&loc=Local"
-	dsn := "root:Skyinno251,@tcp(47.242.184.139:3306)/appserver?charset=utf8mb4&parseTime=True&loc=Local"
+	dsn := "root:Skyinno251,@tcp(192.168.2.18:3306)/gorm?charset=utf8mb4&parseTime=True&loc=Local"
+	//dsn := "root:Skyinno251,@tcp(47.242.184.139:3306)/appserver?charset=utf8mb4&parseTime=True&loc=Local"
 
 	db, err := gorm.Open(mysql.New(mysql.Config{
 		DSN:                       dsn,   // DSN data source name