From 5008b1bf4d9933e610cce681b46ff3c7ca0b2bc7 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 25 Jun 2024 20:49:17 +0800
Subject: [PATCH] 1

---
 server/adminserver/api/v1/system/mail.go     | 13 +++++++------
 server/adminserver/go.mod                    |  4 ++++
 server/adminserver/model/system/mailevent.go | 15 ---------------
 server/adminserver/task/taskmgr.go           |  7 -------
 server/backtask/model/mailevent.go           | 15 ---------------
 server/backtask/task/sysmail.go              |  3 +--
 server/jccommon/types.go                     | 11 +++++++++++
 7 files changed, 23 insertions(+), 45 deletions(-)
 delete mode 100644 server/adminserver/model/system/mailevent.go
 delete mode 100644 server/backtask/model/mailevent.go

diff --git a/server/adminserver/api/v1/system/mail.go b/server/adminserver/api/v1/system/mail.go
index ad9f8c77..a0f87220 100644
--- a/server/adminserver/api/v1/system/mail.go
+++ b/server/adminserver/api/v1/system/mail.go
@@ -8,6 +8,7 @@ import (
 	"main/model/system"
 	"net/http"
 	"q5"
+	"jccommon"
 )
 
 type MailApi struct {
@@ -42,7 +43,7 @@ func (this *MailApi) AddMail(c *gin.Context) {
 		})
 		return
 	}
