更新！

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/TestController.java

@@ -5,7 +5,7 @@ import com.zhongshu.iot.server.core.service.artemis.OperationMessageService;
 import com.zhongshu.iot.server.core.service.iot.IotServiceImpl;
 import com.zhongshu.iot.server.core.service.openApi.OpenAPIRegisterService;
 import com.zhongshu.iot.server.core.service.other.ScanExecuteService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/docker/DockerMetaController.java

@@ -8,7 +8,7 @@ import com.zhongshu.iot.client.model.docker.DockerMetaModel;
 import com.zhongshu.iot.client.model.docker.DockerMetaParam;
 import com.zhongshu.iot.client.model.docker.DockerMetaSearch;
 import com.zhongshu.iot.server.core.service.docker.DockerMetaService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/free/FixDataController.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.controller.free;
 
 import com.zhongshu.iot.server.core.service.fix.FixDataService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/free/GateWayFreeController.java

@@ -5,7 +5,7 @@ import com.zhongshu.iot.client.model.mqtt.GateWayInfoAddParam;
 import com.zhongshu.iot.client.model.mqtt.MqttInfoReturnModel;
 import com.zhongshu.iot.server.core.service.mqtt.DeviceInfoService;
 import com.zhongshu.iot.server.core.service.mqtt.GateWayInfoService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/free/ProjectFromFullCardController.java

@@ -2,7 +2,7 @@ package com.zhongshu.iot.server.core.controller.free;
 
 import com.github.microservice.models.project.ProjectSyncParam;
 import com.zhongshu.iot.server.core.service.sync.ProjectFromFullCardService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/hardware/DeviceController.java

@@ -9,7 +9,7 @@ import com.zhongshu.iot.client.model.mqtt.DeviceInfoSearchParam;
 import com.zhongshu.iot.client.model.mqtt.DeviceInfoUpdateRemark;
 import com.github.microservice.types.FunctionType;
 import com.zhongshu.iot.server.core.service.mqtt.DeviceInfoService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/hardware/GateWayController.java

@@ -7,7 +7,7 @@ import com.zhongshu.iot.client.model.mqtt.GateWayInfoAddParam;
 import com.zhongshu.iot.client.model.mqtt.GateWayInfoModel;
 import com.zhongshu.iot.client.model.mqtt.GateWayInfoSearchParam;
 import com.zhongshu.iot.server.core.service.mqtt.GateWayInfoService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/hardware/GateWayUserInfoController.java

@@ -7,7 +7,7 @@ import com.zhongshu.iot.client.model.mqtt.GateWayUserInfoModel;
 import com.zhongshu.iot.client.model.mqtt.GateWayUserInfoNameParam;
 import com.zhongshu.iot.client.model.mqtt.GateWayUserInfoSearchParam;
 import com.zhongshu.iot.server.core.service.mqtt.GateWayUserInfoService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/hardware/MqttInfoController.java

@@ -6,7 +6,7 @@ import com.zhongshu.iot.client.model.mqtt.MqttInfoAddParam;
 import com.zhongshu.iot.client.model.mqtt.MqttInfoModel;
 import com.zhongshu.iot.client.model.mqtt.MqttInfoSimpleModel;
 import com.zhongshu.iot.server.core.service.mqtt.MqttInfoService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/hardware/OperationLogsController.java

@@ -5,7 +5,7 @@ import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.iot.client.model.operLogs.OperationLogsModel;
 import com.zhongshu.iot.client.model.operLogs.OperationLogsSearchParam;
 import com.zhongshu.iot.server.core.service.user.OperationLogsService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/hardware/OperationMessageController.java

@@ -8,7 +8,7 @@ import com.zhongshu.iot.client.model.artemis.OperationMessageResultSearch;
 import com.zhongshu.iot.client.model.artemis.OperationMessageSearchParam;
 import com.zhongshu.iot.server.core.service.artemis.OperationMessageService;
 import com.zhongshu.iot.server.core.service.mqtt.DeviceInfoService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/iot/IotController.java

@@ -5,7 +5,7 @@ import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.iot.client.model.baseParam.NameModel;
 import com.zhongshu.iot.client.model.iot.*;
 import com.zhongshu.iot.server.core.service.iot.IotServiceImpl;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/iot/IotSendController.java

@@ -5,7 +5,7 @@ import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.models.iot.IotSendParam;
 import com.zhongshu.iot.server.core.service.iot.IotSendMessageService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/openAPi/IotSendApiController.java

