fix: 解决pb文件冲突

.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch file",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "env": {
+                "GOPATH":"C:\\Users\\lenovo\\go",// go env GOPATH命令进行即可查询到
+                "GOOS":"windows" //指定运行平台
+            },
+            "cwd": "${workspaceFolder}\\cmd",//指定工作目录，可注释掉（默认为项目根目录）
+            "program": "${workspaceFolder}\\cmd\\app.go", //执行程序，这里是项目默认的根目录，可以指定文件执行，如"${workspaceFolder}\\cmd\\app.go"
+            "args":[],//程序启动参数 如 ["-env" , 'prod']
+            // "console": "integratedTerminal" //使终端支持fmt.Scanf方式的指令输入，一般不需要，可以直接注释掉
+        }
+    ]
+}

api/accountFiee/accountFiee.proto

@@ -17,7 +17,7 @@
 
 syntax = "proto3";
 package accountFiee;
-import "github.com/mwitkow/go-proto-validators@v0.3.2/validator.proto";
+import "github.com/mwitkow/go-proto-validators/validator.proto";
 option go_package = "./;accountFiee";
 
 //protoc -I . -I C:\Users\lenovo\go\src  --go_out=. --go-triple_out=. ./accountFiee.proto
@@ -988,8 +988,8 @@ message ChatAutoReplyRulerData{
   int64 deletedAt = 4; //
   string title = 5; //标题
   string ruler = 6; //规则内容
-  int32 rulerStatus = 7; //规则状态: 1=启用 2=禁用
-
+  int32 status = 7; //规则状态: 1=启用 2=禁用
+  string response =8; //回复内容
 }
 
 message CreateChatAutoReplyRulerResp{

api/accountFiee/accountFiee_triple.pb.go

@@ -1,8 +1,8 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.8
-// - protoc             v4.24.0--rc1
-// source: api/accountFiee/accountFiee.proto
+// - protoc             v4.22.0--rc2
+// source: accountFiee.proto
 
 package accountFiee
 
@@ -70,7 +70,7 @@ type AccountFieeClient interface {
 	VerifySliderStatus(ctx context.Context, in *VerifySliderStatusRequest, opts ...grpc_go.CallOption) (*VerifySliderStatusResponse, common.ErrorWithAttachment)
 	// submit info
 	SaveSubmitInfo(ctx context.Context, in *SubmitInfoRequest, opts ...grpc_go.CallOption) (*CommonResponse, common.ErrorWithAttachment)
-	//-----------------------------客服聊天系统--------------------------------
+	// -----------------------------客服聊天系统--------------------------------
 	CreateChatUser(ctx context.Context, in *ChatUserData, opts ...grpc_go.CallOption) (*CreateChatUserResp, common.ErrorWithAttachment)
 	UpdateChatUser(ctx context.Context, in *ChatUserData, opts ...grpc_go.CallOption) (*CommonMsg, common.ErrorWithAttachment)
 	SaveChatUser(ctx context.Context, in *ChatUserData, opts ...grpc_go.CallOption) (*CommonMsg, common.ErrorWithAttachment)
@@ -626,7 +626,7 @@ type AccountFieeServer interface {
 	VerifySliderStatus(context.Context, *VerifySliderStatusRequest) (*VerifySliderStatusResponse, error)
 	// submit info
 	SaveSubmitInfo(context.Context, *SubmitInfoRequest) (*CommonResponse, error)
-	//-----------------------------客服聊天系统--------------------------------
+	// -----------------------------客服聊天系统--------------------------------
 	CreateChatUser(context.Context, *ChatUserData) (*CreateChatUserResp, error)
 	UpdateChatUser(context.Context, *ChatUserData) (*CommonMsg, error)
 	SaveChatUser(context.Context, *ChatUserData) (*CommonMsg, error)
@@ -3074,5 +3074,5 @@ var AccountFiee_ServiceDesc = grpc_go.ServiceDesc{
 		},
 	},
 	Streams:  []grpc_go.StreamDesc{},
-	Metadata: "api/accountFiee/accountFiee.proto",
+	Metadata: "accountFiee.proto",
 }

pkg/dao/chatAutoReplyRulerDao.go

@@ -53,8 +53,8 @@ func (chatAutoReplyRulerDao) UpdateChatAutoReplyRuler(data *model.ChatAutoReplyR
 	if data.Ruler != "" {
 		thisData.Ruler = data.Ruler
 	}
-	if data.RulerStatus != 0 {
-		thisData.RulerStatus = data.RulerStatus
+	if data.Status != 0 {
+		thisData.Status = data.Status
 	}
 
 	if err = model.DB.Updates(&thisData).Error; err != nil {
@@ -105,8 +105,8 @@ func (chatAutoReplyRulerDao) GetChatAutoReplyRulerList(info *accountFiee.GetChat
 		if info.Query.Ruler != "" {
 			dbQuery = dbQuery.Where("ruler =?", info.Query.Ruler)
 		}
-		if info.Query.RulerStatus != 0 {
-			dbQuery = dbQuery.Where("ruler_status = ?", info.Query.RulerStatus)
+		if info.Query.Status != 0 {
+			dbQuery = dbQuery.Where("status = ?", info.Query.Status)
 		}
 	}
 	if info.Where != "" {

pkg/dao/chatUserDao.go

@@ -8,6 +8,7 @@ package dao
 import (
 	"errors"
 	"fmt"
+
 	"github.com/fonchain_enterprise/micro-account/api/accountFiee"
 	"github.com/fonchain_enterprise/micro-account/pkg/common/db"
 	"github.com/fonchain_enterprise/micro-account/pkg/m"
@@ -102,7 +103,7 @@ func (chatUserDao) GetChatUserById(id int) (res model.ChatUser, err error) {
 
 // 批量查询聊天用户
 func (chatUserDao) GetChatUserList(info *accountFiee.GetChatUserListRequest) (resp []model.ChatUser, total int64, err error) {
-	var dbQuery = model.DB.Model(&model.ChatUser{})
+	var dbQuery = model.DB.Model(&model.ChatUser{}).Debug()
 	if info.Query != nil {
 
 		if info.Query.ID != 0 {

pkg/model/chatRecord.go

@@ -54,7 +54,8 @@ type ChatAutoReplyRuler struct {
 	Model
 	Title    string `gorm:"column:title;comment:标题"`
 	Ruler    string `gorm:"column:ruler;type:varchar(2000);comment:规则内容"`
-	RulerStatus int32  `gorm:"column:ruler_status;comment:规则状态: 1=启用 2=禁用"`
+	Status   int32  `gorm:"column:status;default:1;comment:启用状态: 1=启用 2=禁用"`
+	Response string `gorm:"column:response;varchar(2000);comment:回复内容"`
 }
 
 func (c ChatRecord) AutoChatRuler() string {
@@ -65,7 +66,7 @@ type ChatUser struct {
 	Model
 	NickName string `gorm:"column:nick_name;comment:昵称"`
 	Account  string `gorm:"column:account;comment:账号"`
-	Role     int32  `gorm:"column:role;default:1;comment:聊天角色 1=用户 2=客服"`
+	Role     int32  `gorm:"column:role;default:1;comment:聊天角色 1=用户 2=客服 3=客服机器人"`
 	Origin   string `gorm:"column:origin;default:'fiee';comment:数据来源"`
 	OriginId int64  `gorm:"column:origin_id;comment:数据来源对应的用户ID"`
 	Avatar   string `gorm:"column:avatar;comment:头像"`

pkg/model/migration.go

@@ -11,6 +11,7 @@ func migration() {
 		&ChatMedia{},
 		&ChatRecord{},
 		&ChatUser{},
+		&ChatAutoReplyRuler{},
 	)
 
 	if err != nil {