Merge branch 'debug' into yhg_20250327

desc/all.api

@@ -43,8 +43,10 @@ import "./wechat/credit_usage.api"
 import "./wechat/pay_recharge.api"
 import "./wechat/whatsapp.api"
 import "./wechat/whatsapp_channel.api"
+import "./wechat/xunji.api"
+import "./wechat/xunji_service.api"
+import "./wp_wecom/send_msg.api"
 import "./wechat/fastgpt.api"
 import "./wechat/department.api"
 import "./wechat/api_key.api"
-import "./wechat/xunji.api"
-import "./wechat/xunji_service.api"
+import "./wechat/auth_login.api"

desc/wechat/auth_login.api

@@ -0,0 +1,84 @@
+import "../base.api"
+
+type (
+    // The log in information | 登陆返回的数据信息
+    LoginInfo {
+        // User's UUID | 用户的UUID
+        UserId       string          `json:"userId"`
+
+        // Token for authorization | 验证身份的token
+        Token        string          `json:"token"`
+
+        // Expire timestamp | 过期时间戳
+        Expire       uint64          `json:"expire"`
+    }
+
+
+    // The permission code for front end permission control | 权限码： 用于前端权限控制
+    PermCodeResp {
+        BaseDataInfo
+
+        // Permission code data | 权限码数据
+        Data []string `json:"data"`
+    }
+
+
+    // Login request | 登录参数
+    LoginReq {
+        // User Name | 用户名
+        Username   string `json:"username" validate:"required,alphanum,max=20"`
+
+        // Password | 密码
+        Password   string `json:"password" validate:"required,max=30,min=6"`
+
+        // Captcha ID which store in redis | 验证码编号, 存在redis中
+        CaptchaId  string `json:"captchaId"  validate:"required,len=20"`
+
+        // The Captcha which users input | 用户输入的验证码
+        Captcha    string `json:"captcha" validate:"required,len=5"`
+    }
+
+    // Log in by email request | 邮箱登录参数
+    LoginByEmailReq {
+        // The user's email address | 用户的邮箱
+        Email     string `json:"email" validate:"required,email,max=100"`
+
+        // The Captcha which users input | 用户输入的验证码
+        Captcha    string `json:"captcha,optional" validate:"omitempty,len=5"`
+    }
+
+    // Log in by SMS request | 短信登录参数
+    LoginBySmsReq {
+        // The user's mobile phone number | 用户的手机号码
+        PhoneNumber   string  `json:"phoneNumber"  validate:"required,numeric,max=20"`
+
+        // The Captcha which users input | 用户输入的验证码
+        Captcha    string `json:"captcha,optional" validate:"omitempty,len=5"`
+    }
+
+    // The log in response data | 登录返回数据
+    LoginResp {
+        BaseDataInfo
+
+        // The log in information | 登陆返回的数据信息
+        Data LoginInfo `json:"data"`
+    }
+)
+
+@server(
+    group: auth
+)
+
+service Wechat {
+    // Log in | 登录
+    @handler login
+    post /user/login (LoginReq) returns (LoginResp)
+    // Log in by email | 邮箱登录
+    @handler loginByEmail
+    post /user/login_by_email (LoginByEmailReq) returns (LoginResp)
+    // Log in by SMS | 短信登录
+    @handler loginBySms
+    post /user/login_by_sms (LoginBySmsReq) returns (LoginResp)
+
+}
+

desc/wechat/contact.api

@@ -64,6 +64,9 @@ type (
 
 		// 内容类型：1-个微 3-企微
 		Ctype *uint64 `json:"ctype,optional"`
+        // 达标的起止时间
+        StartDate *string `json:"start_date,optional"`
+        EndDate *string `json:"end_date,optional"`
     }
 
     // Contact information response | Contact信息返回体

desc/wp_wecom/send_msg.api

@@ -0,0 +1,26 @@
+import "../base.api"
+
+type (
+    WpWecomMsgReq {
+        // 机器人微信id
+        WxId *string `json:"wx_id"`
+        // 接收方微信 id
+        ConvId *string `json:"conv_id"`
+        // 消息类型
+        ContentType *string `json:"content_type"`
+        // 消息内容
+        Content *string `json:"content"`
+    }
+)
+
+@server(
+	group: wp_wecom
+)
+
+service Wechat {
+    @handler sendMsg
+    post /wp/wecom/send_msg (WpWecomMsgReq) returns (BaseMsgResp)
+
+    @handler sendMsgByChan
+    post /wp/wecom/send_msg_by_chan (WpWecomMsgReq) returns (BaseMsgResp)
+}

ent/agent.go

