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

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)