From 5e24f88221dfd8865d585ae377ee6ed2a2ff6c06 Mon Sep 17 00:00:00 2001
From: wenfei <hwf452@163.com>
Date: Thu, 10 Apr 2025 16:30:22 +0800
Subject: [PATCH] db change

---
 .gitignore            |  0
 .idea/go_mqtt.iml     |  0
 .idea/modules.xml     |  0
 .idea/vcs.xml         |  0
 .idea/workspace.xml   | 44 +++++++++++++++++++++++++++++++++++++++----
 README.md             |  0
 go.mod                | 16 +++++++++-------
 go.sum                |  0
 main.go               |  0
 models/Order.go       |  0
 models/Product.go     |  0
 models/Temperature.go |  0
 models/User.go        |  0
 mydb/ManageDb.go      |  0
 mydb/initialize.go    | 10 ++++++----
 utils/RandomNumber.go |  0
 16 files changed, 55 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 .gitignore
 mode change 100644 => 100755 .idea/go_mqtt.iml
 mode change 100644 => 100755 .idea/modules.xml
 mode change 100644 => 100755 .idea/vcs.xml
 mode change 100644 => 100755 .idea/workspace.xml
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 go.mod
 mode change 100644 => 100755 go.sum
 mode change 100644 => 100755 main.go
 mode change 100644 => 100755 models/Order.go
 mode change 100644 => 100755 models/Product.go
 mode change 100644 => 100755 models/Temperature.go
 mode change 100644 => 100755 models/User.go
 mode change 100644 => 100755 mydb/ManageDb.go
 mode change 100644 => 100755 mydb/initialize.go
 mode change 100644 => 100755 utils/RandomNumber.go

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/.idea/go_mqtt.iml b/.idea/go_mqtt.iml
old mode 100644
new mode 100755
diff --git a/.idea/modules.xml b/.idea/modules.xml
old mode 100644
new mode 100755
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
old mode 100644
new mode 100755
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
old mode 100644
new mode 100755
index 2894444..5203c7b
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,23 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9f8c3ce4-c378-4191-b7a4-3d5acbc0ebbc" name="Changes" comment="rr">
+    <list default="true" id="9f8c3ce4-c378-4191-b7a4-3d5acbc0ebbc" name="Changes" comment="rrddf">
       <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/go_mqtt.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/go_mqtt.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" 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$/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/main.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/Order.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/Order.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/Product.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/Product.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/Temperature.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/Temperature.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/User.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/User.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mydb/ManageDb.go" beforeDir="false" afterPath="$PROJECT_DIR$/mydb/ManageDb.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mydb/initialize.go" beforeDir="false" afterPath="$PROJECT_DIR$/mydb/initialize.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/utils/RandomNumber.go" beforeDir="false" afterPath="$PROJECT_DIR$/utils/RandomNumber.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -52,14 +66,25 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="configurable..is.expanded" value="false" />
+    <property name="configurable.GoLibrariesConfigurable.is.expanded" value="true" />
     <property name="go.formatter.settings.were.checked" value="true" />
     <property name="go.import.settings.migrated" value="true" />
     <property name="go.modules.go.list.on.any.changes.was.set" value="true" />
     <property name="go.sdk.automatically.set" value="true" />
-    <property name="last_opened_file_path" value="$USER_HOME$" />
-    <property name="settings.editor.selected.configurable" value="go.sdk" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
   </component>
   <component name="RunManager">
+    <configuration default="true" type="GoApplicationRunConfiguration" factoryName="Go Application">
+      <module name="go_mqtt" />
+      <working_directory value="$PROJECT_DIR$" />
+      <go_parameters value="-i" />
+      <kind value="FILE" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+      <method v="2" />
+    </configuration>
     <configuration name="go build main.go" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
       <module name="go_mqtt" />
       <working_directory value="$PROJECT_DIR$" />
@@ -69,6 +94,16 @@
       <filePath value="$PROJECT_DIR$/main.go" />
       <method v="2" />
     </configuration>