@@ -6,7 +6,7 @@ import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.models.iot.IotSendGateWayParam;
 import com.github.microservice.models.iot.IotSendParam;
 import com.zhongshu.iot.server.core.service.iot.IotSendMessageService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/controller/user/ProjectInfoController.java

@@ -0,0 +1,68 @@
+package com.zhongshu.iot.server.core.controller.user;
+
+import com.github.microservice.net.ResultContent;
+import com.zhongshu.iot.client.model.mqtt.ProjectInfoAddParam;
+import com.zhongshu.iot.client.model.mqtt.ProjectInfoModel;
+import com.zhongshu.iot.client.model.mqtt.ProjectInfoSearchParam;
+import com.zhongshu.iot.server.core.service.mqtt.ProjectInfoService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 项目 服务
+ *
+ * @author TRX
+ * @date 2024/3/21
+ */
+@RequestMapping("/project")
+@RestController
+@Validated
+@Tag(name = "项目管理")
+public class ProjectInfoController {
+
+    @Autowired
+    ProjectInfoService projectInfoService;
+
+    @Operation(summary = "添加-编辑项目")
+    @RequestMapping(value = "addProjectInfo", method = {RequestMethod.POST})
+    public ResultContent addProjectInfo(@RequestBody ProjectInfoAddParam param) {
+        return projectInfoService.addProjectInfo(param);
+    }
+
+    @Operation(summary = "项目列表-分页查询")
+    @RequestMapping(value = {"pageProject"}, method = {RequestMethod.POST})
+    public ResultContent<Page<ProjectInfoModel>> pageProject(@Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable, ProjectInfoSearchParam param) {
+        return projectInfoService.page(pageable, param);
+    }
+
+    @Operation(summary = "删除项目")
+    @RequestMapping(value = "deleteProjectInfo", method = {RequestMethod.GET})
+    public ResultContent deleteProjectInfo(String id) {
+        return projectInfoService.deleteProjectInfo(id);
+    }
+
+    @Operation(summary = "查询项目详情")
+    @RequestMapping(value = "getProjectInfo", method = {RequestMethod.GET})
+    @Parameter(name = "id", description = "数据ID")
+    public ResultContent<ProjectInfoModel> getProjectInfo(String id) {
+        return projectInfoService.getProjectInfo(id);
+    }
+
+    @Operation(summary = "查询所有可用的项目列表")
+    @RequestMapping(value = "getAllProject", method = {RequestMethod.GET})
+    public ResultContent<List<ProjectInfoModel>> getAllProject() {
+        return projectInfoService.getAllProject();
+    }
+}

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/artemis/OperationMessageService.java

@@ -35,7 +35,7 @@ import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.mqtt.MqttTopicUtils;
 import com.zhongshu.iot.server.core.util.mqtt.mqttConfig.client.MQClient;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import jakarta.jms.Message;
 import jakarta.jms.TextMessage;
 import lombok.extern.slf4j.Slf4j;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/base/InitService.java

@@ -2,7 +2,7 @@ package com.zhongshu.iot.server.core.service.base;
 
 import com.zhongshu.iot.server.core.service.mqtt.GateWayUserInfoService;
 import com.zhongshu.iot.server.core.service.user.impl.UserServiceImpl;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/docker/DockerMetaService.java

@@ -14,7 +14,7 @@ import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.util.SecurityUtil;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/fix/FixDataService.java

@@ -5,7 +5,7 @@ import com.zhongshu.iot.server.core.dao.mqtt.GateWayInfoDao;
 import com.zhongshu.iot.server.core.domain.iot.mqtt.DeviceInfo;
 import com.zhongshu.iot.server.core.domain.iot.mqtt.GateWayInfo;
 import com.zhongshu.iot.server.core.service.sync.DeviceSyncFullCardService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotDataVerifyService.java

@@ -8,7 +8,7 @@ import com.github.microservice.types.FunctionType;
 import com.zhongshu.iot.server.core.domain.iot.IotMain;
 import com.zhongshu.iot.server.core.util.CommonUtil;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotSendMessageService.java

@@ -18,7 +18,7 @@ import com.zhongshu.iot.server.core.util.DateUtils;
 import com.zhongshu.iot.server.core.util.TokenUtil;
 import com.zhongshu.iot.server.core.util.mqtt.MqttTopicUtils;
 import com.zhongshu.iot.server.core.util.mqtt.mqttConfig.client.MQClient;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotServiceImpl.java

@@ -22,7 +22,7 @@ import com.zhongshu.iot.server.core.service.base.CommonService;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/mqtt/DeviceInfoService.java

