更新

FullCardClient/src/main/java/com/zhongshu/card/client/ret/CommentException.java

@@ -1,41 +0,0 @@
-package com.zhongshu.card.client.ret;
-
-/**
- * @Author: wy
- * @Date: 2023/6/6 16:43
- */
-public class CommentException extends RuntimeException {
-
-    private ResultState resultState;
-
-    private String message;
-
-    /**
-     * 参数校验异常构造方法
-     */
-    public CommentException(String message) {
-        this.message = message;
-    }
-
-    public CommentException(ResultState resultState, String message) {
-        this.resultState = resultState;
-        this.message = message;
-    }
-
-    @Override
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public ResultState getResultState() {
-        return resultState;
-    }
-
-    public void setResultState(ResultState resultState) {
-        this.resultState = resultState;
-    }
-}

FullCardClient/src/main/java/com/zhongshu/card/client/ret/ResultContent.java

@@ -1,92 +0,0 @@
-package com.zhongshu.card.client.ret;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.*;
-
-import java.util.Optional;
-
-/**
- * 结果
- *
- * @param <T>
- */
-@Builder
-@ToString(callSuper = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@AllArgsConstructor
-@NoArgsConstructor
-public class ResultContent<T> {
-
-    //内容
-    @Getter
-    @Setter
-    private T content;
-
-    //状态
-    @Getter
-    @Setter
-    private ResultState state;
-
-    //文本
-    @Getter
-    @Setter
-    private String msg;
-
-
-    //异常
-    @Getter
-    @Setter
-    private ResultException exception;
-
-
-    /**
-     * 获取内容
-     *
-     * @return
-     */
-    public Optional<T> optionalContent() {
-        return Optional.ofNullable(this.content);
-    }
-
-    public static <T> ResultContent build(ResultState state, T content) {
-        return ResultContent.builder().state(state).content(content).msg(state.getRemark()).build();
-    }
-
-    public static <T> ResultContent build(boolean bool) {
-        return build(bool ? ResultState.Success : ResultState.Fail, null);
-    }
-
-    public static <T> ResultContent build(ResultState state) {
-        return build(state, null);
-    }
-
-    public static <T> ResultContent buildContent(T content) {
-        return build(content == null ? ResultState.Fail : ResultState.Success, content);
-    }
-
-    public static <T> ResultContent buildFail(String msg) {
-        return ResultContent.builder().state(ResultState.Fail).msg(msg).build();
-    }
-
-    public static <T> ResultContent buildSuccess(String msg) {
-        return build(ResultState.Success, msg);
-    }
-
-    public static <T> ResultContent buildSuccess(T content) {
-        return build(ResultState.Success, content);
-    }
-
-    public static <T> ResultContent buildSuccess() {
-        return build(ResultState.Success, ResultState.Success.getRemark());
-    }
-
-    public boolean isSuccess()
-    {
-        return ResultState.Success.equals(this.state);
-    }
-
-    public boolean isFailed()
-    {
-        return !ResultState.Success.equals(this.state);
-    }
-}

FullCardClient/src/main/java/com/zhongshu/card/client/ret/ResultException.java

@@ -1,33 +0,0 @@
-package com.zhongshu.card.client.ret;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 结果集异常
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ResultException {
-
-    private String type;
-    private String cls;
-    private String message;
-
-
-    /**
-     * 创建异常对象
-     *
-     * @param e
-     * @return
-     */
-    public static ResultException build(Exception e) {
-        ResultException exception = new ResultException();
-        exception.type = e.getClass().getSimpleName();
-        exception.cls = e.getClass().getName();
-        exception.message = e.getMessage();
-        return exception;
-    }
-}

FullCardClient/src/main/java/com/zhongshu/card/client/ret/ResultMessage.java

@@ -1,11 +0,0 @@
-package com.zhongshu.card.client.ret;
-
-/**
- * @author TRX
- * @date 2024/5/31
- */
-public class ResultMessage {
-    public static final String DATA_NOT_EXIST = "数据不存在：%s";
-
-    public static final String NAME_EXIST = "名称已存在：%s";
-}

FullCardClient/src/main/java/com/zhongshu/card/client/ret/ResultState.java

@@ -1,38 +0,0 @@
-package com.zhongshu.card.client.ret;
-
-import lombok.Getter;
-
-/**
- * 结果状态模板
- */
-public enum ResultState {
-
-    Success("成功"),
-    Fail("失败"),
-    Error("错误"),
-    Exception("异常"),
-    Robot("机器验证"),
-
-    UserExit("用户存在"),
-    UserNotExit("用户不存在"),
-    UserOrPassWordError("用户名或密码错误"),
-
-    NOT_TOKEN_ERROR("token获取失败"),
-    NOT_AUTH_ERROR("需要授权"),
-    EXPIRE_ERROR( "token已过期"),
-    INVALID_TOKEN("无效token"),
-    LOGIN_REQUIRED("需要登录"),
-    CODE_ERROR("验证码错误"),
-
-    AccountNotNull("账户不能为空"),
-    AccountExists("用户存在"),
-    AccountNotExists("账户不存在"),
-    ;
-
-    @Getter
-    private String remark;
-
-    ResultState(String remark) {
-        this.remark = remark;
-    }
-}

FullCardClient/src/main/java/com/zhongshu/card/client/service/MqttFeignService.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.service;
 
 import com.zhongshu.card.client.model.mqtt.SendMessageModel;
 import com.zhongshu.card.client.model.org.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import org.springframework.cloud.openfeign.FeignClient;

FullCardClient/src/main/java/com/zhongshu/card/client/service/OrganizationFeignService.java

@@ -3,7 +3,7 @@ package com.zhongshu.card.client.service;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.org.*;
 import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import org.springframework.cloud.openfeign.FeignClient;

FullCardClient/src/main/java/com/zhongshu/card/client/service/ProjectPaySettingFeignService.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.service;
 
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.payment.paySetting.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;

FullCardClient/src/main/java/com/zhongshu/card/client/service/ProjectPaySettingService.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.service;
 
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.payment.paySetting.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 
 
 public interface ProjectPaySettingService {

FullCardClient/src/main/java/com/zhongshu/card/client/service/UserFeignService.java

@@ -4,7 +4,7 @@ import com.github.microservice.auth.client.example.ExampleConstant;
 import com.zhongshu.card.client.model.feign.ProjectWxPayModel;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.org.UserCountModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import org.springframework.cloud.openfeign.FeignClient;

FullCardClient/src/main/java/com/zhongshu/card/client/service/org/DepartmentService.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.service.org;
 
 import com.zhongshu.card.client.model.org.DepartmentModel;
 import com.zhongshu.card.client.model.org.DepartmentParam;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.utils.ITree;
 
 import java.util.List;

FullCardClient/src/main/java/com/zhongshu/card/client/service/org/OrganizationService.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.service.org;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.org.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import org.springframework.data.domain.Page;

FullCardClient/src/main/java/com/zhongshu/card/client/service/org/UserAccountService.java

@@ -4,7 +4,7 @@ import com.zhongshu.card.client.model.base.AuthTypeParam;
 import com.zhongshu.card.client.model.base.UserIdModel;
 import com.zhongshu.card.client.model.org.*;
 import com.zhongshu.card.client.model.school.RegisterUserParam;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import org.springframework.data.domain.Page;

FullCardClient/src/main/java/com/zhongshu/card/client/service/payment/ExpenseFlowService.java

@@ -6,7 +6,7 @@ import com.zhongshu.card.client.model.payment.ExpenseFlowSearch;
 import com.zhongshu.card.client.model.payment.ExpenseRefundParam;
 import com.zhongshu.card.client.model.payment.statistic.BusinessMainStatisticModel;
 import com.zhongshu.card.client.model.payment.statistic.StatisticSearch;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

FullCardClient/src/main/java/com/zhongshu/card/client/service/school/AreaService.java

@@ -3,7 +3,7 @@ package com.zhongshu.card.client.service.school;
 import com.zhongshu.card.client.model.base.IDsParam;
 import com.zhongshu.card.client.model.school.AreaModel;
 import com.zhongshu.card.client.model.school.AreaParam;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.utils.ITree;
 
 import java.util.List;

FullCardClient/src/main/java/com/zhongshu/card/client/service/school/BookInfoService.java

@@ -3,7 +3,7 @@ package com.zhongshu.card.client.service.school;
 import com.zhongshu.card.client.model.school.BookInfoAddParam;
 import com.zhongshu.card.client.model.school.BookInfoModel;
 import com.zhongshu.card.client.model.school.BookInfoSearch;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

FullCardClient/src/main/java/com/zhongshu/card/client/service/school/CardInfoService.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.service.school;
 
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

FullCardClient/src/main/java/com/zhongshu/card/client/service/school/CollegeService.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.service.school;
 
 import com.zhongshu.card.client.model.school.CollegeParam;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.utils.ITree;
 
 import java.util.List;

FullCardClient/src/main/java/com/zhongshu/card/client/service/school/DeviceBindService.java

@@ -3,7 +3,7 @@ package com.zhongshu.card.client.service.school;
 import com.zhongshu.card.client.model.school.DeviceBindModel;
 import com.zhongshu.card.client.model.school.DeviceBindParam;
 import com.zhongshu.card.client.model.school.DeviceBindSearch;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

FullCardClient/src/main/java/com/zhongshu/card/client/service/school/DeviceInfoService.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.service.school;
 
 import com.github.microservice.models.device.DeviceInfoSyncParam;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

FullCardClient/src/main/java/com/zhongshu/card/client/service/school/DictInfoService.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.service.school;
 
 import com.zhongshu.card.client.model.school.DictInfoParam;
 import com.zhongshu.card.client.model.school.DictInfoSearch;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

FullCardClient/src/main/java/com/zhongshu/card/client/service/school/GateWayInfoService.java

@@ -4,7 +4,7 @@ import com.github.microservice.models.device.GateWaySyncParam;
 import com.zhongshu.card.client.model.school.GateWayInfoModel;
 import com.zhongshu.card.client.model.school.GateWayInfoParam;
 import com.zhongshu.card.client.model.school.GateWayInfoSearch;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

FullCardClient/src/main/java/com/zhongshu/card/client/service/school/NoticeInfoService.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.client.service.school;
 
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

FullCardClient/src/main/java/com/zhongshu/card/client/service/school/SchoolBingShopService.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.client.service.school;
 
 import com.zhongshu.card.client.model.org.OrganizationRelationSearch;
 import com.zhongshu.card.client.model.school.ShopToSchoolModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

FullCardClient/src/main/java/com/zhongshu/card/client/service/school/SchoolUserService.java

@@ -7,7 +7,7 @@ import com.zhongshu.card.client.model.school.CardInfoModel;
 import com.zhongshu.card.client.model.school.ImportResultModel;
 import com.zhongshu.card.client.model.school.RegisterUserParam;
 import com.zhongshu.card.client.model.school.SchoolUserModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/feign/MqttFeignController.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.controller.feign;
 
 import com.zhongshu.card.client.model.mqtt.SendMessageModel;
 import com.zhongshu.card.client.model.org.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.client.service.org.UserAccountService;
 import com.zhongshu.card.server.core.service.mqtt.MqttServiceImpl;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/feign/OrganizationFeignController.java

@@ -5,7 +5,7 @@ import com.zhongshu.card.client.model.feign.ProjectWxPayModel;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.org.*;
 import com.zhongshu.card.client.model.payment.ExpenseFlowModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.client.service.org.UserAccountService;
 import com.zhongshu.card.server.core.domain.org.Organization;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/fix/FixDataController.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.controller.fix;
 
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.server.core.service.fix.FixDataService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/iotCenter/DeviceSyncController.java

@@ -4,7 +4,7 @@ import com.github.microservice.models.device.DeviceSyncListParam;
 import com.github.microservice.models.device.GateWaySyncParam;
 import com.github.microservice.models.hxz.DevicePingInfoParam;
 import com.zhongshu.card.client.model.mqtt.SendMessageModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.server.core.service.mqtt.MqttServiceImpl;
 import com.zhongshu.card.server.core.service.sync.DeviceSyncFromIotService;
 import io.swagger.v3.oas.annotations.Hidden;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/mqtt/MqttController.java

@@ -4,7 +4,7 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.mqtt.MqttConfigModel;
 import com.zhongshu.card.client.model.mqtt.SendMessageModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.server.core.service.mqtt.MqttServiceImpl;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/DepartmentController.java

@@ -5,7 +5,7 @@ import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.base.OidModel;
 import com.zhongshu.card.client.model.org.DepartmentParam;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.org.DepartmentService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/DeviceInfoController.java

@@ -7,7 +7,7 @@ import com.zhongshu.card.client.model.school.DeviceInfoModel;
 import com.zhongshu.card.client.model.school.DeviceInfoMoreModel;
 import com.zhongshu.card.client.model.school.DeviceInfoParam;
 import com.zhongshu.card.client.model.school.DeviceInfoSearch;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.DeviceInfoService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/GateWayInfoController.java

@@ -5,7 +5,7 @@ import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.school.GateWayInfoModel;
 import com.zhongshu.card.client.model.school.GateWayInfoParam;
 import com.zhongshu.card.client.model.school.GateWayInfoSearch;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.GateWayInfoService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/IndexController.java

@@ -10,8 +10,8 @@ import com.zhongshu.card.client.model.base.AuthTypeParam;
 import com.zhongshu.card.client.model.base.ReTokenParam;
 import com.zhongshu.card.client.model.base.TokenParam;
 import com.zhongshu.card.client.model.org.*;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultState;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultState;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.client.service.org.UserAccountService;
 import com.zhongshu.card.client.utils.type.UserState;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/OrganizationController.java

@@ -5,7 +5,7 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.OidModel;
 import com.zhongshu.card.client.model.org.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.org.DepartmentService;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import io.swagger.v3.oas.annotations.Operation;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/PingController.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.controller.org;
 
 import com.zhongshu.card.client.model.mqtt.SendMessageModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.server.core.service.mqtt.MqttServiceImpl;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/RegionController.java

@@ -5,7 +5,7 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.OidModel;
 import com.zhongshu.card.client.model.org.RegionModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.server.core.service.org.RegionService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/RoleController.java

@@ -5,7 +5,7 @@ import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.base.OidModel;
 import com.zhongshu.card.client.model.org.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.server.core.service.org.RoleServiceImpl;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/TestController.java

@@ -3,7 +3,7 @@ package com.zhongshu.card.server.core.controller.org;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.org.DepartmentParam;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.org.DepartmentService;
 import com.zhongshu.card.server.core.service.TestService;
 import io.swagger.v3.oas.annotations.Operation;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/UserInfoController.java

@@ -5,7 +5,7 @@ import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.AuthTypeParam;
 import com.zhongshu.card.client.model.org.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.client.service.org.UserAccountService;
 import com.zhongshu.card.client.utils.type.UserState;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/UserManagerController.java

@@ -5,7 +5,7 @@ import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.UserIdModel;
 import com.zhongshu.card.client.model.org.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.client.service.org.UserAccountService;
 import com.zhongshu.card.server.core.service.org.IndexService;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/ExpenseFlowController.java

@@ -13,7 +13,7 @@ import com.zhongshu.card.client.model.payment.statistic.StatisticSearch;
 import com.zhongshu.card.client.model.school.BookInfoAddParam;
 import com.zhongshu.card.client.model.school.BookInfoModel;
 import com.zhongshu.card.client.model.school.BookInfoSearch;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.payment.ExpenseFlowService;
 import com.zhongshu.card.client.service.school.BookInfoService;
 import com.zhongshu.card.client.service.school.NoticeInfoService;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/HxzController.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.controller.payment;
 
 
 import com.github.microservice.models.hxz.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.server.core.service.hxz.HxzService;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/PaymentSettingController.java

@@ -4,7 +4,7 @@ import com.github.microservice.auth.client.constant.AuthConstant;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.payment.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.server.core.service.payment.PaymentSettingService;
 import com.zhongshu.card.server.core.service.payment.SignatureServiceImpl;
 import io.swagger.v3.oas.annotations.Operation;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/ProjectPaySettingController.java

@@ -6,7 +6,7 @@ import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.payment.ExpenseFlowModel;
 import com.zhongshu.card.client.model.payment.paySetting.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.ProjectPaySettingService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/WalletController.java

@@ -8,7 +8,7 @@ import com.zhongshu.card.client.model.payment.WalletModel;
 import com.zhongshu.card.client.model.payment.WalletRechargeModel;
 import com.zhongshu.card.client.model.payment.WalletRechargeParam;
 import com.zhongshu.card.client.model.payment.WalletRechargeSearch;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.server.core.domain.payment.Wallet;
 import com.zhongshu.card.server.core.service.payment.WalletService;
 import io.swagger.v3.oas.annotations.Operation;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/AreaController.java

@@ -6,7 +6,7 @@ import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.base.IDsParam;
 import com.zhongshu.card.client.model.base.OidModel;
 import com.zhongshu.card.client.model.school.AreaParam;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.AreaService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/BookInfoController.java

@@ -4,7 +4,7 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.BookInfoService;
 import com.zhongshu.card.client.service.school.NoticeInfoService;
 import com.zhongshu.card.client.utils.type.OrganizationUserType;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/CardController.java

@@ -9,7 +9,7 @@ import com.zhongshu.card.client.model.org.RoleAddParam;
 import com.zhongshu.card.client.model.org.RoleModel;
 import com.zhongshu.card.client.model.org.RoleSearchParam;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.CardInfoService;
 import com.zhongshu.card.client.service.school.SchoolUserService;
 import com.zhongshu.card.server.core.service.org.RoleServiceImpl;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/CardInfoPoolController.java

@@ -5,7 +5,7 @@ import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.CardInfoService;
 import com.zhongshu.card.client.service.school.SchoolUserService;
 import com.zhongshu.card.server.core.service.school.CardInfoPoolService;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/CollegeController.java

@@ -5,7 +5,7 @@ import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.base.OidModel;
 import com.zhongshu.card.client.model.school.CollegeParam;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.CollegeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/DeviceBindController.java

@@ -4,7 +4,7 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.DeviceBindService;
 import com.zhongshu.card.client.service.school.DeviceInfoService;
 import io.swagger.v3.oas.annotations.Operation;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/DictInfoController.java

@@ -4,7 +4,7 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.BookInfoService;
 import com.zhongshu.card.client.service.school.DictInfoService;
 import com.zhongshu.card.client.service.school.NoticeInfoService;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/NoticeController.java

@@ -7,7 +7,7 @@ import com.zhongshu.card.client.model.org.RoleAddParam;
 import com.zhongshu.card.client.model.org.RoleModel;
 import com.zhongshu.card.client.model.org.RoleSearchParam;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.NoticeInfoService;
 import com.zhongshu.card.server.core.service.org.RoleServiceImpl;
 import io.swagger.v3.oas.annotations.Operation;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/OrganizationRelationController.java

@@ -8,7 +8,7 @@ import com.zhongshu.card.client.model.school.BookInfoAddParam;
 import com.zhongshu.card.client.model.school.BookInfoModel;
 import com.zhongshu.card.client.model.school.BookInfoSearch;
 import com.zhongshu.card.client.model.school.ShopToSchoolModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.BookInfoService;
 import com.zhongshu.card.client.service.school.NoticeInfoService;
 import com.zhongshu.card.client.service.school.SchoolBingShopService;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/school/SchoolUserController.java

@@ -10,7 +10,7 @@ import com.zhongshu.card.client.model.org.SchoolUserCountParam;
 import com.zhongshu.card.client.model.school.ImportResultModel;
 import com.zhongshu.card.client.model.school.RegisterUserParam;
 import com.zhongshu.card.client.model.school.SchoolUserModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.org.UserAccountService;
 import com.zhongshu.card.client.service.school.SchoolUserService;
 import io.swagger.v3.oas.annotations.Operation;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/upLoadFile/OssController.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.controller.upLoadFile;
 
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.server.core.model.upLoadFile.RemoteFile;
 import com.zhongshu.card.server.core.model.upLoadFile.StsToken;
 import com.zhongshu.card.server.core.service.oss.NetDiskOssService;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/user/OperationLogsController.java

@@ -4,7 +4,7 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.operLogs.OperationLogsModel;
 import com.zhongshu.card.client.model.operLogs.OperationLogsSearchParam;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.server.core.service.user.OperationLogsService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

FullCardServer/src/main/java/com/zhongshu/card/server/core/handler/RestExceptionHandler.java

@@ -1,9 +1,7 @@
 package com.zhongshu.card.server.core.handler;
 
-import com.github.microservice.core.util.result.InvokerState;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultException;
-import com.zhongshu.card.client.ret.ResultState;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -24,7 +22,6 @@ import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Slf4j
 @RestControllerAdvice

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/TestService.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.service;
 
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.server.core.service.base.RedisService;
 import com.zhongshu.card.server.core.util.wx.WechatCUtil;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/fix/FixDataService.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.service.fix;
 
 import com.github.microservice.auth.security.type.AuthType;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.service.sync.ProjectSyncIotCenterService;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/hxz/HxzService.java

@@ -2,8 +2,8 @@ package com.zhongshu.card.server.core.service.hxz;
 
 import cn.hutool.json.JSONUtil;
 import com.github.microservice.models.hxz.*;
+import com.github.microservice.models.ret.ResultContent;
 import com.github.microservice.models.type.PaymentType;
-import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.server.core.dao.school.CardInfoDao;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.dao.payment.ExpenseFlowDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/mqtt/MqttServiceImpl.java

@@ -5,7 +5,7 @@ import cn.hutool.json.JSONUtil;
 import com.google.gson.JsonObject;
 import com.zhongshu.card.client.model.mqtt.MqttConfigModel;
 import com.zhongshu.card.client.model.mqtt.SendMessageModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.utils.type.ArtemisType;
 import com.zhongshu.card.server.core.dao.mqtt.ArtemisMessageDao;
 import com.zhongshu.card.server.core.dao.mqtt.MqttConfigDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/DepartmentServiceImpl.java

@@ -3,8 +3,8 @@ package com.zhongshu.card.server.core.service.org;
 import com.zhongshu.card.client.model.org.DepartmentModel;
 import com.zhongshu.card.client.model.org.DepartmentParam;
 import com.zhongshu.card.client.model.school.AreaModel;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.service.org.DepartmentService;
 import com.zhongshu.card.client.utils.ITree;
 import com.zhongshu.card.client.utils.TreeUtil;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/DeviceInfoServiceImpl.java

@@ -3,8 +3,8 @@ package com.zhongshu.card.server.core.service.org;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.models.device.DeviceInfoSyncParam;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.service.school.DeviceInfoService;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.school.AreaDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/GateWayInfoServiceImpl.java

@@ -3,7 +3,7 @@ package com.zhongshu.card.server.core.service.org;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.models.device.GateWaySyncParam;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.GateWayInfoService;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.school.AreaDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/IndexService.java

@@ -16,7 +16,7 @@ import com.zhongshu.card.client.model.org.LoginPlatformTokenModel;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
 import com.zhongshu.card.client.model.wechat.PhoneModel;
 import com.zhongshu.card.client.model.wechat.WechatPhoneNumber;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.client.utils.type.LoginFromType;
 import com.zhongshu.card.client.utils.type.OrganizationState;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationServiceImpl.java

@@ -14,8 +14,8 @@ import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.zhongshu.card.client.model.org.*;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.card.client.utils.type.*;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/RegionService.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.service.org;
 
 import com.zhongshu.card.client.model.org.RegionModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.utils.ITree;
 import com.zhongshu.card.client.utils.TreeUtil;
 import com.zhongshu.card.server.core.dao.org.RegionDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/RoleServiceImpl.java

@@ -8,8 +8,8 @@ import com.github.microservice.auth.client.service.AuthResourcesNameService;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.zhongshu.card.client.model.org.*;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.utils.type.DataState;
 import com.zhongshu.card.client.utils.type.EditType;
 import com.zhongshu.card.client.utils.type.PermissionPointType;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/UserAccountServiceImpl.java

@@ -7,12 +7,12 @@ import com.github.microservice.auth.client.service.RoleService;
 import com.github.microservice.auth.client.service.UserService;
 import com.github.microservice.auth.client.type.LoginType;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.model.base.AuthTypeParam;
 import com.zhongshu.card.client.model.base.UserIdModel;
 import com.zhongshu.card.client.model.org.*;
 import com.zhongshu.card.client.model.school.DictInfoSimpleModel;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import com.zhongshu.card.client.service.org.UserAccountService;
 import com.zhongshu.card.client.utils.type.*;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/oss/NetDiskOssService.java

@@ -1,8 +1,8 @@
 package com.zhongshu.card.server.core.service.oss;
 
 import com.google.common.collect.Lists;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultState;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultState;
 import com.zhongshu.card.client.utils.type.oss.PlatformStoreType;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.domain.org.UserAccount;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -12,8 +12,8 @@ import com.zhongshu.card.client.model.payment.*;
 import com.zhongshu.card.client.model.payment.statistic.BusinessMainStatisticModel;
 import com.zhongshu.card.client.model.payment.statistic.StatisticItem;
 import com.zhongshu.card.client.model.payment.statistic.StatisticSearch;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.service.payment.ExpenseFlowService;
 import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.card.client.utils.type.*;
@@ -169,7 +169,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         param.setSchoolId(entity.getSchoolOid());
         param.setTotal(entity.getPayAmount());
         param.setOutTradeNo(entity.getPaymentNo());
-        com.zhongshu.payment.client.ret.ResultContent content = walletFeignService.consume(param);
+        ResultContent content = walletFeignService.consume(param);
         if (content.isSuccess()) {
             // 关联参数
             entity.setPaymentStatus("支付成功");
@@ -454,7 +454,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
                 result.setAmount(CommonUtil.turnMoney2Show(expenseFlow.getPayAmount()));
 
                 if (expenseFlow.getPaymentType() == PaymentType.UserWallet) {
-                    com.zhongshu.payment.client.ret.ResultContent<WalletModel> content = walletFeignService.getWallet(expenseFlow.getProjectOid(), WalletType.User, "", expenseFlow.getUserId());
+                    ResultContent<WalletModel> content = walletFeignService.getWallet(expenseFlow.getProjectOid(), WalletType.User, "", expenseFlow.getUserId());
                     if (content.isSuccess()) {
                         WalletModel walletModel = content.getContent();
                         if (ObjectUtils.isNotEmpty(walletModel)) {
@@ -696,7 +696,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         updateParam.setOutTradeNo(expenseFlow.getPaymentNo());
 
         // 调用支付中心退款
-        com.zhongshu.payment.client.ret.ResultContent content = walletFeignService.refund(updateParam);
+        ResultContent content = walletFeignService.refund(updateParam);
         expenseFlow.setIsRefund(Boolean.TRUE);
         expenseFlow.setRefundRemark(param.getRemark());
         expenseFlow.setRefundTime(System.currentTimeMillis());

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/PaymentSettingService.java

@@ -5,7 +5,7 @@ import com.github.microservice.auth.client.service.UserService;
 import com.zhongshu.card.client.model.payment.PaymentSettingMaxParam;
 import com.zhongshu.card.client.model.payment.PaymentSettingModel;
 import com.zhongshu.card.client.model.payment.PaymentSettingPasswordParam;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.server.core.dao.payment.PaymentSettingDao;
 import com.zhongshu.card.server.core.domain.payment.PaymentSetting;
 import com.zhongshu.card.server.core.service.base.SuperService;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ProjectPaySettingServiceImpl.java

@@ -4,7 +4,7 @@ import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.feign.ProjectWxPayModel;
 import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
 import com.zhongshu.card.client.model.payment.paySetting.*;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.ProjectPaySettingService;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.payment.ProjectPaySettingDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/WalletService.java

@@ -6,7 +6,7 @@ import com.zhongshu.card.client.model.payment.WalletModel;
 import com.zhongshu.card.client.model.payment.WalletRechargeModel;
 import com.zhongshu.card.client.model.payment.WalletRechargeParam;
 import com.zhongshu.card.client.model.payment.WalletRechargeSearch;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.utils.type.DataState;
 import com.zhongshu.card.client.utils.type.RechargeType;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/AreaServiceImpl.java

@@ -4,8 +4,8 @@ import com.zhongshu.card.client.model.base.IDsParam;
 import com.zhongshu.card.client.model.school.AreaModel;
 import com.zhongshu.card.client.model.school.AreaParam;
 import com.zhongshu.card.client.model.school.DictInfoParam;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.service.school.AreaService;
 import com.zhongshu.card.client.utils.ITree;
 import com.zhongshu.card.client.utils.TreeUtil;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/BookInfoServiceImpl.java

@@ -2,8 +2,8 @@ package com.zhongshu.card.server.core.service.school;
 
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.service.school.BookInfoService;
 import com.zhongshu.card.client.utils.type.OrganizationUserType;
 import com.zhongshu.card.server.core.dao.org.DepartmentDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/CardInfoPoolService.java

@@ -5,8 +5,8 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.zhongshu.card.client.model.org.OidAboutInfo;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.utils.type.school.CardType;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.school.CardInfoPoolDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/CardInfoServiceImpl.java

@@ -6,8 +6,8 @@ import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.zhongshu.card.client.model.org.OidAboutInfo;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.service.school.CardInfoService;
 import com.zhongshu.card.client.utils.type.CardOperationType;
 import com.zhongshu.card.client.utils.type.school.CardState;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/CollegeServiceImpl.java

@@ -2,8 +2,8 @@ package com.zhongshu.card.server.core.service.school;
 
 import com.zhongshu.card.client.model.school.CollegeModel;
 import com.zhongshu.card.client.model.school.CollegeParam;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.service.school.CollegeService;
 import com.zhongshu.card.client.utils.ITree;
 import com.zhongshu.card.client.utils.TreeUtil;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/DeviceBindServiceImpl.java

@@ -3,8 +3,8 @@ package com.zhongshu.card.server.core.service.school;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.service.school.DeviceBindService;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.school.AreaDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/DictInfoServiceImpl.java

@@ -2,8 +2,8 @@ package com.zhongshu.card.server.core.service.school;
 
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.service.school.DictInfoService;
 import com.zhongshu.card.client.utils.type.DictInfoType;
 import com.zhongshu.card.server.core.dao.school.DictInfoDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/NoticeInfoServiceImpl.java

@@ -2,8 +2,8 @@ package com.zhongshu.card.server.core.service.school;
 
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.service.school.NoticeInfoService;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/SchoolBingShopServiceImpl.java

@@ -6,7 +6,7 @@ import com.zhongshu.card.client.model.org.OrganizationRelationSearch;
 import com.zhongshu.card.client.model.school.BookInfoModel;
 import com.zhongshu.card.client.model.school.BookInfoSearch;
 import com.zhongshu.card.client.model.school.ShopToSchoolModel;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.SchoolBingShopService;
 import com.zhongshu.card.client.utils.type.OrganizationRelationType;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/SchoolUserServiceImpl.java

@@ -5,8 +5,8 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
 import com.github.microservice.core.util.bean.BeanUtil;
 import com.zhongshu.card.client.model.org.*;
 import com.zhongshu.card.client.model.school.*;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultMessage;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultMessage;
 import com.zhongshu.card.client.service.org.UserAccountService;
 import com.zhongshu.card.client.service.school.SchoolUserService;
 import com.zhongshu.card.client.utils.type.UserType;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/sync/DeviceSyncFromIotService.java

@@ -4,7 +4,7 @@ import com.github.microservice.models.device.DeviceInfoSyncParam;
 import com.github.microservice.models.device.DeviceSyncListParam;
 import com.github.microservice.models.device.GateWaySyncParam;
 import com.github.microservice.models.hxz.DevicePingInfoParam;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.service.school.DeviceInfoService;
 import com.zhongshu.card.client.utils.type.DataState;
 import com.zhongshu.card.client.utils.type.OnLineState;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/sync/ProjectSyncIotCenterService.java

@@ -3,7 +3,7 @@ package com.zhongshu.card.server.core.service.sync;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.models.project.ProjectSyncParam;
 import com.github.microservice.models.type.CommonState;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.utils.type.OrganizationState;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.domain.org.Organization;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/OperationLogsService.java

@@ -4,7 +4,7 @@ import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.components.data.mongo.mongo.domain.SuperEntity;
 import com.zhongshu.card.client.model.operLogs.OperationLogsModel;
 import com.zhongshu.card.client.model.operLogs.OperationLogsSearchParam;
-import com.zhongshu.card.client.ret.ResultContent;
+import com.github.microservice.models.ret.ResultContent;
 import com.zhongshu.card.client.utils.type.LogsLevel;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.dao.user.OperationLogsDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/util/wx/WechatCUtil.java

@@ -14,8 +14,8 @@ import com.zhongshu.card.client.model.wechat.AccessTokenVo;
 import com.zhongshu.card.client.model.wechat.GenerateSchemeVo;
 import com.zhongshu.card.client.model.wechat.MiniAppUserInfoVo;
 import com.zhongshu.card.client.model.wechat.WechatPhoneNumber;
-import com.zhongshu.card.client.ret.ResultContent;
-import com.zhongshu.card.client.ret.ResultState;
+import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.models.ret.ResultState;
 import com.zhongshu.card.server.core.service.base.RedisService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;