diff --git a/iot/src/main/java/com/zeto/cms/helper/upload/oss/OssUploader.java b/iot/src/main/java/com/zeto/cms/helper/upload/oss/OssUploader.java deleted file mode 100644 index 264cf48..0000000 --- a/iot/src/main/java/com/zeto/cms/helper/upload/oss/OssUploader.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.zeto.cms.helper.upload.oss; - -public class OssUploader { -} diff --git a/iot/src/main/java/com/zeto/cms/Application.java b/iot/src/main/java/com/zeto/iot/Application.java similarity index 92% rename from iot/src/main/java/com/zeto/cms/Application.java rename to iot/src/main/java/com/zeto/iot/Application.java index 2536388..3f5b2ca 100644 --- a/iot/src/main/java/com/zeto/cms/Application.java +++ b/iot/src/main/java/com/zeto/iot/Application.java @@ -1,4 +1,4 @@ -package com.zeto.cms; +package com.zeto.iot; import com.zeto.Zen; diff --git a/iot/src/main/java/com/zeto/cms/controller/Activity.java b/iot/src/main/java/com/zeto/iot/controller/Activity.java similarity index 94% rename from iot/src/main/java/com/zeto/cms/controller/Activity.java rename to iot/src/main/java/com/zeto/iot/controller/Activity.java index 2e4cae4..f860b10 100644 --- a/iot/src/main/java/com/zeto/cms/controller/Activity.java +++ b/iot/src/main/java/com/zeto/iot/controller/Activity.java @@ -1,4 +1,4 @@ -package com.zeto.cms.controller; +package com.zeto.iot.controller; import com.zeto.ZenData; import com.zeto.ZenEngine; diff --git a/iot/src/main/java/com/zeto/cms/helper/login/DingLogin.java b/iot/src/main/java/com/zeto/iot/helper/login/DingLogin.java similarity index 55% rename from iot/src/main/java/com/zeto/cms/helper/login/DingLogin.java rename to iot/src/main/java/com/zeto/iot/helper/login/DingLogin.java index 646fe14..9d12ed5 100644 --- a/iot/src/main/java/com/zeto/cms/helper/login/DingLogin.java +++ b/iot/src/main/java/com/zeto/iot/helper/login/DingLogin.java @@ -1,4 +1,4 @@ -package com.zeto.cms.helper.login; +package com.zeto.iot.helper.login; // 钉钉登录 public class DingLogin { diff --git a/iot/src/main/java/com/zeto/cms/helper/login/WeCom.java b/iot/src/main/java/com/zeto/iot/helper/login/WeCom.java similarity index 56% rename from iot/src/main/java/com/zeto/cms/helper/login/WeCom.java rename to iot/src/main/java/com/zeto/iot/helper/login/WeCom.java index ccf3839..97b9785 100644 --- a/iot/src/main/java/com/zeto/cms/helper/login/WeCom.java +++ b/iot/src/main/java/com/zeto/iot/helper/login/WeCom.java @@ -1,4 +1,4 @@ -package com.zeto.cms.helper.login; +package com.zeto.iot.helper.login; // 企业微信登录 public class WeCom { diff --git a/iot/src/main/java/com/zeto/cms/helper/upload/IUploader.java b/iot/src/main/java/com/zeto/iot/helper/upload/IUploader.java similarity index 88% rename from iot/src/main/java/com/zeto/cms/helper/upload/IUploader.java rename to iot/src/main/java/com/zeto/iot/helper/upload/IUploader.java index f8a4b2e..5d2a299 100644 --- a/iot/src/main/java/com/zeto/cms/helper/upload/IUploader.java +++ b/iot/src/main/java/com/zeto/iot/helper/upload/IUploader.java @@ -1,4 +1,4 @@ -package com.zeto.cms.helper.upload; +package com.zeto.iot.helper.upload; import java.util.Map; diff --git a/iot/src/main/java/com/zeto/cms/helper/upload/Uploader.java b/iot/src/main/java/com/zeto/iot/helper/upload/Uploader.java similarity index 94% rename from iot/src/main/java/com/zeto/cms/helper/upload/Uploader.java rename to iot/src/main/java/com/zeto/iot/helper/upload/Uploader.java index f77ffd5..1a376c3 100644 --- a/iot/src/main/java/com/zeto/cms/helper/upload/Uploader.java +++ b/iot/src/main/java/com/zeto/iot/helper/upload/Uploader.java @@ -1,8 +1,7 @@ -package com.zeto.cms.helper.upload; +package com.zeto.iot.helper.upload; import com.zeto.ZenEnvironment; -import com.zeto.cms.helper.upload.cos.CosUploader; -import com.zeto.kit.ConfigKit; +import com.zeto.iot.helper.upload.cos.CosUploader; import java.util.HashMap; import java.util.Map; diff --git a/iot/src/main/java/com/zeto/cms/helper/upload/cos/CosUploader.java b/iot/src/main/java/com/zeto/iot/helper/upload/cos/CosUploader.java similarity index 98% rename from iot/src/main/java/com/zeto/cms/helper/upload/cos/CosUploader.java rename to iot/src/main/java/com/zeto/iot/helper/upload/cos/CosUploader.java index 597c966..77ed3eb 100644 --- a/iot/src/main/java/com/zeto/cms/helper/upload/cos/CosUploader.java +++ b/iot/src/main/java/com/zeto/iot/helper/upload/cos/CosUploader.java @@ -1,4 +1,4 @@ -package com.zeto.cms.helper.upload.cos; +package com.zeto.iot.helper.upload.cos; import com.google.common.base.Strings; @@ -17,7 +17,7 @@ import com.qcloud.cos.utils.StringUtils; import com.tencent.cloud.CosStsClient; import com.tencent.cloud.Response; import com.zeto.ZenEnvironment; -import com.zeto.cms.helper.upload.IUploader; +import com.zeto.iot.helper.upload.IUploader; import com.zeto.kit.StringKit; import lombok.extern.slf4j.Slf4j; diff --git a/iot/src/main/java/com/zeto/iot/helper/upload/oss/OssUploader.java b/iot/src/main/java/com/zeto/iot/helper/upload/oss/OssUploader.java new file mode 100644 index 0000000..e718f20 --- /dev/null +++ b/iot/src/main/java/com/zeto/iot/helper/upload/oss/OssUploader.java @@ -0,0 +1,4 @@ +package com.zeto.iot.helper.upload.oss; + +public class OssUploader { +} diff --git a/iot/src/main/java/com/zeto/cms/hooks/ActivityStatusHook.java b/iot/src/main/java/com/zeto/iot/hooks/ActivityStatusHook.java similarity index 92% rename from iot/src/main/java/com/zeto/cms/hooks/ActivityStatusHook.java rename to iot/src/main/java/com/zeto/iot/hooks/ActivityStatusHook.java index bdfbfc3..917b9f1 100644 --- a/iot/src/main/java/com/zeto/cms/hooks/ActivityStatusHook.java +++ b/iot/src/main/java/com/zeto/iot/hooks/ActivityStatusHook.java @@ -1,14 +1,14 @@ -package com.zeto.cms.hooks; +package com.zeto.iot.hooks; import com.zeto.IZenHook; import com.zeto.ZenData; import com.zeto.ZenEngine; import com.zeto.ZenResult; import com.zeto.annotation.ZenHook; -import com.zeto.cms.helper.upload.Uploader; -import com.zeto.cms.hooks.domain.PageComponentDO; -import com.zeto.cms.hooks.domain.PageDO; import com.zeto.driver.JsonKit; +import com.zeto.iot.helper.upload.Uploader; +import com.zeto.iot.hooks.domain.PageComponentDO; +import com.zeto.iot.hooks.domain.PageDO; import com.zeto.kit.StringKit; import org.noear.solon.annotation.Inject; diff --git a/iot/src/main/java/com/zeto/cms/hooks/ZetoUploadHook.java b/iot/src/main/java/com/zeto/iot/hooks/ZetoUploadHook.java similarity index 88% rename from iot/src/main/java/com/zeto/cms/hooks/ZetoUploadHook.java rename to iot/src/main/java/com/zeto/iot/hooks/ZetoUploadHook.java index 78d376c..7cce80d 100644 --- a/iot/src/main/java/com/zeto/cms/hooks/ZetoUploadHook.java +++ b/iot/src/main/java/com/zeto/iot/hooks/ZetoUploadHook.java @@ -1,10 +1,10 @@ -package com.zeto.cms.hooks; +package com.zeto.iot.hooks; import com.zeto.IZenHook; import com.zeto.ZenData; import com.zeto.ZenResult; import com.zeto.annotation.ZenHook; -import com.zeto.cms.helper.upload.Uploader; +import com.zeto.iot.helper.upload.Uploader; import java.util.Map; diff --git a/iot/src/main/java/com/zeto/cms/hooks/domain/PageComponentDO.java b/iot/src/main/java/com/zeto/iot/hooks/domain/PageComponentDO.java similarity index 84% rename from iot/src/main/java/com/zeto/cms/hooks/domain/PageComponentDO.java rename to iot/src/main/java/com/zeto/iot/hooks/domain/PageComponentDO.java index 16b727d..9474c9c 100644 --- a/iot/src/main/java/com/zeto/cms/hooks/domain/PageComponentDO.java +++ b/iot/src/main/java/com/zeto/iot/hooks/domain/PageComponentDO.java @@ -1,4 +1,4 @@ -package com.zeto.cms.hooks.domain; +package com.zeto.iot.hooks.domain; import lombok.Data; diff --git a/iot/src/main/java/com/zeto/cms/hooks/domain/PageDO.java b/iot/src/main/java/com/zeto/iot/hooks/domain/PageDO.java similarity index 75% rename from iot/src/main/java/com/zeto/cms/hooks/domain/PageDO.java rename to iot/src/main/java/com/zeto/iot/hooks/domain/PageDO.java index 124fde4..b2eb164 100644 --- a/iot/src/main/java/com/zeto/cms/hooks/domain/PageDO.java +++ b/iot/src/main/java/com/zeto/iot/hooks/domain/PageDO.java @@ -1,9 +1,8 @@ -package com.zeto.cms.hooks.domain; +package com.zeto.iot.hooks.domain; import lombok.Data; import java.util.List; -import java.util.Map; @Data public class PageDO {