Merge branch 'sxy' into dev

api/secFilings/secFilings.validator.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: secFilings.proto
+// source: api/secFilings/secFilings.proto
 
 package secFilings
 

api/secFilings/secFilings_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             v3.20.3
-// source: secFilings.proto
+// - protoc             v5.29.2
+// source: api/secFilings/secFilings.proto
 
 package secFilings
 
@@ -503,5 +503,5 @@ var SecFilings_ServiceDesc = grpc_go.ServiceDesc{
 		},
 	},
 	Streams:  []grpc_go.StreamDesc{},
-	Metadata: "secFilings.proto",
+	Metadata: "api/secFilings/secFilings.proto",
 }

conf/prod/config.yaml

@@ -1,5 +0,0 @@
-docDb:
-  host: net-11-fontree-mysql-service:3306
-  user: fonchain_opv
-  password: IhQmhg8HZjDmU=Ove5PnA^D
-  dbName: micro-document

conf/prod/dubbogo.yaml

@@ -1,20 +0,0 @@
-dubbo:
-  registries:
-    demoZK:
-      protocol: zookeeper
-      address: zookeeper:2181
-  protocols:
-    triple:
-      name: tri
-      port: 20028
-  provider:
-    services:
-      GovernanceProvider:
-        protocol: tri
-        interface: governance.Governance # must be compatible with grpc or dubbo-java
-      PressReleasesProvider:
-        protocol: tri
-        interface: pressreleases.PressReleases # must be compatible with grpc or dubbo-java
-      SecFilingsProvider:
-        protocol: tri
-        interface: com.fontree.microservices.fiee.SecFiling # must be compatible with grpc or dubbo-java

internel/dao/governance.go.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/go-sql-driver/mysql"
+	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 )
 
