更新

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

@@ -1,15 +1,12 @@
 package com.zhongshu.card.client.service;
 
 import com.zhongshu.card.client.model.mqtt.SendMessageModel;
-import com.zhongshu.card.client.model.org.*;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import org.springframework.cloud.openfeign.FeignClient;
 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.RequestParam;
 
 
 @FeignClient(name = "fullcardserver/mqttFeign/manager")

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

@@ -1,9 +1,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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 
 
 public interface ProjectPaySettingService {

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

@@ -1,14 +1,10 @@
 package com.zhongshu.card.client.service;
 
-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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import org.springframework.cloud.openfeign.FeignClient;
-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.RequestParam;

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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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,16 +2,9 @@ package com.zhongshu.card.client.service.org;
 
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.org.*;
-import com.github.microservice.models.ret.ResultContent;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
+import com.github.microservice.net.ResultContent;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.PageableDefault;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
 import java.util.List;
 

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

@@ -3,8 +3,7 @@ package com.zhongshu.card.client.service.org;
 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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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,13 +2,10 @@ 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.github.microservice.models.ret.ResultContent;
-import com.zhongshu.card.client.service.org.OrganizationService;
-import com.zhongshu.card.client.service.org.UserAccountService;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.server.core.service.mqtt.MqttServiceImpl;
 import io.swagger.v3.oas.annotations.Hidden;
 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.web.bind.annotation.*;

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

@@ -1,14 +1,9 @@
 package com.zhongshu.card.server.core.controller.feign;
 
-import com.zhongshu.card.client.model.base.IDParam;
-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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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

@@ -3,14 +3,11 @@ package com.zhongshu.card.server.core.controller.iotCenter;
 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.github.microservice.models.ret.ResultContent;
-import com.zhongshu.card.server.core.service.mqtt.MqttServiceImpl;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.server.core.service.sync.DeviceSyncFromIotService;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apiguardian.api.API;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;

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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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

@@ -1,37 +1,25 @@
 package com.zhongshu.card.server.core.controller.org;
 
-import com.github.microservice.auth.client.constant.AuthConstant;
 import com.github.microservice.auth.client.model.LoginTokenModel;
 import com.github.microservice.auth.client.model.UserTokenModel;
-import com.github.microservice.auth.security.annotations.ResourceAuth;
 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.base.ReTokenParam;
-import com.zhongshu.card.client.model.base.TokenParam;
 import com.zhongshu.card.client.model.org.*;
-import com.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultState;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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;
 import com.zhongshu.card.server.core.service.org.IndexService;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 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.http.MediaType;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * @author TRX
  * @date 2024/6/4

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

@@ -5,8 +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.github.microservice.models.ret.ResultContent;
-import com.zhongshu.card.client.service.org.DepartmentService;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.service.org.OrganizationService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -15,7 +14,6 @@ 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.http.MediaType;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -1,13 +1,11 @@
 package com.zhongshu.card.server.core.controller.org;
 
-import com.zhongshu.card.client.model.mqtt.SendMessageModel;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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;
 import org.springframework.beans.factory.annotation.Autowired;
 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;

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

@@ -3,9 +3,8 @@ package com.zhongshu.card.server.core.controller.org;
 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.base.OidModel;
 import com.zhongshu.card.client.model.org.RegionModel;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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

@@ -1,10 +1,6 @@
 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.github.microservice.models.ret.ResultContent;
-import com.zhongshu.card.client.service.org.DepartmentService;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.server.core.service.TestService;
 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/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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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

@@ -10,15 +10,8 @@ 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.model.school.BookInfoAddParam;
-import com.zhongshu.card.client.model.school.BookInfoModel;
-import com.zhongshu.card.client.model.school.BookInfoSearch;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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;
-import com.zhongshu.card.client.utils.type.OrganizationUserType;
-import com.zhongshu.card.server.core.service.org.RoleServiceImpl;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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

@@ -1,12 +1,10 @@
 package com.zhongshu.card.server.core.controller.payment;
 
-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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

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

@@ -2,11 +2,9 @@ package com.zhongshu.card.server.core.controller.payment;
 
 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.feign.ProjectWxPayParam;
-import com.zhongshu.card.client.model.payment.ExpenseFlowModel;
 import com.zhongshu.card.client.model.payment.paySetting.*;
-import com.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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

@@ -5,14 +5,10 @@ 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.org.OrgUserDetailParam;
-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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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,9 +4,8 @@ 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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.service.school.DeviceBindService;
-import com.zhongshu.card.client.service.school.DeviceInfoService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,8 +15,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 设备
  *

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

@@ -4,11 +4,10 @@ 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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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;
-import com.zhongshu.card.client.utils.type.OrganizationUserType;
 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/school/NoticeController.java

@@ -3,11 +3,8 @@ package com.zhongshu.card.server.core.controller.school;
 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.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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

@@ -2,17 +2,12 @@ package com.zhongshu.card.server.core.controller.school;
 
 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.org.OrganizationRelationSearch;
-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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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;
-import com.zhongshu.card.client.utils.type.OrganizationUserType;
 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/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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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,7 +1,7 @@
 package com.zhongshu.card.server.core.handler;
 
-import com.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultException;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.ResultException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;

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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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,7 +2,7 @@ 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.net.ResultContent;
 import com.github.microservice.models.type.PaymentType;
 import com.zhongshu.card.server.core.dao.school.CardInfoDao;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;

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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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

@@ -2,9 +2,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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.ResultMessage;
 import com.zhongshu.card.client.service.org.DepartmentService;
 import com.zhongshu.card.client.utils.ITree;
 import com.zhongshu.card.client.utils.TreeUtil;
@@ -12,7 +11,6 @@ import com.zhongshu.card.client.utils.type.DataState;
 import com.zhongshu.card.server.core.dao.org.DepartmentDao;
 import com.zhongshu.card.server.core.domain.org.Department;
 import com.zhongshu.card.server.core.domain.org.Organization;
-import com.zhongshu.card.server.core.domain.school.Area;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import com.zhongshu.card.server.core.util.CommonUtil;

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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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,8 +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.github.microservice.models.ret.ResultContent;
-import com.zhongshu.card.client.service.org.OrganizationService;
+import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.utils.type.LoginFromType;
 import com.zhongshu.card.client.utils.type.OrganizationState;
 import com.zhongshu.card.client.utils.type.UserState;
@@ -30,12 +29,10 @@ import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.kafka.common.protocol.types.Field;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 

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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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,8 +7,8 @@ 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.github.microservice.net.ResultContent;
+import com.github.microservice.net.ResultMessage;
 import com.zhongshu.card.client.model.base.AuthTypeParam;
 import com.zhongshu.card.client.model.base.UserIdModel;
 import com.zhongshu.card.client.model.org.*;

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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultState;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.ResultMessage;
 import com.zhongshu.card.client.service.payment.ExpenseFlowService;
 import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.card.client.utils.type.*;

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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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

@@ -1,10 +1,9 @@
 package com.zhongshu.card.server.core.service.payment;
 
 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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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,12 +2,11 @@ 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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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;
-import com.zhongshu.card.server.core.domain.school.BookInfo;
 import com.zhongshu.card.server.core.domain.school.DictInfo;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.util.BeanUtils;

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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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

@@ -3,17 +3,14 @@ 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.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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;
 import com.zhongshu.card.server.core.dao.org.OrganizationRelationDao;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.OrganizationRelation;
-import com.zhongshu.card.server.core.domain.school.BookInfo;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
 import com.zhongshu.card.server.core.util.BeanUtils;

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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultMessage;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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,14 +3,12 @@ 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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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;
 import com.zhongshu.card.server.core.event.ProjectSyncEvent;
 import com.zhongshu.card.server.core.httpRequest.ApiRequestService;
-import com.zhongshu.card.server.core.httpRequest.apiConf.APIResponseModel;
-import com.zhongshu.card.server.core.httpRequest.conf.IotCenterAPIConfig;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;

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.github.microservice.models.ret.ResultContent;
+import com.github.microservice.net.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

@@ -1,10 +1,7 @@
 package com.zhongshu.card.server.core.util.wx;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.json.JSON;
-import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.github.microservice.core.util.JsonUtil;
 import com.github.microservice.core.util.net.HttpClient;
 import com.github.microservice.core.util.net.apache.HttpClientUtil;
 import com.github.microservice.core.util.net.apache.HttpModel;
@@ -14,8 +11,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.github.microservice.models.ret.ResultContent;
-import com.github.microservice.models.ret.ResultState;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.ResultState;
 import com.zhongshu.card.server.core.service.base.RedisService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -24,10 +21,6 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;