From a8a8480a68bb6be736f6d4845d82a49943cf1270 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 6 Aug 2024 22:30:41 +0800
Subject: [PATCH] 1

---
 bin/adminserver/config/users.json        | 12 ++++++++++++
 server/adminserver/api/v1/system/mail.go |  4 ++--
 server/adminserver/model/system/mail.go  |  1 +
 third_party/f5                           |  2 +-
 third_party/q5                           |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/bin/adminserver/config/users.json b/bin/adminserver/config/users.json
index 9ce704e2..884519a0 100644
--- a/bin/adminserver/config/users.json
+++ b/bin/adminserver/config/users.json
@@ -21,5 +21,17 @@
       "api": ["xxx", "-xxx"],
       "ui": ["addannouncement", "editannouncement", "addaudit", "editaudit"]
     }
+  },
+  {
+    "account_address": "0x3dC8F7a8E6dB10a9dEE3b74C268520E9Bf4fb322",
+    "__doc__": "az",
+    "roles": [
+      "admin",
+      "customer_service"
+    ],
+    "special": {
+      "api": ["xxx", "-xxx"],
+      "ui": ["addannouncement", "editannouncement", "addaudit", "editaudit"]
+    }
   }
 ]
diff --git a/server/adminserver/api/v1/system/mail.go b/server/adminserver/api/v1/system/mail.go
index b200fe6f..1a2226d8 100644
--- a/server/adminserver/api/v1/system/mail.go
+++ b/server/adminserver/api/v1/system/mail.go
@@ -18,12 +18,12 @@ func (this *MailApi) ListMail(c *gin.Context) {
 	var pageSize int32 = 100
 	var cursor int64 = 0
 	orderBy := ""
-	sql := "SELECT * FROM t_mail"
+	sql := "SELECT * FROM t_mail WHERE 1=1 and unikey is not null "
 	subFilters := []f5.DbQueryFilter{}
 	{
 		inSub := `tag1 IN (` + q5.ToString(jccommon.MAIL_TAG1_CUSTOM)
 		inSub += ")"
-		q5.AppendSlice(&subFilters, f5.GetDbFilter().Custom(inSub).And())
+		//q5.AppendSlice(&subFilters, f5.GetDbFilter().Custom(inSub).And())
 	}
 	mails := []*system.Mail{}
 	f5.GetGoStyleDb().StreamPageQuery(
diff --git a/server/adminserver/model/system/mail.go b/server/adminserver/model/system/mail.go
index 0af7b3fc..ec2d3dbc 100644
--- a/server/adminserver/model/system/mail.go
+++ b/server/adminserver/model/system/mail.go
@@ -23,6 +23,7 @@ Attachments:
 */
 
 type Mail struct {
+	UniKey *string `gorm:"column:unikey" json:"unikey"`
 	MailId int64 `gorm:"primaryKey;column:mail_id;<-:create" json:"mail_id,string"`
 	MailType int32 `gorm:"column:mail_type;<-:create" json:"mail_type"`
 	Subject string `gorm:"column:subject" json:"subject"`
diff --git a/third_party/f5 b/third_party/f5
index 2351ba10..dd033a25 160000
--- a/third_party/f5
+++ b/third_party/f5
@@ -1 +1 @@
-Subproject commit 2351ba1052caee5651ecb6fedfe6a48fe6c43c0e
+Subproject commit dd033a252130057af43c17cf1714d0b9a497228d
diff --git a/third_party/q5 b/third_party/q5
index ba4b733a..489449c6 160000
--- a/third_party/q5
+++ b/third_party/q5
@@ -1 +1 @@
-Subproject commit ba4b733a804045ae931cbef0c2aebb8b1a636ed7
+Subproject commit 489449c65d408c649ec4ceeb3fa1ad48a692eb61