From d01e17f147cb6fd0ee366e919a194738da967229 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 4 Jan 2024 14:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=EF=BC=9A=E5=A2=9E=E5=8A=A0Fr?=
 =?UTF-8?q?pc=E5=86=85=E7=BD=91=E7=A9=BF=E9=80=8F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sms/forwarder/database/AppDatabase.kt     | 23 ++++++++++++++-----
 app/src/main/res/raw/frpc.ini                 |  4 ++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/database/AppDatabase.kt b/app/src/main/java/com/idormy/sms/forwarder/database/AppDatabase.kt
index 6eb5d9c0..4f3fe4fd 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/database/AppDatabase.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/database/AppDatabase.kt
@@ -7,8 +7,19 @@ import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import com.idormy.sms.forwarder.database.dao.*
-import com.idormy.sms.forwarder.database.entity.*
+import com.idormy.sms.forwarder.database.dao.FrpcDao
+import com.idormy.sms.forwarder.database.dao.LogsDao
+import com.idormy.sms.forwarder.database.dao.MsgDao
+import com.idormy.sms.forwarder.database.dao.RuleDao
+import com.idormy.sms.forwarder.database.dao.SenderDao
+import com.idormy.sms.forwarder.database.dao.TaskDao
+import com.idormy.sms.forwarder.database.entity.Frpc
+import com.idormy.sms.forwarder.database.entity.Logs
+import com.idormy.sms.forwarder.database.entity.LogsDetail
+import com.idormy.sms.forwarder.database.entity.Msg
+import com.idormy.sms.forwarder.database.entity.Rule
+import com.idormy.sms.forwarder.database.entity.Sender
+import com.idormy.sms.forwarder.database.entity.Task
 import com.idormy.sms.forwarder.database.ext.ConvertersDate
 import com.idormy.sms.forwarder.utils.DATABASE_NAME
 
@@ -64,7 +75,7 @@ login_fail_exit = false
 type = tcp
 local_ip = 127.0.0.1
 local_port = 5000
-#只要修改下面这一行
+#只要修改下面这一行（frps所在服务器必须暴露的公网端口）
 remote_port = 5000
 
 #[二选一即可]每台机器不可重复，通过 http://smsf.demo.com 访问
@@ -72,7 +83,7 @@ remote_port = 5000
 type = http
 local_ip = 127.0.0.1
 local_port = 5000
-#只要修改下面这一行
+#只要修改下面这一行（在frps端将域名反代到vhost_http_port）
 custom_domains = smsf.demo.com
 ', 0, '1651334400000')
 """.trimIndent()
@@ -200,7 +211,7 @@ login_fail_exit = false
 type = tcp
 local_ip = 127.0.0.1
 local_port = 5000
-#只要修改下面这一行
+#只要修改下面这一行（frps所在服务器必须暴露的公网端口）
 remote_port = 5000
 
 #[二选一即可]每台机器不可重复，通过 http://smsf.demo.com 访问
@@ -208,7 +219,7 @@ remote_port = 5000
 type = http
 local_ip = 127.0.0.1
 local_port = 5000
-#只要修改下面这一行
+#只要修改下面这一行（在frps端将域名反代到vhost_http_port）
 custom_domains = smsf.demo.com
 ', 0, '1651334400000')
 """.trimIndent()
diff --git a/app/src/main/res/raw/frpc.ini b/app/src/main/res/raw/frpc.ini
index 9a026b4e..180f58ac 100644
--- a/app/src/main/res/raw/frpc.ini
+++ b/app/src/main/res/raw/frpc.ini
@@ -15,7 +15,7 @@ login_fail_exit = false
 type = tcp
 local_ip = 127.0.0.1
 local_port = 5000
-#只要修改下面这一行
+#只要修改下面这一行（frps所在服务器必须暴露的公网端口）
 remote_port = 5000
 
 #[二选一即可]每台机器不可重复，通过 http://smsf.demo.com 访问
@@ -23,5 +23,5 @@ remote_port = 5000
 type = http
 local_ip = 127.0.0.1
 local_port = 5000
-#只要修改下面这一行
+#只要修改下面这一行（在frps端将域名反代到vhost_http_port）
 custom_domains = smsf.demo.com