Fix 修复部分查询条件不匹配问题

SERVER/VberAdmin/app/system/models/sys_login_log.go

@@ -45,10 +45,10 @@ func (e *SysLoginLog) GetId() interface{} {
 // SaveLoginLog 从队列中获取登录日志
 func SaveLoginLog(message storage.Message) (err error) {
 	//准备db
-	db := sdk.Runtime.GetDbByKey(message.GetPrefix())
+	db := sdk.Runtime.GetDbByKey(message.GetKey())
 	if db == nil {
 		err = errors.New("db not exist")
-		log.Errorf("host[%s]'s %s", message.GetPrefix(), err.Error())
+		log.Errorf("host[%s]'s %s", message.GetKey(), err.Error())
 		return err
 	}
 	var rb []byte

SERVER/VberAdmin/app/system/models/sys_opera_log.go

@@ -53,10 +53,10 @@ func (e *SysOperaLog) GetId() interface{} {
 // SaveOperaLog 从队列中获取操作日志
 func SaveOperaLog(message storage.Message) (err error) {
 	//准备db
-	db := sdk.Runtime.GetDbByKey(message.GetPrefix())
+	db := sdk.Runtime.GetDbByKey(message.GetKey())
 	if db == nil {
 		err = errors.New("db not exist")
-		log.Errorf("host[%s]'s %s", message.GetPrefix(), err.Error())
+		log.Errorf("host[%s]'s %s", message.GetKey(), err.Error())
 		// Log writing to the database ignores error
 		return nil
 	}

SERVER/VberAdmin/app/system/service/dto/sys_login_log.go

@@ -8,16 +8,19 @@ import (
 
 type SysLoginLogGetPageReq struct {
 	dto.Pagination `search:"-"`
-	Username       string `form:"username" search:"type:exact;column:username;table:sys_login_log" comment:"用户名"`
+	Username       string `form:"username" search:"type:contains;column:username;table:sys_login_log" comment:"用户名"`
 	Status         string `form:"status" search:"type:exact;column:status;table:sys_login_log" comment:"状态"`
 	Ipaddr         string `form:"ipaddr" search:"type:exact;column:ipaddr;table:sys_login_log" comment:"ip地址"`
 	LoginLocation  string `form:"loginLocation" search:"type:exact;column:login_location;table:sys_login_log" comment:"归属地"`
-	BeginTime      string `form:"beginTime" search:"type:gte;column:ctime;table:sys_login_log" comment:"创建时间"`
-	EndTime        string `form:"endTime" search:"type:lte;column:ctime;table:sys_login_log" comment:"创建时间"`
+	BeginTime      string `form:"beginTime" search:"type:gte;column:login_time;table:sys_login_log" comment:"创建时间"`
+	EndTime        string `form:"endTime" search:"type:lte;column:login_time;table:sys_login_log" comment:"创建时间"`
 	SysLoginLogOrder
 }
 
 type SysLoginLogOrder struct {
+	UsernameOrder  string `search:"type:order;column:username;table:sys_login_log" form:"usernameOrder"`
+	StatusOrder    string `search:"type:order;column:status;table:sys_login_log" form:"statusOrder"`
+	LoginTimeOrder string `search:"type:order;column:login_time;table:sys_login_log" form:"loginTimeOrder"`
 	CreatedAtOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"createdAtOrder"`
 }
 

SERVER/VberAdmin/app/system/service/dto/sys_opera_log.go

@@ -17,7 +17,9 @@ type SysOperaLogGetPageReq struct {
 	dto.Pagination `search:"-"`
 	Title          string `form:"title" search:"type:contains;column:title;table:sys_opera_log" comment:"操作模块"`
 	Method         string `form:"method" search:"type:contains;column:method;table:sys_opera_log" comment:"函数"`
-	RequestMethod  string `form:"requestMethod" search:"type:contains;column:request_method;table:sys_opera_log" comment:"请求方式: GET POST PUT DELETE"`
+	OperatorType   string `form:"operatorType" search:"type:exact;column:operator_type;table:sys_opera_log" comment:"操作类型"`
+	RequestMethod  string `form:"requestMethod" search:"type:exact;column:request_method;table:sys_opera_log" comment:"请求方式: GET POST PUT DELETE"`
+	OperName       string `form:"operName" search:"type:icontains;column:oper_name;table:sys_opera_log" comment:"操作人员"`
 	OperUrl        string `form:"operUrl" search:"type:contains;column:oper_url;table:sys_opera_log" comment:"访问地址"`
 	OperIp         string `form:"operIp" search:"type:exact;column:oper_ip;table:sys_opera_log" comment:"客户端ip"`
 	Status         int    `form:"status" search:"type:exact;column:status;table:sys_opera_log" comment:"状态 1:正常 2:关闭"`
@@ -27,7 +29,11 @@ type SysOperaLogGetPageReq struct {
 }
 
 type SysOperaLogOrder struct {
-	CreatedAtOrder string `search:"type:order;column:created_at;table:sys_opera_log" form:"createdAtOrder"`
+	OperatorTypeOrder  string `search:"type:order;column:operator_type;table:sys_opera_log" form:"operatorTypeOrder"`
+	RequestMethodOrder string `search:"type:order;column:request_method;table:sys_opera_log" form:"requestMethodOrder"`
+	StatusOrder        string `search:"type:order;column:status;table:sys_opera_log" form:"statusOrder"`
+	OperUrlOrder       string `search:"type:order;column:oper_url;table:sys_opera_log" form:"operUrlOrder"`
+	CreatedAtOrder     string `search:"type:order;column:created_at;table:sys_opera_log" form:"createdAtOrder"`
 }
 
 func (m *SysOperaLogGetPageReq) GetNeedSearch() interface{} {

SERVER/VberAdmin/app/system/service/dto/sys_role.go

@@ -19,6 +19,8 @@ type SysRoleGetPageReq struct {
 	Remark    string `form:"remark" search:"type:exact;column:remark;table:sys_role" comment:"备注"`        // 备注
 	Admin     bool   `form:"admin" search:"type:exact;column:admin;table:sys_role" comment:"是否管理员"`
 	DataScope string `form:"dataScope" search:"type:exact;column:data_scope;table:sys_role" comment:"是否管理员"`
+	BeginTime string `form:"beginTime" search:"type:gte;column:created_at;table:sys_role" comment:"创建时间"`
+	EndTime   string `form:"endTime" search:"type:lte;column:created_at;table:sys_role" comment:"创建时间"`
 }
 
 type SysRoleOrder struct {

SERVER/VberAdmin/app/system/service/dto/sys_user.go

@@ -18,6 +18,8 @@ type SysUserGetPageReq struct {
 	Email          string `form:"email" search:"type:contains;column:email;table:sys_user" comment:"邮箱"`
 	PostId         string `form:"postId" search:"type:exact;column:post_id;table:sys_user" comment:"岗位"`
 	Status         string `form:"status" search:"type:exact;column:status;table:sys_user" comment:"状态"`
+	BeginTime      string `form:"beginTime" search:"type:gte;column:created_at;table:sys_user" comment:"创建时间"`
+	EndTime        string `form:"endTime" search:"type:lte;column:created_at;table:sys_user" comment:"创建时间"`
 	OrgJoin        `search:"type:left;on:org_id:org_id;table:sys_user;join:sys_org"`
 	SysUserOrder
 }