diff --git a/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/SocketConfig.java b/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/SocketConfig.java index 67848f1..4a547e2 100644 --- a/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/SocketConfig.java +++ b/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/SocketConfig.java @@ -1,17 +1,39 @@ package cn.toesbieya.jxc.socket.config; -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.context.config.annotation.RefreshScope; -import org.springframework.stereotype.Component; +import com.corundumstudio.socketio.SocketIOServer; +import com.corundumstudio.socketio.annotation.SpringAnnotationScanner; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; -@Component -@ConfigurationProperties("socket") -@RefreshScope -@Data +@Configuration +@EnableConfigurationProperties(SocketProperty.class) +@DependsOn("redisUtil") public class SocketConfig { - private String hostname = "localhost"; - private Integer port = 12580; - private Integer maxFramePayloadLength = 1024 * 1024; - private Integer maxHttpContentLength = 1024 * 1024; + private SocketProperty property; + + @Bean + public SocketIOServer socketIOServer() { + com.corundumstudio.socketio.Configuration config = new com.corundumstudio.socketio.Configuration(); + + config.setHostname(property.getHostname()); + config.setPort(property.getPort()); + config.setMaxFramePayloadLength(property.getMaxFramePayloadLength()); + config.setMaxHttpContentLength(property.getMaxHttpContentLength()); + config.setAddVersionHeader(false); + + return new SocketIOServer(config); + } + + @Bean + public SpringAnnotationScanner springAnnotationScanner(SocketIOServer socketServer) { + return new SpringAnnotationScanner(socketServer); + } + + @Autowired + public void setSocketProperty(SocketProperty socketProperty) { + this.property = socketProperty; + } } diff --git a/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/SocketProperty.java b/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/SocketProperty.java new file mode 100644 index 0000000..21665f1 --- /dev/null +++ b/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/SocketProperty.java @@ -0,0 +1,15 @@ +package cn.toesbieya.jxc.socket.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; + +@ConfigurationProperties("socket") +@RefreshScope +@Data +public class SocketProperty { + private String hostname = "localhost"; + private Integer port = 12580; + private Integer maxFramePayloadLength = 1024 * 1024; + private Integer maxHttpContentLength = 1024 * 1024; +} diff --git a/java/local/src/main/java/com/toesbieya/my/MyApplication.java b/java/local/src/main/java/cn/toesbieya/jxc/MyApplication.java similarity index 86% rename from java/local/src/main/java/com/toesbieya/my/MyApplication.java rename to java/local/src/main/java/cn/toesbieya/jxc/MyApplication.java index 0c9a742..fa15805 100644 --- a/java/local/src/main/java/com/toesbieya/my/MyApplication.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/MyApplication.java @@ -1,4 +1,4 @@ -package com.toesbieya.my; +package cn.toesbieya.jxc; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication -@MapperScan("com.toesbieya.my.mapper") +@MapperScan("cn.toesbieya.jxc.mapper") @EnableScheduling public class MyApplication { public static void main(String[] args) { diff --git a/java/local/src/main/java/com/toesbieya/my/annoation/Lock.java b/java/local/src/main/java/cn/toesbieya/jxc/annoation/Lock.java similarity index 82% rename from java/local/src/main/java/com/toesbieya/my/annoation/Lock.java rename to java/local/src/main/java/cn/toesbieya/jxc/annoation/Lock.java index e9ccd1d..2ef8d2b 100644 --- a/java/local/src/main/java/com/toesbieya/my/annoation/Lock.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/annoation/Lock.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.annoation; +package cn.toesbieya.jxc.annoation; import java.lang.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/annoation/TimeCost.java b/java/local/src/main/java/cn/toesbieya/jxc/annoation/TimeCost.java similarity index 79% rename from java/local/src/main/java/com/toesbieya/my/annoation/TimeCost.java rename to java/local/src/main/java/cn/toesbieya/jxc/annoation/TimeCost.java index 7fabd99..f79579d 100644 --- a/java/local/src/main/java/com/toesbieya/my/annoation/TimeCost.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/annoation/TimeCost.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.annoation; +package cn.toesbieya.jxc.annoation; import java.lang.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/annoation/UserAction.java b/java/local/src/main/java/cn/toesbieya/jxc/annoation/UserAction.java similarity index 82% rename from java/local/src/main/java/com/toesbieya/my/annoation/UserAction.java rename to java/local/src/main/java/cn/toesbieya/jxc/annoation/UserAction.java index aa2f3fc..1013cca 100644 --- a/java/local/src/main/java/com/toesbieya/my/annoation/UserAction.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/annoation/UserAction.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.annoation; +package cn.toesbieya.jxc.annoation; import java.lang.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/aspect/LockAspect.java b/java/local/src/main/java/cn/toesbieya/jxc/aspect/LockAspect.java similarity index 86% rename from java/local/src/main/java/com/toesbieya/my/aspect/LockAspect.java rename to java/local/src/main/java/cn/toesbieya/jxc/aspect/LockAspect.java index 164b4ba..90577c0 100644 --- a/java/local/src/main/java/com/toesbieya/my/aspect/LockAspect.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/aspect/LockAspect.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.aspect; +package cn.toesbieya.jxc.aspect; -import com.toesbieya.my.annoation.Lock; -import com.toesbieya.my.utils.RedisUtil; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.SpringUtil; +import cn.toesbieya.jxc.annoation.Lock; +import cn.toesbieya.jxc.utils.Result; +import cn.toesbieya.jxc.utils.RedisUtil; +import cn.toesbieya.jxc.utils.SpringUtil; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.*; @@ -22,7 +22,7 @@ import java.util.ArrayList; public class LockAspect { private final ThreadLocal> lockerThreadLocal = new ThreadLocal<>(); - @Pointcut("@annotation(com.toesbieya.my.annoation.Lock)&&execution(com.toesbieya.my.utils.Result com.toesbieya.my..*.*(..))") + @Pointcut("@annotation(cn.toesbieya.jxc.annoation.Lock)&&execution(cn.toesbieya.jxc.utils.Result cn.toesbieya.jxc..*.*(..))") public void pointCut() { } diff --git a/java/local/src/main/java/com/toesbieya/my/aspect/TimeCostAspect.java b/java/local/src/main/java/cn/toesbieya/jxc/aspect/TimeCostAspect.java similarity index 93% rename from java/local/src/main/java/com/toesbieya/my/aspect/TimeCostAspect.java rename to java/local/src/main/java/cn/toesbieya/jxc/aspect/TimeCostAspect.java index fae2901..29d16e0 100644 --- a/java/local/src/main/java/com/toesbieya/my/aspect/TimeCostAspect.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/aspect/TimeCostAspect.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.aspect; +package cn.toesbieya.jxc.aspect; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; public class TimeCostAspect { private final ThreadLocal instantThreadLocal = new ThreadLocal<>(); - @Pointcut("@annotation(com.toesbieya.my.annoation.TimeCost)") + @Pointcut("@annotation(cn.toesbieya.jxc.annoation.TimeCost)") public void pointCut() { } diff --git a/java/local/src/main/java/com/toesbieya/my/aspect/UserActionAspect.java b/java/local/src/main/java/cn/toesbieya/jxc/aspect/UserActionAspect.java similarity index 79% rename from java/local/src/main/java/com/toesbieya/my/aspect/UserActionAspect.java rename to java/local/src/main/java/cn/toesbieya/jxc/aspect/UserActionAspect.java index 80846ce..48948da 100644 --- a/java/local/src/main/java/com/toesbieya/my/aspect/UserActionAspect.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/aspect/UserActionAspect.java @@ -1,12 +1,12 @@ -package com.toesbieya.my.aspect; +package cn.toesbieya.jxc.aspect; -import com.toesbieya.my.annoation.UserAction; -import com.toesbieya.my.enumeration.UserActionEnum; -import com.toesbieya.my.model.entity.RecUserAction; -import com.toesbieya.my.service.RecService; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.SpringUtil; -import com.toesbieya.my.utils.ThreadUtil; +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.enumeration.UserActionEnum; +import cn.toesbieya.jxc.model.entity.RecUserAction; +import cn.toesbieya.jxc.service.RecService; +import cn.toesbieya.jxc.utils.Result; +import cn.toesbieya.jxc.utils.SpringUtil; +import cn.toesbieya.jxc.utils.ThreadUtil; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -28,7 +28,7 @@ public class UserActionAspect { @Resource private RecService recService; - @Pointcut("@annotation(com.toesbieya.my.annoation.UserAction)&&execution(com.toesbieya.my.utils.Result com.toesbieya.my..*.*(..))") + @Pointcut("@annotation(cn.toesbieya.jxc.annoation.UserAction)&&execution(cn.toesbieya.jxc.utils.Result cn.toesbieya.jxc..*.*(..))") public void pointCut() { } diff --git a/java/local/src/main/java/com/toesbieya/my/config/ExecutorConfig.java b/java/local/src/main/java/cn/toesbieya/jxc/config/ExecutorConfig.java similarity index 98% rename from java/local/src/main/java/com/toesbieya/my/config/ExecutorConfig.java rename to java/local/src/main/java/cn/toesbieya/jxc/config/ExecutorConfig.java index 5834485..fc5fadc 100644 --- a/java/local/src/main/java/com/toesbieya/my/config/ExecutorConfig.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/config/ExecutorConfig.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.config; +package cn.toesbieya.jxc.config; import lombok.extern.slf4j.Slf4j; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; diff --git a/java/local/src/main/java/com/toesbieya/my/config/FastJsonConfigFactory.java b/java/local/src/main/java/cn/toesbieya/jxc/config/FastJsonConfigFactory.java similarity index 95% rename from java/local/src/main/java/com/toesbieya/my/config/FastJsonConfigFactory.java rename to java/local/src/main/java/cn/toesbieya/jxc/config/FastJsonConfigFactory.java index e32ed4e..984827a 100644 --- a/java/local/src/main/java/com/toesbieya/my/config/FastJsonConfigFactory.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/config/FastJsonConfigFactory.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.config; +package cn.toesbieya.jxc.config; import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.support.config.FastJsonConfig; diff --git a/java/local/src/main/java/com/toesbieya/my/config/QiniuConfig.java b/java/local/src/main/java/cn/toesbieya/jxc/config/QiniuConfig.java similarity index 93% rename from java/local/src/main/java/com/toesbieya/my/config/QiniuConfig.java rename to java/local/src/main/java/cn/toesbieya/jxc/config/QiniuConfig.java index 609ba51..c60088c 100644 --- a/java/local/src/main/java/com/toesbieya/my/config/QiniuConfig.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/config/QiniuConfig.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.config; +package cn.toesbieya.jxc.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/java/local/src/main/java/com/toesbieya/my/config/RedisConfig.java b/java/local/src/main/java/cn/toesbieya/jxc/config/RedisConfig.java similarity index 97% rename from java/local/src/main/java/com/toesbieya/my/config/RedisConfig.java rename to java/local/src/main/java/cn/toesbieya/jxc/config/RedisConfig.java index c049d06..f04af06 100644 --- a/java/local/src/main/java/com/toesbieya/my/config/RedisConfig.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.config; +package cn.toesbieya.jxc.config; import com.alibaba.fastjson.support.spring.FastJsonRedisSerializer; import org.springframework.context.annotation.Bean; diff --git a/java/local/src/main/java/com/toesbieya/my/config/RedisEventListenerConfig.java b/java/local/src/main/java/cn/toesbieya/jxc/config/RedisEventListenerConfig.java similarity index 94% rename from java/local/src/main/java/com/toesbieya/my/config/RedisEventListenerConfig.java rename to java/local/src/main/java/cn/toesbieya/jxc/config/RedisEventListenerConfig.java index bd65295..a97a8f0 100644 --- a/java/local/src/main/java/com/toesbieya/my/config/RedisEventListenerConfig.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/config/RedisEventListenerConfig.java @@ -1,12 +1,12 @@ -package com.toesbieya.my.config; - +package cn.toesbieya.jxc.config; + +import cn.toesbieya.jxc.constant.SessionConstant; +import cn.toesbieya.jxc.constant.SocketConstant; +import cn.toesbieya.jxc.model.vo.SocketEventVo; +import cn.toesbieya.jxc.module.WebSocketServer; +import cn.toesbieya.jxc.utils.RedisUtil; +import cn.toesbieya.jxc.utils.SessionUtil; import com.alibaba.fastjson.JSON; -import com.toesbieya.my.constant.SessionConstant; -import com.toesbieya.my.constant.SocketConstant; -import com.toesbieya.my.model.vo.SocketEventVo; -import com.toesbieya.my.module.WebSocketServer; -import com.toesbieya.my.utils.RedisUtil; -import com.toesbieya.my.utils.SessionUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/SocketServerConfig.java b/java/local/src/main/java/cn/toesbieya/jxc/config/SocketConfig.java similarity index 59% rename from java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/SocketServerConfig.java rename to java/local/src/main/java/cn/toesbieya/jxc/config/SocketConfig.java index 9084ca1..ca2de2d 100644 --- a/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/SocketServerConfig.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/config/SocketConfig.java @@ -1,25 +1,27 @@ -package cn.toesbieya.jxc.socket.config; +package cn.toesbieya.jxc.config; import com.corundumstudio.socketio.SocketIOServer; import com.corundumstudio.socketio.annotation.SpringAnnotationScanner; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; @Configuration +@EnableConfigurationProperties(SocketProperty.class) @DependsOn("redisUtil") -public class SocketServerConfig { - private SocketConfig socketConfig; +public class SocketConfig { + private SocketProperty property; @Bean public SocketIOServer socketIOServer() { com.corundumstudio.socketio.Configuration config = new com.corundumstudio.socketio.Configuration(); - config.setHostname(socketConfig.getHostname()); - config.setPort(socketConfig.getPort()); - config.setMaxFramePayloadLength(socketConfig.getMaxFramePayloadLength()); - config.setMaxHttpContentLength(socketConfig.getMaxHttpContentLength()); + config.setHostname(property.getHostname()); + config.setPort(property.getPort()); + config.setMaxFramePayloadLength(property.getMaxFramePayloadLength()); + config.setMaxHttpContentLength(property.getMaxHttpContentLength()); config.setAddVersionHeader(false); return new SocketIOServer(config); @@ -31,7 +33,7 @@ public class SocketServerConfig { } @Autowired - public void setSocketConfig(SocketConfig socketConfig) { - this.socketConfig = socketConfig; + public void setProperty(SocketProperty property) { + this.property = property; } } diff --git a/java/local/src/main/java/com/toesbieya/my/config/SocketConfig.java b/java/local/src/main/java/cn/toesbieya/jxc/config/SocketProperty.java similarity index 73% rename from java/local/src/main/java/com/toesbieya/my/config/SocketConfig.java rename to java/local/src/main/java/cn/toesbieya/jxc/config/SocketProperty.java index 2a04661..f00be86 100644 --- a/java/local/src/main/java/com/toesbieya/my/config/SocketConfig.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/config/SocketProperty.java @@ -1,13 +1,11 @@ -package com.toesbieya.my.config; +package cn.toesbieya.jxc.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; -@Component @ConfigurationProperties("socket") @Data -public class SocketConfig { +public class SocketProperty { private String hostname = "localhost"; private Integer port = 12580; private Integer maxFramePayloadLength = 1024 * 1024; diff --git a/java/local/src/main/java/com/toesbieya/my/config/WebConfig.java b/java/local/src/main/java/cn/toesbieya/jxc/config/WebConfig.java similarity index 91% rename from java/local/src/main/java/com/toesbieya/my/config/WebConfig.java rename to java/local/src/main/java/cn/toesbieya/jxc/config/WebConfig.java index f6e84e1..eb22a3d 100644 --- a/java/local/src/main/java/com/toesbieya/my/config/WebConfig.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/config/WebConfig.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.config; +package cn.toesbieya.jxc.config; +import cn.toesbieya.jxc.interceptor.RateControlInterceptor; +import cn.toesbieya.jxc.interceptor.SecurityInterceptor; +import cn.toesbieya.jxc.interceptor.UserActionInterceptor; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; -import com.toesbieya.my.interceptor.RateControlInterceptor; -import com.toesbieya.my.interceptor.SecurityInterceptor; -import com.toesbieya.my.interceptor.UserActionInterceptor; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; diff --git a/java/local/src/main/java/com/toesbieya/my/constant/DocumentConstant.java b/java/local/src/main/java/cn/toesbieya/jxc/constant/DocumentConstant.java similarity index 89% rename from java/local/src/main/java/com/toesbieya/my/constant/DocumentConstant.java rename to java/local/src/main/java/cn/toesbieya/jxc/constant/DocumentConstant.java index 55bab59..dfd133c 100644 --- a/java/local/src/main/java/com/toesbieya/my/constant/DocumentConstant.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/constant/DocumentConstant.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.constant; +package cn.toesbieya.jxc.constant; public class DocumentConstant { public static final String UPDATE_DOCUMENTS_LOCK_KEY = "UPDATE_DOCUMENTS"; diff --git a/java/local/src/main/java/com/toesbieya/my/constant/MsgConstant.java b/java/local/src/main/java/cn/toesbieya/jxc/constant/MsgConstant.java similarity index 93% rename from java/local/src/main/java/com/toesbieya/my/constant/MsgConstant.java rename to java/local/src/main/java/cn/toesbieya/jxc/constant/MsgConstant.java index 8dd7842..980c045 100644 --- a/java/local/src/main/java/com/toesbieya/my/constant/MsgConstant.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/constant/MsgConstant.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.constant; +package cn.toesbieya.jxc.constant; public class MsgConstant { public static final Integer TYPE_NOTICE = 0; //通知提醒 diff --git a/java/local/src/main/java/com/toesbieya/my/constant/SessionConstant.java b/java/local/src/main/java/cn/toesbieya/jxc/constant/SessionConstant.java similarity index 93% rename from java/local/src/main/java/com/toesbieya/my/constant/SessionConstant.java rename to java/local/src/main/java/cn/toesbieya/jxc/constant/SessionConstant.java index 1a3c74d..bd53d51 100644 --- a/java/local/src/main/java/com/toesbieya/my/constant/SessionConstant.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/constant/SessionConstant.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.constant; +package cn.toesbieya.jxc.constant; public class SessionConstant { //session过期时间，单位秒 diff --git a/java/local/src/main/java/com/toesbieya/my/constant/SocketConstant.java b/java/local/src/main/java/cn/toesbieya/jxc/constant/SocketConstant.java similarity index 95% rename from java/local/src/main/java/com/toesbieya/my/constant/SocketConstant.java rename to java/local/src/main/java/cn/toesbieya/jxc/constant/SocketConstant.java index e0d6574..c2d4898 100644 --- a/java/local/src/main/java/com/toesbieya/my/constant/SocketConstant.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/constant/SocketConstant.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.constant; +package cn.toesbieya.jxc.constant; public class SocketConstant { //web-socket服务端订阅的redis主题名称 diff --git a/java/local/src/main/java/com/toesbieya/my/controller/AccountController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java similarity index 87% rename from java/local/src/main/java/com/toesbieya/my/controller/AccountController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java index 5df23f9..f02fc95 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/AccountController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java @@ -1,13 +1,13 @@ -package com.toesbieya.my.controller; - -import com.toesbieya.my.model.vo.LoginParam; -import com.toesbieya.my.model.vo.PasswordUpdateParam; -import com.toesbieya.my.model.vo.RegisterParam; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.service.AccountService; -import com.toesbieya.my.utils.IpUtil; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.SessionUtil; +package cn.toesbieya.jxc.controller; + +import cn.toesbieya.jxc.model.vo.LoginParam; +import cn.toesbieya.jxc.model.vo.PasswordUpdateParam; +import cn.toesbieya.jxc.model.vo.RegisterParam; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.service.AccountService; +import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.utils.IpUtil; +import cn.toesbieya.jxc.utils.Result; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/BizDocumentHistoryController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/BizDocumentHistoryController.java similarity index 73% rename from java/local/src/main/java/com/toesbieya/my/controller/BizDocumentHistoryController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/BizDocumentHistoryController.java index e5c6510..01f7d58 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/BizDocumentHistoryController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/BizDocumentHistoryController.java @@ -1,8 +1,8 @@ -package com.toesbieya.my.controller; +package cn.toesbieya.jxc.controller; -import com.toesbieya.my.model.vo.search.DocumentHistorySearch; -import com.toesbieya.my.service.BizDocumentHistoryService; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.model.vo.search.DocumentHistorySearch; +import cn.toesbieya.jxc.service.BizDocumentHistoryService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/BizPurchaseInboundController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/BizPurchaseInboundController.java similarity index 89% rename from java/local/src/main/java/com/toesbieya/my/controller/BizPurchaseInboundController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/BizPurchaseInboundController.java index 7f0f3ab..8730583 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/BizPurchaseInboundController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/BizPurchaseInboundController.java @@ -1,14 +1,14 @@ -package com.toesbieya.my.controller; - -import com.toesbieya.my.enumeration.DocStatusEnum; -import com.toesbieya.my.model.entity.BizPurchaseInbound; -import com.toesbieya.my.model.entity.BizPurchaseInboundSub; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.search.PurchaseInboundSearch; -import com.toesbieya.my.model.vo.update.DocumentStatusUpdate; -import com.toesbieya.my.service.BizPurchaseInboundService; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.SessionUtil; +package cn.toesbieya.jxc.controller; + +import cn.toesbieya.jxc.enumeration.DocStatusEnum; +import cn.toesbieya.jxc.model.entity.BizPurchaseInbound; +import cn.toesbieya.jxc.model.entity.BizPurchaseInboundSub; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.search.PurchaseInboundSearch; +import cn.toesbieya.jxc.model.vo.update.DocumentStatusUpdate; +import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.service.BizPurchaseInboundService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/BizPurchaseOrderController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/BizPurchaseOrderController.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/controller/BizPurchaseOrderController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/BizPurchaseOrderController.java index 287d787..8305a07 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/BizPurchaseOrderController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/BizPurchaseOrderController.java @@ -1,14 +1,14 @@ -package com.toesbieya.my.controller; - -import com.toesbieya.my.enumeration.DocStatusEnum; -import com.toesbieya.my.model.entity.BizPurchaseOrder; -import com.toesbieya.my.model.entity.BizPurchaseOrderSub; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.search.PurchaseOrderSearch; -import com.toesbieya.my.model.vo.update.DocumentStatusUpdate; -import com.toesbieya.my.service.BizPurchaseOrderService; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.SessionUtil; +package cn.toesbieya.jxc.controller; + +import cn.toesbieya.jxc.enumeration.DocStatusEnum; +import cn.toesbieya.jxc.model.entity.BizPurchaseOrder; +import cn.toesbieya.jxc.model.entity.BizPurchaseOrderSub; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.search.PurchaseOrderSearch; +import cn.toesbieya.jxc.model.vo.update.DocumentStatusUpdate; +import cn.toesbieya.jxc.service.BizPurchaseOrderService; +import cn.toesbieya.jxc.utils.Result; +import cn.toesbieya.jxc.utils.SessionUtil; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/BizSellOrderController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/BizSellOrderController.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/controller/BizSellOrderController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/BizSellOrderController.java index d21280f..e26f435 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/BizSellOrderController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/BizSellOrderController.java @@ -1,14 +1,14 @@ -package com.toesbieya.my.controller; - -import com.toesbieya.my.enumeration.DocStatusEnum; -import com.toesbieya.my.model.entity.BizSellOrder; -import com.toesbieya.my.model.entity.BizSellOrderSub; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.search.SellOrderSearch; -import com.toesbieya.my.model.vo.update.DocumentStatusUpdate; -import com.toesbieya.my.service.BizSellOrderService; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.SessionUtil; +package cn.toesbieya.jxc.controller; + +import cn.toesbieya.jxc.model.entity.BizSellOrder; +import cn.toesbieya.jxc.model.entity.BizSellOrderSub; +import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.enumeration.DocStatusEnum; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.search.SellOrderSearch; +import cn.toesbieya.jxc.model.vo.update.DocumentStatusUpdate; +import cn.toesbieya.jxc.service.BizSellOrderService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/BizSellOutboundController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/BizSellOutboundController.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/controller/BizSellOutboundController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/BizSellOutboundController.java index 78dedd4..bceac14 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/BizSellOutboundController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/BizSellOutboundController.java @@ -1,14 +1,14 @@ -package com.toesbieya.my.controller; - -import com.toesbieya.my.enumeration.DocStatusEnum; -import com.toesbieya.my.model.entity.BizSellOutbound; -import com.toesbieya.my.model.entity.BizSellOutboundSub; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.search.SellOutboundSearch; -import com.toesbieya.my.model.vo.update.DocumentStatusUpdate; -import com.toesbieya.my.service.BizSellOutboundService; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.SessionUtil; +package cn.toesbieya.jxc.controller; + +import cn.toesbieya.jxc.model.entity.BizSellOutboundSub; +import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.enumeration.DocStatusEnum; +import cn.toesbieya.jxc.model.entity.BizSellOutbound; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.search.SellOutboundSearch; +import cn.toesbieya.jxc.model.vo.update.DocumentStatusUpdate; +import cn.toesbieya.jxc.service.BizSellOutboundService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/BizStockController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/BizStockController.java similarity index 85% rename from java/local/src/main/java/com/toesbieya/my/controller/BizStockController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/BizStockController.java index 9530efa..3b67be2 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/BizStockController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/BizStockController.java @@ -1,8 +1,8 @@ -package com.toesbieya.my.controller; +package cn.toesbieya.jxc.controller; -import com.toesbieya.my.model.vo.search.StockSearch; -import com.toesbieya.my.service.BizStockService; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.model.vo.search.StockSearch; +import cn.toesbieya.jxc.service.BizStockService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/FileController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/FileController.java similarity index 87% rename from java/local/src/main/java/com/toesbieya/my/controller/FileController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/FileController.java index 70b5716..12a0418 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/FileController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/FileController.java @@ -1,7 +1,7 @@ -package com.toesbieya.my.controller; +package cn.toesbieya.jxc.controller; -import com.toesbieya.my.utils.QiniuUtil; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.utils.QiniuUtil; +import cn.toesbieya.jxc.utils.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/MsgController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/MsgController.java similarity index 89% rename from java/local/src/main/java/com/toesbieya/my/controller/MsgController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/MsgController.java index 29e1360..040cdb6 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/MsgController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/MsgController.java @@ -1,13 +1,13 @@ -package com.toesbieya.my.controller; - -import com.toesbieya.my.constant.MsgConstant; -import com.toesbieya.my.model.entity.Msg; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.search.MsgPersonalSearch; -import com.toesbieya.my.model.vo.search.MsgSearch; -import com.toesbieya.my.service.MsgService; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.SessionUtil; +package cn.toesbieya.jxc.controller; + +import cn.toesbieya.jxc.model.entity.Msg; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.search.MsgPersonalSearch; +import cn.toesbieya.jxc.model.vo.search.MsgSearch; +import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.constant.MsgConstant; +import cn.toesbieya.jxc.service.MsgService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/RecController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/RecController.java similarity index 74% rename from java/local/src/main/java/com/toesbieya/my/controller/RecController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/RecController.java index 744c2a4..0613b71 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/RecController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/RecController.java @@ -1,12 +1,12 @@ -package com.toesbieya.my.controller; - -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.search.LoginHistorySearch; -import com.toesbieya.my.model.vo.search.UserActionSearch; -import com.toesbieya.my.service.RecService; -import com.toesbieya.my.utils.DateUtil; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.SessionUtil; +package cn.toesbieya.jxc.controller; + +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.search.LoginHistorySearch; +import cn.toesbieya.jxc.model.vo.search.UserActionSearch; +import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.service.RecService; +import cn.toesbieya.jxc.utils.DateUtil; +import cn.toesbieya.jxc.utils.Result; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/StatisticController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/StatisticController.java similarity index 88% rename from java/local/src/main/java/com/toesbieya/my/controller/StatisticController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/StatisticController.java index 5a95209..393af44 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/StatisticController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/StatisticController.java @@ -1,7 +1,7 @@ -package com.toesbieya.my.controller; +package cn.toesbieya.jxc.controller; -import com.toesbieya.my.service.StatisticService; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.service.StatisticService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/SysCategoryController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysCategoryController.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/controller/SysCategoryController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/SysCategoryController.java index 73dca15..e714757 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/SysCategoryController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysCategoryController.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.controller; +package cn.toesbieya.jxc.controller; -import com.toesbieya.my.model.entity.SysCategory; -import com.toesbieya.my.model.vo.search.CategorySearch; -import com.toesbieya.my.service.SysCategoryService; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.model.entity.SysCategory; +import cn.toesbieya.jxc.model.vo.search.CategorySearch; +import cn.toesbieya.jxc.service.SysCategoryService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/SysCustomerController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysCustomerController.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/controller/SysCustomerController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/SysCustomerController.java index 68e7f9d..8bb840b 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/SysCustomerController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysCustomerController.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.controller; +package cn.toesbieya.jxc.controller; -import com.toesbieya.my.model.entity.SysCustomer; -import com.toesbieya.my.model.vo.search.CustomerSearch; -import com.toesbieya.my.service.SysCustomerService; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.model.entity.SysCustomer; +import cn.toesbieya.jxc.model.vo.search.CustomerSearch; +import cn.toesbieya.jxc.service.SysCustomerService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/SysDepartmentController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysDepartmentController.java similarity index 89% rename from java/local/src/main/java/com/toesbieya/my/controller/SysDepartmentController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/SysDepartmentController.java index 02271de..965641e 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/SysDepartmentController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysDepartmentController.java @@ -1,8 +1,8 @@ -package com.toesbieya.my.controller; +package cn.toesbieya.jxc.controller; -import com.toesbieya.my.model.entity.SysDepartment; -import com.toesbieya.my.service.SysDepartmentService; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.model.entity.SysDepartment; +import cn.toesbieya.jxc.service.SysDepartmentService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/SysResourceController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysResourceController.java similarity index 82% rename from java/local/src/main/java/com/toesbieya/my/controller/SysResourceController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/SysResourceController.java index 7eba74a..7f7954e 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/SysResourceController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysResourceController.java @@ -1,8 +1,8 @@ -package com.toesbieya.my.controller; +package cn.toesbieya.jxc.controller; -import com.toesbieya.my.model.entity.SysResource; -import com.toesbieya.my.service.SysResourceService; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.model.entity.SysResource; +import cn.toesbieya.jxc.service.SysResourceService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/SysRoleController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysRoleController.java similarity index 83% rename from java/local/src/main/java/com/toesbieya/my/controller/SysRoleController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/SysRoleController.java index deed936..6270535 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/SysRoleController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysRoleController.java @@ -1,11 +1,11 @@ -package com.toesbieya.my.controller; - -import com.toesbieya.my.model.entity.SysRole; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.search.RoleSearch; -import com.toesbieya.my.service.SysRoleService; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.SessionUtil; +package cn.toesbieya.jxc.controller; + +import cn.toesbieya.jxc.model.entity.SysRole; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.search.RoleSearch; +import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.service.SysRoleService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/SysSupplierController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysSupplierController.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/controller/SysSupplierController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/SysSupplierController.java index 149c924..2aed554 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/SysSupplierController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysSupplierController.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.controller; +package cn.toesbieya.jxc.controller; -import com.toesbieya.my.model.entity.SysSupplier; -import com.toesbieya.my.model.vo.search.SupplierSearch; -import com.toesbieya.my.service.SysSupplierService; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.model.entity.SysSupplier; +import cn.toesbieya.jxc.model.vo.search.SupplierSearch; +import cn.toesbieya.jxc.service.SysSupplierService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/SysUserController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysUserController.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/controller/SysUserController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/SysUserController.java index 85cbcb9..fa616b1 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/SysUserController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/SysUserController.java @@ -1,11 +1,11 @@ -package com.toesbieya.my.controller; +package cn.toesbieya.jxc.controller; -import com.toesbieya.my.model.entity.RecUserAction; -import com.toesbieya.my.model.entity.SysUser; -import com.toesbieya.my.model.vo.search.UserSearch; -import com.toesbieya.my.service.SysUserService; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.ThreadUtil; +import cn.toesbieya.jxc.model.entity.RecUserAction; +import cn.toesbieya.jxc.model.entity.SysUser; +import cn.toesbieya.jxc.model.vo.search.UserSearch; +import cn.toesbieya.jxc.utils.ThreadUtil; +import cn.toesbieya.jxc.service.SysUserService; +import cn.toesbieya.jxc.utils.Result; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/java/local/src/main/java/com/toesbieya/my/controller/TestController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/TestController.java similarity index 94% rename from java/local/src/main/java/com/toesbieya/my/controller/TestController.java rename to java/local/src/main/java/cn/toesbieya/jxc/controller/TestController.java index d4cac0b..20f71e9 100644 --- a/java/local/src/main/java/com/toesbieya/my/controller/TestController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/TestController.java @@ -1,6 +1,6 @@ -package com.toesbieya.my.controller; +package cn.toesbieya.jxc.controller; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.utils.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/com/toesbieya/my/enumeration/DocFinishEnum.java b/java/local/src/main/java/cn/toesbieya/jxc/enumeration/DocFinishEnum.java similarity index 85% rename from java/local/src/main/java/com/toesbieya/my/enumeration/DocFinishEnum.java rename to java/local/src/main/java/cn/toesbieya/jxc/enumeration/DocFinishEnum.java index 9311bfb..176b201 100644 --- a/java/local/src/main/java/com/toesbieya/my/enumeration/DocFinishEnum.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/enumeration/DocFinishEnum.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.enumeration; +package cn.toesbieya.jxc.enumeration; public enum DocFinishEnum { TO_BE_STARTED(0), UNDERWAY(1), FINISHED(2); diff --git a/java/local/src/main/java/com/toesbieya/my/enumeration/DocHistoryEnum.java b/java/local/src/main/java/cn/toesbieya/jxc/enumeration/DocHistoryEnum.java similarity index 85% rename from java/local/src/main/java/com/toesbieya/my/enumeration/DocHistoryEnum.java rename to java/local/src/main/java/cn/toesbieya/jxc/enumeration/DocHistoryEnum.java index dfb114b..42285e6 100644 --- a/java/local/src/main/java/com/toesbieya/my/enumeration/DocHistoryEnum.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/enumeration/DocHistoryEnum.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.enumeration; +package cn.toesbieya.jxc.enumeration; public enum DocHistoryEnum { WITHDRAW(0), COMMIT(1), PASS(2), REJECT(3); diff --git a/java/local/src/main/java/com/toesbieya/my/enumeration/DocStatusEnum.java b/java/local/src/main/java/cn/toesbieya/jxc/enumeration/DocStatusEnum.java similarity index 85% rename from java/local/src/main/java/com/toesbieya/my/enumeration/DocStatusEnum.java rename to java/local/src/main/java/cn/toesbieya/jxc/enumeration/DocStatusEnum.java index 1380b8f..5920524 100644 --- a/java/local/src/main/java/com/toesbieya/my/enumeration/DocStatusEnum.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/enumeration/DocStatusEnum.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.enumeration; +package cn.toesbieya.jxc.enumeration; public enum DocStatusEnum { DRAFT(0), WAIT_VERIFY(1), VERIFIED(2); diff --git a/java/local/src/main/java/com/toesbieya/my/enumeration/GeneralStatusEnum.java b/java/local/src/main/java/cn/toesbieya/jxc/enumeration/GeneralStatusEnum.java similarity index 84% rename from java/local/src/main/java/com/toesbieya/my/enumeration/GeneralStatusEnum.java rename to java/local/src/main/java/cn/toesbieya/jxc/enumeration/GeneralStatusEnum.java index d15b3c4..d4412a9 100644 --- a/java/local/src/main/java/com/toesbieya/my/enumeration/GeneralStatusEnum.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/enumeration/GeneralStatusEnum.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.enumeration; +package cn.toesbieya.jxc.enumeration; public enum GeneralStatusEnum { DISABLED(0), ENABLED(1); diff --git a/java/local/src/main/java/com/toesbieya/my/enumeration/RecLoginHistoryEnum.java b/java/local/src/main/java/cn/toesbieya/jxc/enumeration/RecLoginHistoryEnum.java similarity index 84% rename from java/local/src/main/java/com/toesbieya/my/enumeration/RecLoginHistoryEnum.java rename to java/local/src/main/java/cn/toesbieya/jxc/enumeration/RecLoginHistoryEnum.java index fa4e9d2..b7c4cf8 100644 --- a/java/local/src/main/java/com/toesbieya/my/enumeration/RecLoginHistoryEnum.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/enumeration/RecLoginHistoryEnum.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.enumeration; +package cn.toesbieya.jxc.enumeration; public enum RecLoginHistoryEnum { LOGOUT(0), LOGIN(1); diff --git a/java/local/src/main/java/com/toesbieya/my/enumeration/UserActionEnum.java b/java/local/src/main/java/cn/toesbieya/jxc/enumeration/UserActionEnum.java similarity index 84% rename from java/local/src/main/java/com/toesbieya/my/enumeration/UserActionEnum.java rename to java/local/src/main/java/cn/toesbieya/jxc/enumeration/UserActionEnum.java index d91b82b..cd8639f 100644 --- a/java/local/src/main/java/com/toesbieya/my/enumeration/UserActionEnum.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/enumeration/UserActionEnum.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.enumeration; +package cn.toesbieya.jxc.enumeration; public enum UserActionEnum { FAIL(0), SUCCESS(1); diff --git a/java/local/src/main/java/com/toesbieya/my/exception/JsonResultException.java b/java/local/src/main/java/cn/toesbieya/jxc/exception/JsonResultException.java similarity index 79% rename from java/local/src/main/java/com/toesbieya/my/exception/JsonResultException.java rename to java/local/src/main/java/cn/toesbieya/jxc/exception/JsonResultException.java index 509fe66..1bbb97a 100644 --- a/java/local/src/main/java/com/toesbieya/my/exception/JsonResultException.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/exception/JsonResultException.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.exception; +package cn.toesbieya.jxc.exception; public class JsonResultException extends RuntimeException { public JsonResultException(String message) { diff --git a/java/local/src/main/java/com/toesbieya/my/handler/GlobalExceptionHandler.java b/java/local/src/main/java/cn/toesbieya/jxc/handler/GlobalExceptionHandler.java similarity index 84% rename from java/local/src/main/java/com/toesbieya/my/handler/GlobalExceptionHandler.java rename to java/local/src/main/java/cn/toesbieya/jxc/handler/GlobalExceptionHandler.java index f625c75..7b37ba0 100644 --- a/java/local/src/main/java/com/toesbieya/my/handler/GlobalExceptionHandler.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/handler/GlobalExceptionHandler.java @@ -1,12 +1,12 @@ -package com.toesbieya.my.handler; - -import com.toesbieya.my.enumeration.UserActionEnum; -import com.toesbieya.my.exception.JsonResultException; -import com.toesbieya.my.model.entity.RecUserAction; -import com.toesbieya.my.service.RecService; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.ThreadUtil; -import com.toesbieya.my.utils.Util; +package cn.toesbieya.jxc.handler; + +import cn.toesbieya.jxc.enumeration.UserActionEnum; +import cn.toesbieya.jxc.exception.JsonResultException; +import cn.toesbieya.jxc.model.entity.RecUserAction; +import cn.toesbieya.jxc.utils.ThreadUtil; +import cn.toesbieya.jxc.utils.Util; +import cn.toesbieya.jxc.service.RecService; +import cn.toesbieya.jxc.utils.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StringUtils; import org.springframework.web.HttpRequestMethodNotSupportedException; diff --git a/java/local/src/main/java/com/toesbieya/my/interceptor/RateControlInterceptor.java b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/RateControlInterceptor.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/interceptor/RateControlInterceptor.java rename to java/local/src/main/java/cn/toesbieya/jxc/interceptor/RateControlInterceptor.java index 4e52dd5..4899085 100644 --- a/java/local/src/main/java/com/toesbieya/my/interceptor/RateControlInterceptor.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/RateControlInterceptor.java @@ -1,8 +1,8 @@ -package com.toesbieya.my.interceptor; +package cn.toesbieya.jxc.interceptor; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.module.request.RequestModule; -import com.toesbieya.my.utils.*; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.module.request.RequestModule; +import cn.toesbieya.jxc.utils.*; import lombok.extern.slf4j.Slf4j; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/java/local/src/main/java/com/toesbieya/my/interceptor/SecurityInterceptor.java b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/SecurityInterceptor.java similarity index 86% rename from java/local/src/main/java/com/toesbieya/my/interceptor/SecurityInterceptor.java rename to java/local/src/main/java/cn/toesbieya/jxc/interceptor/SecurityInterceptor.java index 2b946b2..841998e 100644 --- a/java/local/src/main/java/com/toesbieya/my/interceptor/SecurityInterceptor.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/SecurityInterceptor.java @@ -1,8 +1,8 @@ -package com.toesbieya.my.interceptor; +package cn.toesbieya.jxc.interceptor; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.module.PermissionModule; -import com.toesbieya.my.utils.*; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.module.PermissionModule; +import cn.toesbieya.jxc.utils.*; import lombok.extern.slf4j.Slf4j; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/java/local/src/main/java/com/toesbieya/my/interceptor/UserActionInterceptor.java b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/UserActionInterceptor.java similarity index 83% rename from java/local/src/main/java/com/toesbieya/my/interceptor/UserActionInterceptor.java rename to java/local/src/main/java/cn/toesbieya/jxc/interceptor/UserActionInterceptor.java index fa49325..6c466af 100644 --- a/java/local/src/main/java/com/toesbieya/my/interceptor/UserActionInterceptor.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/UserActionInterceptor.java @@ -1,6 +1,6 @@ -package com.toesbieya.my.interceptor; +package cn.toesbieya.jxc.interceptor; -import com.toesbieya.my.utils.ThreadUtil; +import cn.toesbieya.jxc.utils.ThreadUtil; import org.springframework.web.servlet.HandlerInterceptor; import javax.servlet.http.HttpServletRequest; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/BizDocumentHistoryMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/BizDocumentHistoryMapper.java similarity index 65% rename from java/local/src/main/java/com/toesbieya/my/mapper/BizDocumentHistoryMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/BizDocumentHistoryMapper.java index 171321b..ce6b23a 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/BizDocumentHistoryMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/BizDocumentHistoryMapper.java @@ -1,7 +1,7 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.BizDocumentHistory; -import com.toesbieya.my.model.vo.search.DocumentHistorySearch; +import cn.toesbieya.jxc.model.entity.BizDocumentHistory; +import cn.toesbieya.jxc.model.vo.search.DocumentHistorySearch; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/BizPurchaseInboundMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/BizPurchaseInboundMapper.java similarity index 73% rename from java/local/src/main/java/com/toesbieya/my/mapper/BizPurchaseInboundMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/BizPurchaseInboundMapper.java index ed96355..f8048bc 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/BizPurchaseInboundMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/BizPurchaseInboundMapper.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.BizPurchaseInbound; -import com.toesbieya.my.model.entity.BizPurchaseInboundSub; -import com.toesbieya.my.model.vo.export.PurchaseInboundExport; -import com.toesbieya.my.model.vo.search.PurchaseInboundSearch; +import cn.toesbieya.jxc.model.entity.BizPurchaseInbound; +import cn.toesbieya.jxc.model.entity.BizPurchaseInboundSub; +import cn.toesbieya.jxc.model.vo.search.PurchaseInboundSearch; +import cn.toesbieya.jxc.model.vo.export.PurchaseInboundExport; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/BizPurchaseOrderMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/BizPurchaseOrderMapper.java similarity index 78% rename from java/local/src/main/java/com/toesbieya/my/mapper/BizPurchaseOrderMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/BizPurchaseOrderMapper.java index 688d7ec..852038f 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/BizPurchaseOrderMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/BizPurchaseOrderMapper.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.BizPurchaseOrder; -import com.toesbieya.my.model.entity.BizPurchaseOrderSub; -import com.toesbieya.my.model.vo.export.PurchaseOrderExport; -import com.toesbieya.my.model.vo.search.PurchaseOrderSearch; +import cn.toesbieya.jxc.model.entity.BizPurchaseOrder; +import cn.toesbieya.jxc.model.entity.BizPurchaseOrderSub; +import cn.toesbieya.jxc.model.vo.export.PurchaseOrderExport; +import cn.toesbieya.jxc.model.vo.search.PurchaseOrderSearch; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/BizSellOrderMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/BizSellOrderMapper.java similarity index 78% rename from java/local/src/main/java/com/toesbieya/my/mapper/BizSellOrderMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/BizSellOrderMapper.java index 0c61347..c8a1639 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/BizSellOrderMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/BizSellOrderMapper.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.BizSellOrder; -import com.toesbieya.my.model.entity.BizSellOrderSub; -import com.toesbieya.my.model.vo.export.SellOrderExport; -import com.toesbieya.my.model.vo.search.SellOrderSearch; +import cn.toesbieya.jxc.model.entity.BizSellOrder; +import cn.toesbieya.jxc.model.entity.BizSellOrderSub; +import cn.toesbieya.jxc.model.vo.export.SellOrderExport; +import cn.toesbieya.jxc.model.vo.search.SellOrderSearch; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/BizSellOutboundMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/BizSellOutboundMapper.java similarity index 73% rename from java/local/src/main/java/com/toesbieya/my/mapper/BizSellOutboundMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/BizSellOutboundMapper.java index 8af920b..0e2ebd7 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/BizSellOutboundMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/BizSellOutboundMapper.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.BizSellOutbound; -import com.toesbieya.my.model.entity.BizSellOutboundSub; -import com.toesbieya.my.model.vo.export.SellOutboundExport; -import com.toesbieya.my.model.vo.search.SellOutboundSearch; +import cn.toesbieya.jxc.model.entity.BizSellOutboundSub; +import cn.toesbieya.jxc.model.entity.BizSellOutbound; +import cn.toesbieya.jxc.model.vo.export.SellOutboundExport; +import cn.toesbieya.jxc.model.vo.search.SellOutboundSearch; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/BizStockMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/BizStockMapper.java similarity index 66% rename from java/local/src/main/java/com/toesbieya/my/mapper/BizStockMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/BizStockMapper.java index 7ec1db6..aee4b2e 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/BizStockMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/BizStockMapper.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.BizStock; -import com.toesbieya.my.model.vo.export.StockExport; -import com.toesbieya.my.model.vo.result.StockSearchResult; -import com.toesbieya.my.model.vo.search.StockSearch; +import cn.toesbieya.jxc.model.entity.BizStock; +import cn.toesbieya.jxc.model.vo.export.StockExport; +import cn.toesbieya.jxc.model.vo.result.StockSearchResult; +import cn.toesbieya.jxc.model.vo.search.StockSearch; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/MsgMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/MsgMapper.java similarity index 67% rename from java/local/src/main/java/com/toesbieya/my/mapper/MsgMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/MsgMapper.java index ac253a1..221c7de 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/MsgMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/MsgMapper.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.Msg; -import com.toesbieya.my.model.entity.MsgState; -import com.toesbieya.my.model.vo.search.MsgPersonalSearch; -import com.toesbieya.my.model.vo.search.MsgSearch; +import cn.toesbieya.jxc.model.entity.Msg; +import cn.toesbieya.jxc.model.entity.MsgState; +import cn.toesbieya.jxc.model.vo.search.MsgPersonalSearch; +import cn.toesbieya.jxc.model.vo.search.MsgSearch; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/RecAttachmentMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/RecAttachmentMapper.java similarity index 82% rename from java/local/src/main/java/com/toesbieya/my/mapper/RecAttachmentMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/RecAttachmentMapper.java index df50289..a533e54 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/RecAttachmentMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/RecAttachmentMapper.java @@ -1,6 +1,6 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.RecAttachment; +import cn.toesbieya.jxc.model.entity.RecAttachment; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/RecLoginHistoryMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/RecLoginHistoryMapper.java similarity index 53% rename from java/local/src/main/java/com/toesbieya/my/mapper/RecLoginHistoryMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/RecLoginHistoryMapper.java index 21fe410..e0c7507 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/RecLoginHistoryMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/RecLoginHistoryMapper.java @@ -1,7 +1,7 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.RecLoginHistory; -import com.toesbieya.my.model.vo.search.LoginHistorySearch; +import cn.toesbieya.jxc.model.entity.RecLoginHistory; +import cn.toesbieya.jxc.model.vo.search.LoginHistorySearch; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/RecUserActionMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/RecUserActionMapper.java similarity index 52% rename from java/local/src/main/java/com/toesbieya/my/mapper/RecUserActionMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/RecUserActionMapper.java index d2ee7f2..bdfe8ec 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/RecUserActionMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/RecUserActionMapper.java @@ -1,7 +1,7 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.RecUserAction; -import com.toesbieya.my.model.vo.search.UserActionSearch; +import cn.toesbieya.jxc.model.entity.RecUserAction; +import cn.toesbieya.jxc.model.vo.search.UserActionSearch; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/StatisticMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/StatisticMapper.java similarity index 87% rename from java/local/src/main/java/com/toesbieya/my/mapper/StatisticMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/StatisticMapper.java index b59816e..50501c6 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/StatisticMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/StatisticMapper.java @@ -1,8 +1,8 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.StatFinishOrder; -import com.toesbieya.my.model.entity.StatProfitGoods; -import com.toesbieya.my.model.entity.StatProfitTotal; +import cn.toesbieya.jxc.model.entity.StatFinishOrder; +import cn.toesbieya.jxc.model.entity.StatProfitGoods; +import cn.toesbieya.jxc.model.entity.StatProfitTotal; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/SysCategoryMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysCategoryMapper.java similarity index 79% rename from java/local/src/main/java/com/toesbieya/my/mapper/SysCategoryMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/SysCategoryMapper.java index 65ab650..86534a0 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/SysCategoryMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysCategoryMapper.java @@ -1,7 +1,7 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.SysCategory; -import com.toesbieya.my.model.vo.search.CategorySearch; +import cn.toesbieya.jxc.model.entity.SysCategory; +import cn.toesbieya.jxc.model.vo.search.CategorySearch; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/SysCustomerMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysCustomerMapper.java similarity index 69% rename from java/local/src/main/java/com/toesbieya/my/mapper/SysCustomerMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/SysCustomerMapper.java index ec435e3..11f48c2 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/SysCustomerMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysCustomerMapper.java @@ -1,8 +1,8 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.SysCustomer; -import com.toesbieya.my.model.vo.result.RegionValueResult; -import com.toesbieya.my.model.vo.search.CustomerSearch; +import cn.toesbieya.jxc.model.entity.SysCustomer; +import cn.toesbieya.jxc.model.vo.result.RegionValueResult; +import cn.toesbieya.jxc.model.vo.search.CustomerSearch; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/SysDepartmentMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysDepartmentMapper.java similarity index 82% rename from java/local/src/main/java/com/toesbieya/my/mapper/SysDepartmentMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/SysDepartmentMapper.java index 960b277..0ca1da5 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/SysDepartmentMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysDepartmentMapper.java @@ -1,6 +1,6 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.SysDepartment; +import cn.toesbieya.jxc.model.entity.SysDepartment; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/SysResourceMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysResourceMapper.java similarity index 71% rename from java/local/src/main/java/com/toesbieya/my/mapper/SysResourceMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/SysResourceMapper.java index 7ad4183..efd4b46 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/SysResourceMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysResourceMapper.java @@ -1,6 +1,6 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.SysResource; +import cn.toesbieya.jxc.model.entity.SysResource; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/SysRoleMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysRoleMapper.java similarity index 73% rename from java/local/src/main/java/com/toesbieya/my/mapper/SysRoleMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/SysRoleMapper.java index b84f806..19dd7cf 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/SysRoleMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysRoleMapper.java @@ -1,7 +1,7 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.SysRole; -import com.toesbieya.my.model.vo.search.RoleSearch; +import cn.toesbieya.jxc.model.entity.SysRole; +import cn.toesbieya.jxc.model.vo.search.RoleSearch; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/SysSupplierMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysSupplierMapper.java similarity index 69% rename from java/local/src/main/java/com/toesbieya/my/mapper/SysSupplierMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/SysSupplierMapper.java index f9f7e5a..d41b0ee 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/SysSupplierMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysSupplierMapper.java @@ -1,8 +1,8 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.SysSupplier; -import com.toesbieya.my.model.vo.result.RegionValueResult; -import com.toesbieya.my.model.vo.search.SupplierSearch; +import cn.toesbieya.jxc.model.entity.SysSupplier; +import cn.toesbieya.jxc.model.vo.result.RegionValueResult; +import cn.toesbieya.jxc.model.vo.search.SupplierSearch; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/mapper/SysUserMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysUserMapper.java similarity index 72% rename from java/local/src/main/java/com/toesbieya/my/mapper/SysUserMapper.java rename to java/local/src/main/java/cn/toesbieya/jxc/mapper/SysUserMapper.java index f064c44..5360ab1 100644 --- a/java/local/src/main/java/com/toesbieya/my/mapper/SysUserMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysUserMapper.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.mapper; +package cn.toesbieya.jxc.mapper; -import com.toesbieya.my.model.entity.SysUser; -import com.toesbieya.my.model.vo.PasswordUpdateParam; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.search.UserSearch; +import cn.toesbieya.jxc.model.entity.SysUser; +import cn.toesbieya.jxc.model.vo.PasswordUpdateParam; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.search.UserSearch; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/BizDocument.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizDocument.java similarity index 92% rename from java/local/src/main/java/com/toesbieya/my/model/entity/BizDocument.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizDocument.java index fc4a925..c3ac5c9 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/BizDocument.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizDocument.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/BizDocumentHistory.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizDocumentHistory.java similarity index 91% rename from java/local/src/main/java/com/toesbieya/my/model/entity/BizDocumentHistory.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizDocumentHistory.java index 1260f76..249b124 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/BizDocumentHistory.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizDocumentHistory.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/BizDocumentSub.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizDocumentSub.java similarity index 84% rename from java/local/src/main/java/com/toesbieya/my/model/entity/BizDocumentSub.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizDocumentSub.java index fa43e4e..6705dd3 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/BizDocumentSub.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizDocumentSub.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/BizPurchaseInbound.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseInbound.java similarity index 86% rename from java/local/src/main/java/com/toesbieya/my/model/entity/BizPurchaseInbound.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseInbound.java index fb21b2f..bcdcdb5 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/BizPurchaseInbound.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseInbound.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/BizPurchaseInboundSub.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseInboundSub.java similarity index 84% rename from java/local/src/main/java/com/toesbieya/my/model/entity/BizPurchaseInboundSub.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseInboundSub.java index 98b6d52..8c99caf 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/BizPurchaseInboundSub.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseInboundSub.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/BizPurchaseOrder.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseOrder.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/model/entity/BizPurchaseOrder.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseOrder.java index 213dfb7..0de091f 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/BizPurchaseOrder.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseOrder.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/BizPurchaseOrderSub.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseOrderSub.java similarity index 88% rename from java/local/src/main/java/com/toesbieya/my/model/entity/BizPurchaseOrderSub.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseOrderSub.java index 8abc885..2e46aab 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/BizPurchaseOrderSub.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizPurchaseOrderSub.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/BizSellOrder.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizSellOrder.java similarity index 91% rename from java/local/src/main/java/com/toesbieya/my/model/entity/BizSellOrder.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizSellOrder.java index 92f4d2b..fd8c874 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/BizSellOrder.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizSellOrder.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/BizSellOrderSub.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizSellOrderSub.java similarity index 88% rename from java/local/src/main/java/com/toesbieya/my/model/entity/BizSellOrderSub.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizSellOrderSub.java index 31d75ae..7f4b084 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/BizSellOrderSub.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizSellOrderSub.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/BizSellOutbound.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizSellOutbound.java similarity index 86% rename from java/local/src/main/java/com/toesbieya/my/model/entity/BizSellOutbound.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizSellOutbound.java index c4b4e7c..f9f0b17 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/BizSellOutbound.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizSellOutbound.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/BizSellOutboundSub.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizSellOutboundSub.java similarity index 85% rename from java/local/src/main/java/com/toesbieya/my/model/entity/BizSellOutboundSub.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizSellOutboundSub.java index b998a91..0430487 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/BizSellOutboundSub.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizSellOutboundSub.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/BizStock.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizStock.java similarity index 91% rename from java/local/src/main/java/com/toesbieya/my/model/entity/BizStock.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizStock.java index cc1dfcd..ff5bfb4 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/BizStock.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/BizStock.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/Msg.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/Msg.java similarity index 92% rename from java/local/src/main/java/com/toesbieya/my/model/entity/Msg.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/Msg.java index 88353b3..7a0be44 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/Msg.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/Msg.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/MsgState.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/MsgState.java similarity index 79% rename from java/local/src/main/java/com/toesbieya/my/model/entity/MsgState.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/MsgState.java index a2edd42..7901fa1 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/MsgState.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/MsgState.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/RecAttachment.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/RecAttachment.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/model/entity/RecAttachment.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/RecAttachment.java index b3d4e5d..0ba32a5 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/RecAttachment.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/RecAttachment.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/RecLoginHistory.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/RecLoginHistory.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/model/entity/RecLoginHistory.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/RecLoginHistory.java index 2bcf799..f8f35b9 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/RecLoginHistory.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/RecLoginHistory.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/RecUserAction.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/RecUserAction.java similarity index 91% rename from java/local/src/main/java/com/toesbieya/my/model/entity/RecUserAction.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/RecUserAction.java index 6fdc308..8b00e66 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/RecUserAction.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/RecUserAction.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/StatFinishOrder.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/StatFinishOrder.java similarity index 80% rename from java/local/src/main/java/com/toesbieya/my/model/entity/StatFinishOrder.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/StatFinishOrder.java index 3283cf6..48353a9 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/StatFinishOrder.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/StatFinishOrder.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/StatProfitGoods.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/StatProfitGoods.java similarity index 86% rename from java/local/src/main/java/com/toesbieya/my/model/entity/StatProfitGoods.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/StatProfitGoods.java index 0f68f2e..5851bfa 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/StatProfitGoods.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/StatProfitGoods.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/StatProfitTotal.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/StatProfitTotal.java similarity index 85% rename from java/local/src/main/java/com/toesbieya/my/model/entity/StatProfitTotal.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/StatProfitTotal.java index 7609689..cdc3360 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/StatProfitTotal.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/StatProfitTotal.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/SysCategory.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysCategory.java similarity index 82% rename from java/local/src/main/java/com/toesbieya/my/model/entity/SysCategory.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysCategory.java index 47fcf20..c25afd2 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/SysCategory.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysCategory.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/SysCustomer.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysCustomer.java similarity index 92% rename from java/local/src/main/java/com/toesbieya/my/model/entity/SysCustomer.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysCustomer.java index 25a0474..d5ebecc 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/SysCustomer.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysCustomer.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/SysDepartment.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysDepartment.java similarity index 80% rename from java/local/src/main/java/com/toesbieya/my/model/entity/SysDepartment.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysDepartment.java index ebe7952..762e890 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/SysDepartment.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysDepartment.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/SysRegion.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysRegion.java similarity index 82% rename from java/local/src/main/java/com/toesbieya/my/model/entity/SysRegion.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysRegion.java index 541ccb7..d41ca54 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/SysRegion.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysRegion.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/SysResource.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysResource.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/model/entity/SysResource.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysResource.java index 9d837e8..0aa955c 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/SysResource.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysResource.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/SysRole.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysRole.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/model/entity/SysRole.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysRole.java index 4b464fa..0ca3a08 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/SysRole.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysRole.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/SysSupplier.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysSupplier.java similarity index 89% rename from java/local/src/main/java/com/toesbieya/my/model/entity/SysSupplier.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysSupplier.java index 2127e56..e9d0eb8 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/SysSupplier.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysSupplier.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/entity/SysUser.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysUser.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/model/entity/SysUser.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysUser.java index 87072c9..52c7cee 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/entity/SysUser.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.entity; +package cn.toesbieya.jxc.model.entity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/LoginParam.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/LoginParam.java similarity index 92% rename from java/local/src/main/java/com/toesbieya/my/model/vo/LoginParam.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/LoginParam.java index f6104dd..357cc2b 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/LoginParam.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/LoginParam.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo; +package cn.toesbieya.jxc.model.vo; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/LoginSuccessInfo.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/LoginSuccessInfo.java similarity index 86% rename from java/local/src/main/java/com/toesbieya/my/model/vo/LoginSuccessInfo.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/LoginSuccessInfo.java index 96166a3..a70056c 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/LoginSuccessInfo.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/LoginSuccessInfo.java @@ -1,6 +1,6 @@ -package com.toesbieya.my.model.vo; +package cn.toesbieya.jxc.model.vo; -import com.toesbieya.my.model.entity.SysUser; +import cn.toesbieya.jxc.model.entity.SysUser; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/PasswordUpdateParam.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/PasswordUpdateParam.java similarity index 80% rename from java/local/src/main/java/com/toesbieya/my/model/vo/PasswordUpdateParam.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/PasswordUpdateParam.java index 305a070..6734739 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/PasswordUpdateParam.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/PasswordUpdateParam.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo; +package cn.toesbieya.jxc.model.vo; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/RegisterParam.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/RegisterParam.java similarity index 85% rename from java/local/src/main/java/com/toesbieya/my/model/vo/RegisterParam.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/RegisterParam.java index 3e83f73..2fa4a65 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/RegisterParam.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/RegisterParam.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo; +package cn.toesbieya.jxc.model.vo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/SocketEventVo.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/SocketEventVo.java similarity index 78% rename from java/local/src/main/java/com/toesbieya/my/model/vo/SocketEventVo.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/SocketEventVo.java index fdc13ad..1aeba60 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/SocketEventVo.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/SocketEventVo.java @@ -1,6 +1,6 @@ -package com.toesbieya.my.model.vo; +package cn.toesbieya.jxc.model.vo; -import com.toesbieya.my.constant.SocketConstant; +import cn.toesbieya.jxc.constant.SocketConstant; import lombok.Data; import java.util.List; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/SocketOfflineVo.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/SocketOfflineVo.java similarity index 87% rename from java/local/src/main/java/com/toesbieya/my/model/vo/SocketOfflineVo.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/SocketOfflineVo.java index 79686f8..dffed69 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/SocketOfflineVo.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/SocketOfflineVo.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo; +package cn.toesbieya.jxc.model.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/UserVo.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/UserVo.java similarity index 91% rename from java/local/src/main/java/com/toesbieya/my/model/vo/UserVo.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/UserVo.java index 8698db7..4a7ad5a 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/UserVo.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/UserVo.java @@ -1,6 +1,6 @@ -package com.toesbieya.my.model.vo; +package cn.toesbieya.jxc.model.vo; -import com.toesbieya.my.model.entity.SysUser; +import cn.toesbieya.jxc.model.entity.SysUser; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/export/PurchaseInboundExport.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/PurchaseInboundExport.java similarity index 95% rename from java/local/src/main/java/com/toesbieya/my/model/vo/export/PurchaseInboundExport.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/PurchaseInboundExport.java index 26ab676..1273ed1 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/export/PurchaseInboundExport.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/PurchaseInboundExport.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.export; +package cn.toesbieya.jxc.model.vo.export; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/export/PurchaseOrderExport.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/PurchaseOrderExport.java similarity index 96% rename from java/local/src/main/java/com/toesbieya/my/model/vo/export/PurchaseOrderExport.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/PurchaseOrderExport.java index 5fe1454..d51e250 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/export/PurchaseOrderExport.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/PurchaseOrderExport.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.export; +package cn.toesbieya.jxc.model.vo.export; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/export/SellOrderExport.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/SellOrderExport.java similarity index 96% rename from java/local/src/main/java/com/toesbieya/my/model/vo/export/SellOrderExport.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/SellOrderExport.java index 05a7094..6efb188 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/export/SellOrderExport.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/SellOrderExport.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.export; +package cn.toesbieya.jxc.model.vo.export; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/export/SellOutboundExport.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/SellOutboundExport.java similarity index 95% rename from java/local/src/main/java/com/toesbieya/my/model/vo/export/SellOutboundExport.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/SellOutboundExport.java index a42f92b..3c79b24 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/export/SellOutboundExport.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/SellOutboundExport.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.export; +package cn.toesbieya.jxc.model.vo.export; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/export/StockExport.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/StockExport.java similarity index 96% rename from java/local/src/main/java/com/toesbieya/my/model/vo/export/StockExport.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/StockExport.java index 6c51e7f..8817476 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/export/StockExport.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/export/StockExport.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.export; +package cn.toesbieya.jxc.model.vo.export; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/result/PageResult.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/result/PageResult.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/model/vo/result/PageResult.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/result/PageResult.java index d79293f..b4837fc 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/result/PageResult.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/result/PageResult.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.result; +package cn.toesbieya.jxc.model.vo.result; import com.github.pagehelper.Page; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/result/RegionValueResult.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/result/RegionValueResult.java similarity index 72% rename from java/local/src/main/java/com/toesbieya/my/model/vo/result/RegionValueResult.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/result/RegionValueResult.java index 9517919..42b8ad9 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/result/RegionValueResult.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/result/RegionValueResult.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.result; +package cn.toesbieya.jxc.model.vo.result; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/result/StockSearchResult.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/result/StockSearchResult.java similarity index 83% rename from java/local/src/main/java/com/toesbieya/my/model/vo/result/StockSearchResult.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/result/StockSearchResult.java index d646a2c..4e22672 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/result/StockSearchResult.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/result/StockSearchResult.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.result; +package cn.toesbieya.jxc.model.vo.result; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/BaseSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/BaseSearch.java similarity index 71% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/BaseSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/BaseSearch.java index 13cd8f5..fe535b0 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/BaseSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/BaseSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/CategorySearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/CategorySearch.java similarity index 86% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/CategorySearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/CategorySearch.java index 414343e..c2b5990 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/CategorySearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/CategorySearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/CustomerSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/CustomerSearch.java similarity index 91% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/CustomerSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/CustomerSearch.java index d22199f..bb85755 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/CustomerSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/CustomerSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/DocumentHistorySearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/DocumentHistorySearch.java similarity index 79% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/DocumentHistorySearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/DocumentHistorySearch.java index 7f97a19..8661d38 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/DocumentHistorySearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/DocumentHistorySearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/DocumentSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/DocumentSearch.java similarity index 92% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/DocumentSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/DocumentSearch.java index f4b0994..e12e9e9 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/DocumentSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/DocumentSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/LoginHistorySearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/LoginHistorySearch.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/LoginHistorySearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/LoginHistorySearch.java index 89869e1..c7f84cf 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/LoginHistorySearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/LoginHistorySearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/MsgPersonalSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/MsgPersonalSearch.java similarity index 87% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/MsgPersonalSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/MsgPersonalSearch.java index b132b77..686fba2 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/MsgPersonalSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/MsgPersonalSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/MsgSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/MsgSearch.java similarity index 87% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/MsgSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/MsgSearch.java index 2843dc7..9aa2bf4 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/MsgSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/MsgSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/PurchaseInboundSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/PurchaseInboundSearch.java similarity index 86% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/PurchaseInboundSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/PurchaseInboundSearch.java index 4151dcf..4d4c270 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/PurchaseInboundSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/PurchaseInboundSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/PurchaseOrderSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/PurchaseOrderSearch.java similarity index 89% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/PurchaseOrderSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/PurchaseOrderSearch.java index d135af5..96ab958 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/PurchaseOrderSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/PurchaseOrderSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/RoleSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/RoleSearch.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/RoleSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/RoleSearch.java index ff21a48..ff01571 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/RoleSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/RoleSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/SellOrderSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/SellOrderSearch.java similarity index 89% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/SellOrderSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/SellOrderSearch.java index aa4ee9f..81e315c 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/SellOrderSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/SellOrderSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/SellOutboundSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/SellOutboundSearch.java similarity index 86% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/SellOutboundSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/SellOutboundSearch.java index 4095514..37689e6 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/SellOutboundSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/SellOutboundSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/StockSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/StockSearch.java similarity index 91% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/StockSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/StockSearch.java index 9a5b266..00611c4 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/StockSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/StockSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/SupplierSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/SupplierSearch.java similarity index 91% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/SupplierSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/SupplierSearch.java index e799d85..6ed0ed3 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/SupplierSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/SupplierSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/UserActionSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/UserActionSearch.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/UserActionSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/UserActionSearch.java index 577ed30..01b4348 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/UserActionSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/UserActionSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/search/UserSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/UserSearch.java similarity index 89% rename from java/local/src/main/java/com/toesbieya/my/model/vo/search/UserSearch.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/UserSearch.java index aaeced7..b2f049c 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/search/UserSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/UserSearch.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.search; +package cn.toesbieya.jxc.model.vo.search; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/statictis/FourBlockStat.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/statictis/FourBlockStat.java similarity index 82% rename from java/local/src/main/java/com/toesbieya/my/model/vo/statictis/FourBlockStat.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/statictis/FourBlockStat.java index be4468b..b020b3f 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/statictis/FourBlockStat.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/statictis/FourBlockStat.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.statictis; +package cn.toesbieya.jxc.model.vo.statictis; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/update/DocumentStatusUpdate.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/update/DocumentStatusUpdate.java similarity index 76% rename from java/local/src/main/java/com/toesbieya/my/model/vo/update/DocumentStatusUpdate.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/update/DocumentStatusUpdate.java index f20c2a1..d723fed 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/update/DocumentStatusUpdate.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/update/DocumentStatusUpdate.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.update; +package cn.toesbieya.jxc.model.vo.update; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/model/vo/update/UserUpdatePwd.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/update/UserUpdatePwd.java similarity index 76% rename from java/local/src/main/java/com/toesbieya/my/model/vo/update/UserUpdatePwd.java rename to java/local/src/main/java/cn/toesbieya/jxc/model/vo/update/UserUpdatePwd.java index ee28dff..8e56269 100644 --- a/java/local/src/main/java/com/toesbieya/my/model/vo/update/UserUpdatePwd.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/update/UserUpdatePwd.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.model.vo.update; +package cn.toesbieya.jxc.model.vo.update; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/module/PermissionModule.java b/java/local/src/main/java/cn/toesbieya/jxc/module/PermissionModule.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/module/PermissionModule.java rename to java/local/src/main/java/cn/toesbieya/jxc/module/PermissionModule.java index 12cd0f6..cc18acf 100644 --- a/java/local/src/main/java/com/toesbieya/my/module/PermissionModule.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/module/PermissionModule.java @@ -1,8 +1,8 @@ -package com.toesbieya.my.module; +package cn.toesbieya.jxc.module; -import com.toesbieya.my.model.entity.SysResource; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.service.SysResourceService; +import cn.toesbieya.jxc.model.entity.SysResource; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.service.SysResourceService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/java/local/src/main/java/com/toesbieya/my/module/WebSocketServer.java b/java/local/src/main/java/cn/toesbieya/jxc/module/WebSocketServer.java similarity index 95% rename from java/local/src/main/java/com/toesbieya/my/module/WebSocketServer.java rename to java/local/src/main/java/cn/toesbieya/jxc/module/WebSocketServer.java index 8ee07fe..80055fb 100644 --- a/java/local/src/main/java/com/toesbieya/my/module/WebSocketServer.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/module/WebSocketServer.java @@ -1,16 +1,16 @@ -package com.toesbieya.my.module; +package cn.toesbieya.jxc.module; +import cn.toesbieya.jxc.constant.SessionConstant; +import cn.toesbieya.jxc.constant.SocketConstant; +import cn.toesbieya.jxc.model.vo.SocketOfflineVo; +import cn.toesbieya.jxc.utils.SessionUtil; import com.corundumstudio.socketio.AckRequest; import com.corundumstudio.socketio.SocketIOClient; import com.corundumstudio.socketio.SocketIOServer; import com.corundumstudio.socketio.annotation.OnConnect; import com.corundumstudio.socketio.annotation.OnDisconnect; import com.corundumstudio.socketio.annotation.OnEvent; -import com.toesbieya.my.constant.SessionConstant; -import com.toesbieya.my.constant.SocketConstant; -import com.toesbieya.my.model.vo.SocketOfflineVo; -import com.toesbieya.my.utils.RedisUtil; -import com.toesbieya.my.utils.SessionUtil; +import cn.toesbieya.jxc.utils.RedisUtil; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/java/local/src/main/java/com/toesbieya/my/module/request/RateLimiterHelper.java b/java/local/src/main/java/cn/toesbieya/jxc/module/request/RateLimiterHelper.java similarity index 88% rename from java/local/src/main/java/com/toesbieya/my/module/request/RateLimiterHelper.java rename to java/local/src/main/java/cn/toesbieya/jxc/module/request/RateLimiterHelper.java index 1c0018d..e95c5b9 100644 --- a/java/local/src/main/java/com/toesbieya/my/module/request/RateLimiterHelper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/module/request/RateLimiterHelper.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.module.request; +package cn.toesbieya.jxc.module.request; import com.google.common.util.concurrent.RateLimiter; import lombok.Data; diff --git a/java/local/src/main/java/com/toesbieya/my/module/request/RequestModule.java b/java/local/src/main/java/cn/toesbieya/jxc/module/request/RequestModule.java similarity index 93% rename from java/local/src/main/java/com/toesbieya/my/module/request/RequestModule.java rename to java/local/src/main/java/cn/toesbieya/jxc/module/request/RequestModule.java index 08ea40c..b8d26a7 100644 --- a/java/local/src/main/java/com/toesbieya/my/module/request/RequestModule.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/module/request/RequestModule.java @@ -1,8 +1,8 @@ -package com.toesbieya.my.module.request; +package cn.toesbieya.jxc.module.request; -import com.toesbieya.my.model.entity.SysResource; -import com.toesbieya.my.service.SysResourceService; -import com.toesbieya.my.utils.RedisUtil; +import cn.toesbieya.jxc.model.entity.SysResource; +import cn.toesbieya.jxc.service.SysResourceService; +import cn.toesbieya.jxc.utils.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/java/local/src/main/java/com/toesbieya/my/schedule/DocumentTask.java b/java/local/src/main/java/cn/toesbieya/jxc/schedule/DocumentTask.java similarity index 95% rename from java/local/src/main/java/com/toesbieya/my/schedule/DocumentTask.java rename to java/local/src/main/java/cn/toesbieya/jxc/schedule/DocumentTask.java index e0d09b7..751efc7 100644 --- a/java/local/src/main/java/com/toesbieya/my/schedule/DocumentTask.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/schedule/DocumentTask.java @@ -1,8 +1,8 @@ -package com.toesbieya.my.schedule; +package cn.toesbieya.jxc.schedule; -import com.toesbieya.my.constant.DocumentConstant; -import com.toesbieya.my.utils.DateUtil; -import com.toesbieya.my.utils.RedisUtil; +import cn.toesbieya.jxc.constant.DocumentConstant; +import cn.toesbieya.jxc.utils.DateUtil; +import cn.toesbieya.jxc.utils.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.DependsOn; import org.springframework.scheduling.annotation.Async; diff --git a/java/local/src/main/java/com/toesbieya/my/schedule/SessionTask.java b/java/local/src/main/java/cn/toesbieya/jxc/schedule/SessionTask.java similarity index 89% rename from java/local/src/main/java/com/toesbieya/my/schedule/SessionTask.java rename to java/local/src/main/java/cn/toesbieya/jxc/schedule/SessionTask.java index d8f2753..3b2d804 100644 --- a/java/local/src/main/java/com/toesbieya/my/schedule/SessionTask.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/schedule/SessionTask.java @@ -1,10 +1,10 @@ -package com.toesbieya.my.schedule; +package cn.toesbieya.jxc.schedule; +import cn.toesbieya.jxc.constant.SessionConstant; +import cn.toesbieya.jxc.constant.SocketConstant; +import cn.toesbieya.jxc.model.vo.SocketOfflineVo; import com.alibaba.fastjson.JSONObject; -import com.toesbieya.my.constant.SessionConstant; -import com.toesbieya.my.constant.SocketConstant; -import com.toesbieya.my.model.vo.SocketOfflineVo; -import com.toesbieya.my.utils.RedisUtil; +import cn.toesbieya.jxc.utils.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.DependsOn; import org.springframework.scheduling.annotation.Async; diff --git a/java/local/src/main/java/com/toesbieya/my/schedule/StatisticTask.java b/java/local/src/main/java/cn/toesbieya/jxc/schedule/StatisticTask.java similarity index 93% rename from java/local/src/main/java/com/toesbieya/my/schedule/StatisticTask.java rename to java/local/src/main/java/cn/toesbieya/jxc/schedule/StatisticTask.java index 7772dc6..8543ebd 100644 --- a/java/local/src/main/java/com/toesbieya/my/schedule/StatisticTask.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/schedule/StatisticTask.java @@ -1,10 +1,10 @@ -package com.toesbieya.my.schedule; +package cn.toesbieya.jxc.schedule; -import com.toesbieya.my.mapper.StatisticMapper; -import com.toesbieya.my.model.entity.StatFinishOrder; -import com.toesbieya.my.model.entity.StatProfitGoods; -import com.toesbieya.my.model.entity.StatProfitTotal; -import com.toesbieya.my.utils.DateUtil; +import cn.toesbieya.jxc.model.entity.StatFinishOrder; +import cn.toesbieya.jxc.model.entity.StatProfitGoods; +import cn.toesbieya.jxc.model.entity.StatProfitTotal; +import cn.toesbieya.jxc.mapper.StatisticMapper; +import cn.toesbieya.jxc.utils.DateUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; diff --git a/java/local/src/main/java/com/toesbieya/my/service/AccountService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java similarity index 88% rename from java/local/src/main/java/com/toesbieya/my/service/AccountService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java index 076520e..1a51529 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/AccountService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java @@ -1,16 +1,16 @@ -package com.toesbieya.my.service; - -import com.toesbieya.my.annoation.TimeCost; -import com.toesbieya.my.annoation.UserAction; -import com.toesbieya.my.enumeration.GeneralStatusEnum; -import com.toesbieya.my.enumeration.RecLoginHistoryEnum; -import com.toesbieya.my.mapper.SysUserMapper; -import com.toesbieya.my.model.entity.SysResource; -import com.toesbieya.my.model.entity.SysUser; -import com.toesbieya.my.model.vo.*; -import com.toesbieya.my.utils.QiniuUtil; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.SessionUtil; +package cn.toesbieya.jxc.service; + +import cn.toesbieya.jxc.annoation.TimeCost; +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.enumeration.GeneralStatusEnum; +import cn.toesbieya.jxc.enumeration.RecLoginHistoryEnum; +import cn.toesbieya.jxc.mapper.SysUserMapper; +import cn.toesbieya.jxc.model.entity.SysResource; +import cn.toesbieya.jxc.model.entity.SysUser; +import cn.toesbieya.jxc.model.vo.*; +import cn.toesbieya.jxc.utils.QiniuUtil; +import cn.toesbieya.jxc.utils.Result; +import cn.toesbieya.jxc.utils.SessionUtil; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/java/local/src/main/java/com/toesbieya/my/service/BizDocumentHistoryService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/BizDocumentHistoryService.java similarity index 68% rename from java/local/src/main/java/com/toesbieya/my/service/BizDocumentHistoryService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/BizDocumentHistoryService.java index 35a4cb9..cb45b17 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/BizDocumentHistoryService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/BizDocumentHistoryService.java @@ -1,8 +1,8 @@ -package com.toesbieya.my.service; +package cn.toesbieya.jxc.service; -import com.toesbieya.my.mapper.BizDocumentHistoryMapper; -import com.toesbieya.my.model.entity.BizDocumentHistory; -import com.toesbieya.my.model.vo.search.DocumentHistorySearch; +import cn.toesbieya.jxc.model.entity.BizDocumentHistory; +import cn.toesbieya.jxc.model.vo.search.DocumentHistorySearch; +import cn.toesbieya.jxc.mapper.BizDocumentHistoryMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/java/local/src/main/java/com/toesbieya/my/service/BizPurchaseInboundService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/BizPurchaseInboundService.java similarity index 92% rename from java/local/src/main/java/com/toesbieya/my/service/BizPurchaseInboundService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/BizPurchaseInboundService.java index 679c3b0..b5a0c9e 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/BizPurchaseInboundService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/BizPurchaseInboundService.java @@ -1,26 +1,26 @@ -package com.toesbieya.my.service; - +package cn.toesbieya.jxc.service; + +import cn.toesbieya.jxc.annoation.Lock; +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.enumeration.DocFinishEnum; +import cn.toesbieya.jxc.enumeration.DocHistoryEnum; +import cn.toesbieya.jxc.enumeration.DocStatusEnum; +import cn.toesbieya.jxc.exception.JsonResultException; +import cn.toesbieya.jxc.mapper.BizDocumentHistoryMapper; +import cn.toesbieya.jxc.mapper.BizPurchaseInboundMapper; +import cn.toesbieya.jxc.mapper.BizPurchaseOrderMapper; +import cn.toesbieya.jxc.mapper.BizStockMapper; +import cn.toesbieya.jxc.model.entity.*; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.export.PurchaseInboundExport; +import cn.toesbieya.jxc.model.vo.result.PageResult; +import cn.toesbieya.jxc.model.vo.search.PurchaseInboundSearch; +import cn.toesbieya.jxc.model.vo.update.DocumentStatusUpdate; +import cn.toesbieya.jxc.utils.DocumentUtil; +import cn.toesbieya.jxc.utils.ExcelUtil; +import cn.toesbieya.jxc.utils.Result; +import cn.toesbieya.jxc.utils.Util; import com.github.pagehelper.PageHelper; -import com.toesbieya.my.annoation.Lock; -import com.toesbieya.my.annoation.UserAction; -import com.toesbieya.my.enumeration.DocFinishEnum; -import com.toesbieya.my.enumeration.DocHistoryEnum; -import com.toesbieya.my.enumeration.DocStatusEnum; -import com.toesbieya.my.exception.JsonResultException; -import com.toesbieya.my.mapper.BizDocumentHistoryMapper; -import com.toesbieya.my.mapper.BizPurchaseInboundMapper; -import com.toesbieya.my.mapper.BizPurchaseOrderMapper; -import com.toesbieya.my.mapper.BizStockMapper; -import com.toesbieya.my.model.entity.*; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.export.PurchaseInboundExport; -import com.toesbieya.my.model.vo.result.PageResult; -import com.toesbieya.my.model.vo.search.PurchaseInboundSearch; -import com.toesbieya.my.model.vo.update.DocumentStatusUpdate; -import com.toesbieya.my.utils.DocumentUtil; -import com.toesbieya.my.utils.ExcelUtil; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.Util; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/java/local/src/main/java/com/toesbieya/my/service/BizPurchaseOrderService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/BizPurchaseOrderService.java similarity index 89% rename from java/local/src/main/java/com/toesbieya/my/service/BizPurchaseOrderService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/BizPurchaseOrderService.java index b2c03c2..33e8b7d 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/BizPurchaseOrderService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/BizPurchaseOrderService.java @@ -1,24 +1,24 @@ -package com.toesbieya.my.service; - +package cn.toesbieya.jxc.service; + +import cn.toesbieya.jxc.annoation.Lock; +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.enumeration.DocHistoryEnum; +import cn.toesbieya.jxc.enumeration.DocStatusEnum; +import cn.toesbieya.jxc.mapper.BizPurchaseOrderMapper; +import cn.toesbieya.jxc.model.entity.BizDocumentHistory; +import cn.toesbieya.jxc.model.entity.BizPurchaseOrder; +import cn.toesbieya.jxc.model.entity.BizPurchaseOrderSub; +import cn.toesbieya.jxc.model.entity.RecAttachment; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.export.PurchaseOrderExport; +import cn.toesbieya.jxc.model.vo.result.PageResult; +import cn.toesbieya.jxc.model.vo.search.PurchaseOrderSearch; +import cn.toesbieya.jxc.model.vo.update.DocumentStatusUpdate; +import cn.toesbieya.jxc.utils.ExcelUtil; import com.github.pagehelper.PageHelper; -import com.toesbieya.my.annoation.Lock; -import com.toesbieya.my.annoation.UserAction; -import com.toesbieya.my.enumeration.DocHistoryEnum; -import com.toesbieya.my.enumeration.DocStatusEnum; -import com.toesbieya.my.mapper.BizDocumentHistoryMapper; -import com.toesbieya.my.mapper.BizPurchaseOrderMapper; -import com.toesbieya.my.model.entity.BizDocumentHistory; -import com.toesbieya.my.model.entity.BizPurchaseOrder; -import com.toesbieya.my.model.entity.BizPurchaseOrderSub; -import com.toesbieya.my.model.entity.RecAttachment; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.export.PurchaseOrderExport; -import com.toesbieya.my.model.vo.result.PageResult; -import com.toesbieya.my.model.vo.search.PurchaseOrderSearch; -import com.toesbieya.my.model.vo.update.DocumentStatusUpdate; -import com.toesbieya.my.utils.DocumentUtil; -import com.toesbieya.my.utils.ExcelUtil; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.mapper.BizDocumentHistoryMapper; +import cn.toesbieya.jxc.utils.DocumentUtil; +import cn.toesbieya.jxc.utils.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/java/local/src/main/java/com/toesbieya/my/service/BizSellOrderService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/BizSellOrderService.java similarity index 91% rename from java/local/src/main/java/com/toesbieya/my/service/BizSellOrderService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/BizSellOrderService.java index 3f7f8d8..f15ff71 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/BizSellOrderService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/BizSellOrderService.java @@ -1,24 +1,24 @@ -package com.toesbieya.my.service; - +package cn.toesbieya.jxc.service; + +import cn.toesbieya.jxc.annoation.Lock; +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.enumeration.DocHistoryEnum; +import cn.toesbieya.jxc.enumeration.DocStatusEnum; +import cn.toesbieya.jxc.mapper.BizDocumentHistoryMapper; +import cn.toesbieya.jxc.mapper.BizSellOrderMapper; +import cn.toesbieya.jxc.mapper.BizStockMapper; +import cn.toesbieya.jxc.model.entity.*; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.export.SellOrderExport; +import cn.toesbieya.jxc.model.vo.result.PageResult; +import cn.toesbieya.jxc.model.vo.result.StockSearchResult; +import cn.toesbieya.jxc.model.vo.search.SellOrderSearch; +import cn.toesbieya.jxc.model.vo.search.StockSearch; +import cn.toesbieya.jxc.model.vo.update.DocumentStatusUpdate; +import cn.toesbieya.jxc.utils.DocumentUtil; +import cn.toesbieya.jxc.utils.ExcelUtil; +import cn.toesbieya.jxc.utils.Result; import com.github.pagehelper.PageHelper; -import com.toesbieya.my.annoation.Lock; -import com.toesbieya.my.annoation.UserAction; -import com.toesbieya.my.enumeration.DocHistoryEnum; -import com.toesbieya.my.enumeration.DocStatusEnum; -import com.toesbieya.my.mapper.BizDocumentHistoryMapper; -import com.toesbieya.my.mapper.BizSellOrderMapper; -import com.toesbieya.my.mapper.BizStockMapper; -import com.toesbieya.my.model.entity.*; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.export.SellOrderExport; -import com.toesbieya.my.model.vo.result.PageResult; -import com.toesbieya.my.model.vo.result.StockSearchResult; -import com.toesbieya.my.model.vo.search.SellOrderSearch; -import com.toesbieya.my.model.vo.search.StockSearch; -import com.toesbieya.my.model.vo.update.DocumentStatusUpdate; -import com.toesbieya.my.utils.DocumentUtil; -import com.toesbieya.my.utils.ExcelUtil; -import com.toesbieya.my.utils.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/java/local/src/main/java/com/toesbieya/my/service/BizSellOutboundService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/BizSellOutboundService.java similarity index 93% rename from java/local/src/main/java/com/toesbieya/my/service/BizSellOutboundService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/BizSellOutboundService.java index 4b267a7..5596604 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/BizSellOutboundService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/BizSellOutboundService.java @@ -1,26 +1,26 @@ -package com.toesbieya.my.service; - +package cn.toesbieya.jxc.service; + +import cn.toesbieya.jxc.annoation.Lock; +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.enumeration.DocFinishEnum; +import cn.toesbieya.jxc.enumeration.DocHistoryEnum; +import cn.toesbieya.jxc.enumeration.DocStatusEnum; +import cn.toesbieya.jxc.exception.JsonResultException; +import cn.toesbieya.jxc.mapper.BizDocumentHistoryMapper; +import cn.toesbieya.jxc.mapper.BizSellOrderMapper; +import cn.toesbieya.jxc.mapper.BizSellOutboundMapper; +import cn.toesbieya.jxc.mapper.BizStockMapper; +import cn.toesbieya.jxc.model.entity.*; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.export.SellOutboundExport; +import cn.toesbieya.jxc.model.vo.result.PageResult; +import cn.toesbieya.jxc.model.vo.search.SellOutboundSearch; +import cn.toesbieya.jxc.model.vo.update.DocumentStatusUpdate; +import cn.toesbieya.jxc.utils.DocumentUtil; +import cn.toesbieya.jxc.utils.ExcelUtil; +import cn.toesbieya.jxc.utils.Result; +import cn.toesbieya.jxc.utils.Util; import com.github.pagehelper.PageHelper; -import com.toesbieya.my.annoation.Lock; -import com.toesbieya.my.annoation.UserAction; -import com.toesbieya.my.enumeration.DocFinishEnum; -import com.toesbieya.my.enumeration.DocHistoryEnum; -import com.toesbieya.my.enumeration.DocStatusEnum; -import com.toesbieya.my.exception.JsonResultException; -import com.toesbieya.my.mapper.BizDocumentHistoryMapper; -import com.toesbieya.my.mapper.BizSellOrderMapper; -import com.toesbieya.my.mapper.BizSellOutboundMapper; -import com.toesbieya.my.mapper.BizStockMapper; -import com.toesbieya.my.model.entity.*; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.export.SellOutboundExport; -import com.toesbieya.my.model.vo.result.PageResult; -import com.toesbieya.my.model.vo.search.SellOutboundSearch; -import com.toesbieya.my.model.vo.update.DocumentStatusUpdate; -import com.toesbieya.my.utils.DocumentUtil; -import com.toesbieya.my.utils.ExcelUtil; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.Util; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/java/local/src/main/java/com/toesbieya/my/service/BizStockService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/BizStockService.java similarity index 75% rename from java/local/src/main/java/com/toesbieya/my/service/BizStockService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/BizStockService.java index 99a3d1f..caa1b85 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/BizStockService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/BizStockService.java @@ -1,13 +1,13 @@ -package com.toesbieya.my.service; - +package cn.toesbieya.jxc.service; + +import cn.toesbieya.jxc.model.entity.BizStock; +import cn.toesbieya.jxc.model.vo.export.StockExport; +import cn.toesbieya.jxc.model.vo.result.PageResult; +import cn.toesbieya.jxc.model.vo.result.StockSearchResult; +import cn.toesbieya.jxc.model.vo.search.StockSearch; +import cn.toesbieya.jxc.utils.ExcelUtil; import com.github.pagehelper.PageHelper; -import com.toesbieya.my.mapper.BizStockMapper; -import com.toesbieya.my.model.entity.BizStock; -import com.toesbieya.my.model.vo.export.StockExport; -import com.toesbieya.my.model.vo.result.PageResult; -import com.toesbieya.my.model.vo.result.StockSearchResult; -import com.toesbieya.my.model.vo.search.StockSearch; -import com.toesbieya.my.utils.ExcelUtil; +import cn.toesbieya.jxc.mapper.BizStockMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/java/local/src/main/java/com/toesbieya/my/service/MsgService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/MsgService.java similarity index 85% rename from java/local/src/main/java/com/toesbieya/my/service/MsgService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/MsgService.java index bc3c656..5deb627 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/MsgService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/MsgService.java @@ -1,19 +1,19 @@ -package com.toesbieya.my.service; - +package cn.toesbieya.jxc.service; + +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.constant.MsgConstant; +import cn.toesbieya.jxc.constant.SocketConstant; +import cn.toesbieya.jxc.model.entity.Msg; +import cn.toesbieya.jxc.model.entity.MsgState; +import cn.toesbieya.jxc.model.vo.SocketEventVo; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.result.PageResult; +import cn.toesbieya.jxc.model.vo.search.MsgPersonalSearch; +import cn.toesbieya.jxc.model.vo.search.MsgSearch; +import cn.toesbieya.jxc.utils.WebSocketUtil; import com.github.pagehelper.PageHelper; -import com.toesbieya.my.annoation.UserAction; -import com.toesbieya.my.constant.MsgConstant; -import com.toesbieya.my.constant.SocketConstant; -import com.toesbieya.my.mapper.MsgMapper; -import com.toesbieya.my.model.entity.Msg; -import com.toesbieya.my.model.entity.MsgState; -import com.toesbieya.my.model.vo.SocketEventVo; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.result.PageResult; -import com.toesbieya.my.model.vo.search.MsgPersonalSearch; -import com.toesbieya.my.model.vo.search.MsgSearch; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.WebSocketUtil; +import cn.toesbieya.jxc.mapper.MsgMapper; +import cn.toesbieya.jxc.utils.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/java/local/src/main/java/com/toesbieya/my/service/RecService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/RecService.java similarity index 77% rename from java/local/src/main/java/com/toesbieya/my/service/RecService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/RecService.java index 5917ccd..a80a48f 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/RecService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/RecService.java @@ -1,20 +1,20 @@ -package com.toesbieya.my.service; +package cn.toesbieya.jxc.service; +import cn.toesbieya.jxc.enumeration.RecLoginHistoryEnum; +import cn.toesbieya.jxc.enumeration.UserActionEnum; +import cn.toesbieya.jxc.model.entity.RecAttachment; +import cn.toesbieya.jxc.model.entity.RecLoginHistory; +import cn.toesbieya.jxc.model.entity.RecUserAction; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.result.PageResult; +import cn.toesbieya.jxc.model.vo.search.LoginHistorySearch; +import cn.toesbieya.jxc.model.vo.search.UserActionSearch; +import cn.toesbieya.jxc.utils.QiniuUtil; import com.github.pagehelper.PageHelper; -import com.toesbieya.my.enumeration.RecLoginHistoryEnum; -import com.toesbieya.my.enumeration.UserActionEnum; -import com.toesbieya.my.mapper.RecAttachmentMapper; -import com.toesbieya.my.mapper.RecLoginHistoryMapper; -import com.toesbieya.my.mapper.RecUserActionMapper; -import com.toesbieya.my.model.entity.RecAttachment; -import com.toesbieya.my.model.entity.RecLoginHistory; -import com.toesbieya.my.model.entity.RecUserAction; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.result.PageResult; -import com.toesbieya.my.model.vo.search.LoginHistorySearch; -import com.toesbieya.my.model.vo.search.UserActionSearch; -import com.toesbieya.my.utils.IpUtil; -import com.toesbieya.my.utils.QiniuUtil; +import cn.toesbieya.jxc.mapper.RecAttachmentMapper; +import cn.toesbieya.jxc.mapper.RecLoginHistoryMapper; +import cn.toesbieya.jxc.mapper.RecUserActionMapper; +import cn.toesbieya.jxc.utils.IpUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/java/local/src/main/java/com/toesbieya/my/service/StatisticService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/StatisticService.java similarity index 89% rename from java/local/src/main/java/com/toesbieya/my/service/StatisticService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/StatisticService.java index 3083a60..f8b6c54 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/StatisticService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/StatisticService.java @@ -1,12 +1,12 @@ -package com.toesbieya.my.service; - -import com.toesbieya.my.mapper.StatisticMapper; -import com.toesbieya.my.model.entity.StatFinishOrder; -import com.toesbieya.my.model.entity.StatProfitGoods; -import com.toesbieya.my.model.entity.StatProfitTotal; -import com.toesbieya.my.model.vo.statictis.FourBlockStat; -import com.toesbieya.my.utils.DateUtil; -import com.toesbieya.my.utils.WebSocketUtil; +package cn.toesbieya.jxc.service; + +import cn.toesbieya.jxc.model.entity.StatFinishOrder; +import cn.toesbieya.jxc.model.entity.StatProfitGoods; +import cn.toesbieya.jxc.model.entity.StatProfitTotal; +import cn.toesbieya.jxc.model.vo.statictis.FourBlockStat; +import cn.toesbieya.jxc.utils.WebSocketUtil; +import cn.toesbieya.jxc.mapper.StatisticMapper; +import cn.toesbieya.jxc.utils.DateUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/java/local/src/main/java/com/toesbieya/my/service/SysCategoryService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/SysCategoryService.java similarity index 88% rename from java/local/src/main/java/com/toesbieya/my/service/SysCategoryService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/SysCategoryService.java index 1d55f1f..9a541eb 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/SysCategoryService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/SysCategoryService.java @@ -1,11 +1,11 @@ -package com.toesbieya.my.service; +package cn.toesbieya.jxc.service; -import com.toesbieya.my.annoation.Lock; -import com.toesbieya.my.annoation.UserAction; -import com.toesbieya.my.mapper.SysCategoryMapper; -import com.toesbieya.my.model.entity.SysCategory; -import com.toesbieya.my.model.vo.search.CategorySearch; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.annoation.Lock; +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.model.entity.SysCategory; +import cn.toesbieya.jxc.model.vo.search.CategorySearch; +import cn.toesbieya.jxc.mapper.SysCategoryMapper; +import cn.toesbieya.jxc.utils.Result; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/java/local/src/main/java/com/toesbieya/my/service/SysCustomerService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/SysCustomerService.java similarity index 82% rename from java/local/src/main/java/com/toesbieya/my/service/SysCustomerService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/SysCustomerService.java index bb84341..78864a6 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/SysCustomerService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/SysCustomerService.java @@ -1,13 +1,13 @@ -package com.toesbieya.my.service; +package cn.toesbieya.jxc.service; +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.model.entity.SysCustomer; +import cn.toesbieya.jxc.model.vo.result.PageResult; +import cn.toesbieya.jxc.model.vo.result.RegionValueResult; +import cn.toesbieya.jxc.model.vo.search.CustomerSearch; import com.github.pagehelper.PageHelper; -import com.toesbieya.my.annoation.UserAction; -import com.toesbieya.my.mapper.SysCustomerMapper; -import com.toesbieya.my.model.entity.SysCustomer; -import com.toesbieya.my.model.vo.result.PageResult; -import com.toesbieya.my.model.vo.result.RegionValueResult; -import com.toesbieya.my.model.vo.search.CustomerSearch; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.mapper.SysCustomerMapper; +import cn.toesbieya.jxc.utils.Result; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/java/local/src/main/java/com/toesbieya/my/service/SysDepartmentService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/SysDepartmentService.java similarity index 87% rename from java/local/src/main/java/com/toesbieya/my/service/SysDepartmentService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/SysDepartmentService.java index e8c0761..d0f9153 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/SysDepartmentService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/SysDepartmentService.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.service; +package cn.toesbieya.jxc.service; -import com.toesbieya.my.annoation.UserAction; -import com.toesbieya.my.mapper.SysDepartmentMapper; -import com.toesbieya.my.model.entity.SysDepartment; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.model.entity.SysDepartment; +import cn.toesbieya.jxc.mapper.SysDepartmentMapper; +import cn.toesbieya.jxc.utils.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/java/local/src/main/java/com/toesbieya/my/service/SysResourceService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/SysResourceService.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/service/SysResourceService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/SysResourceService.java index e6d9b91..84abd6d 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/SysResourceService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/SysResourceService.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.service; +package cn.toesbieya.jxc.service; -import com.toesbieya.my.mapper.SysResourceMapper; -import com.toesbieya.my.model.entity.SysResource; -import com.toesbieya.my.module.request.RequestModule; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.model.entity.SysResource; +import cn.toesbieya.jxc.mapper.SysResourceMapper; +import cn.toesbieya.jxc.module.request.RequestModule; +import cn.toesbieya.jxc.utils.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/java/local/src/main/java/com/toesbieya/my/service/SysRoleService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/SysRoleService.java similarity index 82% rename from java/local/src/main/java/com/toesbieya/my/service/SysRoleService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/SysRoleService.java index 5dff368..c5c7b0d 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/SysRoleService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/SysRoleService.java @@ -1,12 +1,12 @@ -package com.toesbieya.my.service; +package cn.toesbieya.jxc.service; +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.model.entity.SysRole; +import cn.toesbieya.jxc.model.vo.result.PageResult; +import cn.toesbieya.jxc.model.vo.search.RoleSearch; import com.github.pagehelper.PageHelper; -import com.toesbieya.my.annoation.UserAction; -import com.toesbieya.my.mapper.SysRoleMapper; -import com.toesbieya.my.model.entity.SysRole; -import com.toesbieya.my.model.vo.result.PageResult; -import com.toesbieya.my.model.vo.search.RoleSearch; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.mapper.SysRoleMapper; +import cn.toesbieya.jxc.utils.Result; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/java/local/src/main/java/com/toesbieya/my/service/SysSupplierService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/SysSupplierService.java similarity index 82% rename from java/local/src/main/java/com/toesbieya/my/service/SysSupplierService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/SysSupplierService.java index 55b04d9..4bf8c21 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/SysSupplierService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/SysSupplierService.java @@ -1,13 +1,13 @@ -package com.toesbieya.my.service; +package cn.toesbieya.jxc.service; +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.model.entity.SysSupplier; +import cn.toesbieya.jxc.model.vo.result.PageResult; +import cn.toesbieya.jxc.model.vo.result.RegionValueResult; +import cn.toesbieya.jxc.model.vo.search.SupplierSearch; import com.github.pagehelper.PageHelper; -import com.toesbieya.my.annoation.UserAction; -import com.toesbieya.my.mapper.SysSupplierMapper; -import com.toesbieya.my.model.entity.SysSupplier; -import com.toesbieya.my.model.vo.result.PageResult; -import com.toesbieya.my.model.vo.result.RegionValueResult; -import com.toesbieya.my.model.vo.search.SupplierSearch; -import com.toesbieya.my.utils.Result; +import cn.toesbieya.jxc.mapper.SysSupplierMapper; +import cn.toesbieya.jxc.utils.Result; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/java/local/src/main/java/com/toesbieya/my/service/SysUserService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/SysUserService.java similarity index 86% rename from java/local/src/main/java/com/toesbieya/my/service/SysUserService.java rename to java/local/src/main/java/cn/toesbieya/jxc/service/SysUserService.java index 7050d0c..75ebc42 100644 --- a/java/local/src/main/java/com/toesbieya/my/service/SysUserService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/SysUserService.java @@ -1,15 +1,15 @@ -package com.toesbieya.my.service; - +package cn.toesbieya.jxc.service; + +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.model.entity.SysUser; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.result.PageResult; +import cn.toesbieya.jxc.model.vo.search.UserSearch; +import cn.toesbieya.jxc.utils.Util; +import cn.toesbieya.jxc.utils.WebSocketUtil; import com.github.pagehelper.PageHelper; -import com.toesbieya.my.annoation.UserAction; -import com.toesbieya.my.mapper.SysUserMapper; -import com.toesbieya.my.model.entity.SysUser; -import com.toesbieya.my.model.vo.UserVo; -import com.toesbieya.my.model.vo.result.PageResult; -import com.toesbieya.my.model.vo.search.UserSearch; -import com.toesbieya.my.utils.Result; -import com.toesbieya.my.utils.Util; -import com.toesbieya.my.utils.WebSocketUtil; +import cn.toesbieya.jxc.mapper.SysUserMapper; +import cn.toesbieya.jxc.utils.Result; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.DigestUtils; diff --git a/java/local/src/main/java/com/toesbieya/my/utils/DateUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/DateUtil.java similarity index 98% rename from java/local/src/main/java/com/toesbieya/my/utils/DateUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/utils/DateUtil.java index 2f04145..51d88cf 100644 --- a/java/local/src/main/java/com/toesbieya/my/utils/DateUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/utils/DateUtil.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.utils; +package cn.toesbieya.jxc.utils; import java.time.Instant; import java.time.LocalDateTime; diff --git a/java/local/src/main/java/com/toesbieya/my/utils/DocumentUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/DocumentUtil.java similarity index 94% rename from java/local/src/main/java/com/toesbieya/my/utils/DocumentUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/utils/DocumentUtil.java index 228a674..a72e63c 100644 --- a/java/local/src/main/java/com/toesbieya/my/utils/DocumentUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/utils/DocumentUtil.java @@ -1,7 +1,7 @@ -package com.toesbieya.my.utils; +package cn.toesbieya.jxc.utils; +import cn.toesbieya.jxc.constant.DocumentConstant; import com.google.common.io.ByteStreams; -import com.toesbieya.my.constant.DocumentConstant; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.ClassPathResource; import org.springframework.data.redis.core.script.DefaultRedisScript; diff --git a/java/local/src/main/java/com/toesbieya/my/utils/ExcelUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/ExcelUtil.java similarity index 99% rename from java/local/src/main/java/com/toesbieya/my/utils/ExcelUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/utils/ExcelUtil.java index b12e9f0..265b106 100644 --- a/java/local/src/main/java/com/toesbieya/my/utils/ExcelUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/utils/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.utils; +package cn.toesbieya.jxc.utils; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/java/local/src/main/java/com/toesbieya/my/utils/IpUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/IpUtil.java similarity index 99% rename from java/local/src/main/java/com/toesbieya/my/utils/IpUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/utils/IpUtil.java index 614d6b2..b15f3c6 100644 --- a/java/local/src/main/java/com/toesbieya/my/utils/IpUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/utils/IpUtil.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.utils; +package cn.toesbieya.jxc.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; diff --git a/java/local/src/main/java/com/toesbieya/my/utils/QiniuUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/QiniuUtil.java similarity index 96% rename from java/local/src/main/java/com/toesbieya/my/utils/QiniuUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/utils/QiniuUtil.java index f7678e4..2b2941d 100644 --- a/java/local/src/main/java/com/toesbieya/my/utils/QiniuUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/utils/QiniuUtil.java @@ -1,11 +1,11 @@ -package com.toesbieya.my.utils; +package cn.toesbieya.jxc.utils; import com.qiniu.common.QiniuException; import com.qiniu.storage.BucketManager; import com.qiniu.storage.Configuration; import com.qiniu.storage.Region; import com.qiniu.util.Auth; -import com.toesbieya.my.config.QiniuConfig; +import cn.toesbieya.jxc.config.QiniuConfig; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.DependsOn; diff --git a/java/local/src/main/java/com/toesbieya/my/utils/RedisUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/RedisUtil.java similarity index 99% rename from java/local/src/main/java/com/toesbieya/my/utils/RedisUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/utils/RedisUtil.java index 0300d02..e53976f 100644 --- a/java/local/src/main/java/com/toesbieya/my/utils/RedisUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/utils/RedisUtil.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.utils; +package cn.toesbieya.jxc.utils; import com.google.common.io.ByteStreams; import lombok.extern.slf4j.Slf4j; diff --git a/java/local/src/main/java/com/toesbieya/my/utils/Result.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/Result.java similarity index 98% rename from java/local/src/main/java/com/toesbieya/my/utils/Result.java rename to java/local/src/main/java/cn/toesbieya/jxc/utils/Result.java index 3aa5ce1..bec9eb1 100644 --- a/java/local/src/main/java/com/toesbieya/my/utils/Result.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/utils/Result.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.utils; +package cn.toesbieya.jxc.utils; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/java/local/src/main/java/com/toesbieya/my/utils/SessionUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/SessionUtil.java similarity index 90% rename from java/local/src/main/java/com/toesbieya/my/utils/SessionUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/utils/SessionUtil.java index e277e60..c922d55 100644 --- a/java/local/src/main/java/com/toesbieya/my/utils/SessionUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/utils/SessionUtil.java @@ -1,9 +1,9 @@ -package com.toesbieya.my.utils; +package cn.toesbieya.jxc.utils; +import cn.toesbieya.jxc.model.entity.SysUser; import com.alibaba.fastjson.JSONObject; -import com.toesbieya.my.constant.SessionConstant; -import com.toesbieya.my.model.entity.SysUser; -import com.toesbieya.my.model.vo.UserVo; +import cn.toesbieya.jxc.constant.SessionConstant; +import cn.toesbieya.jxc.model.vo.UserVo; import org.springframework.util.StringUtils; import javax.servlet.http.HttpServletRequest; diff --git a/java/local/src/main/java/com/toesbieya/my/utils/SpringUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/SpringUtil.java similarity index 98% rename from java/local/src/main/java/com/toesbieya/my/utils/SpringUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/utils/SpringUtil.java index e8bb043..ddb9072 100644 --- a/java/local/src/main/java/com/toesbieya/my/utils/SpringUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/utils/SpringUtil.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.utils; +package cn.toesbieya.jxc.utils; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/java/local/src/main/java/com/toesbieya/my/utils/ThreadUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/ThreadUtil.java similarity index 91% rename from java/local/src/main/java/com/toesbieya/my/utils/ThreadUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/utils/ThreadUtil.java index 6044f3c..755f4d1 100644 --- a/java/local/src/main/java/com/toesbieya/my/utils/ThreadUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/utils/ThreadUtil.java @@ -1,7 +1,7 @@ -package com.toesbieya.my.utils; +package cn.toesbieya.jxc.utils; -import com.toesbieya.my.model.entity.RecUserAction; -import com.toesbieya.my.model.vo.UserVo; +import cn.toesbieya.jxc.model.entity.RecUserAction; +import cn.toesbieya.jxc.model.vo.UserVo; import javax.servlet.http.HttpServletRequest; diff --git a/java/local/src/main/java/com/toesbieya/my/utils/Util.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/Util.java similarity index 98% rename from java/local/src/main/java/com/toesbieya/my/utils/Util.java rename to java/local/src/main/java/cn/toesbieya/jxc/utils/Util.java index 8506b86..d7b9b81 100644 --- a/java/local/src/main/java/com/toesbieya/my/utils/Util.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/utils/Util.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.utils; +package cn.toesbieya.jxc.utils; import org.springframework.util.StringUtils; diff --git a/java/local/src/main/java/com/toesbieya/my/utils/WebSocketUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/WebSocketUtil.java similarity index 88% rename from java/local/src/main/java/com/toesbieya/my/utils/WebSocketUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/utils/WebSocketUtil.java index a9f1061..c1acdb4 100644 --- a/java/local/src/main/java/com/toesbieya/my/utils/WebSocketUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/utils/WebSocketUtil.java @@ -1,7 +1,7 @@ -package com.toesbieya.my.utils; +package cn.toesbieya.jxc.utils; -import com.toesbieya.my.constant.SocketConstant; -import com.toesbieya.my.model.vo.SocketEventVo; +import cn.toesbieya.jxc.constant.SocketConstant; +import cn.toesbieya.jxc.model.vo.SocketEventVo; import java.util.List; import java.util.Set; diff --git a/java/local/src/main/java/com/toesbieya/my/utils/WebUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/WebUtil.java similarity index 96% rename from java/local/src/main/java/com/toesbieya/my/utils/WebUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/utils/WebUtil.java index a512ac1..dc8a6b8 100644 --- a/java/local/src/main/java/com/toesbieya/my/utils/WebUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/utils/WebUtil.java @@ -1,4 +1,4 @@ -package com.toesbieya.my.utils; +package cn.toesbieya.jxc.utils; import com.alibaba.fastjson.JSON; import org.springframework.web.context.request.RequestContextHolder; diff --git a/java/local/src/main/java/com/toesbieya/my/config/SocketServerConfig.java b/java/local/src/main/java/com/toesbieya/my/config/SocketServerConfig.java deleted file mode 100644 index 7956320..0000000 --- a/java/local/src/main/java/com/toesbieya/my/config/SocketServerConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.toesbieya.my.config; - -import com.corundumstudio.socketio.SocketIOServer; -import com.corundumstudio.socketio.annotation.SpringAnnotationScanner; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.DependsOn; - -@Configuration -@DependsOn("redisUtil") -public class SocketServerConfig { - private SocketConfig socketConfig; - - @Bean - public SocketIOServer socketIOServer() { - com.corundumstudio.socketio.Configuration config = new com.corundumstudio.socketio.Configuration(); - - config.setHostname(socketConfig.getHostname()); - config.setPort(socketConfig.getPort()); - config.setMaxFramePayloadLength(socketConfig.getMaxFramePayloadLength()); - config.setMaxHttpContentLength(socketConfig.getMaxHttpContentLength()); - - config.setAddVersionHeader(false); - return new SocketIOServer(config); - } - - @Bean - public SpringAnnotationScanner springAnnotationScanner(SocketIOServer socketServer) { - return new SpringAnnotationScanner(socketServer); - } - - @Autowired - public void setSocketConfig(SocketConfig socketConfig) { - this.socketConfig = socketConfig; - } -} diff --git a/java/local/src/main/resources/mapper/BizDocumentHistory.xml b/java/local/src/main/resources/mapper/BizDocumentHistory.xml index 41d80d2..284c77b 100644 --- a/java/local/src/main/resources/mapper/BizDocumentHistory.xml +++ b/java/local/src/main/resources/mapper/BizDocumentHistory.xml @@ -1,14 +1,14 @@ - - select * from biz_doc_history where pid = #{pid} order by id desc - select * from biz_doc_history where 1 @@ -19,7 +19,7 @@ order by id desc - + insert into biz_doc_history (pid, type, uid, uname, status_before, status_after, time, info) VALUES (#{pid}, #{type}, #{uid}, #{uname}, #{status_before}, #{status_after}, #{time}, #{info}) diff --git a/java/local/src/main/resources/mapper/BizPurchaseInbound.xml b/java/local/src/main/resources/mapper/BizPurchaseInbound.xml index b98152c..e5765e1 100644 --- a/java/local/src/main/resources/mapper/BizPurchaseInbound.xml +++ b/java/local/src/main/resources/mapper/BizPurchaseInbound.xml @@ -1,6 +1,6 @@ - + and id=#{id} and id like "%"#{id_fuzzy}"%" @@ -16,26 +16,26 @@ and vtime = ]]> #{vtimeStart} and vtime #{vtimeEnd} - select * from biz_purchase_inbound where id = #{id} - select * from biz_purchase_inbound_sub where pid = #{id} - select * from biz_purchase_inbound where 1 order by ctime desc - select id, pid, cname, @@ -49,7 +49,7 @@ order by ctime desc - + insert into biz_purchase_inbound id,pid,cid,cname,ctime, @@ -68,14 +68,14 @@ #{remark}, - + INSERT INTO biz_purchase_inbound_sub(pid, cid, cname, num) VALUES (#{i.pid},#{i.cid},#{i.cname},#{i.num}) - + update biz_purchase_inbound set pid=#{pid}, status=#{status}, diff --git a/java/local/src/main/resources/mapper/BizPurchaseOrder.xml b/java/local/src/main/resources/mapper/BizPurchaseOrder.xml index 2b86143..909461d 100644 --- a/java/local/src/main/resources/mapper/BizPurchaseOrder.xml +++ b/java/local/src/main/resources/mapper/BizPurchaseOrder.xml @@ -1,6 +1,6 @@ - + and id=#{id} and id like "%"#{id_fuzzy}"%" @@ -19,26 +19,26 @@ and ftime = ]]> #{ftimeStart} and ftime #{ftimeEnd} - select * from biz_purchase_order where id = #{id} - select * from biz_purchase_order_sub where pid = #{id} - select * from biz_purchase_order where 1 order by ctime desc - select id, sname, cname, @@ -55,7 +55,7 @@ order by ctime desc - + insert into biz_purchase_order id,sid,sname,cid,cname,ctime,finish,total, @@ -76,14 +76,14 @@ #{remark}, - + INSERT INTO biz_purchase_order_sub(pid, cid, cname, num, price, remain_num) VALUES (#{i.pid},#{i.cid},#{i.cname},#{i.num},#{i.price},#{i.remain_num}) - + update biz_purchase_order set sid=#{sid}, sname=#{sname}, diff --git a/java/local/src/main/resources/mapper/BizSellOrder.xml b/java/local/src/main/resources/mapper/BizSellOrder.xml index 31bef46..441d0d8 100644 --- a/java/local/src/main/resources/mapper/BizSellOrder.xml +++ b/java/local/src/main/resources/mapper/BizSellOrder.xml @@ -1,6 +1,6 @@ - + and id=#{id} and id like "%"#{id_fuzzy}"%" @@ -19,26 +19,26 @@ and ftime = ]]> #{ftimeStart} and ftime #{ftimeEnd} - select * from biz_sell_order where id = #{id} - select * from biz_sell_order_sub where pid = #{id} - select * from biz_sell_order where 1 order by ctime desc - select id, customer_name, cname, @@ -55,7 +55,7 @@ order by ctime desc - + insert into biz_sell_order id,customer_id,customer_name,cid,cname,ctime,finish,total, @@ -76,14 +76,14 @@ #{remark}, - + INSERT INTO biz_sell_order_sub(pid, cid, cname, num, price, remain_num) VALUES (#{i.pid},#{i.cid},#{i.cname},#{i.num},#{i.price},#{i.remain_num}) - + update biz_sell_order set customer_id=#{customer_id}, customer_name=#{customer_name}, diff --git a/java/local/src/main/resources/mapper/BizSellOutbound.xml b/java/local/src/main/resources/mapper/BizSellOutbound.xml index bc87a45..1183800 100644 --- a/java/local/src/main/resources/mapper/BizSellOutbound.xml +++ b/java/local/src/main/resources/mapper/BizSellOutbound.xml @@ -1,6 +1,6 @@ - + and id=#{id} and id like "%"#{id_fuzzy}"%" @@ -16,26 +16,26 @@ and vtime = ]]> #{vtimeStart} and vtime #{vtimeEnd} - select * from biz_sell_outbound where id = #{id} - select * from biz_sell_outbound_sub where pid = #{id} - select * from biz_sell_outbound where 1 order by ctime desc - select id, pid, cname, @@ -49,7 +49,7 @@ order by ctime desc - + insert into biz_sell_outbound id,pid,cid,cname,ctime, @@ -68,14 +68,14 @@ #{remark}, - + INSERT INTO biz_sell_outbound_sub(pid,sid, cid, cname, num) VALUES (#{i.pid},#{i.sid},#{i.cid},#{i.cname},#{i.num}) - + update biz_sell_outbound set pid=#{pid}, status=#{status}, diff --git a/java/local/src/main/resources/mapper/BizStock.xml b/java/local/src/main/resources/mapper/BizStock.xml index 66be6ac..3f4298b 100644 --- a/java/local/src/main/resources/mapper/BizStock.xml +++ b/java/local/src/main/resources/mapper/BizStock.xml @@ -1,6 +1,6 @@ - + where 1 @@ -36,8 +36,8 @@ and num > 0 - select cid, cname, sum(num) total_num, @@ -47,7 +47,7 @@ group by cid - select * from biz_stock where cid in (${cids}) @@ -55,14 +55,14 @@ order by cgddid desc, cgrkid desc - select * from biz_stock where id in (${ids}) - select a.cid, a.cname, a.total_num, @@ -88,7 +88,7 @@ order by a.cid, b.cgddid desc, b.cgrkid desc - insert into biz_stock (cid, cname, num, price, ctime, cgrkid, cgddid) diff --git a/java/local/src/main/resources/mapper/Msg.xml b/java/local/src/main/resources/mapper/Msg.xml index 3c57b6d..09bb265 100644 --- a/java/local/src/main/resources/mapper/Msg.xml +++ b/java/local/src/main/resources/mapper/Msg.xml @@ -1,6 +1,6 @@ - + and title like "%"#{title}"%" @@ -23,14 +23,14 @@ and id not in (select mid from msg_state where uid = #{uid}) - + insert into msg (title, content, type, cid, cname, ctime, pid, pname, ptime, wid, wname, wtime, status, broadcast, recipient) values (#{title}, #{content}, #{type}, #{cid}, #{cname}, #{ctime}, #{pid}, #{pname}, #{ptime}, #{wid}, #{wname}, #{wtime}, #{status}, #{broadcast}, #{recipient}) - + insert into msg_state (mid, uid, time) values (#{mid}, #{uid}, #{time}) @@ -42,15 +42,15 @@ and uid = #{uid} - select * from msg where 1 order by id desc - + update msg set title=#{title}, content=#{content}, @@ -84,8 +84,8 @@ and status = 0 - select a.id, a.title, a.content, @@ -98,8 +98,8 @@ order by a.id desc - select id, title, content, diff --git a/java/local/src/main/resources/mapper/RecAttachment.xml b/java/local/src/main/resources/mapper/RecAttachment.xml index 86752d8..49ebf63 100644 --- a/java/local/src/main/resources/mapper/RecAttachment.xml +++ b/java/local/src/main/resources/mapper/RecAttachment.xml @@ -1,7 +1,7 @@ - - select * from rec_attachment where pid = #{pid} @@ -13,7 +13,7 @@ where pid = #{pid} - + insert into rec_attachment (pid, name, time, sort, url,size) VALUES diff --git a/java/local/src/main/resources/mapper/RecLoginHistory.xml b/java/local/src/main/resources/mapper/RecLoginHistory.xml index 30396c2..e4bfe7e 100644 --- a/java/local/src/main/resources/mapper/RecLoginHistory.xml +++ b/java/local/src/main/resources/mapper/RecLoginHistory.xml @@ -1,6 +1,6 @@ - + and uid=#{uid} and uname like "%"#{uname}"%" @@ -10,8 +10,8 @@ and time = ]]> #{startTime} and time #{endTime} - select * from rec_login_history where 1 @@ -19,7 +19,7 @@ order by time desc - + insert into rec_login_history (uid, uname, ip, address, type, time) VALUES (#{uid}, #{uname}, #{ip}, #{address}, #{type}, #{time}) diff --git a/java/local/src/main/resources/mapper/RecUserAction.xml b/java/local/src/main/resources/mapper/RecUserAction.xml index c117bb2..de9d530 100644 --- a/java/local/src/main/resources/mapper/RecUserAction.xml +++ b/java/local/src/main/resources/mapper/RecUserAction.xml @@ -1,6 +1,6 @@ - + and uid=#{uid} and uname like "%"#{uname}"%" @@ -10,8 +10,8 @@ and time = ]]> #{startTime} and time #{endTime} - select * from rec_user_action where 1 @@ -19,7 +19,7 @@ order by time desc - + insert into rec_user_action (uid, uname, ip, url, time, action, error, type) VALUES (#{uid}, #{uname}, #{ip}, #{url}, #{time}, #{action}, #{error}, #{type}) diff --git a/java/local/src/main/resources/mapper/Statistic.xml b/java/local/src/main/resources/mapper/Statistic.xml index 490ce73..a2efd29 100644 --- a/java/local/src/main/resources/mapper/Statistic.xml +++ b/java/local/src/main/resources/mapper/Statistic.xml @@ -1,7 +1,7 @@ - - select * from stat_profit_total where 1 @@ -9,7 +9,7 @@ and time #{end} - select * from stat_profit_goods where 1 @@ -17,7 +17,7 @@ and time #{end} - select * from stat_finish_order where 1 @@ -25,7 +25,7 @@ and time #{end} - select t1.*, t2.name cname from (select cid, @@ -49,18 +49,18 @@ where time = #{time} - + insert into stat_finish_order (purchase, sell, time) values (#{purchase}, #{sell}, #{time}) - + insert into stat_profit_total (purchase, sell, profit, time) values (#{purchase}, #{sell}, #{profit}, #{time}) insert into stat_profit_goods (cid, purchase, sell, profit, time) @@ -90,7 +90,7 @@ and ftime between unix_timestamp(cast(sysdate() as date) - interval 1 day) * 1000 and unix_timestamp(cast(sysdate() as date)) * 1000 - select t1.*, t2.name cname from (select a.cid, @@ -122,7 +122,7 @@ and ftime between unix_timestamp(cast(sysdate() as date) - interval 1 day) * 1000 and unix_timestamp(cast(sysdate() as date)) * 1000 - select t1.*, t2.name cname from (select a.cid, diff --git a/java/local/src/main/resources/mapper/SysCategory.xml b/java/local/src/main/resources/mapper/SysCategory.xml index 29845fc..c38a61e 100644 --- a/java/local/src/main/resources/mapper/SysCategory.xml +++ b/java/local/src/main/resources/mapper/SysCategory.xml @@ -1,6 +1,6 @@ - + and id=#{id} and id in (${ids}) @@ -11,11 +11,11 @@ and ctime = ]]> #{startTime} and ctime #{endTime} - + insert into sys_category (pid, name, type, ctime) values (#{pid}, #{name}, #{type}, #{ctime}) - + update sys_category set pid=#{pid}, name=#{name}, @@ -27,19 +27,19 @@ from sys_category where id = #{id} - select * from sys_category - select * from sys_category where 1 order by ctime desc - select * from sys_category where id = #{id} diff --git a/java/local/src/main/resources/mapper/SysCustomer.xml b/java/local/src/main/resources/mapper/SysCustomer.xml index ad048c8..2d02b44 100644 --- a/java/local/src/main/resources/mapper/SysCustomer.xml +++ b/java/local/src/main/resources/mapper/SysCustomer.xml @@ -1,6 +1,6 @@ - + and a.id=#{id} and a.name like "%"#{name}"%" @@ -12,11 +12,11 @@ and a.ctime = ]]> #{startTime} and a.ctime #{endTime} - + insert into sys_customer (name, address, linkman, linkphone, ctime, region, status, remark) values (#{name}, #{address}, #{linkman}, #{linkphone}, #{ctime}, #{region}, #{status}, #{remark}) - + update sys_customer set name=#{name}, address=#{address}, @@ -33,22 +33,22 @@ where id = #{id} and status = 0 - select a.*, b.fullname region_name from sys_customer a left join sys_region b on a.region = b.id where a.status = 1 - select a.*,b.fullname region_name from sys_customer a left join sys_region b on a.region=b.id where 1 order by a.ctime desc - select * from sys_customer where id = #{id} @@ -61,7 +61,7 @@ and id!=#{id} - select a.id, count(0) value from sys_region a diff --git a/java/local/src/main/resources/mapper/SysDepartment.xml b/java/local/src/main/resources/mapper/SysDepartment.xml index bef752e..625d2a3 100644 --- a/java/local/src/main/resources/mapper/SysDepartment.xml +++ b/java/local/src/main/resources/mapper/SysDepartment.xml @@ -1,20 +1,20 @@ - - select * from sys_department where status = 1 - select * from sys_department - + insert into sys_department (pid, name, status) VALUES (#{pid}, #{name}, #{status}); - + update sys_department set pid=#{pid}, name=#{name}, diff --git a/java/local/src/main/resources/mapper/SysResource.xml b/java/local/src/main/resources/mapper/SysResource.xml index ae7a0b5..a45933c 100644 --- a/java/local/src/main/resources/mapper/SysResource.xml +++ b/java/local/src/main/resources/mapper/SysResource.xml @@ -1,22 +1,22 @@ - - select id, pid, name, url from sys_resource where admin = 0 - select * from sys_resource - select b.* from sys_role a join sys_resource b on find_in_set(b.id, a.resource_id) where a.id = #{role} - + update sys_resource set total_rate=#{total_rate}, ip_rate=#{ip_rate} diff --git a/java/local/src/main/resources/mapper/SysRole.xml b/java/local/src/main/resources/mapper/SysRole.xml index be079b1..c9d008a 100644 --- a/java/local/src/main/resources/mapper/SysRole.xml +++ b/java/local/src/main/resources/mapper/SysRole.xml @@ -1,6 +1,6 @@ - + and id=#{id} and name like "%"#{name}"%" @@ -10,11 +10,11 @@ and ctime = ]]> #{startTime} and ctime #{endTime} - + insert into sys_role (name, resource_id, cid, cname, ctime, status) values (#{name}, #{resource_id}, #{cid}, #{cname}, #{ctime}, #{status}) - + update sys_role set name=#{name}, resource_id=#{resource_id}, @@ -27,12 +27,12 @@ where id = #{id} and status = 0 - select * from sys_role where status = 1 - select * from sys_role @@ -45,8 +45,8 @@ and id!=#{id} - select * from sys_role where 1 diff --git a/java/local/src/main/resources/mapper/SysSupplier.xml b/java/local/src/main/resources/mapper/SysSupplier.xml index 43cd19d..27b6656 100644 --- a/java/local/src/main/resources/mapper/SysSupplier.xml +++ b/java/local/src/main/resources/mapper/SysSupplier.xml @@ -1,6 +1,6 @@ - + and a.id=#{id} and a.name like "%"#{name}"%" @@ -12,11 +12,11 @@ and a.ctime = ]]> #{startTime} and a.ctime #{endTime} - + insert into sys_supplier (name,address,linkman,linkphone,ctime,region,status,remark) values(#{name},#{address},#{linkman},#{linkphone},#{ctime},#{region},#{status},#{remark}) - + update sys_supplier set name=#{name}, address=#{address}, @@ -33,20 +33,20 @@ where id = #{id} and status = 0 - select a.*,b.fullname region_name from sys_supplier a left join sys_region b on a.region=b.id where a.status = 1 - select a.*,b.fullname region_name from sys_supplier a left join sys_region b on a.region=b.id where 1 order by a.ctime desc - select * from sys_supplier where id = #{id} @@ -59,7 +59,7 @@ and id!=#{id} - select a.id,count(0) value from sys_region a join sys_supplier b on a.id = b.region group by a.id diff --git a/java/local/src/main/resources/mapper/SysUser.xml b/java/local/src/main/resources/mapper/SysUser.xml index 2035af2..19f221e 100644 --- a/java/local/src/main/resources/mapper/SysUser.xml +++ b/java/local/src/main/resources/mapper/SysUser.xml @@ -1,6 +1,6 @@ - + and a.id=#{id} and a.name like "%"#{name}"%" @@ -37,15 +37,15 @@ where id = #{id} and admin = 0 - select a.*,b.name role_name from sys_user a left join sys_role b on a.role = b.id where a.name = #{name} and a.pwd = #{pwd} - select a.id, a.name, a.avatar, a.status, a.role, a.admin, a.ctime,b.name role_name from sys_user a left join sys_role b on a.role=b.id