@@ -20,7 +20,7 @@ import com.zhongshu.iot.server.core.service.sync.DeviceSyncFullCardService;
 import com.zhongshu.iot.server.core.service.user.OperationLogsService;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/mqtt/DevicePingInfoService.java

@@ -18,7 +18,7 @@ import com.zhongshu.iot.server.core.service.base.CommonService;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.service.sync.DeviceSyncFullCardService;
 import com.zhongshu.iot.server.core.util.DateUtils;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/mqtt/GateWayInfoService.java

@@ -12,7 +12,7 @@ import com.zhongshu.iot.server.core.util.DateUtils;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.mqtt.MqttTopicUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.Cleanup;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/mqtt/GateWayUserInfoService.java

@@ -14,7 +14,7 @@ import com.zhongshu.iot.server.core.domain.iot.mqtt.MqttInfo;
 import com.zhongshu.iot.server.core.util.DateUtils;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.Cleanup;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/mqtt/MqttInfoService.java

@@ -8,7 +8,7 @@ import com.zhongshu.iot.server.core.dao.mqtt.Mqtt2UserDao;
 import com.zhongshu.iot.server.core.dao.mqtt.MqttInfoDao;
 import com.zhongshu.iot.server.core.domain.iot.mqtt.MqttInfo;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/mqtt/ProjectInfoService.java

@@ -9,7 +9,7 @@ import com.zhongshu.iot.server.core.domain.iot.mqtt.ProjectInfo;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/mqtt/ServerTimeService.java

@@ -4,7 +4,7 @@ import com.github.microservice.models.hxz.ServerTimeResult;
 import com.zhongshu.iot.server.core.domain.ExecuteAnnotationService;
 import com.zhongshu.iot.server.core.domain.ExecuteAnnotationServiceMethod;
 import com.zhongshu.iot.server.core.service.base.SuperService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/payment/HxzService.java

@@ -12,7 +12,7 @@ import com.github.microservice.http.APIResponseModel;
 import com.zhongshu.iot.server.core.httpRequest.conf.FullCardAPIConfig;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.service.other.RequestInfoService;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/sync/DeviceSyncFullCardService.java

@@ -20,7 +20,7 @@ import com.zhongshu.iot.server.core.httpRequest.conf.FullCardAPIConfig;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.service.user.OperationLogsService;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/sync/ProjectFromFullCardService.java

@@ -4,7 +4,7 @@ import com.github.microservice.models.project.ProjectSyncParam;
 import com.zhongshu.iot.client.model.mqtt.ProjectInfoAddParam;
 import com.zhongshu.iot.server.core.service.mqtt.ProjectInfoService;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/DepartmentService.java

@@ -3,7 +3,7 @@ package com.zhongshu.iot.server.core.service.user;
 import com.zhongshu.iot.client.model.user.DepartmentModel;
 import com.zhongshu.iot.client.model.user.DepartmentParam;
 import com.zhongshu.iot.client.utils.ITree;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 
 import java.util.List;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/OperationLogsService.java

@@ -15,7 +15,7 @@ import com.zhongshu.iot.server.core.util.DateUtils;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.net.IPUtil;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/impl/DepartmentServiceImpl.java

@@ -12,7 +12,7 @@ import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.service.user.DepartmentService;
 import com.zhongshu.iot.server.core.util.CommonUtil;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/impl/RoleServiceImpl.java

@@ -11,7 +11,7 @@ import com.zhongshu.iot.server.core.domain.user.Role;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/impl/UserManagerServiceImpl.java

@@ -19,7 +19,7 @@ import com.zhongshu.iot.server.core.util.ValidateResult;
 import com.zhongshu.iot.server.core.util.ValidateUtils;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/impl/UserServiceImpl.java

@@ -16,7 +16,7 @@ import com.zhongshu.iot.server.core.util.ValidateResult;
 import com.zhongshu.iot.server.core.util.ValidateUtils;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.mqtt.mqttConfig.client.MQClient;
-import com.zhongshu.iot.server.core.util.result.ResultContent;
+import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -154,7 +154,11 @@ public class UserServiceImpl extends SuperService implements UserService {
             return ResultContent.buildContent(ResultState.UserNotExists);
         }
         PasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-        return ResultContent.build(passwordEncoder.matches(passWord, user.getPassWord()) ? ResultState.Success : ResultState.UserPasswordError);
+        if (passwordEncoder.matches(passWord, user.getPassWord())) {
+            return ResultContent.buildSuccess();
+        } else {
+            return ResultContent.buildFail("用户密码不正确");
+        }
     }
 
 }