+    <configuration default="true" type="GoTestRunConfiguration" factoryName="Go Test">
+      <module name="go_mqtt" />
+      <working_directory value="$PROJECT_DIR$" />
+      <go_parameters value="-i" />
+      <kind value="DIRECTORY" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+      <framework value="gotest" />
+      <method v="2" />
+    </configuration>
     <recent_temporary>
       <list>
         <item itemvalue="Go Build.go build main.go" />
@@ -95,7 +130,8 @@
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
     <MESSAGE value="数据库改用orm框架 gorm" />
     <MESSAGE value="rr" />
-    <option name="LAST_COMMIT_MESSAGE" value="rr" />
+    <MESSAGE value="rrddf" />
+    <option name="LAST_COMMIT_MESSAGE" value="rrddf" />
   </component>
   <component name="VgoProject">
     <integration-enabled>true</integration-enabled>
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/go.mod b/go.mod
old mode 100644
new mode 100755
index 3964690..041c442
--- a/go.mod
+++ b/go.mod
@@ -1,20 +1,22 @@
 module go_mqtt
 
-go 1.21.3
+go 1.24.1
 
-require github.com/eclipse/paho.mqtt.golang v1.4.2
+require (
+	github.com/eclipse/paho.mqtt.golang v1.4.2
+	github.com/go-sql-driver/mysql v1.9.0
+	github.com/google/uuid v1.6.0
+	github.com/shopspring/decimal v1.4.0
+	gorm.io/driver/mysql v1.5.7
+	gorm.io/gorm v1.25.12
+)
 
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/go-sql-driver/mysql v1.9.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/shopspring/decimal v1.4.0 // indirect
 	golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0 // indirect
 	golang.org/x/sync v0.11.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
-	gorm.io/driver/mysql v1.5.7 // indirect
-	gorm.io/gorm v1.25.12 // indirect
 )
diff --git a/go.sum b/go.sum
old mode 100644
new mode 100755
diff --git a/main.go b/main.go
old mode 100644
new mode 100755
diff --git a/models/Order.go b/models/Order.go
old mode 100644
new mode 100755
diff --git a/models/Product.go b/models/Product.go
old mode 100644
new mode 100755
diff --git a/models/Temperature.go b/models/Temperature.go
old mode 100644
new mode 100755
diff --git a/models/User.go b/models/User.go
old mode 100644
new mode 100755
diff --git a/mydb/ManageDb.go b/mydb/ManageDb.go
old mode 100644
new mode 100755
diff --git a/mydb/initialize.go b/mydb/initialize.go
old mode 100644
new mode 100755
index 4652a74..c4bb4b8
--- a/mydb/initialize.go
+++ b/mydb/initialize.go
@@ -17,8 +17,10 @@ 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(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(localhost:3306)/gorm?charset=utf8mb4&parseTime=True&loc=Local"
+	dsn := "root:Skyinno251,@tcp(192.168.3.29:3306)/gorm?charset=utf8mb4&parseTime=True&loc=Local"
 
 	db, err := gorm.Open(mysql.New(mysql.Config{
 		DSN:                       dsn,   // DSN data source name
@@ -41,16 +43,16 @@ func initDatabase() {
 	}
 
 	// SetMaxIdleConns 用于设置连接池中空闲连接的最大数量。
-	sqlDB.SetMaxIdleConns(10)
+	sqlDB.SetMaxIdleConns(5)
 	// SetMaxOpenConns 设置打开数据库连接的最大数量。
-	sqlDB.SetMaxOpenConns(50)
+	sqlDB.SetMaxOpenConns(20)
 	// SetConnMaxLifetime 设置了连接可复用的最大时间。
 	sqlDB.SetConnMaxLifetime(time.Minute * 5) // 连接最大生命周期
 
 	err = sqlDB.Ping() // 检查连接是否成功建立。如果失败，则返回错误。
 	if err != nil {
 		// 处理连接失败的情况。例如，打印错误信息并退出程序。
-		log.Println("192.168.2.18:3306连接失败")
+		log.Println("数据库连接失败")
 		fmt.Println("Connection failed:", err)
 		return
 	}
diff --git a/utils/RandomNumber.go b/utils/RandomNumber.go
old mode 100644
new mode 100755