@@ -53,10 +53,10 @@ type AgentEdges struct {
 	TokenAgent []*Token `json:"token_agent,omitempty"`
 	// WaAgent holds the value of the wa_agent edge.
 	WaAgent []*Whatsapp `json:"wa_agent,omitempty"`
-	// KeyAgent holds the value of the key_agent edge.
-	KeyAgent []*ApiKey `json:"key_agent,omitempty"`
 	// XjsAgent holds the value of the xjs_agent edge.
 	XjsAgent []*XunjiService `json:"xjs_agent,omitempty"`
+	// KeyAgent holds the value of the key_agent edge.
+	KeyAgent []*ApiKey `json:"key_agent,omitempty"`
 	// loadedTypes holds the information for reporting if a
 	// type was loaded (or requested) in eager-loading or not.
 	loadedTypes [5]bool
@@ -89,22 +89,22 @@ func (e AgentEdges) WaAgentOrErr() ([]*Whatsapp, error) {
 	return nil, &NotLoadedError{edge: "wa_agent"}
 }
 
-// KeyAgentOrErr returns the KeyAgent value or an error if the edge
+// XjsAgentOrErr returns the XjsAgent value or an error if the edge
 // was not loaded in eager-loading.
-func (e AgentEdges) KeyAgentOrErr() ([]*ApiKey, error) {
+func (e AgentEdges) XjsAgentOrErr() ([]*XunjiService, error) {
 	if e.loadedTypes[3] {
-		return e.KeyAgent, nil
+		return e.XjsAgent, nil
 	}
-	return nil, &NotLoadedError{edge: "key_agent"}
+	return nil, &NotLoadedError{edge: "xjs_agent"}
 }
 
-// XjsAgentOrErr returns the XjsAgent value or an error if the edge
+// KeyAgentOrErr returns the KeyAgent value or an error if the edge
 // was not loaded in eager-loading.
-func (e AgentEdges) XjsAgentOrErr() ([]*XunjiService, error) {
+func (e AgentEdges) KeyAgentOrErr() ([]*ApiKey, error) {
 	if e.loadedTypes[4] {
-		return e.XjsAgent, nil
+		return e.KeyAgent, nil
 	}
-	return nil, &NotLoadedError{edge: "xjs_agent"}
+	return nil, &NotLoadedError{edge: "key_agent"}
 }
 
 // scanValues returns the types for scanning values from sql.Rows.
@@ -233,16 +233,16 @@ func (a *Agent) QueryWaAgent() *WhatsappQuery {
 	return NewAgentClient(a.config).QueryWaAgent(a)
 }
 
-// QueryKeyAgent queries the "key_agent" edge of the Agent entity.
-func (a *Agent) QueryKeyAgent() *ApiKeyQuery {
-	return NewAgentClient(a.config).QueryKeyAgent(a)
-}
-
 // QueryXjsAgent queries the "xjs_agent" edge of the Agent entity.
 func (a *Agent) QueryXjsAgent() *XunjiServiceQuery {
 	return NewAgentClient(a.config).QueryXjsAgent(a)
 }
 
+// QueryKeyAgent queries the "key_agent" edge of the Agent entity.
+func (a *Agent) QueryKeyAgent() *ApiKeyQuery {
+	return NewAgentClient(a.config).QueryKeyAgent(a)
+}
+
 // Update returns a builder for updating this Agent.
 // Note that you need to call Agent.Unwrap() before calling this method if this Agent
 // was returned from a transaction, and the transaction was committed or rolled back.

ent/agent/agent.go

@@ -43,10 +43,10 @@ const (
 	EdgeTokenAgent = "token_agent"
 	// EdgeWaAgent holds the string denoting the wa_agent edge name in mutations.
 	EdgeWaAgent = "wa_agent"
-	// EdgeKeyAgent holds the string denoting the key_agent edge name in mutations.
-	EdgeKeyAgent = "key_agent"
 	// EdgeXjsAgent holds the string denoting the xjs_agent edge name in mutations.
 	EdgeXjsAgent = "xjs_agent"
+	// EdgeKeyAgent holds the string denoting the key_agent edge name in mutations.
+	EdgeKeyAgent = "key_agent"
 	// Table holds the table name of the agent in the database.
 	Table = "agent"
 	// WxAgentTable is the table that holds the wx_agent relation/edge.
@@ -70,13 +70,6 @@ const (
 	WaAgentInverseTable = "whatsapp"
 	// WaAgentColumn is the table column denoting the wa_agent relation/edge.
 	WaAgentColumn = "agent_id"
-	// KeyAgentTable is the table that holds the key_agent relation/edge.
-	KeyAgentTable = "api_key"
-	// KeyAgentInverseTable is the table name for the ApiKey entity.
-	// It exists in this package in order to avoid circular dependency with the "apikey" package.
-	KeyAgentInverseTable = "api_key"
-	// KeyAgentColumn is the table column denoting the key_agent relation/edge.
-	KeyAgentColumn = "agent_id"
 	// XjsAgentTable is the table that holds the xjs_agent relation/edge.
 	XjsAgentTable = "xunji_service"
 	// XjsAgentInverseTable is the table name for the XunjiService entity.
@@ -84,6 +77,13 @@ const (
 	XjsAgentInverseTable = "xunji_service"
 	// XjsAgentColumn is the table column denoting the xjs_agent relation/edge.
 	XjsAgentColumn = "agent_id"
+	// KeyAgentTable is the table that holds the key_agent relation/edge.
+	KeyAgentTable = "api_key"
+	// KeyAgentInverseTable is the table name for the ApiKey entity.
+	// It exists in this package in order to avoid circular dependency with the "apikey" package.
+	KeyAgentInverseTable = "api_key"
+	// KeyAgentColumn is the table column denoting the key_agent relation/edge.
+	KeyAgentColumn = "agent_id"
 )
 
 // Columns holds all SQL columns for agent fields.
@@ -253,31 +253,31 @@ func ByWaAgent(term sql.OrderTerm, terms ...sql.OrderTerm) OrderOption {
 	}
 }
 
-// ByKeyAgentCount orders the results by key_agent count.
-func ByKeyAgentCount(opts ...sql.OrderTermOption) OrderOption {
+// ByXjsAgentCount orders the results by xjs_agent count.
+func ByXjsAgentCount(opts ...sql.OrderTermOption) OrderOption {
 	return func(s *sql.Selector) {
-		sqlgraph.OrderByNeighborsCount(s, newKeyAgentStep(), opts...)
+		sqlgraph.OrderByNeighborsCount(s, newXjsAgentStep(), opts...)
 	}
 }
 
-// ByKeyAgent orders the results by key_agent terms.
-func ByKeyAgent(term sql.OrderTerm, terms ...sql.OrderTerm) OrderOption {
+// ByXjsAgent orders the results by xjs_agent terms.
+func ByXjsAgent(term sql.OrderTerm, terms ...sql.OrderTerm) OrderOption {
 	return func(s *sql.Selector) {
-		sqlgraph.OrderByNeighborTerms(s, newKeyAgentStep(), append([]sql.OrderTerm{term}, terms...)...)
+		sqlgraph.OrderByNeighborTerms(s, newXjsAgentStep(), append([]sql.OrderTerm{term}, terms...)...)
 	}
 }
 
-// ByXjsAgentCount orders the results by xjs_agent count.
-func ByXjsAgentCount(opts ...sql.OrderTermOption) OrderOption {
+// ByKeyAgentCount orders the results by key_agent count.
+func ByKeyAgentCount(opts ...sql.OrderTermOption) OrderOption {
 	return func(s *sql.Selector) {
-		sqlgraph.OrderByNeighborsCount(s, newXjsAgentStep(), opts...)
+		sqlgraph.OrderByNeighborsCount(s, newKeyAgentStep(), opts...)
 	}
 }
 
-// ByXjsAgent orders the results by xjs_agent terms.
-func ByXjsAgent(term sql.OrderTerm, terms ...sql.OrderTerm) OrderOption {
+// ByKeyAgent orders the results by key_agent terms.
+func ByKeyAgent(term sql.OrderTerm, terms ...sql.OrderTerm) OrderOption {
 	return func(s *sql.Selector) {
-		sqlgraph.OrderByNeighborTerms(s, newXjsAgentStep(), append([]sql.OrderTerm{term}, terms...)...)
+		sqlgraph.OrderByNeighborTerms(s, newKeyAgentStep(), append([]sql.OrderTerm{term}, terms...)...)
 	}
 }
 func newWxAgentStep() *sqlgraph.Step {
@@ -301,17 +301,17 @@ func newWaAgentStep() *sqlgraph.Step {
 		sqlgraph.Edge(sqlgraph.O2M, false, WaAgentTable, WaAgentColumn),
 	)
 }
-func newKeyAgentStep() *sqlgraph.Step {
+func newXjsAgentStep() *sqlgraph.Step {
 	return sqlgraph.NewStep(
 		sqlgraph.From(Table, FieldID),
-		sqlgraph.To(KeyAgentInverseTable, FieldID),
-		sqlgraph.Edge(sqlgraph.O2M, false, KeyAgentTable, KeyAgentColumn),
+		sqlgraph.To(XjsAgentInverseTable, FieldID),
+		sqlgraph.Edge(sqlgraph.O2M, false, XjsAgentTable, XjsAgentColumn),
 	)
 }
-func newXjsAgentStep() *sqlgraph.Step {
+func newKeyAgentStep() *sqlgraph.Step {
 	return sqlgraph.NewStep(
 		sqlgraph.From(Table, FieldID),
-		sqlgraph.To(XjsAgentInverseTable, FieldID),
-		sqlgraph.Edge(sqlgraph.O2M, false, XjsAgentTable, XjsAgentColumn),
+		sqlgraph.To(KeyAgentInverseTable, FieldID),
+		sqlgraph.Edge(sqlgraph.O2M, false, KeyAgentTable, KeyAgentColumn),
 	)
 }

ent/agent/where.go

@@ -809,21 +809,21 @@ func HasWaAgentWith(preds ...predicate.Whatsapp) predicate.Agent {
 	})
 }
 
-// HasKeyAgent applies the HasEdge predicate on the "key_agent" edge.
-func HasKeyAgent() predicate.Agent {
+// HasXjsAgent applies the HasEdge predicate on the "xjs_agent" edge.
+func HasXjsAgent() predicate.Agent {
 	return predicate.Agent(func(s *sql.Selector) {
 		step := sqlgraph.NewStep(
 			sqlgraph.From(Table, FieldID),
-			sqlgraph.Edge(sqlgraph.O2M, false, KeyAgentTable, KeyAgentColumn),
+			sqlgraph.Edge(sqlgraph.O2M, false, XjsAgentTable, XjsAgentColumn),
 		)
 		sqlgraph.HasNeighbors(s, step)
 	})
 }
 
-// HasKeyAgentWith applies the HasEdge predicate on the "key_agent" edge with a given conditions (other predicates).
-func HasKeyAgentWith(preds ...predicate.ApiKey) predicate.Agent {
+// HasXjsAgentWith applies the HasEdge predicate on the "xjs_agent" edge with a given conditions (other predicates).
+func HasXjsAgentWith(preds ...predicate.XunjiService) predicate.Agent {
 	return predicate.Agent(func(s *sql.Selector) {
-		step := newKeyAgentStep()
+		step := newXjsAgentStep()
 		sqlgraph.HasNeighborsWith(s, step, func(s *sql.Selector) {
 			for _, p := range preds {
 				p(s)
@@ -832,21 +832,21 @@ func HasKeyAgentWith(preds ...predicate.ApiKey) predicate.Agent {
 	})
 }
 
-// HasXjsAgent applies the HasEdge predicate on the "xjs_agent" edge.
-func HasXjsAgent() predicate.Agent {
+// HasKeyAgent applies the HasEdge predicate on the "key_agent" edge.
+func HasKeyAgent() predicate.Agent {
 	return predicate.Agent(func(s *sql.Selector) {
 		step := sqlgraph.NewStep(
 			sqlgraph.From(Table, FieldID),
-			sqlgraph.Edge(sqlgraph.O2M, false, XjsAgentTable, XjsAgentColumn),
+			sqlgraph.Edge(sqlgraph.O2M, false, KeyAgentTable, KeyAgentColumn),
 		)
 		sqlgraph.HasNeighbors(s, step)
 	})
 }
 
-// HasXjsAgentWith applies the HasEdge predicate on the "xjs_agent" edge with a given conditions (other predicates).
-func HasXjsAgentWith(preds ...predicate.XunjiService) predicate.Agent {
+// HasKeyAgentWith applies the HasEdge predicate on the "key_agent" edge with a given conditions (other predicates).
+func HasKeyAgentWith(preds ...predicate.ApiKey) predicate.Agent {
 	return predicate.Agent(func(s *sql.Selector) {
-		step := newXjsAgentStep()
+		step := newKeyAgentStep()
 		sqlgraph.HasNeighborsWith(s, step, func(s *sql.Selector) {
 			for _, p := range preds {
 				p(s)

ent/agent_create.go

@@ -208,21 +208,6 @@ func (ac *AgentCreate) AddWaAgent(w ...*Whatsapp) *AgentCreate {
 	return ac.AddWaAgentIDs(ids...)
 }
 
-// AddKeyAgentIDs adds the "key_agent" edge to the ApiKey entity by IDs.
-func (ac *AgentCreate) AddKeyAgentIDs(ids ...uint64) *AgentCreate {
-	ac.mutation.AddKeyAgentIDs(ids...)
-	return ac
-}
-
-// AddKeyAgent adds the "key_agent" edges to the ApiKey entity.
-func (ac *AgentCreate) AddKeyAgent(a ...*ApiKey) *AgentCreate {
-	ids := make([]uint64, len(a))
-	for i := range a {
-		ids[i] = a[i].ID
-	}
-	return ac.AddKeyAgentIDs(ids...)
-}
-
 // AddXjsAgentIDs adds the "xjs_agent" edge to the XunjiService entity by IDs.
 func (ac *AgentCreate) AddXjsAgentIDs(ids ...uint64) *AgentCreate {
 	ac.mutation.AddXjsAgentIDs(ids...)
@@ -238,6 +223,21 @@ func (ac *AgentCreate) AddXjsAgent(x ...*XunjiService) *AgentCreate {
 	return ac.AddXjsAgentIDs(ids...)
 }
 
+// AddKeyAgentIDs adds the "key_agent" edge to the ApiKey entity by IDs.
+func (ac *AgentCreate) AddKeyAgentIDs(ids ...uint64) *AgentCreate {
+	ac.mutation.AddKeyAgentIDs(ids...)
+	return ac
+}
+
+// AddKeyAgent adds the "key_agent" edges to the ApiKey entity.
+func (ac *AgentCreate) AddKeyAgent(a ...*ApiKey) *AgentCreate {
+	ids := make([]uint64, len(a))
+	for i := range a {
+		ids[i] = a[i].ID
+	}
+	return ac.AddKeyAgentIDs(ids...)
+}
+
 // Mutation returns the AgentMutation object of the builder.
 func (ac *AgentCreate) Mutation() *AgentMutation {
 	return ac.mutation
@@ -485,15 +485,15 @@ func (ac *AgentCreate) createSpec() (*Agent, *sqlgraph.CreateSpec) {
 		}
 		_spec.Edges = append(_spec.Edges, edge)
 	}
-	if nodes := ac.mutation.KeyAgentIDs(); len(nodes) > 0 {
+	if nodes := ac.mutation.XjsAgentIDs(); len(nodes) > 0 {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.KeyAgentTable,
-			Columns: []string{agent.KeyAgentColumn},
+			Table:   agent.XjsAgentTable,
+			Columns: []string{agent.XjsAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
 			},
 		}
 		for _, k := range nodes {
@@ -501,15 +501,15 @@ func (ac *AgentCreate) createSpec() (*Agent, *sqlgraph.CreateSpec) {
 		}
 		_spec.Edges = append(_spec.Edges, edge)
 	}
-	if nodes := ac.mutation.XjsAgentIDs(); len(nodes) > 0 {
+	if nodes := ac.mutation.KeyAgentIDs(); len(nodes) > 0 {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.XjsAgentTable,
-			Columns: []string{agent.XjsAgentColumn},
+			Table:   agent.KeyAgentTable,
+			Columns: []string{agent.KeyAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
 			},
 		}
 		for _, k := range nodes {

ent/agent_query.go

@@ -30,8 +30,8 @@ type AgentQuery struct {
 	withWxAgent    *WxQuery
 	withTokenAgent *TokenQuery
 	withWaAgent    *WhatsappQuery
-	withKeyAgent   *ApiKeyQuery
 	withXjsAgent   *XunjiServiceQuery
+	withKeyAgent   *ApiKeyQuery
 	// intermediate query (i.e. traversal path).
 	sql  *sql.Selector
 	path func(context.Context) (*sql.Selector, error)
@@ -134,9 +134,9 @@ func (aq *AgentQuery) QueryWaAgent() *WhatsappQuery {
 	return query
 }
 
-// QueryKeyAgent chains the current query on the "key_agent" edge.
-func (aq *AgentQuery) QueryKeyAgent() *ApiKeyQuery {
-	query := (&ApiKeyClient{config: aq.config}).Query()
+// QueryXjsAgent chains the current query on the "xjs_agent" edge.
+func (aq *AgentQuery) QueryXjsAgent() *XunjiServiceQuery {
+	query := (&XunjiServiceClient{config: aq.config}).Query()
 	query.path = func(ctx context.Context) (fromU *sql.Selector, err error) {
 		if err := aq.prepareQuery(ctx); err != nil {
 			return nil, err
@@ -147,8 +147,8 @@ func (aq *AgentQuery) QueryKeyAgent() *ApiKeyQuery {
 		}
 		step := sqlgraph.NewStep(
 			sqlgraph.From(agent.Table, agent.FieldID, selector),
-			sqlgraph.To(apikey.Table, apikey.FieldID),
-			sqlgraph.Edge(sqlgraph.O2M, false, agent.KeyAgentTable, agent.KeyAgentColumn),
+			sqlgraph.To(xunjiservice.Table, xunjiservice.FieldID),
+			sqlgraph.Edge(sqlgraph.O2M, false, agent.XjsAgentTable, agent.XjsAgentColumn),
 		)
 		fromU = sqlgraph.SetNeighbors(aq.driver.Dialect(), step)
 		return fromU, nil
@@ -156,9 +156,9 @@ func (aq *AgentQuery) QueryKeyAgent() *ApiKeyQuery {
 	return query
 }
 
-// QueryXjsAgent chains the current query on the "xjs_agent" edge.
-func (aq *AgentQuery) QueryXjsAgent() *XunjiServiceQuery {
-	query := (&XunjiServiceClient{config: aq.config}).Query()
+// QueryKeyAgent chains the current query on the "key_agent" edge.
+func (aq *AgentQuery) QueryKeyAgent() *ApiKeyQuery {
+	query := (&ApiKeyClient{config: aq.config}).Query()
 	query.path = func(ctx context.Context) (fromU *sql.Selector, err error) {
 		if err := aq.prepareQuery(ctx); err != nil {
 			return nil, err
@@ -169,8 +169,8 @@ func (aq *AgentQuery) QueryXjsAgent() *XunjiServiceQuery {
 		}
 		step := sqlgraph.NewStep(
 			sqlgraph.From(agent.Table, agent.FieldID, selector),
-			sqlgraph.To(xunjiservice.Table, xunjiservice.FieldID),
-			sqlgraph.Edge(sqlgraph.O2M, false, agent.XjsAgentTable, agent.XjsAgentColumn),
+			sqlgraph.To(apikey.Table, apikey.FieldID),
+			sqlgraph.Edge(sqlgraph.O2M, false, agent.KeyAgentTable, agent.KeyAgentColumn),
 		)
 		fromU = sqlgraph.SetNeighbors(aq.driver.Dialect(), step)
 		return fromU, nil
@@ -373,8 +373,8 @@ func (aq *AgentQuery) Clone() *AgentQuery {
 		withWxAgent:    aq.withWxAgent.Clone(),
 		withTokenAgent: aq.withTokenAgent.Clone(),
 		withWaAgent:    aq.withWaAgent.Clone(),
-		withKeyAgent:   aq.withKeyAgent.Clone(),
 		withXjsAgent:   aq.withXjsAgent.Clone(),
+		withKeyAgent:   aq.withKeyAgent.Clone(),
 		// clone intermediate query.
 		sql:  aq.sql.Clone(),
 		path: aq.path,
@@ -414,25 +414,25 @@ func (aq *AgentQuery) WithWaAgent(opts ...func(*WhatsappQuery)) *AgentQuery {
 	return aq
 }
 
-// WithKeyAgent tells the query-builder to eager-load the nodes that are connected to
-// the "key_agent" edge. The optional arguments are used to configure the query builder of the edge.
-func (aq *AgentQuery) WithKeyAgent(opts ...func(*ApiKeyQuery)) *AgentQuery {
-	query := (&ApiKeyClient{config: aq.config}).Query()
+// WithXjsAgent tells the query-builder to eager-load the nodes that are connected to
+// the "xjs_agent" edge. The optional arguments are used to configure the query builder of the edge.
+func (aq *AgentQuery) WithXjsAgent(opts ...func(*XunjiServiceQuery)) *AgentQuery {
+	query := (&XunjiServiceClient{config: aq.config}).Query()
 	for _, opt := range opts {
 		opt(query)
 	}
-	aq.withKeyAgent = query
+	aq.withXjsAgent = query
 	return aq
 }
 
-// WithXjsAgent tells the query-builder to eager-load the nodes that are connected to
-// the "xjs_agent" edge. The optional arguments are used to configure the query builder of the edge.
-func (aq *AgentQuery) WithXjsAgent(opts ...func(*XunjiServiceQuery)) *AgentQuery {
-	query := (&XunjiServiceClient{config: aq.config}).Query()
+// WithKeyAgent tells the query-builder to eager-load the nodes that are connected to
+// the "key_agent" edge. The optional arguments are used to configure the query builder of the edge.
+func (aq *AgentQuery) WithKeyAgent(opts ...func(*ApiKeyQuery)) *AgentQuery {
+	query := (&ApiKeyClient{config: aq.config}).Query()
 	for _, opt := range opts {
 		opt(query)
 	}
-	aq.withXjsAgent = query
+	aq.withKeyAgent = query
 	return aq
 }
 
@@ -518,8 +518,8 @@ func (aq *AgentQuery) sqlAll(ctx context.Context, hooks ...queryHook) ([]*Agent,
 			aq.withWxAgent != nil,
 			aq.withTokenAgent != nil,
 			aq.withWaAgent != nil,
-			aq.withKeyAgent != nil,
 			aq.withXjsAgent != nil,
+			aq.withKeyAgent != nil,
 		}
 	)
 	_spec.ScanValues = func(columns []string) ([]any, error) {
@@ -561,13 +561,6 @@ func (aq *AgentQuery) sqlAll(ctx context.Context, hooks ...queryHook) ([]*Agent,
 			return nil, err
 		}
 	}
-	if query := aq.withKeyAgent; query != nil {
-		if err := aq.loadKeyAgent(ctx, query, nodes,
-			func(n *Agent) { n.Edges.KeyAgent = []*ApiKey{} },
-			func(n *Agent, e *ApiKey) { n.Edges.KeyAgent = append(n.Edges.KeyAgent, e) }); err != nil {
-			return nil, err
-		}
-	}
 	if query := aq.withXjsAgent; query != nil {
 		if err := aq.loadXjsAgent(ctx, query, nodes,
 			func(n *Agent) { n.Edges.XjsAgent = []*XunjiService{} },
@@ -575,6 +568,13 @@ func (aq *AgentQuery) sqlAll(ctx context.Context, hooks ...queryHook) ([]*Agent,
 			return nil, err
 		}
 	}
+	if query := aq.withKeyAgent; query != nil {
+		if err := aq.loadKeyAgent(ctx, query, nodes,
+			func(n *Agent) { n.Edges.KeyAgent = []*ApiKey{} },
+			func(n *Agent, e *ApiKey) { n.Edges.KeyAgent = append(n.Edges.KeyAgent, e) }); err != nil {
+			return nil, err
+		}
+	}
 	return nodes, nil
 }
 
@@ -669,7 +669,7 @@ func (aq *AgentQuery) loadWaAgent(ctx context.Context, query *WhatsappQuery, nod
 	}
 	return nil
 }
-func (aq *AgentQuery) loadKeyAgent(ctx context.Context, query *ApiKeyQuery, nodes []*Agent, init func(*Agent), assign func(*Agent, *ApiKey)) error {
+func (aq *AgentQuery) loadXjsAgent(ctx context.Context, query *XunjiServiceQuery, nodes []*Agent, init func(*Agent), assign func(*Agent, *XunjiService)) error {
 	fks := make([]driver.Value, 0, len(nodes))
 	nodeids := make(map[uint64]*Agent)
 	for i := range nodes {
@@ -680,10 +680,10 @@ func (aq *AgentQuery) loadKeyAgent(ctx context.Context, query *ApiKeyQuery, node
 		}
 	}
 	if len(query.ctx.Fields) > 0 {
-		query.ctx.AppendFieldOnce(apikey.FieldAgentID)
+		query.ctx.AppendFieldOnce(xunjiservice.FieldAgentID)
 	}
-	query.Where(predicate.ApiKey(func(s *sql.Selector) {
-		s.Where(sql.InValues(s.C(agent.KeyAgentColumn), fks...))
+	query.Where(predicate.XunjiService(func(s *sql.Selector) {
+		s.Where(sql.InValues(s.C(agent.XjsAgentColumn), fks...))
 	}))
 	neighbors, err := query.All(ctx)
 	if err != nil {
@@ -699,7 +699,7 @@ func (aq *AgentQuery) loadKeyAgent(ctx context.Context, query *ApiKeyQuery, node
 	}
 	return nil
 }
-func (aq *AgentQuery) loadXjsAgent(ctx context.Context, query *XunjiServiceQuery, nodes []*Agent, init func(*Agent), assign func(*Agent, *XunjiService)) error {
+func (aq *AgentQuery) loadKeyAgent(ctx context.Context, query *ApiKeyQuery, nodes []*Agent, init func(*Agent), assign func(*Agent, *ApiKey)) error {
 	fks := make([]driver.Value, 0, len(nodes))
 	nodeids := make(map[uint64]*Agent)
 	for i := range nodes {
@@ -710,10 +710,10 @@ func (aq *AgentQuery) loadXjsAgent(ctx context.Context, query *XunjiServiceQuery
 		}
 	}
 	if len(query.ctx.Fields) > 0 {
-		query.ctx.AppendFieldOnce(xunjiservice.FieldAgentID)
+		query.ctx.AppendFieldOnce(apikey.FieldAgentID)
 	}
-	query.Where(predicate.XunjiService(func(s *sql.Selector) {
-		s.Where(sql.InValues(s.C(agent.XjsAgentColumn), fks...))
+	query.Where(predicate.ApiKey(func(s *sql.Selector) {
+		s.Where(sql.InValues(s.C(agent.KeyAgentColumn), fks...))
 	}))
 	neighbors, err := query.All(ctx)
 	if err != nil {

ent/agent_update.go

@@ -248,21 +248,6 @@ func (au *AgentUpdate) AddWaAgent(w ...*Whatsapp) *AgentUpdate {
 	return au.AddWaAgentIDs(ids...)
 }
 
-// AddKeyAgentIDs adds the "key_agent" edge to the ApiKey entity by IDs.
-func (au *AgentUpdate) AddKeyAgentIDs(ids ...uint64) *AgentUpdate {
-	au.mutation.AddKeyAgentIDs(ids...)
-	return au
-}
-
-// AddKeyAgent adds the "key_agent" edges to the ApiKey entity.
-func (au *AgentUpdate) AddKeyAgent(a ...*ApiKey) *AgentUpdate {
-	ids := make([]uint64, len(a))
-	for i := range a {
-		ids[i] = a[i].ID
-	}
-	return au.AddKeyAgentIDs(ids...)
-}
-
 // AddXjsAgentIDs adds the "xjs_agent" edge to the XunjiService entity by IDs.
 func (au *AgentUpdate) AddXjsAgentIDs(ids ...uint64) *AgentUpdate {
 	au.mutation.AddXjsAgentIDs(ids...)
@@ -278,6 +263,21 @@ func (au *AgentUpdate) AddXjsAgent(x ...*XunjiService) *AgentUpdate {
 	return au.AddXjsAgentIDs(ids...)
 }
 
+// AddKeyAgentIDs adds the "key_agent" edge to the ApiKey entity by IDs.
+func (au *AgentUpdate) AddKeyAgentIDs(ids ...uint64) *AgentUpdate {
+	au.mutation.AddKeyAgentIDs(ids...)
+	return au
+}
+
+// AddKeyAgent adds the "key_agent" edges to the ApiKey entity.
+func (au *AgentUpdate) AddKeyAgent(a ...*ApiKey) *AgentUpdate {
+	ids := make([]uint64, len(a))
+	for i := range a {
+		ids[i] = a[i].ID
+	}
+	return au.AddKeyAgentIDs(ids...)
+}
+
 // Mutation returns the AgentMutation object of the builder.
 func (au *AgentUpdate) Mutation() *AgentMutation {
 	return au.mutation
@@ -346,27 +346,6 @@ func (au *AgentUpdate) RemoveWaAgent(w ...*Whatsapp) *AgentUpdate {
 	return au.RemoveWaAgentIDs(ids...)
 }
 
-// ClearKeyAgent clears all "key_agent" edges to the ApiKey entity.
-func (au *AgentUpdate) ClearKeyAgent() *AgentUpdate {
-	au.mutation.ClearKeyAgent()
-	return au
-}
-
-// RemoveKeyAgentIDs removes the "key_agent" edge to ApiKey entities by IDs.
-func (au *AgentUpdate) RemoveKeyAgentIDs(ids ...uint64) *AgentUpdate {
-	au.mutation.RemoveKeyAgentIDs(ids...)
-	return au
-}
-
-// RemoveKeyAgent removes "key_agent" edges to ApiKey entities.
-func (au *AgentUpdate) RemoveKeyAgent(a ...*ApiKey) *AgentUpdate {
-	ids := make([]uint64, len(a))
-	for i := range a {
-		ids[i] = a[i].ID
-	}
-	return au.RemoveKeyAgentIDs(ids...)
-}
-
 // ClearXjsAgent clears all "xjs_agent" edges to the XunjiService entity.
 func (au *AgentUpdate) ClearXjsAgent() *AgentUpdate {
 	au.mutation.ClearXjsAgent()
@@ -388,6 +367,27 @@ func (au *AgentUpdate) RemoveXjsAgent(x ...*XunjiService) *AgentUpdate {
 	return au.RemoveXjsAgentIDs(ids...)
 }
 
+// ClearKeyAgent clears all "key_agent" edges to the ApiKey entity.
+func (au *AgentUpdate) ClearKeyAgent() *AgentUpdate {
+	au.mutation.ClearKeyAgent()
+	return au
+}
+
+// RemoveKeyAgentIDs removes the "key_agent" edge to ApiKey entities by IDs.
+func (au *AgentUpdate) RemoveKeyAgentIDs(ids ...uint64) *AgentUpdate {
+	au.mutation.RemoveKeyAgentIDs(ids...)
+	return au
+}
+
+// RemoveKeyAgent removes "key_agent" edges to ApiKey entities.
+func (au *AgentUpdate) RemoveKeyAgent(a ...*ApiKey) *AgentUpdate {
+	ids := make([]uint64, len(a))
+	for i := range a {
+		ids[i] = a[i].ID
+	}
+	return au.RemoveKeyAgentIDs(ids...)
+}
+
 // Save executes the query and returns the number of nodes affected by the update operation.
 func (au *AgentUpdate) Save(ctx context.Context) (int, error) {
 	if err := au.defaults(); err != nil {
@@ -655,28 +655,28 @@ func (au *AgentUpdate) sqlSave(ctx context.Context) (n int, err error) {
 		}
 		_spec.Edges.Add = append(_spec.Edges.Add, edge)
 	}
-	if au.mutation.KeyAgentCleared() {
+	if au.mutation.XjsAgentCleared() {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.KeyAgentTable,
-			Columns: []string{agent.KeyAgentColumn},
+			Table:   agent.XjsAgentTable,
+			Columns: []string{agent.XjsAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
 			},
 		}
 		_spec.Edges.Clear = append(_spec.Edges.Clear, edge)
 	}
-	if nodes := au.mutation.RemovedKeyAgentIDs(); len(nodes) > 0 && !au.mutation.KeyAgentCleared() {
+	if nodes := au.mutation.RemovedXjsAgentIDs(); len(nodes) > 0 && !au.mutation.XjsAgentCleared() {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.KeyAgentTable,
-			Columns: []string{agent.KeyAgentColumn},
+			Table:   agent.XjsAgentTable,
+			Columns: []string{agent.XjsAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
 			},
 		}
 		for _, k := range nodes {
@@ -684,15 +684,15 @@ func (au *AgentUpdate) sqlSave(ctx context.Context) (n int, err error) {
 		}
 		_spec.Edges.Clear = append(_spec.Edges.Clear, edge)
 	}
-	if nodes := au.mutation.KeyAgentIDs(); len(nodes) > 0 {
+	if nodes := au.mutation.XjsAgentIDs(); len(nodes) > 0 {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.KeyAgentTable,
-			Columns: []string{agent.KeyAgentColumn},
+			Table:   agent.XjsAgentTable,
+			Columns: []string{agent.XjsAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
 			},
 		}
 		for _, k := range nodes {
@@ -700,28 +700,28 @@ func (au *AgentUpdate) sqlSave(ctx context.Context) (n int, err error) {
 		}
 		_spec.Edges.Add = append(_spec.Edges.Add, edge)
 	}
-	if au.mutation.XjsAgentCleared() {
+	if au.mutation.KeyAgentCleared() {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.XjsAgentTable,
-			Columns: []string{agent.XjsAgentColumn},
+			Table:   agent.KeyAgentTable,
+			Columns: []string{agent.KeyAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
 			},
 		}
 		_spec.Edges.Clear = append(_spec.Edges.Clear, edge)
 	}
-	if nodes := au.mutation.RemovedXjsAgentIDs(); len(nodes) > 0 && !au.mutation.XjsAgentCleared() {
+	if nodes := au.mutation.RemovedKeyAgentIDs(); len(nodes) > 0 && !au.mutation.KeyAgentCleared() {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.XjsAgentTable,
-			Columns: []string{agent.XjsAgentColumn},
+			Table:   agent.KeyAgentTable,
+			Columns: []string{agent.KeyAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
 			},
 		}
 		for _, k := range nodes {
@@ -729,15 +729,15 @@ func (au *AgentUpdate) sqlSave(ctx context.Context) (n int, err error) {
 		}
 		_spec.Edges.Clear = append(_spec.Edges.Clear, edge)
 	}
-	if nodes := au.mutation.XjsAgentIDs(); len(nodes) > 0 {
+	if nodes := au.mutation.KeyAgentIDs(); len(nodes) > 0 {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.XjsAgentTable,
-			Columns: []string{agent.XjsAgentColumn},
+			Table:   agent.KeyAgentTable,
+			Columns: []string{agent.KeyAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
 			},
 		}
 		for _, k := range nodes {
@@ -980,21 +980,6 @@ func (auo *AgentUpdateOne) AddWaAgent(w ...*Whatsapp) *AgentUpdateOne {
 	return auo.AddWaAgentIDs(ids...)
 }
 
-// AddKeyAgentIDs adds the "key_agent" edge to the ApiKey entity by IDs.
-func (auo *AgentUpdateOne) AddKeyAgentIDs(ids ...uint64) *AgentUpdateOne {
-	auo.mutation.AddKeyAgentIDs(ids...)
-	return auo
-}
-
-// AddKeyAgent adds the "key_agent" edges to the ApiKey entity.
-func (auo *AgentUpdateOne) AddKeyAgent(a ...*ApiKey) *AgentUpdateOne {
-	ids := make([]uint64, len(a))
-	for i := range a {
-		ids[i] = a[i].ID
-	}
-	return auo.AddKeyAgentIDs(ids...)
-}
-
 // AddXjsAgentIDs adds the "xjs_agent" edge to the XunjiService entity by IDs.
 func (auo *AgentUpdateOne) AddXjsAgentIDs(ids ...uint64) *AgentUpdateOne {
 	auo.mutation.AddXjsAgentIDs(ids...)
@@ -1010,6 +995,21 @@ func (auo *AgentUpdateOne) AddXjsAgent(x ...*XunjiService) *AgentUpdateOne {
 	return auo.AddXjsAgentIDs(ids...)
 }
 
+// AddKeyAgentIDs adds the "key_agent" edge to the ApiKey entity by IDs.
+func (auo *AgentUpdateOne) AddKeyAgentIDs(ids ...uint64) *AgentUpdateOne {
+	auo.mutation.AddKeyAgentIDs(ids...)
+	return auo
+}
+
+// AddKeyAgent adds the "key_agent" edges to the ApiKey entity.
+func (auo *AgentUpdateOne) AddKeyAgent(a ...*ApiKey) *AgentUpdateOne {
+	ids := make([]uint64, len(a))
+	for i := range a {
+		ids[i] = a[i].ID
+	}
+	return auo.AddKeyAgentIDs(ids...)
+}
+
 // Mutation returns the AgentMutation object of the builder.
 func (auo *AgentUpdateOne) Mutation() *AgentMutation {
 	return auo.mutation
@@ -1078,27 +1078,6 @@ func (auo *AgentUpdateOne) RemoveWaAgent(w ...*Whatsapp) *AgentUpdateOne {
 	return auo.RemoveWaAgentIDs(ids...)
 }
 
-// ClearKeyAgent clears all "key_agent" edges to the ApiKey entity.
-func (auo *AgentUpdateOne) ClearKeyAgent() *AgentUpdateOne {
-	auo.mutation.ClearKeyAgent()
-	return auo
-}
-
-// RemoveKeyAgentIDs removes the "key_agent" edge to ApiKey entities by IDs.
-func (auo *AgentUpdateOne) RemoveKeyAgentIDs(ids ...uint64) *AgentUpdateOne {
-	auo.mutation.RemoveKeyAgentIDs(ids...)
-	return auo
-}
-
-// RemoveKeyAgent removes "key_agent" edges to ApiKey entities.
-func (auo *AgentUpdateOne) RemoveKeyAgent(a ...*ApiKey) *AgentUpdateOne {
-	ids := make([]uint64, len(a))
-	for i := range a {
-		ids[i] = a[i].ID
-	}
-	return auo.RemoveKeyAgentIDs(ids...)
-}
-
 // ClearXjsAgent clears all "xjs_agent" edges to the XunjiService entity.
 func (auo *AgentUpdateOne) ClearXjsAgent() *AgentUpdateOne {
 	auo.mutation.ClearXjsAgent()
@@ -1120,6 +1099,27 @@ func (auo *AgentUpdateOne) RemoveXjsAgent(x ...*XunjiService) *AgentUpdateOne {
 	return auo.RemoveXjsAgentIDs(ids...)
 }
 
+// ClearKeyAgent clears all "key_agent" edges to the ApiKey entity.
+func (auo *AgentUpdateOne) ClearKeyAgent() *AgentUpdateOne {
+	auo.mutation.ClearKeyAgent()
+	return auo
+}
+
+// RemoveKeyAgentIDs removes the "key_agent" edge to ApiKey entities by IDs.
+func (auo *AgentUpdateOne) RemoveKeyAgentIDs(ids ...uint64) *AgentUpdateOne {
+	auo.mutation.RemoveKeyAgentIDs(ids...)
+	return auo
+}
+
+// RemoveKeyAgent removes "key_agent" edges to ApiKey entities.
+func (auo *AgentUpdateOne) RemoveKeyAgent(a ...*ApiKey) *AgentUpdateOne {
+	ids := make([]uint64, len(a))
+	for i := range a {
+		ids[i] = a[i].ID
+	}
+	return auo.RemoveKeyAgentIDs(ids...)
+}
+
 // Where appends a list predicates to the AgentUpdate builder.
 func (auo *AgentUpdateOne) Where(ps ...predicate.Agent) *AgentUpdateOne {
 	auo.mutation.Where(ps...)
@@ -1417,28 +1417,28 @@ func (auo *AgentUpdateOne) sqlSave(ctx context.Context) (_node *Agent, err error
 		}
 		_spec.Edges.Add = append(_spec.Edges.Add, edge)
 	}
-	if auo.mutation.KeyAgentCleared() {
+	if auo.mutation.XjsAgentCleared() {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.KeyAgentTable,
-			Columns: []string{agent.KeyAgentColumn},
+			Table:   agent.XjsAgentTable,
+			Columns: []string{agent.XjsAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
 			},
 		}
 		_spec.Edges.Clear = append(_spec.Edges.Clear, edge)
 	}
-	if nodes := auo.mutation.RemovedKeyAgentIDs(); len(nodes) > 0 && !auo.mutation.KeyAgentCleared() {
+	if nodes := auo.mutation.RemovedXjsAgentIDs(); len(nodes) > 0 && !auo.mutation.XjsAgentCleared() {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.KeyAgentTable,
-			Columns: []string{agent.KeyAgentColumn},
+			Table:   agent.XjsAgentTable,
+			Columns: []string{agent.XjsAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
 			},
 		}
 		for _, k := range nodes {
@@ -1446,15 +1446,15 @@ func (auo *AgentUpdateOne) sqlSave(ctx context.Context) (_node *Agent, err error
 		}
 		_spec.Edges.Clear = append(_spec.Edges.Clear, edge)
 	}
-	if nodes := auo.mutation.KeyAgentIDs(); len(nodes) > 0 {
+	if nodes := auo.mutation.XjsAgentIDs(); len(nodes) > 0 {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.KeyAgentTable,
-			Columns: []string{agent.KeyAgentColumn},
+			Table:   agent.XjsAgentTable,
+			Columns: []string{agent.XjsAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
 			},
 		}
 		for _, k := range nodes {
@@ -1462,28 +1462,28 @@ func (auo *AgentUpdateOne) sqlSave(ctx context.Context) (_node *Agent, err error
 		}
 		_spec.Edges.Add = append(_spec.Edges.Add, edge)
 	}
-	if auo.mutation.XjsAgentCleared() {
+	if auo.mutation.KeyAgentCleared() {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.XjsAgentTable,
-			Columns: []string{agent.XjsAgentColumn},
+			Table:   agent.KeyAgentTable,
+			Columns: []string{agent.KeyAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
 			},
 		}
 		_spec.Edges.Clear = append(_spec.Edges.Clear, edge)
 	}
-	if nodes := auo.mutation.RemovedXjsAgentIDs(); len(nodes) > 0 && !auo.mutation.XjsAgentCleared() {
+	if nodes := auo.mutation.RemovedKeyAgentIDs(); len(nodes) > 0 && !auo.mutation.KeyAgentCleared() {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.XjsAgentTable,
-			Columns: []string{agent.XjsAgentColumn},
+			Table:   agent.KeyAgentTable,
+			Columns: []string{agent.KeyAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
 			},
 		}
 		for _, k := range nodes {
@@ -1491,15 +1491,15 @@ func (auo *AgentUpdateOne) sqlSave(ctx context.Context) (_node *Agent, err error
 		}
 		_spec.Edges.Clear = append(_spec.Edges.Clear, edge)
 	}
-	if nodes := auo.mutation.XjsAgentIDs(); len(nodes) > 0 {
+	if nodes := auo.mutation.KeyAgentIDs(); len(nodes) > 0 {
 		edge := &sqlgraph.EdgeSpec{
 			Rel:     sqlgraph.O2M,
 			Inverse: false,
-			Table:   agent.XjsAgentTable,
-			Columns: []string{agent.XjsAgentColumn},
+			Table:   agent.KeyAgentTable,
+			Columns: []string{agent.KeyAgentColumn},
 			Bidi:    false,
 			Target: &sqlgraph.EdgeTarget{
-				IDSpec: sqlgraph.NewFieldSpec(xunjiservice.FieldID, field.TypeUint64),
+				IDSpec: sqlgraph.NewFieldSpec(apikey.FieldID, field.TypeUint64),
 			},
 		}
 		for _, k := range nodes {

ent/client.go

@@ -716,15 +716,15 @@ func (c *AgentClient) QueryWaAgent(a *Agent) *WhatsappQuery {
 	return query
 }
 
-// QueryKeyAgent queries the key_agent edge of a Agent.
-func (c *AgentClient) QueryKeyAgent(a *Agent) *ApiKeyQuery {
-	query := (&ApiKeyClient{config: c.config}).Query()
+// QueryXjsAgent queries the xjs_agent edge of a Agent.
+func (c *AgentClient) QueryXjsAgent(a *Agent) *XunjiServiceQuery {
+	query := (&XunjiServiceClient{config: c.config}).Query()
 	query.path = func(context.Context) (fromV *sql.Selector, _ error) {
 		id := a.ID
 		step := sqlgraph.NewStep(
 			sqlgraph.From(agent.Table, agent.FieldID, id),
-			sqlgraph.To(apikey.Table, apikey.FieldID),
-			sqlgraph.Edge(sqlgraph.O2M, false, agent.KeyAgentTable, agent.KeyAgentColumn),
+			sqlgraph.To(xunjiservice.Table, xunjiservice.FieldID),
+			sqlgraph.Edge(sqlgraph.O2M, false, agent.XjsAgentTable, agent.XjsAgentColumn),
 		)
 		fromV = sqlgraph.Neighbors(a.driver.Dialect(), step)
 		return fromV, nil
@@ -732,15 +732,15 @@ func (c *AgentClient) QueryKeyAgent(a *Agent) *ApiKeyQuery {
 	return query
 }
 
-// QueryXjsAgent queries the xjs_agent edge of a Agent.
-func (c *AgentClient) QueryXjsAgent(a *Agent) *XunjiServiceQuery {
-	query := (&XunjiServiceClient{config: c.config}).Query()
+// QueryKeyAgent queries the key_agent edge of a Agent.
+func (c *AgentClient) QueryKeyAgent(a *Agent) *ApiKeyQuery {
+	query := (&ApiKeyClient{config: c.config}).Query()
 	query.path = func(context.Context) (fromV *sql.Selector, _ error) {
 		id := a.ID
 		step := sqlgraph.NewStep(
 			sqlgraph.From(agent.Table, agent.FieldID, id),
-			sqlgraph.To(xunjiservice.Table, xunjiservice.FieldID),
-			sqlgraph.Edge(sqlgraph.O2M, false, agent.XjsAgentTable, agent.XjsAgentColumn),
+			sqlgraph.To(apikey.Table, apikey.FieldID),
+			sqlgraph.Edge(sqlgraph.O2M, false, agent.KeyAgentTable, agent.KeyAgentColumn),
 		)
 		fromV = sqlgraph.Neighbors(a.driver.Dialect(), step)
 		return fromV, nil

ent/mutation.go

@@ -141,12 +141,12 @@ type AgentMutation struct {
 	wa_agent           map[uint64]struct{}
 	removedwa_agent    map[uint64]struct{}
 	clearedwa_agent    bool
-	key_agent          map[uint64]struct{}
-	removedkey_agent   map[uint64]struct{}
-	clearedkey_agent   bool
 	xjs_agent          map[uint64]struct{}
 	removedxjs_agent   map[uint64]struct{}
 	clearedxjs_agent   bool
+	key_agent          map[uint64]struct{}
+	removedkey_agent   map[uint64]struct{}
+	clearedkey_agent   bool
 	done               bool
 	oldValue           func(context.Context) (*Agent, error)
 	predicates         []predicate.Agent
@@ -907,60 +907,6 @@ func (m *AgentMutation) ResetWaAgent() {
 	m.removedwa_agent = nil
 }
 
-// AddKeyAgentIDs adds the "key_agent" edge to the ApiKey entity by ids.
-func (m *AgentMutation) AddKeyAgentIDs(ids ...uint64) {
-	if m.key_agent == nil {
-		m.key_agent = make(map[uint64]struct{})
-	}
-	for i := range ids {
-		m.key_agent[ids[i]] = struct{}{}
-	}
-}
-
-// ClearKeyAgent clears the "key_agent" edge to the ApiKey entity.
-func (m *AgentMutation) ClearKeyAgent() {
-	m.clearedkey_agent = true
-}
-
-// KeyAgentCleared reports if the "key_agent" edge to the ApiKey entity was cleared.
-func (m *AgentMutation) KeyAgentCleared() bool {
-	return m.clearedkey_agent
-}
-
-// RemoveKeyAgentIDs removes the "key_agent" edge to the ApiKey entity by IDs.
-func (m *AgentMutation) RemoveKeyAgentIDs(ids ...uint64) {
-	if m.removedkey_agent == nil {
-		m.removedkey_agent = make(map[uint64]struct{})
-	}
-	for i := range ids {
-		delete(m.key_agent, ids[i])
-		m.removedkey_agent[ids[i]] = struct{}{}
-	}
-}
-
-// RemovedKeyAgent returns the removed IDs of the "key_agent" edge to the ApiKey entity.
-func (m *AgentMutation) RemovedKeyAgentIDs() (ids []uint64) {
-	for id := range m.removedkey_agent {
-		ids = append(ids, id)
-	}
-	return
-}
-
-// KeyAgentIDs returns the "key_agent" edge IDs in the mutation.
-func (m *AgentMutation) KeyAgentIDs() (ids []uint64) {
-	for id := range m.key_agent {
-		ids = append(ids, id)
-	}
-	return
-}
-
-// ResetKeyAgent resets all changes to the "key_agent" edge.
-func (m *AgentMutation) ResetKeyAgent() {
-	m.key_agent = nil
-	m.clearedkey_agent = false
-	m.removedkey_agent = nil
-}
-
 // AddXjsAgentIDs adds the "xjs_agent" edge to the XunjiService entity by ids.
 func (m *AgentMutation) AddXjsAgentIDs(ids ...uint64) {
 	if m.xjs_agent == nil {
@@ -1015,6 +961,60 @@ func (m *AgentMutation) ResetXjsAgent() {
 	m.removedxjs_agent = nil
 }
 
+// AddKeyAgentIDs adds the "key_agent" edge to the ApiKey entity by ids.
+func (m *AgentMutation) AddKeyAgentIDs(ids ...uint64) {
+	if m.key_agent == nil {
+		m.key_agent = make(map[uint64]struct{})
+	}
+	for i := range ids {
+		m.key_agent[ids[i]] = struct{}{}
+	}
+}
+
+// ClearKeyAgent clears the "key_agent" edge to the ApiKey entity.
+func (m *AgentMutation) ClearKeyAgent() {
+	m.clearedkey_agent = true
+}
+
+// KeyAgentCleared reports if the "key_agent" edge to the ApiKey entity was cleared.
+func (m *AgentMutation) KeyAgentCleared() bool {
+	return m.clearedkey_agent
+}
+
+// RemoveKeyAgentIDs removes the "key_agent" edge to the ApiKey entity by IDs.
+func (m *AgentMutation) RemoveKeyAgentIDs(ids ...uint64) {
+	if m.removedkey_agent == nil {
+		m.removedkey_agent = make(map[uint64]struct{})
+	}
+	for i := range ids {
+		delete(m.key_agent, ids[i])
+		m.removedkey_agent[ids[i]] = struct{}{}
+	}
+}
+
+// RemovedKeyAgent returns the removed IDs of the "key_agent" edge to the ApiKey entity.
+func (m *AgentMutation) RemovedKeyAgentIDs() (ids []uint64) {
+	for id := range m.removedkey_agent {
+		ids = append(ids, id)
+	}
+	return
+}
+
+// KeyAgentIDs returns the "key_agent" edge IDs in the mutation.
+func (m *AgentMutation) KeyAgentIDs() (ids []uint64) {
+	for id := range m.key_agent {
+		ids = append(ids, id)
+	}
+	return
+}
+
+// ResetKeyAgent resets all changes to the "key_agent" edge.
+func (m *AgentMutation) ResetKeyAgent() {
+	m.key_agent = nil
+	m.clearedkey_agent = false
+	m.removedkey_agent = nil
+}
+
 // Where appends a list predicates to the AgentMutation builder.
 func (m *AgentMutation) Where(ps ...predicate.Agent) {
 	m.predicates = append(m.predicates, ps...)
@@ -1382,12 +1382,12 @@ func (m *AgentMutation) AddedEdges() []string {
 	if m.wa_agent != nil {
 		edges = append(edges, agent.EdgeWaAgent)
 	}
-	if m.key_agent != nil {
-		edges = append(edges, agent.EdgeKeyAgent)
-	}
 	if m.xjs_agent != nil {
 		edges = append(edges, agent.EdgeXjsAgent)
 	}
+	if m.key_agent != nil {
+		edges = append(edges, agent.EdgeKeyAgent)
+	}
 	return edges
 }
 
@@ -1413,18 +1413,18 @@ func (m *AgentMutation) AddedIDs(name string) []ent.Value {
 			ids = append(ids, id)
 		}
 		return ids
-	case agent.EdgeKeyAgent:
-		ids := make([]ent.Value, 0, len(m.key_agent))
-		for id := range m.key_agent {
-			ids = append(ids, id)
-		}
-		return ids
 	case agent.EdgeXjsAgent:
 		ids := make([]ent.Value, 0, len(m.xjs_agent))
 		for id := range m.xjs_agent {
 			ids = append(ids, id)
 		}
 		return ids
+	case agent.EdgeKeyAgent:
+		ids := make([]ent.Value, 0, len(m.key_agent))
+		for id := range m.key_agent {
+			ids = append(ids, id)
+		}
+		return ids
 	}
 	return nil
 }
@@ -1441,12 +1441,12 @@ func (m *AgentMutation) RemovedEdges() []string {
 	if m.removedwa_agent != nil {
 		edges = append(edges, agent.EdgeWaAgent)
 	}
-	if m.removedkey_agent != nil {
-		edges = append(edges, agent.EdgeKeyAgent)
-	}
 	if m.removedxjs_agent != nil {
 		edges = append(edges, agent.EdgeXjsAgent)
 	}
+	if m.removedkey_agent != nil {
+		edges = append(edges, agent.EdgeKeyAgent)
+	}
 	return edges
 }
 
@@ -1472,18 +1472,18 @@ func (m *AgentMutation) RemovedIDs(name string) []ent.Value {
 			ids = append(ids, id)
 		}
 		return ids
-	case agent.EdgeKeyAgent:
-		ids := make([]ent.Value, 0, len(m.removedkey_agent))
-		for id := range m.removedkey_agent {
-			ids = append(ids, id)
-		}
-		return ids
 	case agent.EdgeXjsAgent:
 		ids := make([]ent.Value, 0, len(m.removedxjs_agent))
 		for id := range m.removedxjs_agent {
 			ids = append(ids, id)
 		}
 		return ids
+	case agent.EdgeKeyAgent:
+		ids := make([]ent.Value, 0, len(m.removedkey_agent))
+		for id := range m.removedkey_agent {
+			ids = append(ids, id)
+		}
+		return ids
 	}
 	return nil
 }
@@ -1500,12 +1500,12 @@ func (m *AgentMutation) ClearedEdges() []string {
 	if m.clearedwa_agent {
 		edges = append(edges, agent.EdgeWaAgent)
 	}
-	if m.clearedkey_agent {
-		edges = append(edges, agent.EdgeKeyAgent)
-	}
 	if m.clearedxjs_agent {
 		edges = append(edges, agent.EdgeXjsAgent)
 	}
+	if m.clearedkey_agent {
+		edges = append(edges, agent.EdgeKeyAgent)
+	}
 	return edges
 }
 
@@ -1519,10 +1519,10 @@ func (m *AgentMutation) EdgeCleared(name string) bool {
 		return m.clearedtoken_agent
 	case agent.EdgeWaAgent:
 		return m.clearedwa_agent
-	case agent.EdgeKeyAgent:
-		return m.clearedkey_agent
 	case agent.EdgeXjsAgent:
 		return m.clearedxjs_agent
+	case agent.EdgeKeyAgent:
+		return m.clearedkey_agent
 	}
 	return false
 }
@@ -1548,12 +1548,12 @@ func (m *AgentMutation) ResetEdge(name string) error {
 	case agent.EdgeWaAgent:
 		m.ResetWaAgent()
 		return nil
-	case agent.EdgeKeyAgent:
-		m.ResetKeyAgent()
-		return nil
 	case agent.EdgeXjsAgent:
 		m.ResetXjsAgent()
 		return nil
+	case agent.EdgeKeyAgent:
+		m.ResetKeyAgent()
+		return nil
 	}
 	return fmt.Errorf("unknown Agent edge %s", name)
 }

ent/schema/agent.go

@@ -41,8 +41,8 @@ func (Agent) Edges() []ent.Edge {
 		edge.To("wx_agent", Wx.Type),
 		edge.To("token_agent", Token.Type),
 		edge.To("wa_agent", Whatsapp.Type),
-		edge.To("key_agent", ApiKey.Type),
 		edge.To("xjs_agent", XunjiService.Type),
+		edge.To("key_agent", ApiKey.Type),
 	}
 }
 

go.mod

@@ -17,9 +17,11 @@ require (
 	github.com/go-resty/resty/v2 v2.14.0
 	github.com/gofrs/uuid/v5 v5.0.0
 	github.com/golang-jwt/jwt/v4 v4.3.0
+
 	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/gorilla/websocket v1.5.0
 	github.com/imroc/req/v3 v3.43.1
+	github.com/mojocn/base64Captcha v1.3.6
 	github.com/openai/openai-go v0.1.0-alpha.62
 	github.com/redis/go-redis/v9 v9.6.1
 	github.com/robfig/cron/v3 v3.0.1
@@ -83,6 +85,7 @@ require (
 	github.com/go-sql-driver/mysql v1.8.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
@@ -162,6 +165,7 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
+	golang.org/x/image v0.15.0 // indirect
 	golang.org/x/mod v0.17.0 // indirect
 	golang.org/x/net v0.29.0 // indirect
 	golang.org/x/oauth2 v0.18.0 // indirect

go.sum

@@ -252,6 +252,8 @@ github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0kt
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
 github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -500,6 +502,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/mojocn/base64Captcha v1.3.6 h1:gZEKu1nsKpttuIAQgWHO+4Mhhls8cAKyiV2Ew03H+Tw=
+github.com/mojocn/base64Captcha v1.3.6/go.mod h1:i5CtHvm+oMbj1UzEPXaA8IH/xHFZ3DGY3Wh3dBpZ28E=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
@@ -770,6 +774,9 @@ golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88p
 golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk=
+golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
+golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

internal/config/config.go

@@ -3,6 +3,7 @@ package config
 import (
 	"github.com/suyuan32/simple-admin-common/config"
 	"github.com/suyuan32/simple-admin-common/plugins/casbin"
+	"github.com/suyuan32/simple-admin-common/utils/captcha"
 	"github.com/zeromicro/go-zero/rest"
 	"github.com/zeromicro/go-zero/zrpc"
 	"wechat-api/internal/types"
@@ -21,7 +22,15 @@ type Config struct {
 	Aliyun             types.Aliyun
 	CoreRpc            zrpc.RpcClientConf
 	Xiaoice            types.Xiaoice
-	FastgptMongoConf   types.MongoDB
 	WebSocket          []types.WebSocketConfig
 	OpenAI             types.OpenAI
+	FastgptMongoConf   types.MongoDB
+	//验证码设置
+	Captcha captcha.Conf
+	//登录类型设置
+	LoginConf LoginConf
+}
+
+type LoginConf struct {
+	LoginVerify string `json:",default=captcha,options=[captcha,email,sms,sms_or_email,all]"`
 }

internal/handler/auth/login_by_email_handler.go

@@ -0,0 +1,44 @@
+package auth
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+
+	"wechat-api/internal/logic/auth"
+	"wechat-api/internal/svc"
+	"wechat-api/internal/types"
+)
+
+// swagger:route post /user/login_by_email auth LoginByEmail
+//
+// Log in by email | 邮箱登录
+//
+// Log in by email | 邮箱登录
+//
+// Parameters:
+//  + name: body
+//    require: true
+//    in: body
+//    type: LoginByEmailReq
+//
+// Responses:
+//  200: LoginResp
+
+func LoginByEmailHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.LoginByEmailReq
+		if err := httpx.Parse(r, &req, true); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := auth.NewLoginByEmailLogic(r.Context(), svcCtx, w)
+		resp, err := l.LoginByEmail(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

internal/handler/auth/login_by_sms_handler.go

@@ -0,0 +1,43 @@
+package auth
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+
+	"wechat-api/internal/logic/auth"
+	"wechat-api/internal/svc"
+	"wechat-api/internal/types"
+)
+
+// swagger:route post /user/login_by_sms auth LoginBySms
+//
+// Log in by SMS | 短信登录
+//
+// Log in by SMS | 短信登录
+//
+// Parameters:
+//  + name: body
+//    require: true
+//    in: body
+//    type: LoginBySmsReq
+//
+// Responses:
+//  200: LoginResp
+
+func LoginBySmsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.LoginBySmsReq
+		if err := httpx.Parse(r, &req, true); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+		l := auth.NewLoginBySmsLogic(r.Context(), svcCtx, w)
+		resp, err := l.LoginBySms(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

internal/handler/auth/login_handler.go

@@ -0,0 +1,42 @@
+package auth
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"wechat-api/internal/logic/auth"
+	"wechat-api/internal/svc"
+	"wechat-api/internal/types"
+)
+
+// swagger:route post /auth/login auth Login
+//
+// Log in | 登录
+//
+// Log in | 登录
+//
+// Parameters:
+//  + name: body
+//    require: true
+//    in: body
+//    type: LoginReq
+//
+// Responses:
+//  200: LoginResp
+
+func LoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.LoginReq
+		if err := httpx.Parse(r, &req, true); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+		l := auth.NewLoginLogic(r.Context(), svcCtx, w)
+		resp, err := l.Login(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

internal/handler/auth/logout_handler.go

@@ -0,0 +1,31 @@
+package auth
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+
+	"wechat-api/internal/logic/auth"
+	"wechat-api/internal/svc"
+)
+
+// swagger:route get /auth/logout auth Logout
+//
+// Log out | 退出登陆
+//
+// Log out | 退出登陆
+//
+// Responses:
+//  200: BaseMsgResp
+
+func LogoutHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		l := auth.NewLogoutLogic(r.Context(), svcCtx)
+		resp, err := l.Logout()
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

internal/handler/routes.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctls v1.10.1
+// goctls v1.10.4
 
 package handler
 
@@ -21,6 +21,7 @@ import (
 	aliyun_avatar "wechat-api/internal/handler/aliyun_avatar"
 	allocagent "wechat-api/internal/handler/allocagent"
 	api_key "wechat-api/internal/handler/api_key"
+	auth "wechat-api/internal/handler/auth"
 	avatar "wechat-api/internal/handler/avatar"
 	base "wechat-api/internal/handler/base"
 	batch_msg "wechat-api/internal/handler/batch_msg"
@@ -50,6 +51,7 @@ import (
 	whatsapp "wechat-api/internal/handler/whatsapp"
 	whatsapp_channel "wechat-api/internal/handler/whatsapp_channel"
 	work_experience "wechat-api/internal/handler/work_experience"
+	wp_wecom "wechat-api/internal/handler/wp_wecom"
 	wxcard "wechat-api/internal/handler/wxcard"
 	wxcarduser "wechat-api/internal/handler/wxcarduser"
 	wxcardvisit "wechat-api/internal/handler/wxcardvisit"
@@ -2077,43 +2079,38 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 	)
 
 	server.AddRoutes(
-		[]rest.Route{
-			{
-				Method:  http.MethodGet,
-				Path:    "/api/fastgpt/set_token",
-				Handler: fastgpt.SetTokenHandler(serverCtx),
-			},
-			{
-				Method:  http.MethodPost,
-				Path:    "/api/fastgpt/create",
-				Handler: fastgpt.CreateFastgptHandler(serverCtx),
-			},
-		},
-	)
-
-	server.AddRoutes(
 		rest.WithMiddlewares(
 			[]rest.Middleware{serverCtx.Authority},
 			[]rest.Route{
 				{
 					Method:  http.MethodPost,
-					Path:    "/api/fastgpt/apps_list",
-					Handler: fastgpt.GetAppsListHandler(serverCtx),
+					Path:    "/xunji/create",
+					Handler: xunji.CreateXunjiHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/api/fastgpt/create_app",
-					Handler: fastgpt.CreateAppHandler(serverCtx),
+					Path:    "/xunji/update",
+					Handler: xunji.UpdateXunjiHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/api/fastgpt/update_app",
-					Handler: fastgpt.UpdateAppHandler(serverCtx),
+					Path:    "/xunji/delete",
+					Handler: xunji.DeleteXunjiHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/api/fastgpt/delete_app",
-					Handler: fastgpt.DeleteAppHandler(serverCtx),
+					Path:    "/xunji/list",
+					Handler: xunji.GetXunjiListHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodPost,
+					Path:    "/xunji",
+					Handler: xunji.GetXunjiByIdHandler(serverCtx),
+				},
+				{
+					Method:  http.MethodPost,
+					Path:    "/xunji/detail",
+					Handler: xunji.GetXunjiHandler(serverCtx),
 				},
 			}...,
 		),
@@ -2126,28 +2123,28 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			[]rest.Route{
 				{
 					Method:  http.MethodPost,
-					Path:    "/department/create",
-					Handler: department.CreateDepartmentHandler(serverCtx),
+					Path:    "/xunji_service/create",
+					Handler: xunji_service.CreateXunjiServiceHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/department/update",
-					Handler: department.UpdateDepartmentHandler(serverCtx),
+					Path:    "/xunji_service/update",
+					Handler: xunji_service.UpdateXunjiServiceHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/department/delete",
-					Handler: department.DeleteDepartmentHandler(serverCtx),
+					Path:    "/xunji_service/delete",
+					Handler: xunji_service.DeleteXunjiServiceHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/department/list",
-					Handler: department.GetDepartmentListHandler(serverCtx),
+					Path:    "/xunji_service/list",
+					Handler: xunji_service.GetXunjiServiceListHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/department",
-					Handler: department.GetDepartmentByIdHandler(serverCtx),
+					Path:    "/xunji_service",
+					Handler: xunji_service.GetXunjiServiceByIdHandler(serverCtx),
 				},
 			}...,
 		),
@@ -2155,28 +2152,58 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 	)
 
 	server.AddRoutes(
+		[]rest.Route{
+			{
+				Method:  http.MethodPost,
+				Path:    "/wp/wecom/send_msg",
+				Handler: wp_wecom.SendMsgHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/wp/wecom/send_msg_by_chan",
+				Handler: wp_wecom.SendMsgByChanHandler(serverCtx),
+			},
+		},
+	)
+
+	server.AddRoutes(
+		[]rest.Route{
+			{
+				Method:  http.MethodGet,
+				Path:    "/api/fastgpt/set_token",
+				Handler: fastgpt.SetTokenHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/api/fastgpt/create",
+				Handler: fastgpt.CreateFastgptHandler(serverCtx),
+			},
+		},
+	)
+
+	server.AddRoutes(
 		rest.WithMiddlewares(
 			[]rest.Middleware{serverCtx.Authority},
 			[]rest.Route{
 				{
 					Method:  http.MethodPost,
-					Path:    "/api_key/create",
-					Handler: api_key.CreateApiKeyHandler(serverCtx),
+					Path:    "/api/fastgpt/apps_list",
+					Handler: fastgpt.GetAppsListHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/api_key/update",
-					Handler: api_key.UpdateApiKeyHandler(serverCtx),
+					Path:    "/api/fastgpt/create_app",
+					Handler: fastgpt.CreateAppHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/api_key/delete",
-					Handler: api_key.DeleteApiKeyHandler(serverCtx),
+					Path:    "/api/fastgpt/update_app",
+					Handler: fastgpt.UpdateAppHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/api_key/list",
-					Handler: api_key.GetApiKeyListHandler(serverCtx),
+					Path:    "/api/fastgpt/delete_app",
+					Handler: fastgpt.DeleteAppHandler(serverCtx),
 				},
 			}...,
 		),
@@ -2189,33 +2216,28 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			[]rest.Route{
 				{
 					Method:  http.MethodPost,
-					Path:    "/xunji/create",
-					Handler: xunji.CreateXunjiHandler(serverCtx),
-				},
-				{
-					Method:  http.MethodPost,
-					Path:    "/xunji/update",
-					Handler: xunji.UpdateXunjiHandler(serverCtx),
+					Path:    "/department/create",
+					Handler: department.CreateDepartmentHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/xunji/delete",
-					Handler: xunji.DeleteXunjiHandler(serverCtx),
+					Path:    "/department/update",
+					Handler: department.UpdateDepartmentHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/xunji/list",
-					Handler: xunji.GetXunjiListHandler(serverCtx),
+					Path:    "/department/delete",
+					Handler: department.DeleteDepartmentHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/xunji",
-					Handler: xunji.GetXunjiByIdHandler(serverCtx),
+					Path:    "/department/list",
+					Handler: department.GetDepartmentListHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/xunji/detail",
-					Handler: xunji.GetXunjiHandler(serverCtx),
+					Path:    "/department",
+					Handler: department.GetDepartmentByIdHandler(serverCtx),
 				},
 			}...,
 		),
@@ -2228,31 +2250,46 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			[]rest.Route{
 				{
 					Method:  http.MethodPost,
-					Path:    "/xunji_service/create",
-					Handler: xunji_service.CreateXunjiServiceHandler(serverCtx),
-				},
-				{
-					Method:  http.MethodPost,
-					Path:    "/xunji_service/update",
-					Handler: xunji_service.UpdateXunjiServiceHandler(serverCtx),
+					Path:    "/api_key/create",
+					Handler: api_key.CreateApiKeyHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/xunji_service/delete",
-					Handler: xunji_service.DeleteXunjiServiceHandler(serverCtx),
+					Path:    "/api_key/update",
+					Handler: api_key.UpdateApiKeyHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/xunji_service/list",
-					Handler: xunji_service.GetXunjiServiceListHandler(serverCtx),
+					Path:    "/api_key/delete",
+					Handler: api_key.DeleteApiKeyHandler(serverCtx),
 				},
 				{
 					Method:  http.MethodPost,
-					Path:    "/xunji_service",
-					Handler: xunji_service.GetXunjiServiceByIdHandler(serverCtx),
+					Path:    "/api_key/list",
+					Handler: api_key.GetApiKeyListHandler(serverCtx),
 				},
 			}...,
 		),
 		rest.WithJwt(serverCtx.Config.Auth.AccessSecret),
 	)
+
+	server.AddRoutes(
+		[]rest.Route{
+			{
+				Method:  http.MethodPost,
+				Path:    "/user/login",
+				Handler: auth.LoginHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/user/login_by_email",
+				Handler: auth.LoginByEmailHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/user/login_by_sms",
+				Handler: auth.LoginBySmsHandler(serverCtx),
+			},
+		},
+	)
 }

internal/handler/wp_wecom/send_msg_by_chan_handler.go

@@ -0,0 +1,44 @@
+package wp_wecom
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+
+	"wechat-api/internal/logic/wp_wecom"
+	"wechat-api/internal/svc"
+	"wechat-api/internal/types"
+)
+
+// swagger:route post /wp/wecom/send_msg_by_chan wp_wecom SendMsgByChan
+//
+
+//
+
+//
+// Parameters:
+//  + name: body
+//    require: true
+//    in: body
+//    type: WpWecomMsgReq
+//
+// Responses:
+//  200: BaseMsgResp
+
+func SendMsgByChanHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.WpWecomMsgReq
+		if err := httpx.Parse(r, &req, true); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := wp_wecom.NewSendMsgByChanLogic(r.Context(), svcCtx)
+		resp, err := l.SendMsgByChan(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

internal/handler/wp_wecom/send_msg_handler.go

@@ -0,0 +1,44 @@
+package wp_wecom
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+
+	"wechat-api/internal/logic/wp_wecom"
+	"wechat-api/internal/svc"
+	"wechat-api/internal/types"
+)
+
+// swagger:route get /wp/wecom/send_msg wp_wecom SendMsg
+//
+
+//
+
+//
+// Parameters:
+//  + name: body
+//    require: true
+//    in: body
+//    type: WpWecomMsgReq
+//
+// Responses:
+//  200: BaseMsgResp
+
+func SendMsgHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.WpWecomMsgReq
+		if err := httpx.Parse(r, &req, true); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := wp_wecom.NewSendMsgLogic(r.Context(), svcCtx)
+		resp, err := l.SendMsg(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

internal/logic/agent/upload_agent_data_logic.go

@@ -1,32 +1,20 @@
 package agent
 
 import (
-	"bytes"
 	"context"
 	"encoding/csv"
 	"fmt"
-	"github.com/saintfish/chardet"
 	"github.com/suyuan32/simple-admin-common/msg/errormsg"
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/charmap"
-	"golang.org/x/text/encoding/japanese"
-	"golang.org/x/text/encoding/korean"
-	"golang.org/x/text/encoding/traditionalchinese"
-	"golang.org/x/text/encoding/unicode"
-	"io"
 	"mime/multipart"
-	"strings"
 	agentModel "wechat-api/ent/agent"
 	"wechat-api/hook/fastgpt"
+	"wechat-api/internal/utils"
 	"wechat-api/internal/utils/dberrorhandler"
 
 	"wechat-api/internal/svc"
 	"wechat-api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
-
-	"golang.org/x/text/encoding/simplifiedchinese"
-	"golang.org/x/text/transform"
 )
 
 type UploadAgentDataLogic struct {
@@ -116,72 +104,7 @@ func (l *UploadAgentDataLogic) UploadAgentData(req *types.UploadDataReq, file mu
 	return resp, nil
 }
 
-func trim(s string) string {
-	s = strings.TrimLeft(s, " \r\n\t")
-	s = strings.TrimRight(s, " \r\n\t")
-	return s
-}
-
 // transCharset 自动检测编码并转换为 UTF-8
 func transCharset(s string) string {
-	// 1. 自动检测编码
-	detector := chardet.NewTextDetector()
-	result, err := detector.DetectBest([]byte(s))
-	if err != nil {
-		fmt.Println("Encoding detection failed:", err)
-		return s
-	}
-
-	// 2. 找到相应的编码
-	fmt.Println("result.Charset:", result.Charset)
-	enc := getEncoding(result.Charset)
-	fmt.Println("enc:", enc)
-	if enc == nil {
-		// 直接返回原始字符串
-		fmt.Println("Unsupported charset:", result.Charset)
-		return s
-	}
-
-	// 3. 转换为 UTF-8
-	rd := transform.NewReader(bytes.NewReader([]byte(s)), enc.NewDecoder())
-	utf8Bytes, err := io.ReadAll(rd)
-	if err != nil {
-		fmt.Println("Encoding conversion failed:", err)
-		return s
-	}
-
-	// 4. 返回转换后的 UTF-8 字符串
-	return string(utf8Bytes)
-}
-
-// 根据字符集名称获取 `encoding.Encoding`
-func getEncoding(charset string) encoding.Encoding {
-	switch charset {
-	case "UTF-8", "ASCII":
-		return encoding.Nop // 无需转换
-	case "ISO-8859-1":
-		return charmap.ISO8859_1
-	case "ISO-8859-2":
-		return charmap.ISO8859_2
-	case "ISO-8859-15":
-		return charmap.ISO8859_15
-	case "Windows-1252":
-		return charmap.Windows1252
-	case "Big5":
-		return traditionalchinese.Big5
-	case "GB-2312", "GBK", "GB-18030":
-		return simplifiedchinese.GBK
-	case "Shift_JIS":
-		return japanese.ShiftJIS
-	case "EUC-JP":
-		return japanese.EUCJP
-	case "EUC-KR":
-		return korean.EUCKR
-	case "UTF-16LE":
-		return unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM)
-	case "UTF-16BE":
-		return unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM)
-	default:
-		return nil
-	}
+	return utils.TransCharset(s)
 }

internal/logic/api_key/create_api_key_logic.go

@@ -44,7 +44,7 @@ func (l *CreateApiKeyLogic) CreateApiKey(req *types.ApiKeyInfo) (resp *types.Bas
 	if err != nil {
 		return nil, dberrorhandler.DefaultEntError(l.Logger, err, req)
 	}
-	l.svcCtx.Rds.HSet(l.ctx, "api_key", apiKey, req)
+	//l.svcCtx.Rds.HSet(l.ctx, "api_key", apiKey, req)
 	return &types.BaseMsgResp{Msg: errormsg.CreateSuccess}, nil
 }
 

internal/logic/auth/login_by_email_logic.go

@@ -0,0 +1,115 @@
+package auth
+
+import (
+	"context"
+	"github.com/suyuan32/simple-admin-common/config"
+	"github.com/suyuan32/simple-admin-common/enum/common"
+	"github.com/suyuan32/simple-admin-common/i18n"
+	"github.com/suyuan32/simple-admin-common/utils/jwt"
+	"github.com/suyuan32/simple-admin-common/utils/pointy"
+	"github.com/suyuan32/simple-admin-core/rpc/types/core"
+	"github.com/zeromicro/go-zero/core/errorx"
+	"net/http"
+	"strings"
+	"time"
+	"wechat-api/internal/logic/fastgpt"
+	"wechat-api/internal/svc"
+	"wechat-api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type LoginByEmailLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	w      http.ResponseWriter
+}
+
+func NewLoginByEmailLogic(ctx context.Context, svcCtx *svc.ServiceContext, w http.ResponseWriter) *LoginByEmailLogic {
+	return &LoginByEmailLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		w:      w,
+	}
+}
+
+func (l *LoginByEmailLogic) LoginByEmail(req *types.LoginByEmailReq) (resp *types.LoginResp, err error) {
+	if l.svcCtx.Config.LoginConf.LoginVerify != "email" && l.svcCtx.Config.LoginConf.LoginVerify != "sms_or_email" &&
+		l.svcCtx.Config.LoginConf.LoginVerify != "all" {
+		return nil, errorx.NewCodeAbortedError("login.loginTypeForbidden")
+	}
+
+	captchaData, err := l.svcCtx.Rds.Get(l.ctx, config.RedisCaptchaPrefix+req.Email).Result()
+	if err != nil {
+		logx.Errorw("failed to get captcha data in redis for email validation", logx.Field("detail", err),
+			logx.Field("data", req))
+		return nil, errorx.NewCodeInvalidArgumentError(i18n.Failed)
+	}
+
+	if captchaData != req.Captcha {
+		return nil, errorx.NewCodeInvalidArgumentError("login.wrongCaptcha")
+	}
+	userData, err := l.svcCtx.CoreRpc.GetUserList(l.ctx, &core.UserListReq{
+		Page:     1,
+		PageSize: 1,
+		Email:    &req.Email,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	if userData.Total == 0 {
+		return nil, errorx.NewCodeInvalidArgumentError("login.userNotExist")
+	}
+
+	token, err := jwt.NewJwtToken(l.svcCtx.Config.Auth.AccessSecret, time.Now().Unix(),
+		l.svcCtx.Config.Auth.AccessExpire, jwt.WithOption("userId", userData.Data[0].Id), jwt.WithOption("roleId",
+			strings.Join(userData.Data[0].RoleCodes, ",")), jwt.WithOption("deptId", userData.Data[0].DepartmentId))
+	if err != nil {
+		return nil, err
+	}
+
+	// add token into database
+	expiredAt := time.Now().Add(time.Second * time.Duration(l.svcCtx.Config.Auth.AccessExpire)).UnixMilli()
+	_, err = l.svcCtx.CoreRpc.CreateToken(l.ctx, &core.TokenInfo{
+		Uuid:      userData.Data[0].Id,
+		Token:     pointy.GetPointer(token),
+		Source:    pointy.GetPointer("core_user"),
+		Status:    pointy.GetPointer(uint32(common.StatusNormal)),
+		Username:  userData.Data[0].Username,
+		ExpiredAt: pointy.GetPointer(expiredAt),
+	})
+	if err != nil {
+		return nil, err
+	}
+	err = l.svcCtx.Rds.Del(l.ctx, config.RedisCaptchaPrefix+req.Email).Err()
+	if err != nil {
+		logx.Errorw("failed to delete captcha in redis", logx.Field("detail", err))
+	}
+
+	//注册cookie 到fastgpt
+	fastgptLogic := fastgpt.NewSetTokenLogic(l.ctx, l.svcCtx, l.w)
+	userId := func(s *string) string {
+		if s == nil {
+			return ""
+		}
+		return *s
+	}(userData.Data[0].Id)
+
+	_, err = fastgptLogic.SetTokenByUserId(userId)
+	if err != nil {
+		return nil, err
+	}
+
+	resp = &types.LoginResp{
+		BaseDataInfo: types.BaseDataInfo{Msg: l.svcCtx.Trans.Trans(l.ctx, "login.loginSuccessTitle")},
+		Data: types.LoginInfo{
+			UserId: userId,
+			Token:  token,
+			Expire: uint64(expiredAt),
+		},
+	}
+	return resp, nil
+}

internal/logic/auth/login_by_sms_logic.go

@@ -0,0 +1,107 @@
+package auth
+
+import (
+	"context"
+	"github.com/suyuan32/simple-admin-common/config"
+	"github.com/suyuan32/simple-admin-common/enum/common"
+	"github.com/suyuan32/simple-admin-common/i18n"
+	"github.com/suyuan32/simple-admin-common/msg/errormsg"
+	"github.com/suyuan32/simple-admin-common/utils/jwt"
+	"github.com/suyuan32/simple-admin-common/utils/pointy"
+	"github.com/suyuan32/simple-admin-core/rpc/types/core"
+	"github.com/zeromicro/go-zero/core/errorx"
+	"net/http"
+	"strings"
+	"time"
+	"wechat-api/internal/logic/fastgpt"
+	"wechat-api/internal/svc"
+	"wechat-api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type LoginBySmsLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	w      http.ResponseWriter
+}
+
+func NewLoginBySmsLogic(ctx context.Context, svcCtx *svc.ServiceContext, w http.ResponseWriter) *LoginBySmsLogic {
+	return &LoginBySmsLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		w:      w,
+	}
+}
+
+func (l *LoginBySmsLogic) LoginBySms(req *types.LoginBySmsReq) (resp *types.LoginResp, err error) {
+	if l.svcCtx.Config.LoginConf.LoginVerify != "sms" && l.svcCtx.Config.LoginConf.LoginVerify != "sms_or_email" &&
+		l.svcCtx.Config.LoginConf.LoginVerify != "all" {
+		return nil, errorx.NewCodeAbortedError("login.loginTypeForbidden")
+	}
+
+	captchaData, err := l.svcCtx.Rds.Get(l.ctx, config.RedisCaptchaPrefix+req.PhoneNumber).Result()
+	if err != nil {
+		logx.Errorw("failed to get captcha data in redis for email validation", logx.Field("detail", err),
+			logx.Field("data", req))
+		return nil, errorx.NewCodeInvalidArgumentError(i18n.Failed)
+	}
+
+	if captchaData != req.Captcha {
+		return nil, errorx.NewCodeInvalidArgumentError("login.wrongCaptcha")
+	}
+	userData, err := l.svcCtx.CoreRpc.GetUserList(l.ctx, &core.UserListReq{
+		Page:     1,
+		PageSize: 1,
+		Mobile:   &req.PhoneNumber,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if userData.Total == 0 {
+		return nil, errorx.NewCodeInvalidArgumentError("login.userNotExist")
+	}
+	token, err := jwt.NewJwtToken(l.svcCtx.Config.Auth.AccessSecret, time.Now().Unix(),
+		l.svcCtx.Config.Auth.AccessExpire, jwt.WithOption("userId", userData.Data[0].Id), jwt.WithOption("roleId",
+			strings.Join(userData.Data[0].RoleCodes, ",")), jwt.WithOption("deptId", userData.Data[0].DepartmentId))
+	if err != nil {
+		return nil, err
+	}
+
+	// add token into database
+	expiredAt := time.Now().Add(time.Second * time.Duration(l.svcCtx.Config.Auth.AccessExpire)).UnixMilli()
+	_, err = l.svcCtx.CoreRpc.CreateToken(l.ctx, &core.TokenInfo{
+		Uuid:      userData.Data[0].Id,
+		Token:     pointy.GetPointer(token),
+		Source:    pointy.GetPointer("core_user"),
+		Status:    pointy.GetPointer(uint32(common.StatusNormal)),
+		Username:  userData.Data[0].Username,
+		ExpiredAt: pointy.GetPointer(expiredAt),
+	})
+	if err != nil {
+		return nil, err
+	}
+	err = l.svcCtx.Rds.Del(l.ctx, config.RedisCaptchaPrefix+req.PhoneNumber).Err()
+	if err != nil {
+		logx.Errorw("failed to delete captcha in redis", logx.Field("detail", err))
+	}
+
+	//注册cookie 到fastgpt
+	fastgptLogic := fastgpt.NewSetTokenLogic(l.ctx, l.svcCtx, l.w)
+	_, err = fastgptLogic.SetTokenByUserId(*userData.Data[0].Id)
+	if err != nil {
+		return nil, err
+	}
+
+	resp = &types.LoginResp{
+		BaseDataInfo: types.BaseDataInfo{Msg: errormsg.Success},
+		Data: types.LoginInfo{
+			UserId: *userData.Data[0].Id,
+			Token:  token,
+			Expire: uint64(expiredAt),
+		},
+	}
+	return resp, nil
+}

internal/logic/auth/login_logic.go

@@ -0,0 +1,98 @@
+package auth
+
+import (
+	"context"
+	"github.com/suyuan32/simple-admin-common/config"
+	"github.com/suyuan32/simple-admin-common/enum/common"
+	"github.com/suyuan32/simple-admin-common/msg/errormsg"
+	"github.com/suyuan32/simple-admin-common/utils/encrypt"
+	"github.com/suyuan32/simple-admin-common/utils/jwt"
+	"github.com/suyuan32/simple-admin-common/utils/pointy"
+	"github.com/suyuan32/simple-admin-core/rpc/types/core"
+	"github.com/zeromicro/go-zero/core/errorx"
+	"github.com/zeromicro/go-zero/core/logx"
+	"net/http"
+	"strings"
+	"time"
+	"wechat-api/internal/logic/fastgpt"
+	"wechat-api/internal/svc"
+	"wechat-api/internal/types"
+)
+
+type LoginLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	rw     http.ResponseWriter
+}
+
+func NewLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext, rw http.ResponseWriter) *LoginLogic {
+	return &LoginLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		rw:     rw,
+	}
+}
+
+func (l *LoginLogic) Login(req *types.LoginReq) (resp *types.LoginResp, err error) {
+	//判断调用类型
+
+	if l.svcCtx.Config.LoginConf.LoginVerify != "captcha" && l.svcCtx.Config.LoginConf.LoginVerify != "all" {
+		return nil, errorx.NewCodeAbortedError("login.loginTypeForbidden")
+	}
+	ok := l.svcCtx.Captcha.Verify(config.RedisCaptchaPrefix+req.CaptchaId, req.Captcha, true)
+	if !ok {
+		return nil, errorx.NewCodeInvalidArgumentError("login.wrongCaptcha")
+	}
+	user, err := l.svcCtx.CoreRpc.GetUserByUsername(l.ctx,
+		&core.UsernameReq{
+			Username: req.Username,
+		})
+	if err != nil {
+		return nil, err
+	}
+	if !encrypt.BcryptCheck(req.Password, *user.Password) {
+		return nil, errorx.NewCodeInvalidArgumentError("login.wrongUsernameOrPassword")
+	}
+	token, err := jwt.NewJwtToken(l.svcCtx.Config.Auth.AccessSecret, time.Now().Unix(),
+		l.svcCtx.Config.Auth.AccessExpire, jwt.WithOption("userId", user.Id), jwt.WithOption("roleId",
+			strings.Join(user.RoleCodes, ",")), jwt.WithOption("deptId", user.DepartmentId))
+	if err != nil {
+		return nil, err
+	}
+	// add token into database
+	expiredAt := time.Now().Add(time.Second * time.Duration(l.svcCtx.Config.Auth.AccessExpire)).UnixMilli()
+	_, err = l.svcCtx.CoreRpc.CreateToken(l.ctx, &core.TokenInfo{
+		Uuid:      user.Id,
+		Token:     pointy.GetPointer(token),
+		Source:    pointy.GetPointer("core_user"),
+		Status:    pointy.GetPointer(uint32(common.StatusNormal)),
+		Username:  user.Username,
+		ExpiredAt: pointy.GetPointer(expiredAt),
+	})
+	if err != nil {
+		return nil, err
+	}
+	err = l.svcCtx.Rds.Del(l.ctx, config.RedisCaptchaPrefix+req.CaptchaId).Err()
+	if err != nil {
+		logx.Errorw("failed to delete captcha in redis", logx.Field("detail", err))
+	}
+	//请求fastgpt，并种cookie。先同步，后期可以异步
+	//set_cookie.NewFastGpt(l.svcCtx, fastgptLogic)
+	fastgptLogic := fastgpt.NewSetTokenLogic(l.ctx, l.svcCtx, l.rw)
+	//userId := *user.Id
+	_, err = fastgptLogic.SetTokenByUserId(*user.Id)
+	if err != nil {
+		return nil, err
+	}
+	resp = &types.LoginResp{
+		BaseDataInfo: types.BaseDataInfo{Msg: errormsg.Success},
+		Data: types.LoginInfo{
+			UserId: *user.Id,
+			Token:  token,
+			Expire: uint64(expiredAt),
+		},
+	}
+	return resp, nil
+}

internal/logic/auth/logout_logic.go

@@ -0,0 +1,29 @@
+package auth
+
+import (
+	"context"
+
+	"wechat-api/internal/svc"
+	"wechat-api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type LogoutLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewLogoutLogic(ctx context.Context, svcCtx *svc.ServiceContext) *LogoutLogic {
+	return &LogoutLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx}
+}
+
+func (l *LogoutLogic) Logout() (resp *types.BaseMsgResp, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

internal/logic/base/init_api_data.go

@@ -6,6 +6,130 @@ import (
 )
 
 func (l *InitDatabaseLogic) insertApiData() (err error) {
+	// XunjiService
+
+	_, err = l.svcCtx.CoreRpc.CreateApi(l.ctx, &core.ApiInfo{
+		ServiceName: pointy.GetPointer("Wechat"),
+		Path:        pointy.GetPointer("/xunji_service/create"),
+		Description: pointy.GetPointer("apiDesc.createXunjiService"),
+		ApiGroup:    pointy.GetPointer("xunji_service"),
+		Method:      pointy.GetPointer("POST"),
+	})
+
+	if err != nil {
+		return err
+	}
+
+	_, err = l.svcCtx.CoreRpc.CreateApi(l.ctx, &core.ApiInfo{
+		ServiceName: pointy.GetPointer("Wechat"),
+		Path:        pointy.GetPointer("/xunji_service/update"),
+		Description: pointy.GetPointer("apiDesc.updateXunjiService"),
+		ApiGroup:    pointy.GetPointer("xunji_service"),
+		Method:      pointy.GetPointer("POST"),
+	})
+
+	if err != nil {
+		return err
+	}
+
+	_, err = l.svcCtx.CoreRpc.CreateApi(l.ctx, &core.ApiInfo{
+		ServiceName: pointy.GetPointer("Wechat"),
+		Path:        pointy.GetPointer("/xunji_service/delete"),
+		Description: pointy.GetPointer("apiDesc.deleteXunjiService"),
+		ApiGroup:    pointy.GetPointer("xunji_service"),
+		Method:      pointy.GetPointer("POST"),
+	})
+
+	if err != nil {
+		return err
+	}
+
+	_, err = l.svcCtx.CoreRpc.CreateApi(l.ctx, &core.ApiInfo{
+		ServiceName: pointy.GetPointer("Wechat"),
+		Path:        pointy.GetPointer("/xunji_service/list"),
+		Description: pointy.GetPointer("apiDesc.getXunjiServiceList"),
+		ApiGroup:    pointy.GetPointer("xunji_service"),
+		Method:      pointy.GetPointer("POST"),
+	})
+
+	if err != nil {
+		return err
+	}
+
+	_, err = l.svcCtx.CoreRpc.CreateApi(l.ctx, &core.ApiInfo{
+		ServiceName: pointy.GetPointer("Wechat"),
+		Path:        pointy.GetPointer("/xunji_service"),
+		Description: pointy.GetPointer("apiDesc.getXunjiServiceById"),
+		ApiGroup:    pointy.GetPointer("xunji_service"),
+		Method:      pointy.GetPointer("POST"),
+	})
+
+	if err != nil {
+		return err
+	}
+
+	// Xunji
+
+	_, err = l.svcCtx.CoreRpc.CreateApi(l.ctx, &core.ApiInfo{
+		ServiceName: pointy.GetPointer("Wechat"),
+		Path:        pointy.GetPointer("/xunji/create"),
+		Description: pointy.GetPointer("apiDesc.createXunji"),
+		ApiGroup:    pointy.GetPointer("xunji"),
+		Method:      pointy.GetPointer("POST"),
+	})
+
+	if err != nil {
+		return err
+	}
+
+	_, err = l.svcCtx.CoreRpc.CreateApi(l.ctx, &core.ApiInfo{
+		ServiceName: pointy.GetPointer("Wechat"),
+		Path:        pointy.GetPointer("/xunji/update"),
+		Description: pointy.GetPointer("apiDesc.updateXunji"),
+		ApiGroup:    pointy.GetPointer("xunji"),
+		Method:      pointy.GetPointer("POST"),
+	})
+
+	if err != nil {
+		return err
+	}
+
+	_, err = l.svcCtx.CoreRpc.CreateApi(l.ctx, &core.ApiInfo{
+		ServiceName: pointy.GetPointer("Wechat"),
+		Path:        pointy.GetPointer("/xunji/delete"),
+		Description: pointy.GetPointer("apiDesc.deleteXunji"),
+		ApiGroup:    pointy.GetPointer("xunji"),
+		Method:      pointy.GetPointer("POST"),
+	})
+
+	if err != nil {
+		return err
+	}
+
+	_, err = l.svcCtx.CoreRpc.CreateApi(l.ctx, &core.ApiInfo{
+		ServiceName: pointy.GetPointer("Wechat"),
+		Path:        pointy.GetPointer("/xunji/list"),
+		Description: pointy.GetPointer("apiDesc.getXunjiList"),
+		ApiGroup:    pointy.GetPointer("xunji"),
+		Method:      pointy.GetPointer("POST"),
+	})
+
+	if err != nil {
+		return err
+	}
+
+	_, err = l.svcCtx.CoreRpc.CreateApi(l.ctx, &core.ApiInfo{
+		ServiceName: pointy.GetPointer("Wechat"),
+		Path:        pointy.GetPointer("/xunji"),
+		Description: pointy.GetPointer("apiDesc.getXunjiById"),
+		ApiGroup:    pointy.GetPointer("xunji"),
+		Method:      pointy.GetPointer("POST"),
+	})
+
+	if err != nil {
+		return err
+	}
+
 	// WhatsappChannel
 
 	_, err = l.svcCtx.CoreRpc.CreateApi(l.ctx, &core.ApiInfo{

internal/logic/contact/get_contact_list_logic.go

@@ -2,6 +2,7 @@ package contact
 
 import (
 	"context"
+	"time"
 	"wechat-api/ent"
 	"wechat-api/ent/label"
 	"wechat-api/ent/labelrelationship"
@@ -56,6 +57,38 @@ func (l *GetContactListLogic) GetContactList(req *types.ContactListReq) (*types.
 	if req.WxWxid == nil || (req.WxWxid != nil && !isAdmin) {
 		predicates = append(predicates, contact.OrganizationIDEQ(organizationId))
 	}
+	layout := "2006-01-02 15:04:05"
+	var startTime, endTime *time.Time
+
+	if req.StartDate != nil && *req.StartDate != "" {
+		startStr := *req.StartDate + " 00:00:00"
+		if t, err := time.ParseInLocation(layout, startStr, time.Local); err == nil {
+			startTime = &t
+		} else {
+			l.Logger.Errorf("invalid startDate: %v", err)
+		}
+	}
+
+	if req.EndDate != nil && *req.EndDate != "" {
+		endStr := *req.EndDate + " 23:59:59"
+		if t, err := time.ParseInLocation(layout, endStr, time.Local); err == nil {
+			endTime = &t
+		} else {
+			l.Logger.Errorf("invalid endDate: %v", err)
+		}
+	}
+
+	var relPreds []predicate.LabelRelationship
+
+	if startTime != nil {
+		relPreds = append(relPreds, labelrelationship.CreatedAtGTE(*startTime))
+	}
+	if endTime != nil {
+		relPreds = append(relPreds, labelrelationship.CreatedAtLTE(*endTime))
+	}
+	if len(relPreds) > 0 {
+		predicates = append(predicates, contact.HasContactRelationshipsWith(relPreds...))
+	}
 
 	var ctype uint64 = 1
 	if req.Ctype != nil {

internal/logic/contact/import_whatsapp_contact_logic.go

@@ -1,15 +1,11 @@
 package contact
 
 import (
-	"bytes"
 	"context"
 	"encoding/csv"
 	"fmt"
 	"github.com/suyuan32/simple-admin-common/msg/errormsg"
 	"github.com/suyuan32/simple-admin-common/utils/uuidx"
-	"golang.org/x/text/encoding/simplifiedchinese"
-	"golang.org/x/text/transform"
-	"io"
 	"mime/multipart"
 	"strconv"
 	"strings"
@@ -19,6 +15,7 @@ import (
 	"wechat-api/ent/label"
 	"wechat-api/internal/svc"
 	"wechat-api/internal/types"
+	"wechat-api/internal/utils"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -59,8 +56,8 @@ func (l *ImportWhatsappContactLogic) ImportWhatsappContact(req *types.ImportWhat
 		_, err := l.svcCtx.DB.Contact.Query().Where(
 			contact.OrganizationID(organizationId),
 			contact.Ctype(2),
-			contact.Cc(trim(record[0])),
-			contact.Phone(trim(record[1])),
+			contact.Cc(utils.Trim(record[0])),
+			contact.Phone(utils.Trim(record[1])),
 		).First(l.ctx)
 		if err == nil || !ent.IsNotFound(err) {
 			fail++
@@ -68,16 +65,16 @@ func (l *ImportWhatsappContactLogic) ImportWhatsappContact(req *types.ImportWhat
 		}
 
 		uuidstr := uuidx.NewUUID().String()
-		sex, _ := strconv.Atoi(trim(record[5]))
-		cage, _ := strconv.Atoi(trim(record[7]))
+		sex, _ := strconv.Atoi(utils.Trim(record[5]))
+		cage, _ := strconv.Atoi(utils.Trim(record[7]))
 		var cbirthday string
-		t, err := time.Parse("2006/01/02", trim(record[8]))
+		t, err := time.Parse("2006/01/02", utils.Trim(record[8]))
 		if err == nil {
 			cbirthday = t.Format("2006-01-02")
 		}
 		newContact, err := l.svcCtx.DB.Contact.Create().SetCtype(2).
-			SetCc(trim(record[0])).
-			SetPhone(trim(record[1])).
+			SetCc(utils.Trim(record[0])).
+			SetPhone(utils.Trim(record[1])).
 			SetType(5).
 			SetWxWxid(uuidstr).
 			SetWxid(uuidstr).
@@ -89,7 +86,7 @@ func (l *ImportWhatsappContactLogic) ImportWhatsappContact(req *types.ImportWhat
 			SetCarea(transCharset(record[9])).
 			SetCbirthday(cbirthday).
 			SetCbirtharea(transCharset(record[10])).
-			SetCidcardNo(trim(record[11])).
+			SetCidcardNo(utils.Trim(record[11])).
 			SetOrganizationID(organizationId).
 			Save(l.ctx)
 		if err != nil {
@@ -100,7 +97,7 @@ func (l *ImportWhatsappContactLogic) ImportWhatsappContact(req *types.ImportWhat
 			success++
 		}
 
-		labels := trim(record[4])
+		labels := utils.Trim(record[4])
 		if labels != "" {
 			for _, value := range strings.Split(labels, "+") {
 				_, err = l.svcCtx.DB.Label.Query().Where(
@@ -140,15 +137,6 @@ func (l *ImportWhatsappContactLogic) ImportWhatsappContact(req *types.ImportWhat
 	return &resp, nil
 }
 
-func trim(s string) string {
-	return strings.Trim(s, " \r\n\t")
-}
-
 func transCharset(s string) string {
-	s = trim(s)
-	return s
-	rd := transform.NewReader(bytes.NewReader([]byte(s)), simplifiedchinese.GBK.NewDecoder())
-	bytes, err := io.ReadAll(rd)
-	fmt.Printf("bytes=%s err=%v\n", bytes, err)
-	return string(bytes)
+	return utils.TransCharset(s)
 }

internal/logic/fastgpt/set_token_logic.go

@@ -32,13 +32,47 @@ func NewSetTokenLogic(ctx context.Context, svcCtx *svc.ServiceContext, rw http.R
 }
 
 func (l *SetTokenLogic) SetToken(username string) (resp *types.BaseMsgResp, err error) {
+	//println(username)
 	claims, err := ParseJWT(username, l.svcCtx.Config.Auth.AccessSecret)
 	if err != nil {
-		return nil, fmt.Errorf("invalid token")
+		return nil, error(err)
 	}
 	data, err := l.svcCtx.CoreRpc.GetUserById(context.TODO(), &core.UUIDReq{Id: claims.UserId})
 	token, err := GetToken(strconv.FormatUint(*data.DepartmentId, 10))
 	if err != nil {
+		return nil, fmt.Errorf("invalid token3")
+	}
+	//if err != nil {
+	//	return nil, err
+	//}
+	// 创建一个新的 Cookie
+	cookie := &http.Cookie{
+		Name:     "fastgpt_token",
+		Value:    token, // 假设 req.Token 是你要设置的 Cookie 值
+		Domain:   ".gkscrm.com",
+		SameSite: http.SameSiteNoneMode,
+		Secure:   true, // 如果 SameSite 设置为 None，必须设置 Secure 为 true
+		HttpOnly: false,
+		Path:     "/",
+	}
+
+	// 设置 Cookie 到响应中
+	http.SetCookie(l.rw, cookie)
+
+	// 返回响应消息
+	resp = &types.BaseMsgResp{
+		Code: 0,
+		Msg:  "Cookie set successfully",
+	}
+
+	return
+}
+
+func (l *SetTokenLogic) SetTokenByUserId(UserId string) (resp *types.BaseMsgResp, err error) {
+	data, err := l.svcCtx.CoreRpc.GetUserById(context.TODO(), &core.UUIDReq{Id: UserId})
+	println(data)
+	token, err := GetToken(strconv.FormatUint(*data.DepartmentId, 10))
+	if err != nil {
 		return nil, fmt.Errorf("invalid token")
 	}
 	//if err != nil {
@@ -138,11 +172,11 @@ func ParseJWT(tokenString, accessSecret string) (*Claims, error) {
 	})
 
 	if err != nil {
-		return nil, fmt.Errorf("invalid token")
+		return nil, fmt.Errorf("invalid token1")
 	}
 
 	if !token.Valid {
-		return nil, fmt.Errorf("invalid token")
+		return nil, fmt.Errorf("invalid token2")
 	}
 
 	return claims, nil

internal/logic/wp_wecom/send_msg_by_chan_logic.go

@@ -0,0 +1,29 @@
+package wp_wecom
+
+import (
+	"context"
+
+	"wechat-api/internal/svc"
+	"wechat-api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type SendMsgByChanLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewSendMsgByChanLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SendMsgByChanLogic {
+	return &SendMsgByChanLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx}
+}
+
+func (l *SendMsgByChanLogic) SendMsgByChan(req *types.WpWecomMsgReq) (resp *types.BaseMsgResp, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

internal/logic/wp_wecom/send_msg_logic.go

@@ -0,0 +1,44 @@
+package wp_wecom
+
+import (
+	"context"
+	"encoding/base64"
+	"encoding/json"
+
+	"wechat-api/internal/svc"
+	"wechat-api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type SendMsgLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewSendMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SendMsgLogic {
+	return &SendMsgLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx}
+}
+
+func (l *SendMsgLogic) SendMsg(req *types.WpWecomMsgReq) (resp *types.BaseMsgResp, err error) {
+	data := map[string]interface{}{
+		"MsgType": "TalkToFriendTask",
+		"Content": map[string]interface{}{
+			"WxId":        req.WxId,
+			"ConvId":      req.ConvId,
+			"ContentType": req.ContentType,
+			"Content":     base64.StdEncoding.EncodeToString([]byte(*req.Content)),
+		},
+	}
+	jsonStr, err := json.Marshal(data)
+	err = l.svcCtx.WechatWs["wecom"].SendMsg([]byte(jsonStr))
+	if err != nil {
+		return nil, err
+	}
+
+	return
+}

internal/pkg/wechat_ws/wechat_ws_client.go

@@ -242,7 +242,6 @@ func (c *WechatWsClient) ReadPump() {
 						}
 					}()
 				}
-
 			}
 		}
 

internal/svc/service_context.go

@@ -2,7 +2,13 @@ package svc
 
 import (
 	"github.com/bwmarrin/snowflake"
+	"github.com/mojocn/base64Captcha"
+	"github.com/redis/go-redis/v9"
+	"github.com/suyuan32/simple-admin-common/i18n"
+	"github.com/suyuan32/simple-admin-common/utils/captcha"
+	"github.com/suyuan32/simple-admin-core/rpc/coreclient"
 	"github.com/zeromicro/go-zero/core/collection"
+	"github.com/zeromicro/go-zero/core/logx"
 	"gorm.io/gorm"
 	"time"
 	"wechat-api/database"
@@ -12,17 +18,12 @@ import (
 	"wechat-api/internal/pkg/wechat_ws"
 	"wechat-api/mongo_model"
 
-	"github.com/redis/go-redis/v9"
-
-	"wechat-api/ent"
-	_ "wechat-api/ent/runtime"
-
-	"github.com/suyuan32/simple-admin-core/rpc/coreclient"
-	"github.com/zeromicro/go-zero/core/logx"
-
 	"github.com/casbin/casbin/v2"
+
 	"github.com/zeromicro/go-zero/rest"
 	"github.com/zeromicro/go-zero/zrpc"
+	"wechat-api/ent"
+	_ "wechat-api/ent/runtime"
 )
 
 type ServiceContext struct {
@@ -40,6 +41,8 @@ type ServiceContext struct {
 	Cache         *collection.Cache
 	NodeID        *snowflake.Node
 	MongoModel    *mongo_model.AllMongoModel
+	Captcha       *base64Captcha.Captcha
+	Trans         *i18n.Translator
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
@@ -111,5 +114,6 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		Cache:         cache,
 		NodeID:        node,
 		MongoModel:    all_mongo_model,
+		Captcha:       captcha.MustNewOriginalRedisCaptcha(c.Captcha, rds),
 	}
 }

internal/types/types.go

@@ -1027,6 +1027,9 @@ type ContactListReq struct {
 	Type *int `json:"type,optional"`
 	// 内容类型：1-个微 3-企微
 	Ctype *uint64 `json:"ctype,optional"`
+	// 达标的起止时间
+	StartDate *string `json:"start_date,optional"`
+	EndDate   *string `json:"end_date,optional"`
 }
 
 // Contact information response | Contact信息返回体
@@ -4223,6 +4226,125 @@ type WhatsappChannelInfoResp struct {
 	Data WhatsappChannelInfo `json:"data"`
 }
 
+// The data of xunji information | Xunji信息
+// swagger:model XunjiInfo
+type XunjiInfo struct {
+	BaseIDInfo
+	// Status 1: normal 2: ban | 状态 1 正常 2 禁用
+	Status *uint8 `json:"status,optional"`
+	// AppKey
+	AppKey *string `json:"appKey,optional"`
+	// AppSecret
+	AppSecret *string `json:"appSecret,optional"`
+	// Token
+	Token *string `json:"token,optional"`
+	// 加密key
+	EncodingKey *string `json:"encodingKey,optional"`
+	// organization_id | 租户ID
+	OrganizationId *uint64 `json:"organizationId,optional"`
+}
+
+// The response data of xunji list | Xunji列表数据
+// swagger:model XunjiListResp
+type XunjiListResp struct {
+	BaseDataInfo
+	// Xunji list data | Xunji列表数据
+	Data XunjiListInfo `json:"data"`
+}
+
+// Xunji list data | Xunji列表数据
+// swagger:model XunjiListInfo
+type XunjiListInfo struct {
+	BaseListInfo
+	// The API list data | Xunji列表数据
+	Data []XunjiInfo `json:"data"`
+}
+
+// Get xunji list request params | Xunji列表请求参数
+// swagger:model XunjiListReq
+type XunjiListReq struct {
+	PageInfo
+	// AppKey
+	AppKey *string `json:"appKey,optional"`
+	// AppSecret
+	AppSecret *string `json:"appSecret,optional"`
+	// Token
+	Token *string `json:"token,optional"`
+}
+
+// Xunji information response | Xunji信息返回体
+// swagger:model XunjiInfoResp
+type XunjiInfoResp struct {
+	BaseDataInfo
+	// Xunji information | Xunji数据
+	Data XunjiInfo `json:"data"`
+}
+
+// The data of xunji service information | XunjiService信息
+// swagger:model XunjiServiceInfo
+type XunjiServiceInfo struct {
+	BaseIDInfo
+	// Status 1: normal 2: ban | 状态 1 正常 2 禁用
+	Status *uint8 `json:"status,optional"`
+	// Xunji表ID
+	XunjiId *uint64 `json:"xunjiId,optional"`
+	// 智能体ID
+	AgentId *uint64 `json:"agentId,optional"`
+	// 模式信息
+	AgentInfo *AgentInfo `json:"agentInfo,optional"`
+	// organization_id | 租户ID
+	OrganizationId *uint64 `json:"organizationId,optional"`
+	// 微信ID
+	Wxid *string `json:"wxid,optional"`
+	// 大模型服务地址
+	ApiBase *string `json:"apiBase,optional"`
+	// 大模型服务密钥
+	ApiKey *string `json:"apiKey,optional"`
+}
+
+// The response data of xunji service list | XunjiService列表数据
+// swagger:model XunjiServiceListResp
+type XunjiServiceListResp struct {
+	BaseDataInfo
+	// XunjiService list data | XunjiService列表数据
+	Data XunjiServiceListInfo `json:"data"`
+}
+
+// XunjiService list data | XunjiService列表数据
+// swagger:model XunjiServiceListInfo
+type XunjiServiceListInfo struct {
+	BaseListInfo
+	// The API list data | XunjiService列表数据
+	Data []XunjiServiceInfo `json:"data"`
+}
+
+// Get xunji service list request params | XunjiService列表请求参数
+// swagger:model XunjiServiceListReq
+type XunjiServiceListReq struct {
+	PageInfo
+	XunjiID *uint64 `json:"configId,optional"`
+}
+
+// XunjiService information response | XunjiService信息返回体
+// swagger:model XunjiServiceInfoResp
+type XunjiServiceInfoResp struct {
+	BaseDataInfo
+	// XunjiService information | XunjiService数据
+	Data XunjiServiceInfo `json:"data"`
+}
+
+// swagger:model WpWecomMsgReq
+type WpWecomMsgReq struct {
+	// 机器人微信id
+	WxId *string `json:"wx_id"`
+	// 接收方微信 id
+	ConvId *string `json:"conv_id"`
+	// 消息类型
+	ContentType *string `json:"content_type"`
+	// 消息内容
+	Content *string `json:"content"`
+}
+
 // swagger:model CreateInfo
 type CreateInfo struct {
 	// Translated Name | 展示名称
@@ -4386,109 +4508,79 @@ type ApiKeyListReq struct {
 	OrganizationId *uint64 `json:"organization_id,optional"`
 }
 
-// The data of xunji information | Xunji信息
-// swagger:model XunjiInfo
-type XunjiInfo struct {
-	BaseIDInfo
-	// Status 1: normal 2: ban | 状态 1 正常 2 禁用
-	Status *uint8 `json:"status,optional"`
-	// AppKey
-	AppKey *string `json:"appKey,optional"`
-	// AppSecret
-	AppSecret *string `json:"appSecret,optional"`
-	// Token
-	Token *string `json:"token,optional"`
-	// 加密key
-	EncodingKey *string `json:"encodingKey,optional"`
-	// organization_id | 租户ID
-	OrganizationId *uint64 `json:"organizationId,optional"`
-}
-
-// The response data of xunji list | Xunji列表数据
-// swagger:model XunjiListResp
-type XunjiListResp struct {
-	BaseDataInfo
-	// Xunji list data | Xunji列表数据
-	Data XunjiListInfo `json:"data"`
-}
-
-// Xunji list data | Xunji列表数据
-// swagger:model XunjiListInfo
-type XunjiListInfo struct {
-	BaseListInfo
-	// The API list data | Xunji列表数据
-	Data []XunjiInfo `json:"data"`
-}
-
-// Get xunji list request params | Xunji列表请求参数
-// swagger:model XunjiListReq
-type XunjiListReq struct {
-	PageInfo
-	// AppKey
-	AppKey *string `json:"appKey,optional"`
-	// AppSecret
-	AppSecret *string `json:"appSecret,optional"`
-	// Token
-	Token *string `json:"token,optional"`
+// The log in information | 登陆返回的数据信息
+// swagger:model LoginInfo
+type LoginInfo struct {
+	// User's UUID | 用户的UUID
+	UserId string `json:"userId"`
+	// Token for authorization | 验证身份的token
+	Token string `json:"token"`
+	// Expire timestamp | 过期时间戳
+	Expire uint64 `json:"expire"`
 }
 
-// Xunji information response | Xunji信息返回体
-// swagger:model XunjiInfoResp
-type XunjiInfoResp struct {
+// The permission code for front end permission control | 权限码： 用于前端权限控制
+// swagger:model PermCodeResp
+type PermCodeResp struct {
 	BaseDataInfo
-	// Xunji information | Xunji数据
-	Data XunjiInfo `json:"data"`
-}
-
-// The data of xunji service information | XunjiService信息
-// swagger:model XunjiServiceInfo
-type XunjiServiceInfo struct {
-	BaseIDInfo
-	// Status 1: normal 2: ban | 状态 1 正常 2 禁用
-	Status *uint8 `json:"status,optional"`
-	// Xunji表ID
-	XunjiId *uint64 `json:"xunjiId,optional"`
-	// 智能体ID
-	AgentId *uint64 `json:"agentId,optional"`
-	// 模式信息
-	AgentInfo *AgentInfo `json:"agentInfo,optional"`
-	// organization_id | 租户ID
-	OrganizationId *uint64 `json:"organizationId,optional"`
-	// 微信ID
-	Wxid *string `json:"wxid,optional"`
-	// 大模型服务地址
-	ApiBase *string `json:"apiBase,optional"`
-	// 大模型服务密钥
-	ApiKey *string `json:"apiKey,optional"`
+	// Permission code data | 权限码数据
+	Data []string `json:"data"`
 }
 
-// The response data of xunji service list | XunjiService列表数据
-// swagger:model XunjiServiceListResp
-type XunjiServiceListResp struct {
-	BaseDataInfo
-	// XunjiService list data | XunjiService列表数据
-	Data XunjiServiceListInfo `json:"data"`
+// Login request | 登录参数
+// swagger:model LoginReq
+type LoginReq struct {
+	// User Name | 用户名
+	// required : true
+	// max length : 20
+	Username string `json:"username" validate:"required,alphanum,max=20"`
+	// Password | 密码
+	// required : true
+	// max length : 30
+	// min length : 6
+	Password string `json:"password" validate:"required,max=30,min=6"`
+	// Captcha ID which store in redis | 验证码编号, 存在redis中
+	// required : true
+	// max length : 20
+	// min length : 20
+	CaptchaId string `json:"captchaId"  validate:"required,len=20"`
+	// The Captcha which users input | 用户输入的验证码
+	// required : true
+	// max length : 5
+	// min length : 5
+	Captcha string `json:"captcha" validate:"required,len=5"`
 }
 
-// XunjiService list data | XunjiService列表数据
-// swagger:model XunjiServiceListInfo
-type XunjiServiceListInfo struct {
-	BaseListInfo
-	// The API list data | XunjiService列表数据
-	Data []XunjiServiceInfo `json:"data"`
+// Log in by email request | 邮箱登录参数
+// swagger:model LoginByEmailReq
+type LoginByEmailReq struct {
+	// The user's email address | 用户的邮箱
+	// required : true
+	// max length : 100
+	Email string `json:"email" validate:"required,email,max=100"`
+	// The Captcha which users input | 用户输入的验证码
+	// max length : 5
+	// min length : 5
+	Captcha string `json:"captcha,optional" validate:"omitempty,len=5"`
 }
 
-// Get xunji service list request params | XunjiService列表请求参数
-// swagger:model XunjiServiceListReq
-type XunjiServiceListReq struct {
-	PageInfo
-	XunjiID *uint64 `json:"configId,optional"`
+// Log in by SMS request | 短信登录参数
+// swagger:model LoginBySmsReq
+type LoginBySmsReq struct {
+	// The user's mobile phone number | 用户的手机号码
+	// required : true
+	// max length : 20
+	PhoneNumber string `json:"phoneNumber"  validate:"required,numeric,max=20"`
+	// The Captcha which users input | 用户输入的验证码
+	// max length : 5
+	// min length : 5
+	Captcha string `json:"captcha,optional" validate:"omitempty,len=5"`
 }
 
-// XunjiService information response | XunjiService信息返回体
-// swagger:model XunjiServiceInfoResp
-type XunjiServiceInfoResp struct {
+// The log in response data | 登录返回数据
+// swagger:model LoginResp
+type LoginResp struct {
 	BaseDataInfo
-	// XunjiService information | XunjiService数据
-	Data XunjiServiceInfo `json:"data"`
+	// The log in information | 登陆返回的数据信息
+	Data LoginInfo `json:"data"`
 }

internal/utils/charset.go

@@ -0,0 +1,85 @@
+package utils
+
+import (
+	"bytes"
+	"fmt"
+	"github.com/saintfish/chardet"
+	"golang.org/x/text/encoding"
+	"golang.org/x/text/encoding/charmap"
+	"golang.org/x/text/encoding/japanese"
+	"golang.org/x/text/encoding/korean"
+	"golang.org/x/text/encoding/simplifiedchinese"
+	"golang.org/x/text/encoding/traditionalchinese"
+	"golang.org/x/text/encoding/unicode"
+	"golang.org/x/text/transform"
+	"io"
+	"strings"
+)
+
+// TransCharset 自动检测编码并转换为 UTF-8
+func TransCharset(s string) string {
+	// 1. 自动检测编码
+	detector := chardet.NewTextDetector()
+	result, err := detector.DetectBest([]byte(s))
+	if err != nil {
+		fmt.Println("Encoding detection failed:", err)
+		return s
+	}
+
+	// 2. 找到相应的编码
+	fmt.Println("result.Charset:", result.Charset)
+	enc := getEncoding(result.Charset)
+	fmt.Println("enc:", enc)
+	if enc == nil {
+		// 直接返回原始字符串
+		fmt.Println("Unsupported charset:", result.Charset)
+		return s
+	}
+
+	// 3. 转换为 UTF-8
+	rd := transform.NewReader(bytes.NewReader([]byte(s)), enc.NewDecoder())
+	utf8Bytes, err := io.ReadAll(rd)
+	if err != nil {
+		fmt.Println("Encoding conversion failed:", err)
+		return s
+	}
+
+	// 4. 返回转换后的 UTF-8 字符串
+	return string(utf8Bytes)
+}
+
+// 根据字符集名称获取 `encoding.Encoding`
+func getEncoding(charset string) encoding.Encoding {
+	switch charset {
+	case "UTF-8", "ASCII":
+		return encoding.Nop // 无需转换
+	case "ISO-8859-1":
+		return charmap.ISO8859_1
+	case "ISO-8859-2":
+		return charmap.ISO8859_2
+	case "ISO-8859-15":
+		return charmap.ISO8859_15
+	case "Windows-1252":
+		return charmap.Windows1252
+	case "Big5":
+		return traditionalchinese.Big5
+	case "GB-2312", "GBK", "GB-18030":
+		return simplifiedchinese.GBK
+	case "Shift_JIS":
+		return japanese.ShiftJIS
+	case "EUC-JP":
+		return japanese.EUCJP
+	case "EUC-KR":
+		return korean.EUCKR
+	case "UTF-16LE":
+		return unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM)
+	case "UTF-16BE":
+		return unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM)
+	default:
+		return nil
+	}
+}
+
+func Trim(s string) string {
+	return strings.Trim(s, " \r\n\t")
+}