Merge remote-tracking branch 'origin/main' into lichang

src/framework/config/config/config.default.yaml

@@ -1,7 +1,7 @@
 # 项目信息
 framework:
   name: "CN EMS"
-  version: "2.2404.3"
+  version: "2.2404.4"
 
 # 应用服务配置
 server:

src/lib_features/account/account.go

@@ -1,39 +0,0 @@
-package libfeatures
-
-import (
-	"time"
-
-	"be.ems/lib/dborm"
-	"be.ems/lib/oauth"
-	libConfig "be.ems/restagent/config"
-	"be.ems/src/framework/logger"
-	"be.ems/src/framework/redis"
-)
-
-// SessionToken 设置登录会话-兼容旧登录方式
-func SessionToken(username, sourceAddr string) bool {
-	// token, _ := redis.Get("", "session_token")
-	// if token != "" {
-	// 	se, err := dborm.XormUpdateSessionShakeTime(token)
-	// 	if se.AccountId != username || err != nil {
-	// 		// 过期时间单位秒 配置1800是半小时
-	// 		expireTime := time.Duration(int64(libConfig.GetExpiresFromConfig())) * time.Second
-	// 		redis.SetByExpire("", "session_token", token, expireTime)
-	// 		return true
-	// 	}
-	// }
-	// 不管原先的登录情况，直接插入写入覆盖redis中session
-	//
-	token := oauth.GenRandToken("omc") // Generate new token to session ID
-	affected, err := dborm.XormInsertSession(username, sourceAddr, token, libConfig.GetExpiresFromConfig(), libConfig.GetYamlConfig().Auth.Session)
-	if err != nil {
-		logger.Errorf("SessionToken XormInsertSession err %v", err)
-	}
-	if affected >= 1 {
-		// 过期时间单位秒 配置1800是半小时
-		expireTime := time.Duration(int64(libConfig.GetExpiresFromConfig())) * time.Second
-		redis.SetByExpire("", "session_token", token, expireTime)
-		return true
-	}
-	return false
-}

src/lib_features/readme.md

@@ -1,5 +1,4 @@
 # 外层 lib 和 features 粘合层
 
 - config.go 配置合并: restagent.yaml 文件内容，主要是数据库配置
-- account.go 登录会话生成 token
-- session.go 中间件方式设置请求头 token 值
+

src/lib_features/session/session.go

@@ -1,28 +0,0 @@
-package session
-
-import (
-	"time"
-
-	libConfig "be.ems/restagent/config"
-	"be.ems/src/framework/redis"
-	"github.com/gin-gonic/gin"
-)
-
-// SessionHeader 旧登录方式token头
-func SessionHeader() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		// 读取登录生成的会话token
-		token, _ := redis.Get("", "session_token")
-		if token != "" {
-			// 过期时间单位秒 配置1800是半小时
-			expireTime := time.Duration(int64(libConfig.GetExpiresFromConfig())) * time.Second
-			redis.SetByExpire("", "session_token", token, expireTime)
-			c.Request.Header.Set("Accesstoken", token)
-		}
-
-		// Accesstoken: omc-ce4d0a86-8515-ad51-3249-4913c95f8e34
-		// 调用下一个处理程序
-		c.Next()
-
-	}
-}

src/modules/common/controller/account.go

@@ -9,7 +9,6 @@ import (
 	tokenUtils "be.ems/src/framework/utils/token"
 	"be.ems/src/framework/vo"
 	"be.ems/src/framework/vo/result"
-	libAccount "be.ems/src/lib_features/account"
 	commonModel "be.ems/src/modules/common/model"
 	commonService "be.ems/src/modules/common/service"
 	systemService "be.ems/src/modules/system/service"
@@ -83,9 +82,6 @@ func (s *AccountController) Login(c *gin.Context) {
 		)
 	}
 
-	// 设置登录会话-兼容旧登录方式
-	libAccount.SessionToken(loginBody.Username, ipaddr)
-
 	c.JSON(200, result.OkData(map[string]any{
 		tokenConstants.RESPONSE_FIELD: tokenStr,
 	}))

src/modules/crontask/processor/getStateFromNE/getStateFromNE.go

@@ -116,17 +116,20 @@ func (s *BarProcessor) Execute(data any) (any, error) {
 			log.Trace("response body:", string(response.Body()))
 			state := new(SystemState)
 			_ = json.Unmarshal(response.Body(), &state)
-			var dateStr *string = nil
-			if state.ExpiryDate != "" && state.ExpiryDate != "-" {
-				dateStr = &state.ExpiryDate
-			}
+			// var dateStr *string = nil
+			// if state.ExpiryDate != "" && state.ExpiryDate != "-" {
+			// 	dateStr = &state.ExpiryDate
+			// }
 			neState := new(dborm.NeState)
 			neState.NeType = ne.NeType
 			neState.NeId = ne.NeId
 			neState.Version = state.Version
 			neState.Capability = state.Capability
 			neState.SerialNum = state.SerialNum
-			neState.ExpiryDate = *dateStr
+			// if dateStr != nil {
+			// 	neState.ExpiryDate = *dateStr
+			// }
+			neState.ExpiryDate = state.ExpiryDate
 			cu, _ := json.Marshal(state.CpuUsage)
 			neState.CpuUsage = string(cu)
 			mu, _ := json.Marshal(state.MemUsage)