Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	cmd/discuss/interanl/pkg/db/migrate.go

@@ -33,3 +33,4 @@ lastupdate.tmp
 public/*
 public/*
 logs/
 logs/
 cmd/discuss/api/api
 cmd/discuss/api/api
+discuss

@@ -2,11 +2,12 @@ package main
 
 
 import (
 import (
 	"flag"
 	"flag"
+	"net/http"
+	"strings"
+
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/logx"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
-	"net/http"
-	"strings"
 
 
 	"github.com/golang-jwt/jwt/v4/request"
 	"github.com/golang-jwt/jwt/v4/request"
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/core/conf"

 import "core/comment.api"
 import "core/comment.api"
-import "core/message.api"
+import "core/message.api"
+import "core/article_tag.api"
+import "core/user.api"
+import "core/company.api"

+syntax = "v1"
+
+info(
+	title: "文章内容处理"
+	desc: "编辑处理文章内容"
+	author: "author"
+	email: "email"
+	version: "v1"
+)
+
+// 坐标地点描述
+type Location {
+	Longitude float64 `json:"longitude"` //经度
+	Latitude  float64 `json:"latitude"`  //纬度
+	Descript  string  `json:"descript"`  //地点描述
+}
+
+// 人员的简单展示信息
+type Author {
+	Id       int64  `json:"id"`       // 人员id
+	Name     string `json:"name"`     // 人员的名字
+	Avatar   string `json:"avatar"`   // 人员头像URL
+	Group    string `json:"group"`    // 人员的分组
+	Position string `json:"position"` // 职位
+}
+
+// 创建发布文章
+type (
+	ArticleCreateRequest {
+		Title     string   `json:"title"`     //标题
+		Section   []string `json:"section"`   //文章的文本内容
+		AuthorId  int      `json:"authorId"`  //发布人id
+		Images    []string `json:"images"`    //图片
+		WhoRead   []int    `json:"whoRead"`   //谁可查看
+		WhoReview []int    `json:"whoReview"` //谁可评论
+		Location  Location `json:"location"`  //定位坐标
+	}
+	ArticleCreateResponse {
+		Id int64 `json:"id"`
+	}
+)
+
+// 查看文章的详情
+type (
+	ArticleGetRequest {
+		Id int64 `json:"id"` //id
+	}
+	ArticleGetResponse {
+		Title        string   `json:"title"`        //标题
+		AuthorId     int      `json:"authorId"`     //发布人id
+		Author       Author   `json:"author"`       //发布人
+		CreatedAt    int64    `json:"createdAt"`    //文章的发布时间
+		Section      []string `json:"section"`      //文章的文本内容
+		Images       []string `json:"images"`       //图片
+		WhoRead      []int    `json:"whoRead"`      //谁可查看
+		WhoReview    []int    `json:"whoReview"`    //谁可评论
+		Location     Location `json:"location"`     //定位坐标
+		CountLove    int      `json:"countLove"`    // 点赞数量
+		CountComment int      `json:"countComment"` // 评论数量
+		Show         int      `json:"showState"`    // 评论的展示状态（0显示、1不显示）
+	}
+)
+
+// 小程序接口
+@server(
+	prefix: v1/mini
+	group: article
+	jwt: MiniAuth
+)
+service Core {
+	@doc "小程序创建发布内容"
+	@handler CreateArticle
+	post /article (ArticleCreateRequest) returns (ArticleCreateResponse)
+	@doc "小程序获取文章内容详情"
+	@handler GetArticle
+	get /article/:id (ArticleGetRequest) returns (ArticleGetResponse)
+}

+syntax = "v1"
+
+info(
+	title: "后台编辑标签"
+	desc: "编辑处理标签信息"
+	author: "author"
+	email: "email"
+	version: "v1"
+)
+
+// 创建标签
+type (
+	TagCreateRequest {
+		CompanyId int64  `json:"companyId"`
+		Image     string `json:"image"`
+		Name      string `json:"name"`   // 标签名称
+		Group     string `json:"group"`  // 标签分类
+		Remark    string `json:"remark"` // 备注
+	}
+
+	TagCreateResponse {
+		Id int64 `json:"id"`
+	}
+)
+
+// 编辑标签
+type (
+	TagEditRequest {
+		Id        int64  `json:"id"`
+		CompanyId int64  `json:"companyId"`
+		Image     string `json:"image"`
+		Name      string `json:"name"`   // 标签名称
+		Group     string `json:"group"`  // 标签分类
+		Remark    string `json:"remark"` // 备注
+	}
+
+	TagEditResponse {
+		Id int64 `json:"id"`
+	}
+)
+
+// 获取标签详情
+type (
+	TagGetRequest {
+		Id int64 `json:"id"`
+	}
+	TagGetResponse {
+		Id     int64  `json:"id"`
+		Image  string `json:"image"`
+		Name   string `json:"name"`   // 标签名称
+		Group  string `json:"group"`  // 标签分类
+		Remark string `json:"remark"` // 备注
+	}
+)
+
+//标签列表
+type (
+	TagListRequest {
+		Page int `json:"page"`
+		Size int `json:"size"`
+	}
+	TagListResponse {
+		Total int       `json:"total"`
+		List  []TagItem `json:"list"`
+	}
+	TagItem {
+		Id        int64  `json:"id"`
+		Image     string `json:"image"`
+		Name      string `json:"name"`   // 标签名称
+		Group     string `json:"group"`  // 标签分类
+		Remark    string `json:"remark"` // 备注
+		CreatedAt int64  `json:"createdAt"`
+	}
+)
+
+//删除标签
+type (
+	TagDeleteRequest {
+		Id int64 `json:"id"`
+	}
+	TagDeleteResponse {
+		Id int64 `json:"id"`
+	}
+)
+
+@server(
+	prefix: v1/mini
+	group: tags
+	jwt: MiniAuth
+)
+service Core {
+	@doc "后台创建文章标签"
+	@handler CreateTag
+	post /article_tag (TagCreateRequest) returns (TagCreateResponse)
+	@doc "后台编辑文章标签"
+	@handler EditTag
+	put /article_tag (TagEditRequest) returns (TagEditResponse)
+	@doc "后台获取文章标签"
+	@handler GetTag
+	get /article_tag/:id (TagGetRequest) returns (TagGetResponse)
+	@doc "后台删除文章标签"
+	@handler DeleteTag
+	delete /article_tag (TagDeleteRequest) returns (TagDeleteResponse)
+}

+syntax = "v1"
+
+info(
+    title: "天联鹰蜓"
+    desc: "天联鹰蜓"
+    author: "email"
+    email: "email"
+    version: "v1"
+)
+
+// 小程序接口
+@server(
+    prefix: v1
+    group: company
+)
+service Core {
+    @doc "公司搜索"
+    @handler miniCompanySearch
+    post /mini/company/search(CompanySearchRequest) returns (CompanySearchResponse)
+}
+
+// 小程序接口
+@server(
+    prefix: v1
+    group: company
+    jwt : SystemAuth
+)
+service Core {
+    @doc "公司搜索"
+    @handler systemCompanySearch
+    post /system/company/search(CompanySearchRequest) returns (CompanySearchResponse)
+}
+
+type (
+    CompanySearchRequest struct{
+        Page int  `json:"page"`
+        Size int  `json:"size"`
+        UserId int64 `json:"userId,optional"` // 按用户搜索
+        Code string  `json:"code,optional"`   // 按编码搜索
+    }
+    CompanySearchResponse{
+        List []Company  `json:"list"`
+        Total int64 `json:"total"`
+    }
+    Company struct{
+        Id   int64  `json:"id,omitempty"`   // 唯一标识
+        Name string `json:"name,omitempty"` // 名称
+        Code string `json:"code,omitempty"` // 编码（搜索使用,4位字母数字）
+        Logo string `json:"logo,omitempty"` // 公司LOGO
+    }
+)

+syntax = "v1"
+
+info(
+    title: "天联鹰蜓"
+    desc: "天联鹰蜓"
+    author: "email"
+    email: "email"
+    version: "v1"
+)
+
+// 小程序接口
+@server(
+    prefix: v1
+    group: user
+)
+service Core {
+    @doc "用户申请加入公司"
+    @handler miniUserApplyJoinCompany
+    post /mini/user/apply-join-company(MiniUserApplyJoinCompanyRequest) returns (MiniUserApplyJoinCompanyResponse)
+    @doc "用户登录"
+    @handler miniUserLogin
+    post /mini/user/login (MiniUserLoginRequest) returns (MiniUserLoginResponse)
+}
+@server(
+    prefix: v1
+    group: user
+    jwt: MiniAuth
+)
+service Core {
+    @doc "用户信息"
+    @handler miniUserInfo
+    post /mini/user/info (MiniUserInfoRequest) returns (MiniUserInfoResponse)
+    @doc "用户审核列表"
+    @handler miniUserAuditList
+    post /mini/user/audit-list (UserSearchRequest)returns(UserSearchResponse)
+    @doc "用户审核"
+    @handler miniUserAudit
+    post /mini/user/audit (MiniUserAuditRequest)
+    @doc "部门用户列表"
+    @handler miniUserDepartmentUsers
+    post /mini/user/department-users (MiniUserDepartmentUsersRequest)returns (MiniUserInfoResponse)
+    @doc "关注我的人"
+    @handler miniUserFollower
+    post /mini/user/follower (UserSearchRequest)returns(UserSearchResponse)
+    @doc "我关注的人"
+    @handler miniUserFollowing
+    post /mini/user/following (UserSearchRequest)returns(UserSearchResponse)
+    @doc "关注"
+    @handler miniUserFollow
+    post /mini/user/follow (FollowRequest)
+    @doc "取消关注"
+    @handler miniUserUnFollow
+    post /mini/user/unfollow (FollowRequest)
+}
+
+type(
+    MiniUserLoginRequest {
+        LoginType           string `json:"loginType"`                    // 登录类型 wechat-login whchat-phone-login  phone-password-login phone-smscode-login
+        WechatAuthCode      string `json:"wechatAuthcode,optional"`      // 微信登录 授权码
+        WechatEncryptedData string `json:"wechatEncryptedData,optional"` // 微信登录 加密数据
+        WechatIV            string `json:"wechatIV,optional"`            // 微信登录 加密算法初始向量
+        Phone               string `json:"phone,optional"`               // 手机号
+        Password            string `json:"password,optional"`            // 密码
+        SmsCode             string `json:"smsCode,optional"`             // 短信验证码
+    }
+    MiniUserLoginResponse {
+        Token string `json:"token"` // x-token
+        Phone string `json:"phone"` // 手机号
+        Message string `json:"message"` // 失败消息（审核中，注册成功等待审核）
+        Success bool `json:"success"`  //  成功标识
+    }
+
+    MiniUserInfoRequest {
+        //MyStatisticsFlag bool `json:"myStatisticsFlag"` // true:返回统计信息 false；统计信息不返回
+    }
+    MiniUserInfoResponse {
+        User         *UserItem  `json:"user,omitempty"` // 用户信息
+        TotalArticle int64  `json:"totalArticle"`   // 累计信息发布
+        TotalLoved   int64  `json:"totalLoved"`     // 累计收到的赞
+        TotalAccepted int64 `json:"totalAccepted"`  // 累计被采纳
+    }
+    MiniUserApplyJoinCompanyRequest{
+        Phone string `json:"phone"` 
+        Code  string `json:"code"`
+    }
+    MiniUserApplyJoinCompanyResponse{
+
+    }
+    MiniUserAuditRequest{
+        UserId int64 `json:"userId"` // 用户ID
+    }
+    MiniUserDepartmentUsersRequest{
+
+    }
+    MiniUserDepartmentUsersResponse{
+        Departments []*Department `json:"departments"`
+        Users       []*UserItem       `json:"users"`
+    }
+    UserItem {
+        CompanyId    int64   `json:"companyId,omitempty"`    // 公司ID
+        DepartmentId int64   `json:"departmentId,omitempty"` // 部门ID
+        Roles        []int64 `json:"roleId,omitempty"`       // 角色
+        Flag         int     `json:"flag,omitempty"`         // 标识 1:管理员 2:普通用户 （有绑定角色是管理员）
+        Name         string  `json:"name,omitempty"`         // 名称
+        Avatar       string  `json:"avatar,omitempty"`       // 头像
+        Phone        string  `json:"phone,omitempty"`        // 手机号 唯一
+        Position     string  `json:"position,omitempty"`     // 职位
+        Enable       int     `json:"enable,omitempty"`       // 启用状态 1:启用 2：禁用
+        AuditStatus  int     `json:"auditStatus,omitempty"`  // 审核状态 0:待审核 1:审核通过 2:拒绝
+        Follower     []int64 `json:"followers,omitempty"`    // 关注我的人 （冗余）
+        Following    []int64 `json:"following,omitempty"`    // 我关注的人 （冗余）
+    }
+    Department struct {
+        Id int64 `json:"id,omitempty"`               // 部门ID
+        CompanyId int64 `json:"companyId,omitempty"` // 公司ID
+        ParentId int64 `json:"parentId,omitempty"`   // 父级ID
+        Name string `json:"name,omitempty"`          // 部门名称
+    }
+    UserSearchRequest{
+        Page int  `json:"page,optional"`
+        Size int  `json:"size,optional"`
+        AuditFlag *int `json:"auditFlag,optional"` // 按审核状态 0:待审核 1:审核通过 2:拒绝
+    }
+    UserSearchResponse{
+        List []*UserItem `json:"list"`
+        Total int64 `json:"total"`
+    }
+    FollowRequest{
+        UserId int64 `json:"userId"`
+    }
+)
+
+
+// 后台接口
+//@server(
+//    prefix: v1
+//    group: user
+//    jwt: SystemAuth
+//)
+//service Core {
+//    @doc "系统评论"
+//    @handler systemUser
+//    get /system/user () returns ()
+//}

+package company
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/company"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func MiniCompanySearchHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.CompanySearchRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := company.NewMiniCompanySearchLogic(r.Context(), svcCtx)
+		resp, err := l.MiniCompanySearch(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package company
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/company"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func SystemCompanySearchHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.CompanySearchRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := company.NewSystemCompanySearchLogic(r.Context(), svcCtx)
+		resp, err := l.SystemCompanySearch(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

@@ -5,7 +5,10 @@ import (
 	"net/http"
 	"net/http"
 
 
 	comment "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/handler/comment"
 	comment "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/handler/comment"
+	company "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/handler/company"
 	message "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/handler/message"
 	message "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/handler/message"
+	tags "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/handler/tags"
+	user "gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/handler/user"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
 
 
 	"github.com/zeromicro/go-zero/rest"
 	"github.com/zeromicro/go-zero/rest"
@@ -52,4 +55,117 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		rest.WithJwt(serverCtx.Config.MiniAuth.AccessSecret),
 		rest.WithJwt(serverCtx.Config.MiniAuth.AccessSecret),
 		rest.WithPrefix("/v1"),
 		rest.WithPrefix("/v1"),
 	)
 	)
+
+	server.AddRoutes(
+		[]rest.Route{
+			{
+				Method:  http.MethodPost,
+				Path:    "/article_tag",
+				Handler: tags.CreateTagHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPut,
+				Path:    "/article_tag",
+				Handler: tags.EditTagHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodGet,
+				Path:    "/article_tag/:id",
+				Handler: tags.GetTagHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodDelete,
+				Path:    "/article_tag",
+				Handler: tags.DeleteTagHandler(serverCtx),
+			},
+		},
+		rest.WithJwt(serverCtx.Config.MiniAuth.AccessSecret),
+		rest.WithPrefix("/v1/mini"),
+	)
+
+	server.AddRoutes(
+		[]rest.Route{
+			{
+				Method:  http.MethodPost,
+				Path:    "/mini/user/apply-join-company",
+				Handler: user.MiniUserApplyJoinCompanyHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/mini/user/login",
+				Handler: user.MiniUserLoginHandler(serverCtx),
+			},
+		},
+		rest.WithPrefix("/v1"),
+	)
+
+	server.AddRoutes(
+		[]rest.Route{
+			{
+				Method:  http.MethodPost,
+				Path:    "/mini/user/info",
+				Handler: user.MiniUserInfoHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/mini/user/audit-list",
+				Handler: user.MiniUserAuditListHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/mini/user/audit",
+				Handler: user.MiniUserAuditHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/mini/user/department-users",
+				Handler: user.MiniUserDepartmentUsersHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/mini/user/follower",
+				Handler: user.MiniUserFollowerHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/mini/user/following",
+				Handler: user.MiniUserFollowingHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/mini/user/follow",
+				Handler: user.MiniUserFollowHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/mini/user/unfollow",
+				Handler: user.MiniUserUnFollowHandler(serverCtx),
+			},
+		},
+		rest.WithJwt(serverCtx.Config.MiniAuth.AccessSecret),
+		rest.WithPrefix("/v1"),
+	)
+
+	server.AddRoutes(
+		[]rest.Route{
+			{
+				Method:  http.MethodPost,
+				Path:    "/mini/company/search",
+				Handler: company.MiniCompanySearchHandler(serverCtx),
+			},
+		},
+		rest.WithPrefix("/v1"),
+	)
+
+	server.AddRoutes(
+		[]rest.Route{
+			{
+				Method:  http.MethodPost,
+				Path:    "/system/company/search",
+				Handler: company.SystemCompanySearchHandler(serverCtx),
+			},
+		},
+		rest.WithJwt(serverCtx.Config.SystemAuth.AccessSecret),
+		rest.WithPrefix("/v1"),
+	)
 }
 }

+package tags
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/tags"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func CreateTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.TagCreateRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := tags.NewCreateTagLogic(r.Context(), svcCtx)
+		resp, err := l.CreateTag(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package tags
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/tags"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func DeleteTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.TagDeleteRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := tags.NewDeleteTagLogic(r.Context(), svcCtx)
+		resp, err := l.DeleteTag(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package tags
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/tags"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func EditTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.TagEditRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := tags.NewEditTagLogic(r.Context(), svcCtx)
+		resp, err := l.EditTag(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package tags
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/tags"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func GetTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.TagGetRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := tags.NewGetTagLogic(r.Context(), svcCtx)
+		resp, err := l.GetTag(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package user
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/user"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func MiniUserApplyJoinCompanyHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.MiniUserApplyJoinCompanyRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := user.NewMiniUserApplyJoinCompanyLogic(r.Context(), svcCtx)
+		resp, err := l.MiniUserApplyJoinCompany(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package user
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/user"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func MiniUserAuditHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.MiniUserAuditRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := user.NewMiniUserAuditLogic(r.Context(), svcCtx)
+		err := l.MiniUserAudit(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.Ok(w)
+		}
+	}
+}

+package user
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/user"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func MiniUserAuditListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.UserSearchRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := user.NewMiniUserAuditListLogic(r.Context(), svcCtx)
+		resp, err := l.MiniUserAuditList(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package user
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/user"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func MiniUserDepartmentUsersHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.MiniUserDepartmentUsersRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := user.NewMiniUserDepartmentUsersLogic(r.Context(), svcCtx)
+		resp, err := l.MiniUserDepartmentUsers(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package user
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/user"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func MiniUserFollowHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.FollowRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := user.NewMiniUserFollowLogic(r.Context(), svcCtx)
+		err := l.MiniUserFollow(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.Ok(w)
+		}
+	}
+}

+package user
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/user"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func MiniUserFollowerHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.UserSearchRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := user.NewMiniUserFollowerLogic(r.Context(), svcCtx)
+		resp, err := l.MiniUserFollower(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package user
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/user"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func MiniUserFollowingHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.UserSearchRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := user.NewMiniUserFollowingLogic(r.Context(), svcCtx)
+		resp, err := l.MiniUserFollowing(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package user
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/user"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func MiniUserInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.MiniUserInfoRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := user.NewMiniUserInfoLogic(r.Context(), svcCtx)
+		resp, err := l.MiniUserInfo(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package user
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/user"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func MiniUserLoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.MiniUserLoginRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := user.NewMiniUserLoginLogic(r.Context(), svcCtx)
+		resp, err := l.MiniUserLogin(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

+package user
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/logic/user"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+)
+
+func MiniUserUnFollowHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.FollowRequest
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := user.NewMiniUserUnFollowLogic(r.Context(), svcCtx)
+		err := l.MiniUserUnFollow(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.Ok(w)
+		}
+	}
+}

+package company
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MiniCompanySearchLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniCompanySearchLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniCompanySearchLogic {
+	return &MiniCompanySearchLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniCompanySearchLogic) MiniCompanySearch(req *types.CompanySearchRequest) (resp *types.CompanySearchResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package company
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type SystemCompanySearchLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewSystemCompanySearchLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SystemCompanySearchLogic {
+	return &SystemCompanySearchLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *SystemCompanySearchLogic) SystemCompanySearch(req *types.CompanySearchRequest) (resp *types.CompanySearchResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package tags
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CreateTagLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewCreateTagLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreateTagLogic {
+	return &CreateTagLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *CreateTagLogic) CreateTag(req *types.TagCreateRequest) (resp *types.TagCreateResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package tags
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type DeleteTagLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewDeleteTagLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeleteTagLogic {
+	return &DeleteTagLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *DeleteTagLogic) DeleteTag(req *types.TagDeleteRequest) (resp *types.TagDeleteResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package tags
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type EditTagLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewEditTagLogic(ctx context.Context, svcCtx *svc.ServiceContext) *EditTagLogic {
+	return &EditTagLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *EditTagLogic) EditTag(req *types.TagEditRequest) (resp *types.TagEditResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package tags
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetTagLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetTagLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetTagLogic {
+	return &GetTagLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetTagLogic) GetTag(req *types.TagGetRequest) (resp *types.TagGetResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package user
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MiniUserApplyJoinCompanyLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniUserApplyJoinCompanyLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniUserApplyJoinCompanyLogic {
+	return &MiniUserApplyJoinCompanyLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniUserApplyJoinCompanyLogic) MiniUserApplyJoinCompany(req *types.MiniUserApplyJoinCompanyRequest) (resp *types.MiniUserApplyJoinCompanyResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package user
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MiniUserAuditListLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniUserAuditListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniUserAuditListLogic {
+	return &MiniUserAuditListLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniUserAuditListLogic) MiniUserAuditList(req *types.UserSearchRequest) (resp *types.UserSearchResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package user
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MiniUserAuditLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniUserAuditLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniUserAuditLogic {
+	return &MiniUserAuditLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniUserAuditLogic) MiniUserAudit(req *types.MiniUserAuditRequest) error {
+	// todo: add your logic here and delete this line
+
+	return nil
+}

+package user
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MiniUserDepartmentUsersLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniUserDepartmentUsersLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniUserDepartmentUsersLogic {
+	return &MiniUserDepartmentUsersLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniUserDepartmentUsersLogic) MiniUserDepartmentUsers(req *types.MiniUserDepartmentUsersRequest) (resp *types.MiniUserInfoResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package user
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MiniUserFollowLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniUserFollowLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniUserFollowLogic {
+	return &MiniUserFollowLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniUserFollowLogic) MiniUserFollow(req *types.FollowRequest) error {
+	// todo: add your logic here and delete this line
+
+	return nil
+}

+package user
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MiniUserFollowerLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniUserFollowerLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniUserFollowerLogic {
+	return &MiniUserFollowerLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniUserFollowerLogic) MiniUserFollower(req *types.UserSearchRequest) (resp *types.UserSearchResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package user
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MiniUserFollowingLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniUserFollowingLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniUserFollowingLogic {
+	return &MiniUserFollowingLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniUserFollowingLogic) MiniUserFollowing(req *types.UserSearchRequest) (resp *types.UserSearchResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package user
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MiniUserInfoLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniUserInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniUserInfoLogic {
+	return &MiniUserInfoLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniUserInfoLogic) MiniUserInfo(req *types.MiniUserInfoRequest) (resp *types.MiniUserInfoResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package user
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MiniUserLoginLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniUserLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniUserLoginLogic {
+	return &MiniUserLoginLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniUserLoginLogic) MiniUserLogin(req *types.MiniUserLoginRequest) (resp *types.MiniUserLoginResponse, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

+package user
+
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/svc"
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type MiniUserUnFollowLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewMiniUserUnFollowLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MiniUserUnFollowLogic {
+	return &MiniUserUnFollowLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *MiniUserUnFollowLogic) MiniUserUnFollow(req *types.FollowRequest) error {
+	// todo: add your logic here and delete this line
+
+	return nil
+}

@@ -20,6 +20,8 @@ type ServiceContext struct {
 	ArticleCommentRepository domain.ArticleCommentRepository
 	ArticleCommentRepository domain.ArticleCommentRepository
 	ArticleDraftRepository   domain.ArticleDraftRepository
 	ArticleDraftRepository   domain.ArticleDraftRepository
 	ArticleRepository        domain.ArticleRepository
 	ArticleRepository        domain.ArticleRepository
+	ArticleSectionRepository domain.ArticleSectionRepository
+	ArticleTagRepository     domain.ArticleTagRepository
 
 
 	CompanyRepository         domain.CompanyRepository
 	CompanyRepository         domain.CompanyRepository
 	CommentRepository         domain.CommentRepository // 待移除
 	CommentRepository         domain.CommentRepository // 待移除
@@ -35,6 +37,7 @@ type ServiceContext struct {
 func NewServiceContext(c config.Config) *ServiceContext {
 func NewServiceContext(c config.Config) *ServiceContext {
 
 
 	db := database.OpenGormPGDB(c.DB.DataSource, c.Log.Mode)
 	db := database.OpenGormPGDB(c.DB.DataSource, c.Log.Mode)
+
 	mlCache := cache.NewMultiLevelCache([]string{c.Redis.Host}, c.Redis.Pass)
 	mlCache := cache.NewMultiLevelCache([]string{c.Redis.Host}, c.Redis.Pass)
 	redis, _ := redis.NewRedis(redis.RedisConf{Host: c.Redis.Host, Pass: c.Redis.Pass, Type: "node"})
 	redis, _ := redis.NewRedis(redis.RedisConf{Host: c.Redis.Host, Pass: c.Redis.Pass, Type: "node"})
 
 
@@ -47,6 +50,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		ArticleCommentRepository:  repository.NewArticleCommentRepository(cache.NewCachedRepository(mlCache)),
 		ArticleCommentRepository:  repository.NewArticleCommentRepository(cache.NewCachedRepository(mlCache)),
 		ArticleDraftRepository:    repository.NewArticleDraftRepository(cache.NewCachedRepository(mlCache)),
 		ArticleDraftRepository:    repository.NewArticleDraftRepository(cache.NewCachedRepository(mlCache)),
 		ArticleRepository:         repository.NewArticleRepository(cache.NewCachedRepository(mlCache)),
 		ArticleRepository:         repository.NewArticleRepository(cache.NewCachedRepository(mlCache)),
+		ArticleSectionRepository:  repository.NewArticleSectionRepository(cache.NewCachedRepository(mlCache)),
 		CompanyRepository:         repository.NewCompanyRepository(cache.NewCachedRepository(mlCache)),
 		CompanyRepository:         repository.NewCompanyRepository(cache.NewCachedRepository(mlCache)),
 		DepartmentRepository:      repository.NewDepartmentRepository(cache.NewCachedRepository(mlCache)),
 		DepartmentRepository:      repository.NewDepartmentRepository(cache.NewCachedRepository(mlCache)),
 		MessageBusinessRepository: repository.NewMessageBusinessRepository(cache.NewCachedRepository(mlCache)),
 		MessageBusinessRepository: repository.NewMessageBusinessRepository(cache.NewCachedRepository(mlCache)),
@@ -55,6 +59,7 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		UserFollowRepository:      repository.NewUserFollowRepository(cache.NewCachedRepository(mlCache)),
 		UserFollowRepository:      repository.NewUserFollowRepository(cache.NewCachedRepository(mlCache)),
 		UserLoveFlagRepository:    repository.NewUserLoveFlagRepository(cache.NewCachedRepository(mlCache)),
 		UserLoveFlagRepository:    repository.NewUserLoveFlagRepository(cache.NewCachedRepository(mlCache)),
 		UserRepository:            repository.NewUserRepository(cache.NewCachedRepository(mlCache)),
 		UserRepository:            repository.NewUserRepository(cache.NewCachedRepository(mlCache)),
+		ArticleTagRepository:      repository.NewArticleTagRepository(cache.NewCachedRepository(mlCache)),
 	}
 	}
 }
 }
 
 

@@ -63,3 +63,170 @@ type User struct {
 	Avatar       string `json:"avatar,omitempty"`       // 头像
 	Avatar       string `json:"avatar,omitempty"`       // 头像
 	Position     string `json:"position,omitempty"`     // 职位
 	Position     string `json:"position,omitempty"`     // 职位
 }
 }
+
+type TagCreateRequest struct {
+	CompanyId int64  `json:"companyId"`
+	Image     string `json:"image"`
+	Name      string `json:"name"`   // 标签名称
+	Group     string `json:"group"`  // 标签分类
+	Remark    string `json:"remark"` // 备注
+}
+
+type TagCreateResponse struct {
+	Id int64 `json:"id"`
+}
+
+type TagEditRequest struct {
+	Id        int64  `json:"id"`
+	CompanyId int64  `json:"companyId"`
+	Image     string `json:"image"`
+	Name      string `json:"name"`   // 标签名称
+	Group     string `json:"group"`  // 标签分类
+	Remark    string `json:"remark"` // 备注
+}
+
+type TagEditResponse struct {
+	Id int64 `json:"id"`
+}
+
+type TagGetRequest struct {
+	Id int64 `json:"id"`
+}
+
+type TagGetResponse struct {
+	Id     int64  `json:"id"`
+	Image  string `json:"image"`
+	Name   string `json:"name"`   // 标签名称
+	Group  string `json:"group"`  // 标签分类
+	Remark string `json:"remark"` // 备注
+}
+
+type TagListRequest struct {
+	Page int `json:"page"`
+	Size int `json:"size"`
+}
+
+type TagListResponse struct {
+	Total int       `json:"total"`
+	List  []TagItem `json:"list"`
+}
+
+type TagItem struct {
+	Id        int64  `json:"id"`
+	Image     string `json:"image"`
+	Name      string `json:"name"`   // 标签名称
+	Group     string `json:"group"`  // 标签分类
+	Remark    string `json:"remark"` // 备注
+	CreatedAt int64  `json:"createdAt"`
+}
+
+type TagDeleteRequest struct {
+	Id int64 `json:"id"`
+}
+
+type TagDeleteResponse struct {
+	Id int64 `json:"id"`
+}
+
+type MiniUserLoginRequest struct {
+	LoginType           string `json:"loginType"`                    // 登录类型 wechat-login whchat-phone-login  phone-password-login phone-smscode-login
+	WechatAuthCode      string `json:"wechatAuthcode,optional"`      // 微信登录 授权码
+	WechatEncryptedData string `json:"wechatEncryptedData,optional"` // 微信登录 加密数据
+	WechatIV            string `json:"wechatIV,optional"`            // 微信登录 加密算法初始向量
+	Phone               string `json:"phone,optional"`               // 手机号
+	Password            string `json:"password,optional"`            // 密码
+	SmsCode             string `json:"smsCode,optional"`             // 短信验证码
+}
+
+type MiniUserLoginResponse struct {
+	Token   string `json:"token"`   // x-token
+	Phone   string `json:"phone"`   // 手机号
+	Message string `json:"message"` // 失败消息（审核中，注册成功等待审核）
+	Success bool   `json:"success"` //  成功标识
+}
+
+type MiniUserInfoRequest struct {
+}
+
+type MiniUserInfoResponse struct {
+	User          *UserItem `json:"user,omitempty"` // 用户信息
+	TotalArticle  int64     `json:"totalArticle"`   // 累计信息发布
+	TotalLoved    int64     `json:"totalLoved"`     // 累计收到的赞
+	TotalAccepted int64     `json:"totalAccepted"`  // 累计被采纳
+}
+
+type MiniUserApplyJoinCompanyRequest struct {
+	Phone string `json:"phone"`
+	Code  string `json:"code"`
+}
+
+type MiniUserApplyJoinCompanyResponse struct {
+}
+
+type MiniUserAuditRequest struct {
+	UserId int64 `json:"userId"` // 用户ID
+}
+
+type MiniUserDepartmentUsersRequest struct {
+}
+
+type MiniUserDepartmentUsersResponse struct {
+	Departments []*Department `json:"departments"`
+	Users       []*UserItem   `json:"users"`
+}
+
+type UserItem struct {
+	CompanyId    int64   `json:"companyId,omitempty"`    // 公司ID
+	DepartmentId int64   `json:"departmentId,omitempty"` // 部门ID
+	Roles        []int64 `json:"roleId,omitempty"`       // 角色
+	Flag         int     `json:"flag,omitempty"`         // 标识 1:管理员 2:普通用户 （有绑定角色是管理员）
+	Name         string  `json:"name,omitempty"`         // 名称
+	Avatar       string  `json:"avatar,omitempty"`       // 头像
+	Phone        string  `json:"phone,omitempty"`        // 手机号 唯一
+	Position     string  `json:"position,omitempty"`     // 职位
+	Enable       int     `json:"enable,omitempty"`       // 启用状态 1:启用 2：禁用
+	AuditStatus  int     `json:"auditStatus,omitempty"`  // 审核状态 0:待审核 1:审核通过 2:拒绝
+	Follower     []int64 `json:"followers,omitempty"`    // 关注我的人 （冗余）
+	Following    []int64 `json:"following,omitempty"`    // 我关注的人 （冗余）
+}
+
+type Department struct {
+	Id        int64  `json:"id,omitempty"`        // 部门ID
+	CompanyId int64  `json:"companyId,omitempty"` // 公司ID
+	ParentId  int64  `json:"parentId,omitempty"`  // 父级ID
+	Name      string `json:"name,omitempty"`      // 部门名称
+}
+
+type UserSearchRequest struct {
+	Page      int  `json:"page,optional"`
+	Size      int  `json:"size,optional"`
+	AuditFlag *int `json:"auditFlag,optional"` // 按审核状态 0:待审核 1:审核通过 2:拒绝
+}
+
+type UserSearchResponse struct {
+	List  []*UserItem `json:"list"`
+	Total int64       `json:"total"`
+}
+
+type FollowRequest struct {
+	UserId int64 `json:"userId"`
+}
+
+type CompanySearchRequest struct {
+	Page   int    `json:"page"`
+	Size   int    `json:"size"`
+	UserId int64  `json:"userId,optional"` // 按用户搜索
+	Code   string `json:"code,optional"`   // 按编码搜索
+}
+
+type CompanySearchResponse struct {
+	List  []Company `json:"list"`
+	Total int64     `json:"total"`
+}
+
+type Company struct {
+	Id   int64  `json:"id,omitempty"`   // 唯一标识
+	Name string `json:"name,omitempty"` // 名称
+	Code string `json:"code,omitempty"` // 编码（搜索使用,4位字母数字）
+	Logo string `json:"logo,omitempty"` // 公司LOGO
+}

@@ -6,5 +6,21 @@ import (
 )
 )
 
 
 func Migrate(db *gorm.DB) {
 func Migrate(db *gorm.DB) {
-	_ = db.AutoMigrate(models.MessageSystem{}, models.MessageBusiness{})
+	modelsList := []interface{}{
+		&models.Article{},
+		&models.ArticleSection{},
+		&models.ArticleBackup{},
+		&models.ArticleDraft{},
+		&models.ArticleComment{},
+		&models.ArticleTag{},
+		&models.UserLoveFlag{},
+		&models.User{},
+		&models.Role{},
+		&models.Company{},
+		&models.UserFollow{},
+		&models.MessageSystem{},
+		&models.MessageBusiness{},
+	}
+
+	db.AutoMigrate(modelsList...)
 }
 }

@@ -18,16 +18,15 @@ type Article struct {
 	IsDel        soft_delete.DeletedAt `gorm:"softDelete:flag,DeletedAtField:DeletedAt"`
 	IsDel        soft_delete.DeletedAt `gorm:"softDelete:flag,DeletedAtField:DeletedAt"`
 	Version      int
 	Version      int
 	AuthorId     int64             // 发布人
 	AuthorId     int64             // 发布人
-	Author       domain.UserSimple // 发布人
+	Author       domain.UserSimple `gorm:"type:jsonb;serializer:json"` // 发布人
 	Title        string            // 文章标题
 	Title        string            // 文章标题
-	Images       []domain.Image    // 图片
-	WhoRead      []int64           // 谁可以看
-	WhoReview    []int64           // 评论人
-	Location     domain.Location   // 坐标
+	Images       []domain.Image    `gorm:"type:jsonb;serializer:json"` // 图片
+	WhoRead      []int64           `gorm:"type:jsonb;serializer:json"` // 谁可以看
+	WhoReview    []int64           `gorm:"type:jsonb;serializer:json"` // 评论人
+	Location     domain.Location   `gorm:"type:jsonb;serializer:json"` // 坐标
 	TargetUser   int               // 分发方式 0 分发给所有人 1 分发给指定的人
 	TargetUser   int               // 分发方式 0 分发给所有人 1 分发给指定的人
 	CountLove    int               // 点赞数量
 	CountLove    int               // 点赞数量
 	CountComment int               // 评论数量
 	CountComment int               // 评论数量
-	Tags         []int             // 标签
 	Show         int               // 评论的展示状态（0显示、1不显示）
 	Show         int               // 评论的展示状态（0显示、1不显示）
 }
 }
 
 

@@ -17,14 +17,14 @@ type ArticleBackup struct {
 	DeletedAt  int64
 	DeletedAt  int64
 	IsDel      soft_delete.DeletedAt `gorm:"softDelete:flag,DeletedAtField:DeletedAt"`
 	IsDel      soft_delete.DeletedAt `gorm:"softDelete:flag,DeletedAtField:DeletedAt"`
 	Version    int
 	Version    int
-	Operator   domain.UserSimple       // 操作人
+	Operator   domain.UserSimple       `gorm:"type:jsonb;serializer:json"` // 操作人
 	Title      string                  // 标题
 	Title      string                  // 标题
-	Section    []domain.ArticleSection // 分段内容
-	Images     []domain.Image          // 图片
+	Section    []domain.ArticleSection `gorm:"type:jsonb;serializer:json"` // 分段内容
+	Images     []domain.Image          `gorm:"type:jsonb;serializer:json"` // 图片
 	Action     string                  // 操作
 	Action     string                  // 操作
-	WhoRead    []int64                 // 谁可以看
-	WhoReview  []int64                 // 评论人
-	Tags       []int                   // 标签
+	WhoRead    []int64                 `gorm:"type:jsonb;serializer:json"` // 谁可以看
+	WhoReview  []int64                 `gorm:"type:jsonb;serializer:json"` // 评论人
+	Tags       []int                   `gorm:"type:jsonb;serializer:json"` // 标签
 	TargetUser int                     // 分发方式 0 分发给所有人 1 分发给指定的人
 	TargetUser int                     // 分发方式 0 分发给所有人 1 分发给指定的人
 }
 }
 
 

@@ -23,9 +23,9 @@ type ArticleComment struct {
 	ArticleSectionId int64             // 文本内容id
 	ArticleSectionId int64             // 文本内容id
 	SectionContent   string            // 引用的文章内容文本
 	SectionContent   string            // 引用的文章内容文本
 	FromUserId       int64             // 谁填写的评论
 	FromUserId       int64             // 谁填写的评论
-	FromUser         domain.UserSimple // 谁填写的评论
+	FromUser         domain.UserSimple `gorm:"type:jsonb;serializer:json"` // 谁填写的评论
 	ToUserId         int64             // 回复谁的评论
 	ToUserId         int64             // 回复谁的评论
-	ToUser           domain.UserSimple // 回复谁的评论
+	ToUser           domain.UserSimple `gorm:"type:jsonb;serializer:json"` // 回复谁的评论
 	Content          string            // 评论内容
 	Content          string            // 评论内容
 	CountReply       int               // 回复数量
 	CountReply       int               // 回复数量
 	CountUserLove    int               // 用户点赞数量
 	CountUserLove    int               // 用户点赞数量

@@ -17,13 +17,13 @@ type ArticleDraft struct {
 	DeletedAt int64
 	DeletedAt int64
 	Version   int
 	Version   int
 	Template  int             // 填写内容时用的样板0、无 1、演绎式 2、归纳式
 	Template  int             // 填写内容时用的样板0、无 1、演绎式 2、归纳式
-	Content   []string        // 文章内容
+	Content   []string        `gorm:"type:jsonb;serializer:json"` // 文章内容
 	AuthorId  int64           // 发布人
 	AuthorId  int64           // 发布人
 	Title     string          // 文章标题
 	Title     string          // 文章标题
-	Images    []domain.Image  // 图片
-	WhoRead   []int64         // 谁可以看
-	WhoReview []int64         // 评论人
-	Location  domain.Location // 坐标
+	Images    []domain.Image  `gorm:"type:jsonb;serializer:json"` // 图片
+	WhoRead   []int64         `gorm:"type:jsonb;serializer:json"` // 谁可以看
+	WhoReview []int64         `gorm:"type:jsonb;serializer:json"` // 评论人
+	Location  domain.Location `gorm:"type:jsonb;serializer:json"` // 坐标
 }
 }
 
 
 func (m *ArticleDraft) TableName() string {
 func (m *ArticleDraft) TableName() string {

@@ -9,14 +9,14 @@ import (
 
 
 type Company struct {
 type Company struct {
 	Id   int64  // 唯一标识
 	Id   int64  // 唯一标识
-	Name string `json:"name,omitempty"` // 名称
-	Code string `json:"code,omitempty"` // 编码（搜索使用,4位字母数字）
-	Logo string `json:"logo,omitempty"` // 公司LOGO
-
-	CreatedAt int64 `json:"createdAt,omitempty"`
-	UpdatedAt int64 `json:"updatedAt,omitempty"`
-	DeletedAt int64 `json:"deletedAt,omitempty"`
-	Version   int   `json:"version,omitempty"`
+	Name string // 名称
+	Code string // 编码（搜索使用,4位字母数字）
+	Logo string // 公司LOGO
+
+	CreatedAt int64
+	UpdatedAt int64
+	DeletedAt int64
+	Version   int
 }
 }
 
 
 func (m *Company) TableName() string {
 func (m *Company) TableName() string {

@@ -4,16 +4,18 @@ import (
 	"fmt"
 	"fmt"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gorm.io/gorm"
 	"gorm.io/gorm"
+	"gorm.io/plugin/soft_delete"
 	"time"
 	"time"
 )
 )
 
 
 type Role struct {
 type Role struct {
 	Id int64 // 唯一标识
 	Id int64 // 唯一标识
 
 
-	CreatedAt int64 `json:"createdAt,omitempty"`
-	UpdatedAt int64 `json:"updatedAt,omitempty"`
-	DeletedAt int64 `json:"deletedAt,omitempty"`
-	Version   int   `json:"version,omitempty"`
+	CreatedAt int64
+	UpdatedAt int64
+	DeletedAt int64
+	Version   int
+	IsDel     soft_delete.DeletedAt `gorm:"softDelete:flag,DeletedAtField:DeletedAt"`
 }
 }
 
 
 func (m *Role) TableName() string {
 func (m *Role) TableName() string {

@@ -4,28 +4,30 @@ import (
 	"fmt"
 	"fmt"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gorm.io/gorm"
 	"gorm.io/gorm"
+	"gorm.io/plugin/soft_delete"
 	"time"
 	"time"
 )
 )
 
 
 type User struct {
 type User struct {
 	Id           int64   // 唯一标识
 	Id           int64   // 唯一标识
-	CompanyId    int64   `json:"companyId,omitempty"`    // 公司ID
-	DepartmentId int64   `json:"departmentId,omitempty"` // 部门ID
-	Roles        []int64 `json:"roleId,omitempty"`       // 角色
-	Flag         int     `json:"flag"`                   // 标识 1:管理员 2:普通用户 （有绑定角色是管理员）
-	Name         string  `json:"name,omitempty"`         // 名称
-	Avatar       string  `json:"avatar,omitempty"`       // 头像
-	Phone        string  `json:"phone,omitempty"`        // 手机号 唯一
-	Position     string  `json:"position,omitempty"`     // 职位
-	Enable       int     `json:"enable,omitempty"`       // 启用状态 1:启用 2：禁用
-	AuditStatus  int     `json:"auditStatus,omitempty"`  // 审核状态 0:待审核 1:审核通过 2:拒绝
-	Follower     []int64 `json:"followers,omitempty"`    // 关注我的人 （冗余）
-	Following    []int64 `json:"following,omitempty"`    // 我关注的人 （冗余）
+	CompanyId    int64   // 公司ID
+	DepartmentId int64   // 部门ID
+	Roles        []int64 `gorm:"type:jsonb;serializer:json"` // 角色
+	Flag         int     // 标识 1:管理员 2:普通用户 （有绑定角色是管理员）
+	Name         string  // 名称
+	Avatar       string  // 头像
+	Phone        string  // 手机号 唯一
+	Position     string  // 职位
+	Enable       int     // 启用状态 1:启用 2：禁用
+	AuditStatus  int     // 审核状态 0:待审核 1:审核通过 2:拒绝
+	Follower     []int64 `gorm:"type:jsonb;serializer:json"` // 关注我的人 （冗余）
+	Following    []int64 `gorm:"type:jsonb;serializer:json"` // 我关注的人 （冗余）
 
 
-	CreatedAt int64 `json:"createdAt,omitempty"`
-	UpdatedAt int64 `json:"updatedAt,omitempty"`
-	DeletedAt int64 `json:"deletedAt,omitempty"`
-	Version   int   `json:"version,omitempty"`
+	CreatedAt int64
+	UpdatedAt int64
+	DeletedAt int64
+	Version   int
+	IsDel     soft_delete.DeletedAt `gorm:"softDelete:flag,DeletedAtField:DeletedAt"`
 }
 }
 
 
 func (m *User) TableName() string {
 func (m *User) TableName() string {

@@ -158,7 +158,6 @@ func (repository *ArticleRepository) ModelToDomainModel(from *models.Article) (*
 		TargetUser:   domain.ArticleTarget(from.TargetUser),
 		TargetUser:   domain.ArticleTarget(from.TargetUser),
 		CountLove:    from.CountLove,
 		CountLove:    from.CountLove,
 		CountComment: from.CountComment,
 		CountComment: from.CountComment,
-		Tags:         from.Tags,
 		Show:         domain.ArticleShow(from.Show),
 		Show:         domain.ArticleShow(from.Show),
 	}
 	}
 	return to, nil
 	return to, nil
@@ -182,7 +181,6 @@ func (repository *ArticleRepository) DomainModelToModel(from *domain.Article) (*
 		TargetUser:   int(from.TargetUser),
 		TargetUser:   int(from.TargetUser),
 		CountLove:    from.CountLove,
 		CountLove:    from.CountLove,
 		CountComment: from.CountComment,
 		CountComment: from.CountComment,
-		Tags:         from.Tags,
 		Show:         int(from.Show),
 		Show:         int(from.Show),
 	}
 	}
 	// err := copier.Copy(to, from)
 	// err := copier.Copy(to, from)

@@ -24,7 +24,6 @@ type Article struct {
 	TargetUser   ArticleTarget `json:"targetUser"`   // 分发方式 0 分发给所有人 1 分发给指定的人
 	TargetUser   ArticleTarget `json:"targetUser"`   // 分发方式 0 分发给所有人 1 分发给指定的人
 	CountLove    int           `json:"countLove"`    // 点赞数量
 	CountLove    int           `json:"countLove"`    // 点赞数量
 	CountComment int           `json:"countComment"` // 评论数量
 	CountComment int           `json:"countComment"` // 评论数量
-	Tags         []int         `json:"tags"`         // 标签
 	Show         ArticleShow   `json:"showState"`    // 评论的展示状态（0显示、1不显示）
 	Show         ArticleShow   `json:"showState"`    // 评论的展示状态（0显示、1不显示）
 	// ...more
 	// ...more
 }
 }
@@ -68,6 +67,7 @@ type ArticleRepository interface {
 	Insert(ctx context.Context, conn transaction.Conn, dm *Article) (*Article, error)
 	Insert(ctx context.Context, conn transaction.Conn, dm *Article) (*Article, error)
 	Update(ctx context.Context, conn transaction.Conn, dm *Article) (*Article, error)
 	Update(ctx context.Context, conn transaction.Conn, dm *Article) (*Article, error)
 	Delete(ctx context.Context, conn transaction.Conn, dm *Article) (*Article, error)
 	Delete(ctx context.Context, conn transaction.Conn, dm *Article) (*Article, error)
+	UpdateWithVersion(ctx context.Context, conn transaction.Conn, dm *Article) (*Article, error)
 	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*Article, error)
 	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*Article, error)
 	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*Article, error)
 	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*Article, error)
 }
 }

@@ -28,6 +28,7 @@ type ArticleBackup struct {
 type ArticleBackupRepository interface {
 type ArticleBackupRepository interface {
 	Insert(ctx context.Context, conn transaction.Conn, dm *ArticleBackup) (*ArticleBackup, error)
 	Insert(ctx context.Context, conn transaction.Conn, dm *ArticleBackup) (*ArticleBackup, error)
 	Update(ctx context.Context, conn transaction.Conn, dm *ArticleBackup) (*ArticleBackup, error)
 	Update(ctx context.Context, conn transaction.Conn, dm *ArticleBackup) (*ArticleBackup, error)
+	UpdateWithVersion(ctx context.Context, conn transaction.Conn, dm *ArticleBackup) (*ArticleBackup, error)
 	Delete(ctx context.Context, conn transaction.Conn, dm *ArticleBackup) (*ArticleBackup, error)
 	Delete(ctx context.Context, conn transaction.Conn, dm *ArticleBackup) (*ArticleBackup, error)
 	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*ArticleBackup, error)
 	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*ArticleBackup, error)
 	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*ArticleBackup, error)
 	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*ArticleBackup, error)

@@ -42,6 +42,7 @@ const (
 type ArticleCommentRepository interface {
 type ArticleCommentRepository interface {
 	Insert(ctx context.Context, conn transaction.Conn, dm *ArticleComment) (*ArticleComment, error)
 	Insert(ctx context.Context, conn transaction.Conn, dm *ArticleComment) (*ArticleComment, error)
 	Update(ctx context.Context, conn transaction.Conn, dm *ArticleComment) (*ArticleComment, error)
 	Update(ctx context.Context, conn transaction.Conn, dm *ArticleComment) (*ArticleComment, error)
+	UpdateWithVersion(ctx context.Context, conn transaction.Conn, dm *ArticleComment) (*ArticleComment, error)
 	Delete(ctx context.Context, conn transaction.Conn, dm *ArticleComment) (*ArticleComment, error)
 	Delete(ctx context.Context, conn transaction.Conn, dm *ArticleComment) (*ArticleComment, error)
 	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*ArticleComment, error)
 	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*ArticleComment, error)
 	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*ArticleComment, error)
 	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*ArticleComment, error)

@@ -27,6 +27,7 @@ type ArticleDraft struct {
 type ArticleDraftRepository interface {
 type ArticleDraftRepository interface {
 	Insert(ctx context.Context, conn transaction.Conn, dm *ArticleDraft) (*ArticleDraft, error)
 	Insert(ctx context.Context, conn transaction.Conn, dm *ArticleDraft) (*ArticleDraft, error)
 	Update(ctx context.Context, conn transaction.Conn, dm *ArticleDraft) (*ArticleDraft, error)
 	Update(ctx context.Context, conn transaction.Conn, dm *ArticleDraft) (*ArticleDraft, error)
+	UpdateWithVersion(ctx context.Context, conn transaction.Conn, dm *ArticleDraft) (*ArticleDraft, error)
 	Delete(ctx context.Context, conn transaction.Conn, dm *ArticleDraft) (*ArticleDraft, error)
 	Delete(ctx context.Context, conn transaction.Conn, dm *ArticleDraft) (*ArticleDraft, error)
 	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*ArticleDraft, error)
 	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*ArticleDraft, error)
 	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*ArticleDraft, error)
 	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*ArticleDraft, error)

@@ -6,7 +6,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
 )
 )
 
 
-// 文章段落
+// 文章段落内容
 type ArticleSection struct {
 type ArticleSection struct {
 	Id           int64  `json:"id"`
 	Id           int64  `json:"id"`
 	CompanyId    int64  `json:"companyId"`
 	CompanyId    int64  `json:"companyId"`
@@ -23,6 +23,7 @@ type ArticleSection struct {
 type ArticleSectionRepository interface {
 type ArticleSectionRepository interface {
 	Insert(ctx context.Context, conn transaction.Conn, dm *ArticleSection) (*ArticleSection, error)
 	Insert(ctx context.Context, conn transaction.Conn, dm *ArticleSection) (*ArticleSection, error)
 	Update(ctx context.Context, conn transaction.Conn, dm *ArticleSection) (*ArticleSection, error)
 	Update(ctx context.Context, conn transaction.Conn, dm *ArticleSection) (*ArticleSection, error)
+	UpdateWithVersion(ctx context.Context, conn transaction.Conn, dm *ArticleSection) (*ArticleSection, error)
 	Delete(ctx context.Context, conn transaction.Conn, dm *ArticleSection) (*ArticleSection, error)
 	Delete(ctx context.Context, conn transaction.Conn, dm *ArticleSection) (*ArticleSection, error)
 	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*ArticleSection, error)
 	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*ArticleSection, error)
 	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*ArticleSection, error)
 	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*ArticleSection, error)

@@ -6,7 +6,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
 )
 )
 
 
-// 文章的标签
+// 文章全部的标签
 
 
 type ArticleTag struct {
 type ArticleTag struct {
 	Id        int64  `json:"id"`
 	Id        int64  `json:"id"`
@@ -22,8 +22,9 @@ type ArticleTag struct {
 }
 }
 type ArticleTagRepository interface {
 type ArticleTagRepository interface {
 	Insert(ctx context.Context, conn transaction.Conn, dm *ArticleTag) (*ArticleTag, error)
 	Insert(ctx context.Context, conn transaction.Conn, dm *ArticleTag) (*ArticleTag, error)
-	Update(ctx context.Context, conn transaction.Conn, dm *ArticleTag) (*ArticleSection, error)
+	Update(ctx context.Context, conn transaction.Conn, dm *ArticleTag) (*ArticleTag, error)
 	Delete(ctx context.Context, conn transaction.Conn, dm *ArticleTag) (*ArticleTag, error)
 	Delete(ctx context.Context, conn transaction.Conn, dm *ArticleTag) (*ArticleTag, error)
+	UpdateWithVersion(ctx context.Context, conn transaction.Conn, dm *ArticleTag) (*ArticleTag, error)
 	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*ArticleTag, error)
 	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*ArticleTag, error)
 	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*ArticleTag, error)
 	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*ArticleTag, error)
 }
 }

@@ -10,7 +10,7 @@ type User struct {
 	CompanyId    int64   `json:"companyId,omitempty"`    // 公司ID
 	CompanyId    int64   `json:"companyId,omitempty"`    // 公司ID
 	DepartmentId int64   `json:"departmentId,omitempty"` // 部门ID
 	DepartmentId int64   `json:"departmentId,omitempty"` // 部门ID
 	Roles        []int64 `json:"roleId,omitempty"`       // 角色
 	Roles        []int64 `json:"roleId,omitempty"`       // 角色
-	Flag         int     `json:"flag"`                   // 标识 1:管理员 2:普通用户 （有绑定角色是管理员）
+	Flag         int     `json:"flag,omitempty"`         // 标识 1:管理员 2:普通用户 （有绑定角色是管理员）
 	Name         string  `json:"name,omitempty"`         // 名称
 	Name         string  `json:"name,omitempty"`         // 名称
 	Avatar       string  `json:"avatar,omitempty"`       // 头像
 	Avatar       string  `json:"avatar,omitempty"`       // 头像
 	Phone        string  `json:"phone,omitempty"`        // 手机号 唯一
 	Phone        string  `json:"phone,omitempty"`        // 手机号 唯一

 package domain
 package domain
 
 
+import (
+	"context"
+
+	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/db/transaction"
+)
+
 // 人员查看文章详情后，标记一个记录
 // 人员查看文章详情后，标记一个记录
 // 浏览记录
 // 浏览记录
 
 
@@ -14,3 +20,12 @@ type UserReadArticle struct {
 	DeletedAt int64      `json:"deletedAt,omitempty"`
 	DeletedAt int64      `json:"deletedAt,omitempty"`
 	Version   int        `json:"version,omitempty"`
 	Version   int        `json:"version,omitempty"`
 }
 }
+
+type UserReadArticleRepository interface {
+	Insert(ctx context.Context, conn transaction.Conn, dm *UserReadArticle) (*UserReadArticle, error)
+	Update(ctx context.Context, conn transaction.Conn, dm *UserReadArticle) (*UserReadArticle, error)
+	UpdateWithVersion(ctx context.Context, conn transaction.Conn, dm *UserReadArticle) (*UserReadArticle, error)
+	Delete(ctx context.Context, conn transaction.Conn, dm *UserReadArticle) (*UserReadArticle, error)
+	FindOne(ctx context.Context, conn transaction.Conn, id int64) (*UserReadArticle, error)
+	Find(ctx context.Context, conn transaction.Conn, queryOptions map[string]interface{}) (int64, []*UserReadArticle, error)
+}