调整 file-service 的包结构

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/FileServiceImpl.java

@@ -3,9 +3,9 @@ package cn.reghao.tnb.file.app.rpc;
 import cn.reghao.file.api.dto.JobInfo;
 import cn.reghao.file.api.iface.FileService;
 import cn.reghao.jutil.jdk.db.PageList;
-import cn.reghao.tnb.file.app.db.mapper.JobDetailMapper;
-import cn.reghao.tnb.file.app.model.constant.JobStatus;
-import cn.reghao.tnb.file.app.model.po.JobDetail;
+import cn.reghao.tnb.file.app.zjob.db.JobDetailMapper;
+import cn.reghao.tnb.file.app.zjob.model.constant.JobStatus;
+import cn.reghao.tnb.file.app.zjob.model.po.JobDetail;
 import cn.reghao.tnb.file.app.util.ImageUtil;
 import cn.reghao.tnb.file.app.model.constant.OssType;
 import org.apache.commons.io.FileUtils;

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/StoreServiceWrapperRouter.java

@@ -1,6 +1,7 @@
 package cn.reghao.tnb.file.app.rpc;
 
 import cn.reghao.file.api.iface.OssService;
+import cn.reghao.tnb.file.app.zoss.rpc.StoreServiceWrapper;
 import cn.reghao.tnb.oss.api.iface.ConsoleService;
 import cn.reghao.tnb.oss.api.constant.ObjectScope;
 import cn.reghao.tnb.oss.api.dto.ObjectInfo;
@@ -9,9 +10,9 @@ import cn.reghao.tnb.oss.api.dto.media.AudioInfo;
 import cn.reghao.tnb.oss.api.dto.media.ConvertedImageInfo;
 import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
 import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
-import cn.reghao.tnb.file.app.db.repository.StoreRepository;
+import cn.reghao.tnb.file.app.zoss.db.repository.StoreRepository;
 import cn.reghao.tnb.file.app.model.constant.OssType;
-import cn.reghao.tnb.file.app.model.po.UploadChannel;
+import cn.reghao.tnb.file.app.zoss.model.po.UploadChannel;
 import cn.reghao.tnb.file.app.service.StoreConfigService;
 import cn.reghao.tnb.file.app.service.UploadChannelService;
 import org.apache.dubbo.config.annotation.DubboService;

file/file-service/src/main/java/cn/reghao/tnb/file/app/service/OssFileService.java

@@ -8,10 +8,10 @@ import cn.reghao.tnb.oss.api.constant.ObjectScope;
 import cn.reghao.tnb.oss.api.constant.ObjectType;
 import cn.reghao.tnb.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.file.app.model.po.StoreNode;
-import cn.reghao.tnb.file.app.model.po.UserNode;
-import cn.reghao.tnb.file.app.model.vo.FileInfo;
-import cn.reghao.tnb.file.app.rpc.RpcService;
+import cn.reghao.tnb.file.app.zoss.model.po.StoreNode;
+import cn.reghao.tnb.file.app.zoss.model.po.UserNode;
+import cn.reghao.tnb.file.app.zoss.model.vo.FileInfo;
+import cn.reghao.tnb.file.app.zoss.rpc.RpcService;
 import org.apache.dubbo.rpc.RpcException;
 import org.springframework.stereotype.Service;
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/service/ReportService.java