-	if reqJson.MailType <= constant.MAIL_TYPE_BEGIN || reqJson.MailType >= constant.MAIL_TYPE_END {
+	if reqJson.MailType <= jccommon.MAIL_TYPE_BEGIN || reqJson.MailType >= jccommon.MAIL_TYPE_END {
 		c.JSON(http.StatusOK, gin.H{
 			"code":    2,
 			"message": "mail_type参数错误",
@@ -65,8 +66,8 @@ func (this *MailApi) AddMail(c *gin.Context) {
 	mail.ModifyTime = nowDaySeconds
 	f5.GetApp().GetOrmDb(constant.MAIL_DB).Create(mail)
 	{
-		e := new(system.MailEvent)
-		e.EventName = constant.EVENT_MAIL_UPDATE
+		e := new(jccommon.MailEvent)
+		e.EventName = jccommon.EVENT_MAIL_UPDATE
 		e.Param1 = q5.ToString(mail.MailId)
 		e.CreateTime = nowDaySeconds
 		e.ModifyTime = nowDaySeconds
@@ -98,7 +99,7 @@ func (this *MailApi) EditMail(c *gin.Context) {
 		})
 		return
 	}
-	if reqJson.MailType <= constant.MAIL_TYPE_BEGIN || reqJson.MailType >= constant.MAIL_TYPE_END {
+	if reqJson.MailType <= jccommon.MAIL_TYPE_BEGIN || reqJson.MailType >= jccommon.MAIL_TYPE_END {
 		c.JSON(http.StatusOK, gin.H{
 			"code":    2,
 			"message": "mail_type参数错误",
@@ -121,8 +122,8 @@ func (this *MailApi) EditMail(c *gin.Context) {
 	mail.ModifyTime = nowDaySeconds
 	f5.GetApp().GetOrmDb(constant.MAIL_DB).Save(mail)
 	{
-		e := new(system.MailEvent)
-		e.EventName = constant.EVENT_MAIL_UPDATE
+		e := new(jccommon.MailEvent)
+		e.EventName = jccommon.EVENT_MAIL_UPDATE
 		e.Param1 = q5.ToString(mail.MailId)
 		e.CreateTime = nowDaySeconds
 		e.ModifyTime = nowDaySeconds
diff --git a/server/adminserver/go.mod b/server/adminserver/go.mod
index c2a0ea3c..888f029e 100644
--- a/server/adminserver/go.mod
+++ b/server/adminserver/go.mod
@@ -6,6 +6,8 @@ require q5 v1.0.0
 
 require f5 v1.0.0
 
+require jccommon v1.0.0
+
 require mt v1.0.0
 
 require mtb v1.0.0 // indirect
@@ -60,6 +62,8 @@ replace q5 => ../../third_party/q5
 
 replace f5 => ../../third_party/f5
 
+replace jccommon => ../jccommon
+
 replace mt => ./mt
 
 replace mtb => ./mtb
diff --git a/server/adminserver/model/system/mailevent.go b/server/adminserver/model/system/mailevent.go
deleted file mode 100644
index cc97b9c5..00000000
--- a/server/adminserver/model/system/mailevent.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package system
-
-import (
-)
-
-type MailEvent struct {
-	EventName string `gorm:"column:event_name" json:"event_name"`
-	Param1 string `gorm:"column:param1" json:"param1"`
-	CreateTime int32 `gorm:"column:createtime;<-:create" json:"createtime"`
-	ModifyTime int32 `gorm:"column:modifytime" json:"modifytime"`
-}
-
-func (MailEvent) TableName() string {
-	return "t_event"
-}
diff --git a/server/adminserver/task/taskmgr.go b/server/adminserver/task/taskmgr.go
index a6fa0e2a..3cd9e701 100644
--- a/server/adminserver/task/taskmgr.go
+++ b/server/adminserver/task/taskmgr.go
@@ -1,13 +1,6 @@
 package task
 
 import (
-	"q5"
-	"f5"
-	"fmt"
-	"sync"
-	"time"
-	"main/constant"
-	"main/model/system"
 )
 
 type taskMgr struct {
diff --git a/server/backtask/model/mailevent.go b/server/backtask/model/mailevent.go
deleted file mode 100644
index f82f6f23..00000000
--- a/server/backtask/model/mailevent.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package model
-
-import (
-)
-
-type MailEvent struct {
-	EventName string `gorm:"column:event_name" json:"event_name"`
-	Param1 string `gorm:"column:param1" json:"param1"`
-	CreateTime int32 `gorm:"column:createtime;<-:create" json:"createtime"`
-	ModifyTime int32 `gorm:"column:modifytime" json:"modifytime"`
-}
-
-func (MailEvent) TableName() string {
-	return "t_event"
-}
diff --git a/server/backtask/task/sysmail.go b/server/backtask/task/sysmail.go
index 9381d517..71c0df73 100644
--- a/server/backtask/task/sysmail.go
+++ b/server/backtask/task/sysmail.go
@@ -8,7 +8,6 @@ import (
 	"sync"
 	"jccommon"
 	"main/constant"
-	"main/model"
 )
 
 type sysMail struct {
@@ -133,7 +132,7 @@ func (this *sysMail) writeMail(ds *f5.DataSet) bool {
 			} else {
 				{
 					nowDaySeconds := int32(f5.GetApp().GetRealSeconds())
-					e := new(model.MailEvent)
+					e := new(jccommon.MailEvent)
 					e.EventName = jccommon.EVENT_MAIL_UPDATE
 					e.Param1 = q5.ToString(mailId)
 					e.CreateTime = nowDaySeconds
diff --git a/server/jccommon/types.go b/server/jccommon/types.go
index 4420806e..18b94a4a 100644
--- a/server/jccommon/types.go
+++ b/server/jccommon/types.go
@@ -47,3 +47,14 @@ type MailConfig struct {
 	Tag1 int32
 	Tag2 int32
 }
+
+type MailEvent struct {
+	EventName string `gorm:"column:event_name" json:"event_name"`
+	Param1 string `gorm:"column:param1" json:"param1"`
+	CreateTime int32 `gorm:"column:createtime;<-:create" json:"createtime"`
+	ModifyTime int32 `gorm:"column:modifytime" json:"modifytime"`
+}
+
+func (MailEvent) TableName() string {
+	return "t_event"
+}