@@ -34,8 +35,10 @@ func (governanceDao) List(req *governance.ListReq) (data []model.Governance, tot
 
 func (governanceDao) Delete(req *governance.DeleteReq) (err error) {
 	return db.DocDB.Delete(&model.Governance{
-		ID:        uint(req.Id),
-		UpdatedAt: time.Now(),
+		Model: gorm.Model{
+			ID:        uint(req.Id),
+			UpdatedAt: time.Now(),
+		},
 	}).Error
 }
 
@@ -48,7 +51,9 @@ func (governanceDao) Edit(req *governance.EditReq) (err error) {
 		AttachmentName: req.AttachmentName,
 		Operator:       req.Operator,
 		OperatorID:     int(req.OperatorId),
-		UpdatedAt:      time.Now(),
+		Model: gorm.Model{
+			UpdatedAt: time.Now(),
+		},
 	}).Error
 	if err != nil {
 		var mysqlErr *mysql.MySQLError

internel/dao/press_releases.go

@@ -92,8 +92,10 @@ func (pressReleasesDao) Edit(req *pressreleases.EditReq) (err error) {
 			OperatorID:     uint(req.OperatorId),
 			Content:        req.Content,
 			Display:        int(req.Display),
-			CreatedAt:      time.UnixMilli(int64(req.CreatedAt)),
-			UpdatedAt:      time.Now(),
+			Model: gorm.Model{
+				CreatedAt: time.UnixMilli(int64(req.CreatedAt)),
+				UpdatedAt: time.Now(),
+			},
 		}).Error
 		if err != nil {
 			var mysqlErr *mysql.MySQLError
@@ -127,8 +129,10 @@ func (pressReleasesDao) Create(req *pressreleases.CreateReq) (err error) {
 			Content:        req.Content,
 			Summary:        req.Summary,
 			Display:        int(req.Display),
-			CreatedAt:      time.UnixMilli(int64(req.CreatedAt)),
-			UpdatedAt:      time.Now(),
+			Model: gorm.Model{
+				CreatedAt: time.UnixMilli(int64(req.CreatedAt)),
+				UpdatedAt: time.Now(),
+			},
 		}).Error
 		if err != nil {
 			var mysqlErr *mysql.MySQLError
@@ -152,7 +156,9 @@ func (pressReleasesDao) Create(req *pressreleases.CreateReq) (err error) {
 
 func (pressReleasesDao) Delete(req *pressreleases.DeleteReq) (err error) {
 	return db.DocDB.Delete(&model.PressReleases{
-		ID: uint(req.Id),
+		Model: gorm.Model{
+			ID: uint(req.Id),
+		},
 	}).Error
 }
 

internel/dao/secFilings.go

@@ -30,7 +30,7 @@ func (secFilingsDao) CreateSecFiling(req *secFilings.CreateSecFilingReq) (*secFi
 	}
 	j, err := json.Marshal(dataFiles)
 	if err != nil {
-		return nil, errors.New("文件转换失败")
+		return nil, errors.New("datafiles文件json转换失败: " + err.Error())
 	}
 	filingKey := model.GenFilingKey(req.FilingDate, req.Form, req.FileLink)
 	var count int64
@@ -38,7 +38,7 @@ func (secFilingsDao) CreateSecFiling(req *secFilings.CreateSecFilingReq) (*secFi
 		return nil, err
 	}
 	if count != 0 {
-		return nil, errors.New("key已存在,创建失败")
+		return nil, errors.New("filing_key已存在")
 	}
 	if err := db.DocDB.Model(&model.SecFilings{}).Create(&model.SecFilings{
 		FilingKey:       filingKey,
@@ -57,6 +57,7 @@ func (secFilingsDao) CreateSecFiling(req *secFilings.CreateSecFilingReq) (*secFi
 		return nil, err
 	}
 	resp.FilingKey = filingKey
+	resp.Msg = "create success"
 	return resp, nil
 }
 func (secFilingsDao) UpdateSecFiling(query map[string]string, column map[string]interface{}) (*secFilings.CommonResp, error) {
@@ -64,6 +65,7 @@ func (secFilingsDao) UpdateSecFiling(query map[string]string, column map[string]
 	if err := db.DocDB.Model(&model.SecFilings{}).Where("filing_key = ?", query["filing_key"]).Updates(column).Error; err != nil {
 		return nil, err
 	}
+	resp.Msg = "update success"
 	return resp, nil
 }
 func (secFilingsDao) ListSecFiling(req *secFilings.ListSecFilingReq) (res []*model.SecFilings, total int64, err error) {
@@ -73,7 +75,7 @@ func (secFilingsDao) ListSecFiling(req *secFilings.ListSecFilingReq) (res []*mod
 		query = query.Where("form LIKE ?", "%"+form+"%")
 	}
 	if req.FilingDateBegin != "" && req.FilingDateEnd != "" && req.FilingDateBegin > req.FilingDateEnd {
-		return nil, 0, errors.New("开始日期超过结束日期")
+		return nil, 0, errors.New("开始日期不能大于结束日期")
 
 	}
 
@@ -141,6 +143,7 @@ func (secFilingsDao) UpdateSecFilingStatus(query map[string]string, column map[s
 		return nil, err
 	}
 	resp.FilingKey = query["filing_key"]
+	resp.Msg = "update status success"
 	return resp, nil
 }
 func (secFilingsDao) ListFormType(req *secFilings.ListFormTypeReq) (res []*model.FormType, total int64, err error) {

internel/logic/secFilings.go

@@ -16,13 +16,14 @@ var SecFilingsLogic = new(secFilingsLogic)
 func (secFilingsLogic) CreateSecFiling(req *secFilings.CreateSecFilingReq) (*secFilings.CommonResp, error) {
 	resp, err := dao.SecFilingsDao.CreateSecFiling(req)
 	if err != nil {
-		return nil, errors.New("创建失败")
+		return nil, errors.New("创建失败:" + err.Error())
 	}
+	resp.Msg = "创建成功"
 	return resp, nil
 }
 func (secFilingsLogic) UpdateSecFiling(req *secFilings.UpdateSecFilingReq) (*secFilings.CommonResp, error) {
 	if req.FilingKey == "" {
-		return nil, errors.New("参数缺失")
+		return nil, errors.New("filing_key is empty")
 	}
 	filingKey := model.GenFilingKey(req.FilingDate, req.Form, req.FileLink)
 	column := map[string]interface{}{
@@ -43,9 +44,10 @@ func (secFilingsLogic) UpdateSecFiling(req *secFilings.UpdateSecFilingReq) (*sec
 	}
 	resp, err := dao.SecFilingsDao.UpdateSecFiling(query, column)
 	if err != nil {
-		return nil, errors.New("更新失败")
+		return nil, errors.New("更新失败：" + err.Error())
 	}
 	resp.FilingKey = filingKey
+	resp.Msg = "更新成功"
 	return resp, nil
 }
 func (secFilingsLogic) ListSecFiling(req *secFilings.ListSecFilingReq) (*secFilings.SecFilingListResp, error) {
@@ -53,13 +55,13 @@ func (secFilingsLogic) ListSecFiling(req *secFilings.ListSecFilingReq) (*secFili
 	datas := []*secFilings.SecFiling{}
 	list, total, err := dao.SecFilingsDao.ListSecFiling(req)
 	if err != nil {
-		return nil, errors.New("查询失败")
+		return nil, errors.New("查询失败：" + err.Error())
 	}
 	for _, item := range list {
 		dataFiles := []*secFilings.DataFiles{}
 		if item.DataFiles != nil && len(item.DataFiles) != 0 {
 			if err := json.Unmarshal(item.DataFiles, &dataFiles); err != nil {
-				return nil, errors.New("文件转换失败")
+				return nil, errors.New("datafiles文件json转换失败: " + err.Error())
 			}
 		}
 		datas = append(datas, &secFilings.SecFiling{
@@ -82,6 +84,7 @@ func (secFilingsLogic) ListSecFiling(req *secFilings.ListSecFilingReq) (*secFili
 		})
 	}
 	resp.Total = uint32(total)
+	resp.Msg = "查询成功"
 	resp.Data = datas
 	return resp, nil
 
@@ -89,15 +92,15 @@ func (secFilingsLogic) ListSecFiling(req *secFilings.ListSecFilingReq) (*secFili
 func (secFilingsLogic) DetailSecFiling(req *secFilings.DetailSecFilingReq) (*secFilings.SecFilingDetailResp, error) {
 	resp := &secFilings.SecFilingDetailResp{}
 	if req.FilingKey == "" {
-		return nil, errors.New("参数缺失")
+		return nil, errors.New("filing_key is empty")
 	}
 	detail, err := dao.SecFilingsDao.DetailSecFiling(req)
 	if err != nil {
-		return nil, errors.New("查询失败")
+		return nil, errors.New("查询失败：" + err.Error())
 	}
 	var dataFiles []*secFilings.DataFiles
 	if err := json.Unmarshal(detail.DataFiles, &dataFiles); err != nil {
-		return nil, errors.New("文件转换失败")
+		return nil, errors.New("datafiles文件json转换失败: " + err.Error())
 	}
 	data := &secFilings.SecFiling{
 		FilingKey:       detail.FilingKey,
@@ -116,39 +119,41 @@ func (secFilingsLogic) DetailSecFiling(req *secFilings.DetailSecFilingReq) (*sec
 		CreatedAt:       time.Unix(detail.CreatedAt, 0).Format("2006-01-02 15:04:05"),
 		UpdatedAt:       time.Unix(detail.UpdatedAt, 0).Format("2006-01-02 15:04:05"),
 	}
+	resp.Msg = "查询成功"
 	resp.Data = data
 	return resp, nil
 }
 func (secFilingsLogic) DeleteSecFiling(req *secFilings.DeleteSecFilingReq) (*secFilings.CommonResp, error) {
 	resp := &secFilings.CommonResp{}
 	if req.FilingKey == "" {
-		return nil, errors.New("参数缺失")
+		return nil, errors.New("filing_key is empty")
 	}
 	if err := dao.SecFilingsDao.DeleteSecFiling(req); err != nil {
-		return nil, errors.New("删除失败")
+		return nil, errors.New("删除失败：" + err.Error())
 	}
+	resp.Msg = "删除成功"
 	return resp, nil
 }
 
 func (secFilingsLogic) IsSecFilingExist(req *secFilings.IsSecFilingExistReq) (*secFilings.IsSecFilingExistResp, error) {
 	resp := &secFilings.IsSecFilingExistResp{}
 	if req.FilingDate == "" || req.Form == "" || req.FinalLink == "" {
-		return nil, errors.New("参数缺失")
+		return nil, errors.New("filing_date or form_type or final_link is empty")
 	}
 	filingKey := model.GenFilingKey(req.FilingDate, req.Form, req.FinalLink)
 	exist, err := dao.SecFilingsDao.IsSecFilingExist(filingKey, req.FilingDate)
 	if err != nil {
-		return nil, errors.New("查询失败")
+		return nil, errors.New("查询失败：" + err.Error())
 	}
 	resp.Exist = exist
 	return resp, nil
 }
 func (secFilingsLogic) UpdateSecFilingStatus(req *secFilings.UpdateSecFilingStatusReq) (*secFilings.CommonResp, error) {
 	if req.FilingKey == "" {
-		return nil, errors.New("参数缺失")
+		return nil, errors.New("filing_key is empty")
 	}
 	if req.Status != 1 && req.Status != 2 {
-		return nil, errors.New("状态值无效")
+		return nil, errors.New("invalid status value")
 	}
 	column := map[string]interface{}{
 		"status":      req.Status,
@@ -160,15 +165,16 @@ func (secFilingsLogic) UpdateSecFilingStatus(req *secFilings.UpdateSecFilingStat
 	}
 	resp, err := dao.SecFilingsDao.UpdateSecFilingStatus(query, column)
 	if err != nil {
-		return nil, errors.New("更新状态失败")
+		return nil, errors.New("更新状态失败:" + err.Error())
 	}
+	resp.Msg = "状态更新成功"
 	return resp, nil
 }
 func (secFilingsLogic) ListFormType(req *secFilings.ListFormTypeReq) (*secFilings.FormTypeListResp, error) {
 	resp := &secFilings.FormTypeListResp{}
 	list, total, err := dao.SecFilingsDao.ListFormType(req)
 	if err != nil {
-		return nil, errors.New("查询失败")
+		return nil, errors.New("查询失败：" + err.Error())
 	}
 	for _, item := range list {
 		resp.FormType = append(resp.FormType, &secFilings.FormType{
@@ -184,13 +190,13 @@ func (secFilingsLogic) WebListSecFiling(req *secFilings.WebListSecFilingReq) (*s
 	datas := []*secFilings.SecFiling{}
 	list, total, err := dao.SecFilingsDao.WebListSecFiling(req)
 	if err != nil {
-		return nil, errors.New("查询失败")
+		return nil, errors.New("查询失败：" + err.Error())
 	}
 	for _, item := range list {
 		dataFiles := []*secFilings.DataFiles{}
 		if item.DataFiles != nil && len(item.DataFiles) != 0 {
 			if err := json.Unmarshal(item.DataFiles, &dataFiles); err != nil {
-				return nil, errors.New("文件转换失败")
+				return nil, errors.New("datafiles文件json转换失败: " + err.Error())
 			}
 		}
 		datas = append(datas, &secFilings.SecFiling{
@@ -213,6 +219,7 @@ func (secFilingsLogic) WebListSecFiling(req *secFilings.WebListSecFilingReq) (*s
 		})
 	}
 	resp.Total = uint32(total)
+	resp.Msg = "查询成功"
 	resp.Data = datas
 	return resp, nil
 }

internel/model/governance.go

@@ -1,23 +1,16 @@
 package model
 
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
+import "gorm.io/gorm"
 
 type Governance struct {
-	ID             uint `gorm:"primarykey"`
-	CreatedAt      time.Time
-	UpdatedAt      time.Time
-	DeletedAt      gorm.DeletedAt `gorm:"column:deleted_at;index:idx_governance_deleted_at;uniqueIndex:governance_unique;"`
-	Title          string         `gorm:"column:title;type:varchar(100);not null;uniqueIndex:governance_unique"`
-	Attachment     string         `gorm:"type:varchar(1024);not null;default:'';comment:附件链接"`
-	AttachmentName string         `gorm:"type:varchar(1024);not null;default:'';comment:附件文件名"`
-	Sort           int            `gorm:"comment:排序"`
-	Status         int            `gorm:"comment:状态 1下架 2 上架"`
-	Operator       string         `gorm:"type:varchar(50);comment:操作人"`
-	OperatorID     int            `gorm:"column:operator_id;comment:操作人Id"`
+	gorm.Model
+	Title          string `gorm:"type:varchar(100);uniqueIndex:governance_unique;not null"`
+	Attachment     string `gorm:"type:varchar(1024);not null;default:'';comment:附件链接"`
+	AttachmentName string `gorm:"type:varchar(1024);not null;default:'';comment:附件文件名"`
+	Sort           int    `gorm:"comment:排序"`
+	Status         int    `gorm:"comment:状态 1下架 2 上架"`
+	Operator       string `gorm:"type:varchar(50);comment:操作人"`
+	OperatorID     int    `gorm:"column:operator_id;comment:操作人Id"`
 }
 
 func (*Governance) TableName() string {

internel/model/press_releases.go

@@ -1,26 +1,19 @@
 package model
 
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
+import "gorm.io/gorm"
 
 type PressReleases struct {
-	ID             uint `gorm:"primarykey"`
-	CreatedAt      time.Time
-	UpdatedAt      time.Time
-	DeletedAt      gorm.DeletedAt `gorm:"column:deleted_at;index:idx_governance_deleted_at;uniqueIndex:governance_unique;"`
-	Title          string         `gorm:"column:title;type:varchar(100);not null;uniqueIndex:governance_unique"`
-	Sort           uint           `gorm:"not null"`
-	Content        string         `gorm:"type:longtext"`
-	Attachment     string         `gorm:"type:varchar(1024)"`
-	Display        int            `gorm:"comment:状态 1不展示 2 展示"`
-	Summary        string         `gorm:"type:text;comment:摘要"`
-	Status         int            `gorm:"comment:状态 1下架 2 上架"`
-	Operator       string         `gorm:"type:varchar(100)"`
-	OperatorID     uint           `gorm:"column:operator_id"`
-	AttachmentName string         `gorm:"type:varchar(1024)"`
+	gorm.Model
+	Title          string `gorm:"type:varchar(100);uniqueIndex:press_releases_unique"`
+	Sort           uint   `gorm:"not null"`
+	Content        string `gorm:"type:longtext"`
+	Attachment     string `gorm:"type:varchar(1024)"`
+	Display        int    `gorm:"comment:状态 1不展示 2 展示"`
+	Summary        string `gorm:"type:text;comment:摘要"`
+	Status         int    `gorm:"comment:状态 1下架 2 上架"`
+	Operator       string `gorm:"type:varchar(100)"`
+	OperatorID     uint   `gorm:"column:operator_id"`
+	AttachmentName string `gorm:"type:varchar(1024)"`
 }
 
 func (*PressReleases) TableName() string {