@@ -26,9 +26,9 @@ public class ReportService {
 
     public void createCertificate() {
         //  获取证书背景图片路径
-        String backgroundImage = Objects.requireNonNull(PDFUtil.class.getClassLoader().getResource("static/img/bg.png")).getPath();
+        String backgroundImage = Objects.requireNonNull(PDFUtil.class.getClassLoader().getResource("static/bg.png")).getPath();
         //  获取发放证书的项目Logo
-        String logo = Objects.requireNonNull(PDFUtil.class.getClassLoader().getResource("static/img/logo.png")).getPath();
+        String logo = Objects.requireNonNull(PDFUtil.class.getClassLoader().getResource("static/logo.png")).getPath();
         //  生成的pdf的文件位置
         String reportPath = String.format("%s/%s.pdf", baseDir, System.currentTimeMillis());
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/service/StoreNodeService.java

@@ -6,15 +6,15 @@ import cn.reghao.jutil.jdk.math.Calculator;
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.tnb.oss.api.dto.StoreNodeDto;
 import cn.reghao.tnb.oss.api.dto.disk.DiskVolume;
-import cn.reghao.tnb.file.app.db.mapper.StoreNodeMapper;
-import cn.reghao.tnb.file.app.db.mapper.StoreVolumeMapper;
-import cn.reghao.tnb.file.app.db.mapper.UserNodeMapper;
-import cn.reghao.tnb.file.app.db.repository.StoreRepository;
-import cn.reghao.tnb.file.app.model.po.StoreNode;
-import cn.reghao.tnb.file.app.model.po.StoreVolume;
+import cn.reghao.tnb.file.app.zoss.db.mapper.StoreNodeMapper;
+import cn.reghao.tnb.file.app.zoss.db.mapper.StoreVolumeMapper;
+import cn.reghao.tnb.file.app.zoss.db.mapper.UserNodeMapper;
+import cn.reghao.tnb.file.app.zoss.db.repository.StoreRepository;
+import cn.reghao.tnb.file.app.zoss.model.po.StoreNode;
+import cn.reghao.tnb.file.app.zoss.model.po.StoreVolume;
 import cn.reghao.tnb.common.db.SelectOption;
-import cn.reghao.tnb.file.app.model.vo.StoreNodeInfo;
-import cn.reghao.tnb.file.app.rpc.StoreServiceWrapper;
+import cn.reghao.tnb.file.app.zoss.model.vo.StoreNodeInfo;
+import cn.reghao.tnb.file.app.zoss.rpc.StoreServiceWrapper;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

file/file-service/src/main/java/cn/reghao/tnb/file/app/service/UploadChannelService.java

@@ -8,13 +8,13 @@ import cn.reghao.tnb.oss.api.dto.ObjectChannel;
 import cn.reghao.tnb.oss.api.constant.ObjectScope;
 import cn.reghao.tnb.oss.api.constant.ObjectType;
 import cn.reghao.tnb.common.util.ConstantId;
-import cn.reghao.tnb.file.app.db.mapper.UploadChannelMapper;
-import cn.reghao.tnb.file.app.db.repository.ChannelRepository;
+import cn.reghao.tnb.file.app.zoss.db.mapper.UploadChannelMapper;
+import cn.reghao.tnb.file.app.zoss.db.repository.ChannelRepository;
 import cn.reghao.file.api.constant.UploadChannelType;
-import cn.reghao.tnb.file.app.model.dto.UploadChannelDto;
-import cn.reghao.tnb.file.app.model.po.UploadChannel;
-import cn.reghao.tnb.file.app.model.po.UserNode;
-import cn.reghao.tnb.file.app.rpc.StoreServiceWrapper;
+import cn.reghao.tnb.file.app.zoss.model.dto.UploadChannelDto;
+import cn.reghao.tnb.file.app.zoss.model.po.UploadChannel;
+import cn.reghao.tnb.file.app.zoss.model.po.UserNode;
+import cn.reghao.tnb.file.app.zoss.rpc.StoreServiceWrapper;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

file/file-service/src/main/java/cn/reghao/tnb/file/app/service/UserKeyService.java

@@ -6,9 +6,9 @@ import cn.reghao.tnb.oss.api.constant.ChannelAction;
 import cn.reghao.tnb.auth.model.OssPayload;
 import cn.reghao.tnb.common.auth.LoginUser;
 import cn.reghao.tnb.auth.JwtUtil;
-import cn.reghao.tnb.file.app.db.mapper.UserKeyMapper;
-import cn.reghao.tnb.file.app.model.dto.KeyAuthDto;
-import cn.reghao.tnb.file.app.model.po.UserKey;
+import cn.reghao.tnb.file.app.zoss.db.mapper.UserKeyMapper;
+import cn.reghao.tnb.file.app.zoss.model.dto.KeyAuthDto;
+import cn.reghao.tnb.file.app.zoss.model.po.UserKey;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

file/file-service/src/main/java/cn/reghao/tnb/file/app/service/UserNodeService.java

@@ -2,14 +2,14 @@ package cn.reghao.tnb.file.app.service;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.tnb.common.util.ConstantId;
-import cn.reghao.tnb.file.app.db.mapper.StoreNodeMapper;
-import cn.reghao.tnb.file.app.db.mapper.UploadChannelMapper;
-import cn.reghao.tnb.file.app.db.mapper.UserNodeMapper;
-import cn.reghao.tnb.file.app.model.dto.NodeAddDto;
-import cn.reghao.tnb.file.app.model.dto.NodeUpdateDto;
-import cn.reghao.tnb.file.app.model.po.StoreNode;
-import cn.reghao.tnb.file.app.model.po.UploadChannel;
-import cn.reghao.tnb.file.app.model.po.UserNode;
+import cn.reghao.tnb.file.app.zoss.db.mapper.StoreNodeMapper;
+import cn.reghao.tnb.file.app.zoss.db.mapper.UploadChannelMapper;
+import cn.reghao.tnb.file.app.zoss.db.mapper.UserNodeMapper;
+import cn.reghao.tnb.file.app.zoss.model.dto.NodeAddDto;
+import cn.reghao.tnb.file.app.zoss.model.dto.NodeUpdateDto;
+import cn.reghao.tnb.file.app.zoss.model.po.StoreNode;
+import cn.reghao.tnb.file.app.zoss.model.po.UploadChannel;
+import cn.reghao.tnb.file.app.zoss.model.po.UserNode;
 import cn.reghao.tnb.common.db.SelectOption;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

file/file-service/src/main/java/cn/reghao/tnb/file/app/delay/DelayJob.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zjob/DelayJob.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.delay;
+package cn.reghao.tnb.file.app.zjob;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

file/file-service/src/main/java/cn/reghao/tnb/file/app/delay/JobContext.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zjob/JobContext.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.file.app.delay;
+package cn.reghao.tnb.file.app.zjob;
 
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
-import cn.reghao.tnb.file.app.db.mapper.JobDetailMapper;
-import cn.reghao.tnb.file.app.model.constant.JobStatus;
-import cn.reghao.tnb.file.app.model.po.JobDetail;
+import cn.reghao.tnb.file.app.zjob.db.JobDetailMapper;
+import cn.reghao.tnb.file.app.zjob.model.constant.JobStatus;
+import cn.reghao.tnb.file.app.zjob.model.po.JobDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/db/mapper/JobDetailMapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zjob/db/JobDetailMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.db.mapper;
+package cn.reghao.tnb.file.app.zjob.db;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.file.app.model.po.JobDetail;
+import cn.reghao.tnb.file.app.zjob.model.po.JobDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/constant/JobStatus.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zjob/model/constant/JobStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.constant;
+package cn.reghao.tnb.file.app.zjob.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/po/JobDetail.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zjob/model/po/JobDetail.java

@@ -1,9 +1,7 @@
-package cn.reghao.tnb.file.app.model.po;
+package cn.reghao.tnb.file.app.zjob.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.tnb.file.app.delay.DelayJob;
-import cn.reghao.tnb.file.app.delay.task.ConvertTaskInfo;
-import cn.reghao.tnb.file.app.model.constant.JobStatus;
+import cn.reghao.tnb.file.app.zjob.DelayJob;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/JobServiceImpl.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zjob/rpc/JobServiceImpl.java

@@ -1,19 +1,19 @@
-package cn.reghao.tnb.file.app.rpc;
+package cn.reghao.tnb.file.app.zjob.rpc;
 
 import cn.reghao.file.api.iface.JobService;
 import cn.reghao.jutil.tool.id.SnowFlake;
 import cn.reghao.tnb.content.api.iface.AdminVideoService;
 import cn.reghao.tnb.content.api.iface.MallService;
-import cn.reghao.tnb.file.app.db.mapper.JobDetailMapper;
-import cn.reghao.tnb.file.app.db.mapper.OrderMapper;
-import cn.reghao.tnb.file.app.delay.JobContext;
-import cn.reghao.tnb.file.app.delay.DelayJob;
-import cn.reghao.tnb.file.app.delay.task.ConvertTask;
-import cn.reghao.tnb.file.app.delay.task.ConvertTaskInfo;
-import cn.reghao.tnb.file.app.delay.task.OrderTask;
-import cn.reghao.tnb.file.app.delay.task.PublishVideoTask;
-import cn.reghao.tnb.file.app.model.constant.JobStatus;
-import cn.reghao.tnb.file.app.model.po.JobDetail;
+import cn.reghao.tnb.file.app.zjob.db.JobDetailMapper;
+import cn.reghao.tnb.file.app.zorder.db.OrderMapper;
+import cn.reghao.tnb.file.app.zjob.JobContext;
+import cn.reghao.tnb.file.app.zjob.DelayJob;
+import cn.reghao.tnb.file.app.zjob.task.ConvertTask;
+import cn.reghao.tnb.file.app.zjob.task.ConvertTaskInfo;
+import cn.reghao.tnb.file.app.zjob.task.OrderTask;
+import cn.reghao.tnb.file.app.zjob.task.PublishVideoTask;
+import cn.reghao.tnb.file.app.zjob.model.constant.JobStatus;
+import cn.reghao.tnb.file.app.zjob.model.po.JobDetail;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;

file/file-service/src/main/java/cn/reghao/tnb/file/app/delay/task/ConvertTask.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zjob/task/ConvertTask.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.file.app.delay.task;
+package cn.reghao.tnb.file.app.zjob.task;
 
 import cn.reghao.jutil.media.FFmpegWrapper;
 import cn.reghao.tnb.content.api.iface.AdminVideoService;
-import cn.reghao.tnb.file.app.db.mapper.JobDetailMapper;
-import cn.reghao.tnb.file.app.model.constant.JobStatus;
+import cn.reghao.tnb.file.app.zjob.db.JobDetailMapper;
+import cn.reghao.tnb.file.app.zjob.model.constant.JobStatus;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

file/file-service/src/main/java/cn/reghao/tnb/file/app/delay/task/ConvertTaskInfo.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zjob/task/ConvertTaskInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.delay.task;
+package cn.reghao.tnb.file.app.zjob.task;
 
 import cn.reghao.tnb.content.api.iface.AdminVideoService;
 import lombok.Getter;

file/file-service/src/main/java/cn/reghao/tnb/file/app/delay/task/OrderTask.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zjob/task/OrderTask.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.file.app.delay.task;
+package cn.reghao.tnb.file.app.zjob.task;
 
 import cn.reghao.tnb.content.api.iface.MallService;
-import cn.reghao.tnb.file.app.db.mapper.OrderMapper;
-import cn.reghao.tnb.file.app.model.constant.OrderStatus;
-import cn.reghao.tnb.file.app.model.po.Order;
+import cn.reghao.tnb.file.app.zorder.db.OrderMapper;
+import cn.reghao.tnb.file.app.zorder.model.constant.OrderStatus;
+import cn.reghao.tnb.file.app.zorder.model.po.Order;
 import lombok.extern.slf4j.Slf4j;
 
 /**

file/file-service/src/main/java/cn/reghao/tnb/file/app/delay/task/PublishVideoTask.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zjob/task/PublishVideoTask.java

@@ -1,10 +1,10 @@
-package cn.reghao.tnb.file.app.delay.task;
+package cn.reghao.tnb.file.app.zjob.task;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.result.ResultStatus;
 import cn.reghao.tnb.content.api.iface.AdminVideoService;
-import cn.reghao.tnb.file.app.db.mapper.JobDetailMapper;
-import cn.reghao.tnb.file.app.model.constant.JobStatus;
+import cn.reghao.tnb.file.app.zjob.db.JobDetailMapper;
+import cn.reghao.tnb.file.app.zjob.model.constant.JobStatus;
 
 import java.time.LocalDateTime;
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/OrderController.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zorder/controller/OrderController.java

@@ -1,10 +1,10 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.tnb.file.app.zorder.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
-import cn.reghao.tnb.file.app.model.vo.OrderDetail;
-import cn.reghao.tnb.file.app.service.OrderService;
+import cn.reghao.tnb.file.app.zorder.model.vo.OrderDetail;
+import cn.reghao.tnb.file.app.zorder.service.OrderService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.web.bind.annotation.*;

file/file-service/src/main/java/cn/reghao/tnb/file/app/db/mapper/OrderMapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zorder/db/OrderMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.db.mapper;
+package cn.reghao.tnb.file.app.zorder.db;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.file.app.model.po.Order;
+import cn.reghao.tnb.file.app.zorder.model.po.Order;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/constant/OrderStatus.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zorder/model/constant/OrderStatus.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.constant;
+package cn.reghao.tnb.file.app.zorder.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/po/Order.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zorder/model/po/Order.java

@@ -1,9 +1,8 @@
-package cn.reghao.tnb.file.app.model.po;
+package cn.reghao.tnb.file.app.zorder.model.po;
 
 import cn.reghao.file.api.dto.BuyDto;
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.file.app.model.constant.OrderStatus;
+import cn.reghao.tnb.file.app.zorder.model.constant.OrderStatus;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/vo/OrderDetail.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zorder/model/vo/OrderDetail.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.file.app.model.vo;
+package cn.reghao.tnb.file.app.zorder.model.vo;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.tnb.content.api.dto.ItemSnapshot;
-import cn.reghao.tnb.file.app.model.constant.OrderStatus;
-import cn.reghao.tnb.file.app.model.po.Order;
+import cn.reghao.tnb.file.app.zorder.model.constant.OrderStatus;
+import cn.reghao.tnb.file.app.zorder.model.po.Order;
 
 /**
  * @author reghao

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/NewOrderServiceImpl.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zorder/rpc/NewOrderServiceImpl.java

@@ -1,11 +1,11 @@
-package cn.reghao.tnb.file.app.rpc;
+package cn.reghao.tnb.file.app.zorder.rpc;
 
 import cn.reghao.file.api.dto.BuyDto;
 import cn.reghao.file.api.iface.NewOrderService;
 import cn.reghao.file.api.iface.JobService;
 import cn.reghao.jutil.tool.id.SnowFlake;
-import cn.reghao.tnb.file.app.db.mapper.OrderMapper;
-import cn.reghao.tnb.file.app.model.po.Order;
+import cn.reghao.tnb.file.app.zorder.db.OrderMapper;
+import cn.reghao.tnb.file.app.zorder.model.po.Order;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/service/OrderService.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zorder/service/OrderService.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.service;
+package cn.reghao.tnb.file.app.zorder.service;
 
 import cn.reghao.file.api.iface.JobService;
 import cn.reghao.jutil.jdk.result.Result;
@@ -6,10 +6,10 @@ import cn.reghao.jutil.jdk.result.ResultStatus;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.dto.ItemSnapshot;
 import cn.reghao.tnb.content.api.iface.MallService;
-import cn.reghao.tnb.file.app.db.mapper.OrderMapper;
-import cn.reghao.tnb.file.app.model.constant.OrderStatus;
-import cn.reghao.tnb.file.app.model.po.Order;
-import cn.reghao.tnb.file.app.model.vo.OrderDetail;
+import cn.reghao.tnb.file.app.zorder.db.OrderMapper;
+import cn.reghao.tnb.file.app.zorder.model.constant.OrderStatus;
+import cn.reghao.tnb.file.app.zorder.model.po.Order;
+import cn.reghao.tnb.file.app.zorder.model.vo.OrderDetail;
 import cn.reghao.tnb.user.api.iface.UserWalletService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/OssSdkController.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/controller/OssSdkController.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.tnb.file.app.zoss.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
@@ -10,8 +10,8 @@ import cn.reghao.tnb.oss.api.dto.media.ConvertedImageInfo;
 import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
 import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.file.app.model.dto.KeyAuthDto;
-import cn.reghao.tnb.file.app.rpc.StoreServiceWrapper;
+import cn.reghao.tnb.file.app.zoss.model.dto.KeyAuthDto;
+import cn.reghao.tnb.file.app.zoss.rpc.StoreServiceWrapper;
 import cn.reghao.tnb.file.app.service.UserKeyService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/StoreNodeController.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/controller/StoreNodeController.java

@@ -1,10 +1,10 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.tnb.file.app.zoss.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.common.db.SelectOption;
-import cn.reghao.tnb.file.app.model.po.StoreVolume;
-import cn.reghao.tnb.file.app.model.vo.StoreNodeInfo;
+import cn.reghao.tnb.file.app.zoss.model.po.StoreVolume;
+import cn.reghao.tnb.file.app.zoss.model.vo.StoreNodeInfo;
 import cn.reghao.tnb.file.app.service.StoreNodeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/StoreObjectController.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/controller/StoreObjectController.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.tnb.file.app.zoss.controller;
 
 import cn.reghao.file.api.iface.FileService;
 import cn.reghao.jutil.jdk.db.PageList;
@@ -7,8 +7,8 @@ import cn.reghao.tnb.oss.api.iface.ConsoleService;
 import cn.reghao.tnb.oss.api.dto.ObjectInfo;
 import cn.reghao.tnb.oss.api.dto.ServerInfo;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.file.app.model.po.UserNode;
-import cn.reghao.tnb.file.app.model.vo.FileInfo;
+import cn.reghao.tnb.file.app.zoss.model.po.UserNode;
+import cn.reghao.tnb.file.app.zoss.model.vo.FileInfo;
 import cn.reghao.tnb.file.app.service.OssFileService;
 import cn.reghao.tnb.file.app.service.UploadChannelService;
 import cn.reghao.tnb.file.app.service.UserNodeService;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/UploadChannelController.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/controller/UploadChannelController.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.tnb.file.app.zoss.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
@@ -6,11 +6,11 @@ import cn.reghao.tnb.oss.api.constant.ObjectSize;
 import cn.reghao.tnb.oss.api.constant.ObjectScope;
 import cn.reghao.tnb.oss.api.constant.ObjectType;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.file.app.model.dto.UploadChannelDto;
+import cn.reghao.tnb.file.app.zoss.model.dto.UploadChannelDto;
 import cn.reghao.tnb.common.db.SelectOption;
-import cn.reghao.tnb.file.app.model.po.UploadChannel;
-import cn.reghao.tnb.file.app.model.po.UserNode;
-import cn.reghao.tnb.file.app.model.vo.AddChannelAttr;
+import cn.reghao.tnb.file.app.zoss.model.po.UploadChannel;
+import cn.reghao.tnb.file.app.zoss.model.po.UserNode;
+import cn.reghao.tnb.file.app.zoss.model.vo.AddChannelAttr;
 import cn.reghao.tnb.file.app.service.UploadChannelService;
 import cn.reghao.tnb.file.app.service.UserNodeService;
 import io.swagger.v3.oas.annotations.Operation;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/UserKeyController.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/controller/UserKeyController.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.tnb.file.app.zoss.controller;
 
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.tnb.file.app.model.po.UserKey;
+import cn.reghao.tnb.file.app.zoss.model.po.UserKey;
 import cn.reghao.tnb.file.app.service.StoreConfigService;
 import cn.reghao.tnb.file.app.service.UserKeyService;
 import io.swagger.v3.oas.annotations.Operation;

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/UserNodeController.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/controller/UserNodeController.java

@@ -1,12 +1,12 @@
-package cn.reghao.tnb.file.app.controller;
+package cn.reghao.tnb.file.app.zoss.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.file.app.model.dto.NodeAddDto;
+import cn.reghao.tnb.file.app.zoss.model.dto.NodeAddDto;
 import cn.reghao.tnb.common.db.SelectOption;
-import cn.reghao.tnb.file.app.model.dto.NodeUpdateDto;
-import cn.reghao.tnb.file.app.model.po.UserNode;
+import cn.reghao.tnb.file.app.zoss.model.dto.NodeUpdateDto;
+import cn.reghao.tnb.file.app.zoss.model.po.UserNode;
 import cn.reghao.tnb.file.app.service.UserNodeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

file/file-service/src/main/java/cn/reghao/tnb/file/app/db/mapper/StoreNodeMapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/db/mapper/StoreNodeMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.db.mapper;
+package cn.reghao.tnb.file.app.zoss.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.file.app.model.po.StoreNode;
+import cn.reghao.tnb.file.app.zoss.model.po.StoreNode;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

file/file-service/src/main/java/cn/reghao/tnb/file/app/db/mapper/StoreVolumeMapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/db/mapper/StoreVolumeMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.db.mapper;
+package cn.reghao.tnb.file.app.zoss.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.file.app.model.po.StoreVolume;
+import cn.reghao.tnb.file.app.zoss.model.po.StoreVolume;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

file/file-service/src/main/java/cn/reghao/tnb/file/app/db/mapper/UploadChannelMapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/db/mapper/UploadChannelMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.db.mapper;
+package cn.reghao.tnb.file.app.zoss.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.file.app.model.po.UploadChannel;
+import cn.reghao.tnb.file.app.zoss.model.po.UploadChannel;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/db/mapper/UserKeyMapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/db/mapper/UserKeyMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.db.mapper;
+package cn.reghao.tnb.file.app.zoss.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.file.app.model.po.UserKey;
+import cn.reghao.tnb.file.app.zoss.model.po.UserKey;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

file/file-service/src/main/java/cn/reghao/tnb/file/app/db/mapper/UserNodeMapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/db/mapper/UserNodeMapper.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.file.app.db.mapper;
+package cn.reghao.tnb.file.app.zoss.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.file.app.model.dto.NodeUpdateDto;
-import cn.reghao.tnb.file.app.model.po.UserNode;
+import cn.reghao.tnb.file.app.zoss.model.dto.NodeUpdateDto;
+import cn.reghao.tnb.file.app.zoss.model.po.UserNode;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

file/file-service/src/main/java/cn/reghao/tnb/file/app/db/repository/ChannelRepository.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/db/repository/ChannelRepository.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.file.app.db.repository;
+package cn.reghao.tnb.file.app.zoss.db.repository;
 
-import cn.reghao.tnb.file.app.db.mapper.UploadChannelMapper;
-import cn.reghao.tnb.file.app.model.po.UploadChannel;
-import cn.reghao.tnb.file.app.rpc.StoreServiceWrapper;
+import cn.reghao.tnb.file.app.zoss.db.mapper.UploadChannelMapper;
+import cn.reghao.tnb.file.app.zoss.model.po.UploadChannel;
+import cn.reghao.tnb.file.app.zoss.rpc.StoreServiceWrapper;
 import cn.reghao.tnb.file.app.service.StoreConfigService;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;

file/file-service/src/main/java/cn/reghao/tnb/file/app/db/repository/StoreRepository.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/db/repository/StoreRepository.java

@@ -1,12 +1,12 @@
-package cn.reghao.tnb.file.app.db.repository;
+package cn.reghao.tnb.file.app.zoss.db.repository;
 
 import cn.reghao.tnb.oss.api.dto.StoreNodeDto;
-import cn.reghao.tnb.file.app.db.mapper.StoreNodeMapper;
-import cn.reghao.tnb.file.app.db.mapper.StoreVolumeMapper;
-import cn.reghao.tnb.file.app.db.mapper.UploadChannelMapper;
-import cn.reghao.tnb.file.app.model.po.StoreNode;
-import cn.reghao.tnb.file.app.model.po.StoreVolume;
-import cn.reghao.tnb.file.app.model.po.UploadChannel;
+import cn.reghao.tnb.file.app.zoss.db.mapper.StoreNodeMapper;
+import cn.reghao.tnb.file.app.zoss.db.mapper.StoreVolumeMapper;
+import cn.reghao.tnb.file.app.zoss.db.mapper.UploadChannelMapper;
+import cn.reghao.tnb.file.app.zoss.model.po.StoreNode;
+import cn.reghao.tnb.file.app.zoss.model.po.StoreVolume;
+import cn.reghao.tnb.file.app.zoss.model.po.UploadChannel;
 import cn.reghao.tnb.file.app.service.StoreConfigService;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Repository;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/dto/KeyAuthDto.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/dto/KeyAuthDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.dto;
+package cn.reghao.tnb.file.app.zoss.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/dto/NodeAddDto.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/dto/NodeAddDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.dto;
+package cn.reghao.tnb.file.app.zoss.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/dto/NodeUpdateDto.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/dto/NodeUpdateDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.dto;
+package cn.reghao.tnb.file.app.zoss.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/dto/UploadChannelDto.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/dto/UploadChannelDto.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.dto;
+package cn.reghao.tnb.file.app.zoss.model.dto;
 
 import cn.reghao.jutil.web.validator.ValidEnum;
 import cn.reghao.tnb.oss.api.constant.ObjectSize;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/po/StoreNode.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/po/StoreNode.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.po;
+package cn.reghao.tnb.file.app.zoss.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import cn.reghao.tnb.oss.api.dto.StoreNodeDto;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/po/StoreVolume.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/po/StoreVolume.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.po;
+package cn.reghao.tnb.file.app.zoss.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import cn.reghao.tnb.oss.api.dto.disk.DiskVolume;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/po/UploadChannel.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/po/UploadChannel.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.file.app.model.po;
+package cn.reghao.tnb.file.app.zoss.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import cn.reghao.file.api.constant.UploadChannelType;
-import cn.reghao.tnb.file.app.model.dto.UploadChannelDto;
+import cn.reghao.tnb.file.app.zoss.model.dto.UploadChannelDto;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/po/UserKey.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/po/UserKey.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.po;
+package cn.reghao.tnb.file.app.zoss.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import lombok.AllArgsConstructor;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/po/UserNode.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/po/UserNode.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.model.po;
+package cn.reghao.tnb.file.app.zoss.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
-import cn.reghao.tnb.file.app.model.dto.NodeAddDto;
+import cn.reghao.tnb.file.app.zoss.model.dto.NodeAddDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/vo/AddChannelAttr.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/vo/AddChannelAttr.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.vo;
+package cn.reghao.tnb.file.app.zoss.model.vo;
 
 import cn.reghao.tnb.common.db.SelectOption;
 import lombok.AllArgsConstructor;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/vo/FileInfo.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/vo/FileInfo.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.model.vo;
+package cn.reghao.tnb.file.app.zoss.model.vo;
 
 import cn.reghao.tnb.oss.api.constant.ObjectType;
 import cn.reghao.tnb.oss.api.dto.ObjectInfo;

file/file-service/src/main/java/cn/reghao/tnb/file/app/model/vo/StoreNodeInfo.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/model/vo/StoreNodeInfo.java

@@ -1,6 +1,6 @@
-package cn.reghao.tnb.file.app.model.vo;
+package cn.reghao.tnb.file.app.zoss.model.vo;
 
-import cn.reghao.tnb.file.app.model.po.StoreNode;
+import cn.reghao.tnb.file.app.zoss.model.po.StoreNode;
 import lombok.Getter;
 
 /**

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/ConsoleServiceImpl.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/rpc/ConsoleServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.rpc;
+package cn.reghao.tnb.file.app.zoss.rpc;
 
 import cn.reghao.tnb.oss.api.dto.NodeProperties;
 import cn.reghao.tnb.oss.api.dto.ObjectChannel;
@@ -6,9 +6,9 @@ import cn.reghao.tnb.oss.api.dto.StoreNodeDto;
 import cn.reghao.tnb.oss.api.iface.ConsoleService;
 import cn.reghao.tnb.oss.api.iface.StoreService;
 import cn.reghao.tnb.oss.api.dto.ServerInfo;
-import cn.reghao.tnb.file.app.model.po.StoreNode;
-import cn.reghao.tnb.file.app.model.po.UploadChannel;
-import cn.reghao.tnb.file.app.model.po.UserNode;
+import cn.reghao.tnb.file.app.zoss.model.po.StoreNode;
+import cn.reghao.tnb.file.app.zoss.model.po.UploadChannel;
+import cn.reghao.tnb.file.app.zoss.model.po.UserNode;
 import cn.reghao.tnb.file.app.service.StoreConfigService;
 import cn.reghao.tnb.file.app.service.StoreNodeService;
 import cn.reghao.tnb.file.app.service.UploadChannelService;

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/RemoteService.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/rpc/RemoteService.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.rpc;
+package cn.reghao.tnb.file.app.zoss.rpc;
 
 import org.apache.dubbo.config.ApplicationConfig;
 import org.apache.dubbo.config.ConsumerConfig;

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/RpcService.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/rpc/RpcService.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.file.app.rpc;
+package cn.reghao.tnb.file.app.zoss.rpc;
 
 import cn.reghao.tnb.oss.api.iface.StoreService;
-import cn.reghao.tnb.file.app.model.po.StoreNode;
+import cn.reghao.tnb.file.app.zoss.model.po.StoreNode;
 import org.apache.dubbo.config.ApplicationConfig;
 import org.apache.dubbo.config.ConsumerConfig;
 import org.apache.dubbo.config.ReferenceConfig;

file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/StoreServiceWrapper.java → file/file-service/src/main/java/cn/reghao/tnb/file/app/zoss/rpc/StoreServiceWrapper.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.file.app.rpc;
+package cn.reghao.tnb.file.app.zoss.rpc;
 
 import cn.reghao.tnb.oss.api.dto.disk.DiskVolume;
 import cn.reghao.tnb.oss.api.iface.StoreService;
@@ -7,8 +7,8 @@ import cn.reghao.tnb.oss.api.dto.media.AudioInfo;
 import cn.reghao.tnb.oss.api.dto.media.ConvertedImageInfo;
 import cn.reghao.tnb.oss.api.dto.media.ImageInfo;
 import cn.reghao.tnb.oss.api.dto.media.VideoInfo;
-import cn.reghao.tnb.file.app.db.mapper.StoreNodeMapper;
-import cn.reghao.tnb.file.app.model.po.StoreNode;
+import cn.reghao.tnb.file.app.zoss.db.mapper.StoreNodeMapper;
+import cn.reghao.tnb.file.app.zoss.model.po.StoreNode;
 import cn.reghao.tnb.file.app.service.UserNodeService;
 import org.springframework.stereotype.Service;
 

file/file-service/src/main/resources/application.yml

@@ -5,7 +5,7 @@ dubbo:
     qos-port: 16103
     qos-accept-foreign-ip: false
   scan:
-    base-packages: cn.reghao.tnb.file.app.rpc
+    base-packages: cn.reghao.tnb.file.app.rpc,cn.reghao.tnb.file.app.zjob.rpc,cn.reghao.tnb.file.app.zorder.rpc
   protocol:
     name: dubbo
     port: 6103

file/file-service/src/main/resources/mapper/JobDetailMapper.xml → file/file-service/src/main/resources/mapper/job/JobDetailMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.file.app.db.mapper.JobDetailMapper">
+<mapper namespace="cn.reghao.tnb.file.app.zjob.db.JobDetailMapper">
     <insert id="save">
         insert into file_job_detail
         (`job_id`,`job_name`,`status`,`start_at`,`end_at`)
@@ -23,11 +23,11 @@
         where job_id=#{jobId}
     </update>
 
-    <select id="findAll" resultType="cn.reghao.tnb.file.app.model.po.JobDetail">
+    <select id="findAll" resultType="cn.reghao.tnb.file.app.zjob.model.po.JobDetail">
         select *
         from file_job_detail
     </select>
-    <select id="findByStatus" resultType="cn.reghao.tnb.file.app.model.po.JobDetail">
+    <select id="findByStatus" resultType="cn.reghao.tnb.file.app.zjob.model.po.JobDetail">
         select *
         from file_job_detail
         where `status`=#{status}

file/file-service/src/main/resources/mapper/OrderMapper.xml → file/file-service/src/main/resources/mapper/order/OrderMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.file.app.db.mapper.OrderMapper">
+<mapper namespace="cn.reghao.tnb.file.app.zorder.db.OrderMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into mall_order
         (`order_id`,`product_id`,`delivery_id`,`price`,`amount`,`owner`,`status`)
@@ -23,14 +23,14 @@
         where `order_id`=#{orderId}
     </update>
     
-    <select id="findByOwner" resultType="cn.reghao.tnb.file.app.model.po.Order">
+    <select id="findByOwner" resultType="cn.reghao.tnb.file.app.zorder.model.po.Order">
         select *
         from mall_order
         where `owner`=#{owner}
         order by create_time desc
         limit #{pageSize}
     </select>
-    <select id="findByOrderId" resultType="cn.reghao.tnb.file.app.model.po.Order">
+    <select id="findByOrderId" resultType="cn.reghao.tnb.file.app.zorder.model.po.Order">
         select *
         from mall_order
         where `order_id`=#{orderId}

file/file-service/src/main/resources/mapper/StoreNodeMapper.xml → file/file-service/src/main/resources/mapper/oss/StoreNodeMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.file.app.db.mapper.StoreNodeMapper">
+<mapper namespace="cn.reghao.tnb.file.app.zoss.db.mapper.StoreNodeMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into file_store_node
         (`node_addr`,`http_port`,`rpc_port`,`enabled`)
@@ -9,27 +9,27 @@
         (#{nodeAddr},#{httpPort},#{rpcPort},#{enabled})
     </insert>
 
-    <select id="findAll" resultType="cn.reghao.tnb.file.app.model.po.StoreNode">
+    <select id="findAll" resultType="cn.reghao.tnb.file.app.zoss.model.po.StoreNode">
         select *
         from file_store_node
     </select>
-    <select id="findByNodeAddr" resultType="cn.reghao.tnb.file.app.model.po.StoreNode">
+    <select id="findByNodeAddr" resultType="cn.reghao.tnb.file.app.zoss.model.po.StoreNode">
         select *
         from file_store_node
         where node_addr=#{nodeAddr}
     </select>
-    <select id="findById" resultType="cn.reghao.tnb.file.app.model.po.StoreNode">
+    <select id="findById" resultType="cn.reghao.tnb.file.app.zoss.model.po.StoreNode">
         select *
         from file_store_node
         where id=#{id}
     </select>
-    <resultMap id="imageAlbumCard" type="cn.reghao.tnb.file.app.model.po.StoreNode">
+    <resultMap id="imageAlbumCard" type="cn.reghao.tnb.file.app.zoss.model.po.StoreNode">
         <result property="userId" column="user_id"/>
         <result property="albumId" column="album_id"/>
         <result property="albumName" column="album_name"/>
-        <collection property="imageFiles" column="album_id" ofType="cn.reghao.tnb.file.app.model.po.StoreVolume" select="findStoreVolumes"/>
+        <collection property="imageFiles" column="album_id" ofType="cn.reghao.tnb.file.app.zoss.model.po.StoreVolume" select="findStoreVolumes"/>
     </resultMap>
-    <select id="findStoreVolumes" resultType="cn.reghao.tnb.file.app.model.po.StoreVolume">
+    <select id="findStoreVolumes" resultType="cn.reghao.tnb.file.app.zoss.model.po.StoreVolume">
         select *
         from file_store_volume
         where store_node_id=#{storeNodeId}

file/file-service/src/main/resources/mapper/StoreVolumeMapper.xml → file/file-service/src/main/resources/mapper/oss/StoreVolumeMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.file.app.db.mapper.StoreVolumeMapper">
+<mapper namespace="cn.reghao.tnb.file.app.zoss.db.mapper.StoreVolumeMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into file_store_volume
         (`store_node_id`,`name`,`volume`,`mount_point`,`fs_type`,`block_id`,`total_space`,`avail_space`,`total_inode`,`avail_inode`,`store_dir`)
@@ -17,7 +17,7 @@
         </foreach>
     </insert>
 
-    <select id="findByStoreNodeId" resultType="cn.reghao.tnb.file.app.model.po.StoreVolume">
+    <select id="findByStoreNodeId" resultType="cn.reghao.tnb.file.app.zoss.model.po.StoreVolume">
         select *
         from file_store_volume
         where store_node_id=#{storeNodeId}

file/file-service/src/main/resources/mapper/UploadChannelMapper.xml → file/file-service/src/main/resources/mapper/oss/UploadChannelMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.file.app.db.mapper.UploadChannelMapper">
+<mapper namespace="cn.reghao.tnb.file.app.zoss.db.mapper.UploadChannelMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into file_upload_channel
         (`channel_code`,`name`,`prefix`,`max_size`,`file_type`,`set_url`,`set_callback`,`scope`,`enabled`,`user_node_id`,`create_by`)
@@ -27,32 +27,32 @@
         from file_upload_channel
         where create_by=#{createBy}
     </select>
-    <select id="findByCreateBy" resultType="cn.reghao.tnb.file.app.model.po.UploadChannel">
+    <select id="findByCreateBy" resultType="cn.reghao.tnb.file.app.zoss.model.po.UploadChannel">
         select *
         from file_upload_channel
         where create_by=#{createBy}
     </select>
-    <select id="findById" resultType="cn.reghao.tnb.file.app.model.po.UploadChannel">
+    <select id="findById" resultType="cn.reghao.tnb.file.app.zoss.model.po.UploadChannel">
         select *
         from file_upload_channel
         where id=#{id}
     </select>
-    <select id="findByCreateByAndUserNodeId" resultType="cn.reghao.tnb.file.app.model.po.UploadChannel">
+    <select id="findByCreateByAndUserNodeId" resultType="cn.reghao.tnb.file.app.zoss.model.po.UploadChannel">
         select *
         from file_upload_channel
         where create_by=#{createBy} and user_node_id=#{userNodeId}
     </select>
-    <select id="findByCreateByAndChannelCode" resultType="cn.reghao.tnb.file.app.model.po.UploadChannel">
+    <select id="findByCreateByAndChannelCode" resultType="cn.reghao.tnb.file.app.zoss.model.po.UploadChannel">
         select *
         from file_upload_channel
         where create_by=#{createBy} and channel_code=#{channelCode}
     </select>
-    <select id="findByCreateByAndPrefix" resultType="cn.reghao.tnb.file.app.model.po.UploadChannel">
+    <select id="findByCreateByAndPrefix" resultType="cn.reghao.tnb.file.app.zoss.model.po.UploadChannel">
         select *
         from file_upload_channel
         where create_by=#{createBy} and prefix like concat(#{prefix},'%')
     </select>
-    <select id="findByCreateByAndName" resultType="cn.reghao.tnb.file.app.model.po.UploadChannel">
+    <select id="findByCreateByAndName" resultType="cn.reghao.tnb.file.app.zoss.model.po.UploadChannel">
         select *
         from file_upload_channel
         where create_by=#{createBy} and name=#{name}

file/file-service/src/main/resources/mapper/UserKeyMapper.xml → file/file-service/src/main/resources/mapper/oss/UserKeyMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.file.app.db.mapper.UserKeyMapper">
+<mapper namespace="cn.reghao.tnb.file.app.zoss.db.mapper.UserKeyMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into file_user_key
         (`access_key_id`,`access_key_secret`,`create_by`)
@@ -15,12 +15,12 @@
         where create_by=#{createBy}
     </update>
 
-    <select id="findByCreateBy" resultType="cn.reghao.tnb.file.app.model.po.UserKey">
+    <select id="findByCreateBy" resultType="cn.reghao.tnb.file.app.zoss.model.po.UserKey">
         select *
         from file_user_key
         where create_by=#{createBy}
     </select>
-    <select id="findByAccessKeyId" resultType="cn.reghao.tnb.file.app.model.po.UserKey">
+    <select id="findByAccessKeyId" resultType="cn.reghao.tnb.file.app.zoss.model.po.UserKey">
         select *
         from file_user_key
         where access_key_id=#{accessKeyId}

file/file-service/src/main/resources/mapper/UserNodeMapper.xml → file/file-service/src/main/resources/mapper/oss/UserNodeMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.reghao.tnb.file.app.db.mapper.UserNodeMapper">
+<mapper namespace="cn.reghao.tnb.file.app.zoss.db.mapper.UserNodeMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         insert into file_user_node
         (`store_node_id`,`domain`,`referer`,`secret_key`,`create_by`)
@@ -28,22 +28,22 @@
         from file_user_node
         where create_by=#{createBy}
     </select>
-    <select id="findByCreateByAndStoreNodeId" resultType="cn.reghao.tnb.file.app.model.po.UserNode">
+    <select id="findByCreateByAndStoreNodeId" resultType="cn.reghao.tnb.file.app.zoss.model.po.UserNode">
         select *
         from file_user_node
         where create_by=#{createBy} and store_node_id=#{storeNodeId}
     </select>
-    <select id="findByCreateBy" resultType="cn.reghao.tnb.file.app.model.po.UserNode">
+    <select id="findByCreateBy" resultType="cn.reghao.tnb.file.app.zoss.model.po.UserNode">
         select *
         from file_user_node
         where create_by=#{create_by}
     </select>
-    <select id="findByDomain" resultType="cn.reghao.tnb.file.app.model.po.UserNode">
+    <select id="findByDomain" resultType="cn.reghao.tnb.file.app.zoss.model.po.UserNode">
         select *
         from file_user_node
         where domain=#{domain}
     </select>
-    <select id="findById" resultType="cn.reghao.tnb.file.app.model.po.UserNode">
+    <select id="findById" resultType="cn.reghao.tnb.file.app.zoss.model.po.UserNode">
         select *
         from file_user_node
         where id=#{id}