diff --git a/dsAi/src/main/java/com/dsideal/Res/AiApplication.java b/dsAi/src/main/java/com/dsideal/Ai/AiApplication.java similarity index 89% rename from dsAi/src/main/java/com/dsideal/Res/AiApplication.java rename to dsAi/src/main/java/com/dsideal/Ai/AiApplication.java index f3798511..faa83a7f 100644 --- a/dsAi/src/main/java/com/dsideal/Res/AiApplication.java +++ b/dsAi/src/main/java/com/dsideal/Ai/AiApplication.java @@ -1,12 +1,11 @@ -package com.dsideal.Res; +package com.dsideal.Ai; import com.dsideal.Config.PropKit; -import com.dsideal.Res.Index.IndexController; -import com.dsideal.Res.Interceptor.*; -import com.dsideal.Res.Plugin.RocketMQPlugin; -import com.dsideal.Res.Plugin.YamlProp; -import com.dsideal.Res.Util.FileUtil; -import com.dsideal.Res.Util.LogBackLogFactory; +import com.dsideal.Ai.Index.IndexController; +import com.dsideal.Ai.Interceptor.*; +import com.dsideal.Ai.Plugin.RocketMQPlugin; +import com.dsideal.Ai.Util.FileUtil; +import com.dsideal.Ai.Util.LogBackLogFactory; import com.jfinal.config.*; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; import com.jfinal.plugin.activerecord.dialect.MysqlDialect; diff --git a/dsAi/src/main/java/com/dsideal/Res/Index/IndexController.java b/dsAi/src/main/java/com/dsideal/Ai/Index/IndexController.java similarity index 81% rename from dsAi/src/main/java/com/dsideal/Res/Index/IndexController.java rename to dsAi/src/main/java/com/dsideal/Ai/Index/IndexController.java index aed7441c..d5ca7228 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Index/IndexController.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Index/IndexController.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Index; +package com.dsideal.Ai.Index; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterceptor.java b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/CheckIdsInterceptor.java similarity index 93% rename from dsRes/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterceptor.java rename to dsAi/src/main/java/com/dsideal/Ai/Interceptor/CheckIdsInterceptor.java index 74b42da1..fc924413 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterceptor.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/CheckIdsInterceptor.java @@ -1,7 +1,7 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; -import com.dsideal.Res.Util.CommonUtil; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Util.CommonUtil; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterface.java b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/CheckIdsInterface.java similarity index 80% rename from dsRes/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterface.java rename to dsAi/src/main/java/com/dsideal/Ai/Interceptor/CheckIdsInterface.java index 473d24a4..879fdf4b 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterface.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/CheckIdsInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; import java.lang.annotation.*; diff --git a/dsRes/src/main/java/com/dsideal/Res/Interceptor/EmptyInterceptor.java b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/EmptyInterceptor.java similarity index 92% rename from dsRes/src/main/java/com/dsideal/Res/Interceptor/EmptyInterceptor.java rename to dsAi/src/main/java/com/dsideal/Ai/Interceptor/EmptyInterceptor.java index 1cd988c8..43f91bec 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Interceptor/EmptyInterceptor.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/EmptyInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/Res/Interceptor/EmptyInterface.java b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/EmptyInterface.java similarity index 87% rename from dsRes/src/main/java/com/dsideal/Res/Interceptor/EmptyInterface.java rename to dsAi/src/main/java/com/dsideal/Ai/Interceptor/EmptyInterface.java index c8608348..8487023b 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Interceptor/EmptyInterface.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/EmptyInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterceptor.java b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsGuidInterceptor.java similarity index 91% rename from dsAi/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterceptor.java rename to dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsGuidInterceptor.java index 5d350d4d..51d2abd4 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterceptor.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsGuidInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterface.java b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsGuidInterface.java similarity index 80% rename from dsRes/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterface.java rename to dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsGuidInterface.java index b81327fe..fcb47f39 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterface.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsGuidInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; import java.lang.annotation.*; diff --git a/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsNumbericInterceptor.java b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsNumbericInterceptor.java similarity index 90% rename from dsRes/src/main/java/com/dsideal/Res/Interceptor/IsNumbericInterceptor.java rename to dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsNumbericInterceptor.java index decdb2ec..bc5e640b 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsNumbericInterceptor.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsNumbericInterceptor.java @@ -1,7 +1,7 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; -import com.dsideal.Res.Util.CommonUtil; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Util.CommonUtil; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsNumericInterface.java b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsNumericInterface.java similarity index 80% rename from dsAi/src/main/java/com/dsideal/Res/Interceptor/IsNumericInterface.java rename to dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsNumericInterface.java index a88260e1..7101892b 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsNumericInterface.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsNumericInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; import java.lang.annotation.*; diff --git a/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterceptor.java b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsSysAdminInterceptor.java similarity index 92% rename from dsAi/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterceptor.java rename to dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsSysAdminInterceptor.java index 48d89a75..d04874b1 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterceptor.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsSysAdminInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterface.java b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsSysAdminInterface.java similarity index 80% rename from dsRes/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterface.java rename to dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsSysAdminInterface.java index 040957c4..c316dfeb 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterface.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/IsSysAdminInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; import java.lang.annotation.*; diff --git a/dsAi/src/main/java/com/dsideal/Res/Interceptor/LengthInterceptor.java b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/LengthInterceptor.java similarity index 93% rename from dsAi/src/main/java/com/dsideal/Res/Interceptor/LengthInterceptor.java rename to dsAi/src/main/java/com/dsideal/Ai/Interceptor/LengthInterceptor.java index f5684aaa..7139ad71 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Interceptor/LengthInterceptor.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/LengthInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/Res/Interceptor/LengthInterface.java b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/LengthInterface.java similarity index 79% rename from dsRes/src/main/java/com/dsideal/Res/Interceptor/LengthInterface.java rename to dsAi/src/main/java/com/dsideal/Ai/Interceptor/LengthInterface.java index bfbd5f99..45111271 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Interceptor/LengthInterface.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Interceptor/LengthInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; import java.lang.annotation.*; diff --git a/dsAi/src/main/java/com/dsideal/Res/JApiDocsGenerator.java b/dsAi/src/main/java/com/dsideal/Ai/JApiDocsGenerator.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/JApiDocsGenerator.java rename to dsAi/src/main/java/com/dsideal/Ai/JApiDocsGenerator.java index efee6c21..59a97022 100644 --- a/dsAi/src/main/java/com/dsideal/Res/JApiDocsGenerator.java +++ b/dsAi/src/main/java/com/dsideal/Ai/JApiDocsGenerator.java @@ -1,9 +1,9 @@ -package com.dsideal.Res; +package com.dsideal.Ai; import cn.hutool.core.io.FileUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Plugin.PostmanDocPlugin; +import com.dsideal.Ai.Plugin.PostmanDocPlugin; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.jfinal.aop.Before; diff --git a/dsAi/src/main/java/com/dsideal/Res/Plugin/PostmanDocPlugin.java b/dsAi/src/main/java/com/dsideal/Ai/Plugin/PostmanDocPlugin.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Plugin/PostmanDocPlugin.java rename to dsAi/src/main/java/com/dsideal/Ai/Plugin/PostmanDocPlugin.java index f188860a..3edf55cb 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Plugin/PostmanDocPlugin.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Plugin/PostmanDocPlugin.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Plugin; +package com.dsideal.Ai.Plugin; import freemarker.template.Template; import freemarker.template.TemplateException; diff --git a/dsAi/src/main/java/com/dsideal/Res/Plugin/RocketMQPlugin.java b/dsAi/src/main/java/com/dsideal/Ai/Plugin/RocketMQPlugin.java similarity index 87% rename from dsAi/src/main/java/com/dsideal/Res/Plugin/RocketMQPlugin.java rename to dsAi/src/main/java/com/dsideal/Ai/Plugin/RocketMQPlugin.java index 3cf7042d..599932b5 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Plugin/RocketMQPlugin.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Plugin/RocketMQPlugin.java @@ -1,6 +1,6 @@ -package com.dsideal.Res.Plugin; +package com.dsideal.Ai.Plugin; -import com.dsideal.Res.Util.RocketMqKit; +import com.dsideal.Ai.Util.RocketMqKit; import com.jfinal.plugin.IPlugin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/Res/Plugin/YamlProp.java b/dsAi/src/main/java/com/dsideal/Ai/Plugin/YamlProp.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/Res/Plugin/YamlProp.java rename to dsAi/src/main/java/com/dsideal/Ai/Plugin/YamlProp.java index 6828b1fe..7cdb211a 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Plugin/YamlProp.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Plugin/YamlProp.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Plugin; +package com.dsideal.Ai.Plugin; import com.jfinal.kit.Prop; import org.yaml.snakeyaml.Yaml; diff --git a/dsAi/src/main/java/com/dsideal/Res/Test/CallDeepSeek.java b/dsAi/src/main/java/com/dsideal/Ai/Test/CallDeepSeek.java similarity index 97% rename from dsAi/src/main/java/com/dsideal/Res/Test/CallDeepSeek.java rename to dsAi/src/main/java/com/dsideal/Ai/Test/CallDeepSeek.java index 21bb9f82..89c3a266 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Test/CallDeepSeek.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Test/CallDeepSeek.java @@ -1,11 +1,10 @@ -package com.dsideal.Res.Test; +package com.dsideal.Ai.Test; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.CharsetUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONArray; -import com.jfinal.kit.PathKit; import org.apache.commons.codec.digest.DigestUtils; diff --git a/dsAi/src/main/java/com/dsideal/Res/Test/MetadataTemplateGenerator.java b/dsAi/src/main/java/com/dsideal/Ai/Test/MetadataTemplateGenerator.java similarity index 97% rename from dsAi/src/main/java/com/dsideal/Res/Test/MetadataTemplateGenerator.java rename to dsAi/src/main/java/com/dsideal/Ai/Test/MetadataTemplateGenerator.java index 96ee7ec3..e6ccb0c4 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Test/MetadataTemplateGenerator.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Test/MetadataTemplateGenerator.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Test; +package com.dsideal.Ai.Test; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.xssf.usermodel.XSSFWorkbook; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo1.java b/dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/AiPptDemo1.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo1.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/AiPptDemo1.java index 5265704c..0ce7909d 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo1.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/AiPptDemo1.java @@ -1,8 +1,8 @@ -package com.dsideal.Res.Util.AiPpt; +package com.dsideal.Ai.Util.AiPpt; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.AiPpt.Kit.ApiKit; -import com.dsideal.Res.Util.AiPpt.Kit.HttpUtils; +import com.dsideal.Ai.Util.AiPpt.Kit.ApiKit; +import com.dsideal.Ai.Util.AiPpt.Kit.HttpUtils; import javax.swing.filechooser.FileSystemView; import java.io.File; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo2.java b/dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/AiPptDemo2.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo2.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/AiPptDemo2.java index 359a2780..a0591b14 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo2.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/AiPptDemo2.java @@ -1,8 +1,8 @@ -package com.dsideal.Res.Util.AiPpt; +package com.dsideal.Ai.Util.AiPpt; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.AiPpt.Kit.ApiKit; -import com.dsideal.Res.Util.AiPpt.Kit.HttpUtils; +import com.dsideal.Ai.Util.AiPpt.Kit.ApiKit; +import com.dsideal.Ai.Util.AiPpt.Kit.HttpUtils; import javax.swing.filechooser.FileSystemView; import java.io.File; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo3.java b/dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/AiPptDemo3.java similarity index 92% rename from dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo3.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/AiPptDemo3.java index 97350ca8..849cae27 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo3.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/AiPptDemo3.java @@ -1,8 +1,8 @@ -package com.dsideal.Res.Util.AiPpt; +package com.dsideal.Ai.Util.AiPpt; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.AiPpt.Kit.ApiKit; -import com.dsideal.Res.Util.AiPpt.Kit.HttpUtils; +import com.dsideal.Ai.Util.AiPpt.Kit.ApiKit; +import com.dsideal.Ai.Util.AiPpt.Kit.HttpUtils; import javax.swing.filechooser.FileSystemView; import java.io.File; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo4.java b/dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/AiPptDemo4.java similarity index 92% rename from dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo4.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/AiPptDemo4.java index e1ffeb49..dbff175e 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo4.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/AiPptDemo4.java @@ -1,8 +1,8 @@ -package com.dsideal.Res.Util.AiPpt; +package com.dsideal.Ai.Util.AiPpt; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.AiPpt.Kit.ApiKit; -import com.dsideal.Res.Util.AiPpt.Kit.HttpUtils; +import com.dsideal.Ai.Util.AiPpt.Kit.ApiKit; +import com.dsideal.Ai.Util.AiPpt.Kit.HttpUtils; import javax.swing.filechooser.FileSystemView; import java.io.File; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/Doc/文档.txt similarity index 100% rename from dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/Doc/文档.txt diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Kit/ApiKit.java b/dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/Kit/ApiKit.java similarity index 99% rename from dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Kit/ApiKit.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/Kit/ApiKit.java index 91b3a73c..68dfd106 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Kit/ApiKit.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/Kit/ApiKit.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.AiPpt.Kit; +package com.dsideal.Ai.Util.AiPpt.Kit; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Kit/HttpUtils.java b/dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/Kit/HttpUtils.java similarity index 99% rename from dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Kit/HttpUtils.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/Kit/HttpUtils.java index 82668a9f..431dc7da 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Kit/HttpUtils.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/AiPpt/Kit/HttpUtils.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.AiPpt.Kit; +package com.dsideal.Ai.Util.AiPpt.Kit; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/CommonUtil.java b/dsAi/src/main/java/com/dsideal/Ai/Util/CommonUtil.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/Res/Util/CommonUtil.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/CommonUtil.java index fd294641..98441759 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/CommonUtil.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/CommonUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/CookieUtil.java b/dsAi/src/main/java/com/dsideal/Ai/Util/CookieUtil.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/Res/Util/CookieUtil.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/CookieUtil.java index b2e157a2..31e54188 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/CookieUtil.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/CookieUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/Doc/文档.txt similarity index 100% rename from dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/Doc/文档.txt diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/ImgSong.java b/dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/ImgSong.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/Util/DashScope/ImgSong.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/ImgSong.java index ce99501a..66d601e0 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/ImgSong.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/ImgSong.java @@ -1,9 +1,9 @@ -package com.dsideal.Res.Util.DashScope; +package com.dsideal.Ai.Util.DashScope; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.DashScope.Kit.DashScopeCommon; +import com.dsideal.Ai.Util.DashScope.Kit.DashScopeCommon; import lombok.SneakyThrows; import okhttp3.*; import org.slf4j.Logger; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/ImgSpeak.java b/dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/ImgSpeak.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/Util/DashScope/ImgSpeak.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/ImgSpeak.java index f5b04568..5a1d3c76 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/ImgSpeak.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/ImgSpeak.java @@ -1,8 +1,8 @@ -package com.dsideal.Res.Util.DashScope; +package com.dsideal.Ai.Util.DashScope; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.DashScope.Kit.DashScopeCommon; +import com.dsideal.Ai.Util.DashScope.Kit.DashScopeCommon; import lombok.SneakyThrows; import okhttp3.*; import org.slf4j.Logger; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Kit/DashScopeCommon.java b/dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/Kit/DashScopeCommon.java similarity index 70% rename from dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Kit/DashScopeCommon.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/Kit/DashScopeCommon.java index 6a646bfb..5f613552 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Kit/DashScopeCommon.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/Kit/DashScopeCommon.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.DashScope.Kit; +package com.dsideal.Ai.Util.DashScope.Kit; public class DashScopeCommon { protected static final String API_KEY= "sk-01d13a39e09844038322108ecdbd1bbc"; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Kit/VideoStyleEnum.java b/dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/Kit/VideoStyleEnum.java similarity index 93% rename from dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Kit/VideoStyleEnum.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/Kit/VideoStyleEnum.java index 6921ebf6..f137b9a2 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Kit/VideoStyleEnum.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/Kit/VideoStyleEnum.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.DashScope.Kit; +package com.dsideal.Ai.Util.DashScope.Kit; /** * 阿里云达摩院视频风格转换类型枚举 diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/VideoStyleTransform.java b/dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/VideoStyleTransform.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/DashScope/VideoStyleTransform.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/VideoStyleTransform.java index bf1cf761..32be604c 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/VideoStyleTransform.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/DashScope/VideoStyleTransform.java @@ -1,9 +1,9 @@ -package com.dsideal.Res.Util.DashScope; +package com.dsideal.Ai.Util.DashScope; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.DashScope.Kit.DashScopeCommon; -import com.dsideal.Res.Util.DashScope.Kit.VideoStyleEnum; +import com.dsideal.Ai.Util.DashScope.Kit.DashScopeCommon; +import com.dsideal.Ai.Util.DashScope.Kit.VideoStyleEnum; import lombok.SneakyThrows; import okhttp3.*; import org.slf4j.Logger; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/ExcelExportUtil.java b/dsAi/src/main/java/com/dsideal/Ai/Util/ExcelExportUtil.java similarity index 97% rename from dsAi/src/main/java/com/dsideal/Res/Util/ExcelExportUtil.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/ExcelExportUtil.java index e0cc0f21..5bdba0dc 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/ExcelExportUtil.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/ExcelExportUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/FileSizeUtil.java b/dsAi/src/main/java/com/dsideal/Ai/Util/FileSizeUtil.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/Util/FileSizeUtil.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/FileSizeUtil.java index ea0deb6e..75f5ae7e 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/FileSizeUtil.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/FileSizeUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import java.io.File; import java.io.FileInputStream; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/FileUtil.java b/dsAi/src/main/java/com/dsideal/Ai/Util/FileUtil.java similarity index 94% rename from dsRes/src/main/java/com/dsideal/Res/Util/FileUtil.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/FileUtil.java index 0377e481..67503173 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/FileUtil.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/FileUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.alibaba.fastjson.JSONObject; import java.io.*; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/HttpClient.java b/dsAi/src/main/java/com/dsideal/Ai/Util/HttpClient.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/Util/HttpClient.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/HttpClient.java index 02d2a07a..a41004b7 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/HttpClient.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/HttpClient.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.dsideal.Config.GatewayConfig; import okhttp3.*; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/Ai/Util/HuoShanFangZhou/Doc/文档.txt similarity index 100% rename from dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/Ai/Util/HuoShanFangZhou/Doc/文档.txt diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Kit/HuoShanCommon.java b/dsAi/src/main/java/com/dsideal/Ai/Util/HuoShanFangZhou/Kit/HuoShanCommon.java similarity index 85% rename from dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Kit/HuoShanCommon.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/HuoShanFangZhou/Kit/HuoShanCommon.java index b7eb8a87..296f8d83 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Kit/HuoShanCommon.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/HuoShanFangZhou/Kit/HuoShanCommon.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.HuoShanFangZhou.Kit; +package com.dsideal.Ai.Util.HuoShanFangZhou.Kit; public class HuoShanCommon { //火山方舟大模型 diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Txt2Img.java b/dsAi/src/main/java/com/dsideal/Ai/Util/HuoShanFangZhou/Txt2Img.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Txt2Img.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/HuoShanFangZhou/Txt2Img.java index 42c0fbb4..8584346f 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Txt2Img.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/HuoShanFangZhou/Txt2Img.java @@ -1,8 +1,8 @@ -package com.dsideal.Res.Util.HuoShanFangZhou; +package com.dsideal.Ai.Util.HuoShanFangZhou; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.HuoShanFangZhou.Kit.HuoShanCommon; +import com.dsideal.Ai.Util.HuoShanFangZhou.Kit.HuoShanCommon; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/IDCardUtil.java b/dsAi/src/main/java/com/dsideal/Ai/Util/IDCardUtil.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/Res/Util/IDCardUtil.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/IDCardUtil.java index 30ca9429..1956426d 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/IDCardUtil.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/IDCardUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.alibaba.fastjson.JSONObject; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/IdCardGenerator.java b/dsAi/src/main/java/com/dsideal/Ai/Util/IdCardGenerator.java similarity index 98% rename from dsAi/src/main/java/com/dsideal/Res/Util/IdCardGenerator.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/IdCardGenerator.java index a136de60..e951f303 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/IdCardGenerator.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/IdCardGenerator.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import java.util.Calendar; import java.util.Collection; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/IpUtil.java b/dsAi/src/main/java/com/dsideal/Ai/Util/IpUtil.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/IpUtil.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/IpUtil.java index 37341253..8e998339 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/IpUtil.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/IpUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmImg2Video.java b/dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/JmImg2Video.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmImg2Video.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/JmImg2Video.java index d865b763..cffc790f 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmImg2Video.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/JmImg2Video.java @@ -1,10 +1,10 @@ -package com.dsideal.Res.Util.JiMeng; +package com.dsideal.Ai.Util.JiMeng; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.JiMeng.Kit.JmCommon; -import com.dsideal.Res.Util.JiMeng.Kit.JmErrorCode; +import com.dsideal.Ai.Util.JiMeng.Kit.JmCommon; +import com.dsideal.Ai.Util.JiMeng.Kit.JmErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmTxt2Img.java b/dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/JmTxt2Img.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmTxt2Img.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/JmTxt2Img.java index 584b0595..c2748423 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmTxt2Img.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/JmTxt2Img.java @@ -1,9 +1,9 @@ -package com.dsideal.Res.Util.JiMeng; +package com.dsideal.Ai.Util.JiMeng; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.JiMeng.Kit.JmCommon; -import com.dsideal.Res.Util.JiMeng.Kit.JmErrorCode; +import com.dsideal.Ai.Util.JiMeng.Kit.JmCommon; +import com.dsideal.Ai.Util.JiMeng.Kit.JmErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmTxt2Video.java b/dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/JmTxt2Video.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmTxt2Video.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/JmTxt2Video.java index b5df0778..3bae81ff 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmTxt2Video.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/JmTxt2Video.java @@ -1,9 +1,9 @@ -package com.dsideal.Res.Util.JiMeng; +package com.dsideal.Ai.Util.JiMeng; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.JiMeng.Kit.JmCommon; -import com.dsideal.Res.Util.JiMeng.Kit.JmErrorCode; +import com.dsideal.Ai.Util.JiMeng.Kit.JmCommon; +import com.dsideal.Ai.Util.JiMeng.Kit.JmErrorCode; import com.jfinal.kit.StrKit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/Kit/JmCommon.java b/dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/Kit/JmCommon.java similarity index 97% rename from dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/Kit/JmCommon.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/Kit/JmCommon.java index 659ea084..9eb08bf3 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/Kit/JmCommon.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/Kit/JmCommon.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.JiMeng.Kit; +package com.dsideal.Ai.Util.JiMeng.Kit; import cn.hutool.http.Method; import com.alibaba.fastjson.JSON; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/Kit/JmErrorCode.java b/dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/Kit/JmErrorCode.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/Kit/JmErrorCode.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/Kit/JmErrorCode.java index b438d0c6..cd89a94b 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/Kit/JmErrorCode.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/JiMeng/Kit/JmErrorCode.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.JiMeng.Kit; +package com.dsideal.Ai.Util.JiMeng.Kit; import lombok.Getter; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java b/dsAi/src/main/java/com/dsideal/Ai/Util/JwtUtil.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/JwtUtil.java index 4c7e189c..e97c51c1 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/JwtUtil.java @@ -1,7 +1,6 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.dsideal.Config.PropKit; -import com.dsideal.Res.AiApplication; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/Doc/文档.txt similarity index 100% rename from dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/Doc/文档.txt diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Kit/KlCommon.java b/dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/Kit/KlCommon.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Kit/KlCommon.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/Kit/KlCommon.java index 84436a45..1269f235 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Kit/KlCommon.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/Kit/KlCommon.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.KeLing.Kit; +package com.dsideal.Ai.Util.KeLing.Kit; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Kit/KlErrorCode.java b/dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/Kit/KlErrorCode.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Kit/KlErrorCode.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/Kit/KlErrorCode.java index 1eefd33a..46d5da37 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Kit/KlErrorCode.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/Kit/KlErrorCode.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.KeLing.Kit; +package com.dsideal.Ai.Util.KeLing.Kit; import lombok.Getter; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlAccount.java b/dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/KlAccount.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlAccount.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/KlAccount.java index be82275d..343bbb49 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlAccount.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/KlAccount.java @@ -1,12 +1,12 @@ -package com.dsideal.Res.Util.KeLing; +package com.dsideal.Ai.Util.KeLing; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.dsideal.Res.Util.KeLing.Kit.KlCommon; -import com.dsideal.Res.Util.KeLing.Kit.KlErrorCode; +import com.dsideal.Ai.Util.KeLing.Kit.KlCommon; +import com.dsideal.Ai.Util.KeLing.Kit.KlErrorCode; import lombok.Getter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlImg2Video.java b/dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/KlImg2Video.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlImg2Video.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/KlImg2Video.java index d41748e0..fd2a7394 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlImg2Video.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/KlImg2Video.java @@ -1,12 +1,12 @@ -package com.dsideal.Res.Util.KeLing; +package com.dsideal.Ai.Util.KeLing; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.KeLing.Kit.KlCommon; -import com.dsideal.Res.Util.KeLing.Kit.KlErrorCode; +import com.dsideal.Ai.Util.KeLing.Kit.KlCommon; +import com.dsideal.Ai.Util.KeLing.Kit.KlErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlTxt2Img.java b/dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/KlTxt2Img.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlTxt2Img.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/KlTxt2Img.java index 1d674b78..4a92a84d 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlTxt2Img.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/KlTxt2Img.java @@ -1,12 +1,12 @@ -package com.dsideal.Res.Util.KeLing; +package com.dsideal.Ai.Util.KeLing; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.KeLing.Kit.KlCommon; -import com.dsideal.Res.Util.KeLing.Kit.KlErrorCode; +import com.dsideal.Ai.Util.KeLing.Kit.KlCommon; +import com.dsideal.Ai.Util.KeLing.Kit.KlErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlTxt2Video.java b/dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/KlTxt2Video.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlTxt2Video.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/KlTxt2Video.java index 7d691338..c298190f 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlTxt2Video.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/KeLing/KlTxt2Video.java @@ -1,12 +1,12 @@ -package com.dsideal.Res.Util.KeLing; +package com.dsideal.Ai.Util.KeLing; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.KeLing.Kit.KlCommon; -import com.dsideal.Res.Util.KeLing.Kit.KlErrorCode; +import com.dsideal.Ai.Util.KeLing.Kit.KlCommon; +import com.dsideal.Ai.Util.KeLing.Kit.KlErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Doc/文档.txt similarity index 100% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Doc/文档.txt diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Enum/SamplingMethod.java b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Enum/SamplingMethod.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Enum/SamplingMethod.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Enum/SamplingMethod.java index 3227cf94..58d5451b 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Enum/SamplingMethod.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Enum/SamplingMethod.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.Liblib.Enum; +package com.dsideal.Ai.Util.Liblib.Enum; import lombok.Getter; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Enum/UltraTemplate.java b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Enum/UltraTemplate.java similarity index 93% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Enum/UltraTemplate.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Enum/UltraTemplate.java index 5bde4a19..f7db48da 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Enum/UltraTemplate.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Enum/UltraTemplate.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.Liblib.Enum; +package com.dsideal.Ai.Util.Liblib.Enum; import lombok.Getter; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png similarity index 100% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png similarity index 100% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png similarity index 100% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png similarity index 100% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/TextToImageUltra.png b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Example/TextToImageUltra.png similarity index 100% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/TextToImageUltra.png rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Example/TextToImageUltra.png diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Kit/LibLibCommon.java b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Kit/LibLibCommon.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Kit/LibLibCommon.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Kit/LibLibCommon.java index 23d36ed0..b57e3f95 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Kit/LibLibCommon.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/Kit/LibLibCommon.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.Liblib.Kit; +package com.dsideal.Ai.Util.Liblib.Kit; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/LibImg2Img.java b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/LibImg2Img.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/LibImg2Img.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/LibImg2Img.java index 086bdfa0..b5bbc8fd 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/LibImg2Img.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/LibImg2Img.java @@ -1,9 +1,9 @@ -package com.dsideal.Res.Util.Liblib; +package com.dsideal.Ai.Util.Liblib; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.Liblib.Kit.LibLibCommon; +import com.dsideal.Ai.Util.Liblib.Kit.LibLibCommon; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/LibTxt2Img.java b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/LibTxt2Img.java similarity index 97% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/LibTxt2Img.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/LibTxt2Img.java index 756b6474..42a89610 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/LibTxt2Img.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/LibTxt2Img.java @@ -1,9 +1,9 @@ -package com.dsideal.Res.Util.Liblib; +package com.dsideal.Ai.Util.Liblib; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.Liblib.Kit.LibLibCommon; +import com.dsideal.Ai.Util.Liblib.Kit.LibLibCommon; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/QueryModelVersion.java b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/QueryModelVersion.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/QueryModelVersion.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/QueryModelVersion.java index aa64a6cb..c5e3a89c 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/QueryModelVersion.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/QueryModelVersion.java @@ -1,8 +1,8 @@ -package com.dsideal.Res.Util.Liblib; +package com.dsideal.Ai.Util.Liblib; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.Liblib.Kit.LibLibCommon; +import com.dsideal.Ai.Util.Liblib.Kit.LibLibCommon; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/UltraImg2Img.java b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/UltraImg2Img.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/UltraImg2Img.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/UltraImg2Img.java index e0c8b805..01eecb5d 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/UltraImg2Img.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/UltraImg2Img.java @@ -1,9 +1,9 @@ -package com.dsideal.Res.Util.Liblib; +package com.dsideal.Ai.Util.Liblib; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.Liblib.Enum.UltraTemplate; -import com.dsideal.Res.Util.Liblib.Kit.LibLibCommon; +import com.dsideal.Ai.Util.Liblib.Enum.UltraTemplate; +import com.dsideal.Ai.Util.Liblib.Kit.LibLibCommon; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/UltraTxt2Img.java b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/UltraTxt2Img.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/Liblib/UltraTxt2Img.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/UltraTxt2Img.java index b86237f3..f64bec81 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/UltraTxt2Img.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/Liblib/UltraTxt2Img.java @@ -1,8 +1,8 @@ -package com.dsideal.Res.Util.Liblib; +package com.dsideal.Ai.Util.Liblib; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Util.Liblib.Enum.UltraTemplate; -import com.dsideal.Res.Util.Liblib.Kit.LibLibCommon; +import com.dsideal.Ai.Util.Liblib.Enum.UltraTemplate; +import com.dsideal.Ai.Util.Liblib.Kit.LibLibCommon; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/LogBackLog.java b/dsAi/src/main/java/com/dsideal/Ai/Util/LogBackLog.java similarity index 93% rename from dsAi/src/main/java/com/dsideal/Res/Util/LogBackLog.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/LogBackLog.java index 6fdf4e7e..3b1e3bda 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/LogBackLog.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/LogBackLog.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.jfinal.log.Log; import org.slf4j.Logger; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/LogBackLogFactory.java b/dsAi/src/main/java/com/dsideal/Ai/Util/LogBackLogFactory.java similarity index 87% rename from dsAi/src/main/java/com/dsideal/Res/Util/LogBackLogFactory.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/LogBackLogFactory.java index 3d712f9e..9faa9ef9 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/LogBackLogFactory.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/LogBackLogFactory.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.jfinal.log.ILogFactory; import com.jfinal.log.Log; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/Ai/Util/Midjourney/Doc/文档.txt similarity index 100% rename from dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/Ai/Util/Midjourney/Doc/文档.txt diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Kit/MjCommon.java b/dsAi/src/main/java/com/dsideal/Ai/Util/Midjourney/Kit/MjCommon.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Kit/MjCommon.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/Midjourney/Kit/MjCommon.java index 51e2f52f..27836189 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Kit/MjCommon.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/Midjourney/Kit/MjCommon.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.Midjourney.Kit; +package com.dsideal.Ai.Util.Midjourney.Kit; import cn.hutool.core.io.FileUtil; import cn.hutool.http.HttpUtil; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Txt2Img.java b/dsAi/src/main/java/com/dsideal/Ai/Util/Midjourney/Txt2Img.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Txt2Img.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/Midjourney/Txt2Img.java index 717c9d75..6f31f404 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Txt2Img.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/Midjourney/Txt2Img.java @@ -1,6 +1,6 @@ -package com.dsideal.Res.Util.Midjourney; +package com.dsideal.Ai.Util.Midjourney; -import com.dsideal.Res.Util.Midjourney.Kit.MjCommon; +import com.dsideal.Ai.Util.Midjourney.Kit.MjCommon; import lombok.SneakyThrows; import okhttp3.*; import com.alibaba.fastjson.JSON; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/PassWordUtil.java b/dsAi/src/main/java/com/dsideal/Ai/Util/PassWordUtil.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/Res/Util/PassWordUtil.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/PassWordUtil.java index 64111cac..7de7dc11 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/PassWordUtil.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/PassWordUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import java.security.SecureRandom; import java.util.ArrayList; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/PkUtil.java b/dsAi/src/main/java/com/dsideal/Ai/Util/PkUtil.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/Res/Util/PkUtil.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/PkUtil.java index 3c79898d..543585dc 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/PkUtil.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/PkUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Record; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/RandomGeneratorUtil.java b/dsAi/src/main/java/com/dsideal/Ai/Util/RandomGeneratorUtil.java similarity index 99% rename from dsRes/src/main/java/com/dsideal/Res/Util/RandomGeneratorUtil.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/RandomGeneratorUtil.java index 9a18f4ed..e5e62e41 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/RandomGeneratorUtil.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/RandomGeneratorUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import java.util.HashMap; import java.util.Map; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/RedisKit.java b/dsAi/src/main/java/com/dsideal/Ai/Util/RedisKit.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/Res/Util/RedisKit.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/RedisKit.java index 8d95731a..1b1ef3fc 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/RedisKit.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/RedisKit.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.jfinal.plugin.redis.Redis; import redis.clients.jedis.Pipeline; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/RetKit.java b/dsAi/src/main/java/com/dsideal/Ai/Util/RetKit.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/Util/RetKit.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/RetKit.java index 754def6e..c67305e7 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/RetKit.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/RetKit.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Page; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/RocketMqKit.java b/dsAi/src/main/java/com/dsideal/Ai/Util/RocketMqKit.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/Res/Util/RocketMqKit.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/RocketMqKit.java index 2cbb3ec4..5f3decec 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/RocketMqKit.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/RocketMqKit.java @@ -1,7 +1,6 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.dsideal.Config.PropKit; -import com.dsideal.Res.AiApplication; import org.apache.rocketmq.client.consumer.DefaultLitePullConsumer; import org.apache.rocketmq.client.producer.DefaultMQProducer; import org.apache.rocketmq.client.producer.SendCallback; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/RsaUtils.java b/dsAi/src/main/java/com/dsideal/Ai/Util/RsaUtils.java similarity index 97% rename from dsAi/src/main/java/com/dsideal/Res/Util/RsaUtils.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/RsaUtils.java index bf379e86..7fe3cd52 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/RsaUtils.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/RsaUtils.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import cn.hutool.core.codec.Base64; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/Suno/SunoMusicGenerator.java b/dsAi/src/main/java/com/dsideal/Ai/Util/Suno/SunoMusicGenerator.java similarity index 97% rename from dsAi/src/main/java/com/dsideal/Res/Util/Suno/SunoMusicGenerator.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/Suno/SunoMusicGenerator.java index 6e90c6d2..045c77fe 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/Suno/SunoMusicGenerator.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/Suno/SunoMusicGenerator.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util.Suno; +package com.dsideal.Ai.Util.Suno; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/TelNumGenerator.java b/dsAi/src/main/java/com/dsideal/Ai/Util/TelNumGenerator.java similarity index 92% rename from dsRes/src/main/java/com/dsideal/Res/Util/TelNumGenerator.java rename to dsAi/src/main/java/com/dsideal/Ai/Util/TelNumGenerator.java index bd3c9b1d..7ed7d27a 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/TelNumGenerator.java +++ b/dsAi/src/main/java/com/dsideal/Ai/Util/TelNumGenerator.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; public class TelNumGenerator { diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Example/Text2Img.jpg b/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Example/Text2Img.jpg deleted file mode 100644 index 2238c6bf..00000000 Binary files a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Example/Text2Img.jpg and /dev/null differ diff --git a/dsRes/Dockerfile b/dsRes/Dockerfile index 74195cb5..988a27dd 100644 --- a/dsRes/Dockerfile +++ b/dsRes/Dockerfile @@ -20,4 +20,4 @@ ENV JAVA_OPTS="-Xms512m -Xmx1024m" # 标识为生产环境 ENV WORKING_ENV="pro" -ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/target/classes:/root/lib/* com.dsideal.Res.ResApplication" ] +ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/target/classes:/root/lib/* com.dsideal.Ai.ResApplication" ] diff --git a/dsRes/src/main/java/com/dsideal/Res/Base/Controller/BaseController.java b/dsRes/src/main/java/com/dsideal/Ai/Base/Controller/BaseController.java similarity index 94% rename from dsRes/src/main/java/com/dsideal/Res/Base/Controller/BaseController.java rename to dsRes/src/main/java/com/dsideal/Ai/Base/Controller/BaseController.java index d9bbfa68..3004dcca 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Base/Controller/BaseController.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Base/Controller/BaseController.java @@ -1,9 +1,9 @@ -package com.dsideal.Res.Base.Controller; +package com.dsideal.Ai.Base.Controller; -import com.dsideal.Res.Base.Model.BaseModel; -import com.dsideal.Res.Interceptor.EmptyInterface; -import com.dsideal.Res.Interceptor.IsNumericInterface; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Base.Model.BaseModel; +import com.dsideal.Ai.Interceptor.EmptyInterface; +import com.dsideal.Ai.Interceptor.IsNumericInterface; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Before; import com.jfinal.core.Controller; import com.jfinal.ext.interceptor.GET; diff --git a/dsRes/src/main/java/com/dsideal/Res/Base/Model/BaseModel.java b/dsRes/src/main/java/com/dsideal/Ai/Base/Model/BaseModel.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Base/Model/BaseModel.java rename to dsRes/src/main/java/com/dsideal/Ai/Base/Model/BaseModel.java index a7093fea..29082987 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Base/Model/BaseModel.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Base/Model/BaseModel.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Base.Model; +package com.dsideal.Ai.Base.Model; import com.jfinal.kit.Kv; import com.jfinal.plugin.activerecord.Db; diff --git a/dsRes/src/main/java/com/dsideal/Res/Index/IndexController.java b/dsRes/src/main/java/com/dsideal/Ai/Index/IndexController.java similarity index 81% rename from dsRes/src/main/java/com/dsideal/Res/Index/IndexController.java rename to dsRes/src/main/java/com/dsideal/Ai/Index/IndexController.java index aed7441c..d5ca7228 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Index/IndexController.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Index/IndexController.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Index; +package com.dsideal.Ai.Index; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterceptor.java b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/CheckIdsInterceptor.java similarity index 93% rename from dsAi/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterceptor.java rename to dsRes/src/main/java/com/dsideal/Ai/Interceptor/CheckIdsInterceptor.java index 74b42da1..fc924413 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterceptor.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/CheckIdsInterceptor.java @@ -1,7 +1,7 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; -import com.dsideal.Res.Util.CommonUtil; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Util.CommonUtil; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterface.java b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/CheckIdsInterface.java similarity index 80% rename from dsAi/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterface.java rename to dsRes/src/main/java/com/dsideal/Ai/Interceptor/CheckIdsInterface.java index 473d24a4..879fdf4b 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterface.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/CheckIdsInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; import java.lang.annotation.*; diff --git a/dsAi/src/main/java/com/dsideal/Res/Interceptor/EmptyInterceptor.java b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/EmptyInterceptor.java similarity index 92% rename from dsAi/src/main/java/com/dsideal/Res/Interceptor/EmptyInterceptor.java rename to dsRes/src/main/java/com/dsideal/Ai/Interceptor/EmptyInterceptor.java index 1cd988c8..43f91bec 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Interceptor/EmptyInterceptor.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/EmptyInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/Res/Interceptor/EmptyInterface.java b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/EmptyInterface.java similarity index 87% rename from dsAi/src/main/java/com/dsideal/Res/Interceptor/EmptyInterface.java rename to dsRes/src/main/java/com/dsideal/Ai/Interceptor/EmptyInterface.java index c8608348..8487023b 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Interceptor/EmptyInterface.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/EmptyInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterceptor.java b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsGuidInterceptor.java similarity index 91% rename from dsRes/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterceptor.java rename to dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsGuidInterceptor.java index 5d350d4d..51d2abd4 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterceptor.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsGuidInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterface.java b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsGuidInterface.java similarity index 80% rename from dsAi/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterface.java rename to dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsGuidInterface.java index b81327fe..fcb47f39 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterface.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsGuidInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; import java.lang.annotation.*; diff --git a/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsNumbericInterceptor.java b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsNumbericInterceptor.java similarity index 90% rename from dsAi/src/main/java/com/dsideal/Res/Interceptor/IsNumbericInterceptor.java rename to dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsNumbericInterceptor.java index decdb2ec..bc5e640b 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsNumbericInterceptor.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsNumbericInterceptor.java @@ -1,7 +1,7 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; -import com.dsideal.Res.Util.CommonUtil; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Util.CommonUtil; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsNumericInterface.java b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsNumericInterface.java similarity index 80% rename from dsRes/src/main/java/com/dsideal/Res/Interceptor/IsNumericInterface.java rename to dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsNumericInterface.java index a88260e1..7101892b 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsNumericInterface.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsNumericInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; import java.lang.annotation.*; diff --git a/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterceptor.java b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsSysAdminInterceptor.java similarity index 92% rename from dsRes/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterceptor.java rename to dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsSysAdminInterceptor.java index 48d89a75..d04874b1 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterceptor.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsSysAdminInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterface.java b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsSysAdminInterface.java similarity index 80% rename from dsAi/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterface.java rename to dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsSysAdminInterface.java index 040957c4..c316dfeb 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterface.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/IsSysAdminInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; import java.lang.annotation.*; diff --git a/dsRes/src/main/java/com/dsideal/Res/Interceptor/LengthInterceptor.java b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/LengthInterceptor.java similarity index 93% rename from dsRes/src/main/java/com/dsideal/Res/Interceptor/LengthInterceptor.java rename to dsRes/src/main/java/com/dsideal/Ai/Interceptor/LengthInterceptor.java index f5684aaa..7139ad71 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Interceptor/LengthInterceptor.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/LengthInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/Res/Interceptor/LengthInterface.java b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/LengthInterface.java similarity index 79% rename from dsAi/src/main/java/com/dsideal/Res/Interceptor/LengthInterface.java rename to dsRes/src/main/java/com/dsideal/Ai/Interceptor/LengthInterface.java index bfbd5f99..45111271 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Interceptor/LengthInterface.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Interceptor/LengthInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Interceptor; +package com.dsideal.Ai.Interceptor; import java.lang.annotation.*; diff --git a/dsRes/src/main/java/com/dsideal/Res/JApiDocsGenerator.java b/dsRes/src/main/java/com/dsideal/Ai/JApiDocsGenerator.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/JApiDocsGenerator.java rename to dsRes/src/main/java/com/dsideal/Ai/JApiDocsGenerator.java index efee6c21..59a97022 100644 --- a/dsRes/src/main/java/com/dsideal/Res/JApiDocsGenerator.java +++ b/dsRes/src/main/java/com/dsideal/Ai/JApiDocsGenerator.java @@ -1,9 +1,9 @@ -package com.dsideal.Res; +package com.dsideal.Ai; import cn.hutool.core.io.FileUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.Res.Plugin.PostmanDocPlugin; +import com.dsideal.Ai.Plugin.PostmanDocPlugin; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.jfinal.aop.Before; diff --git a/dsRes/src/main/java/com/dsideal/Res/Milvus/Controller/MilvusDemoController.java b/dsRes/src/main/java/com/dsideal/Ai/Milvus/Controller/MilvusDemoController.java similarity index 94% rename from dsRes/src/main/java/com/dsideal/Res/Milvus/Controller/MilvusDemoController.java rename to dsRes/src/main/java/com/dsideal/Ai/Milvus/Controller/MilvusDemoController.java index d62ff6b5..19756bd7 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Milvus/Controller/MilvusDemoController.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Milvus/Controller/MilvusDemoController.java @@ -1,7 +1,7 @@ -package com.dsideal.Res.Milvus.Controller; +package com.dsideal.Ai.Milvus.Controller; import com.dsideal.Config.PropKit; // 配置文件工具类 -import com.dsideal.Res.Plugin.MilvusPlugin; // Milvus连接池管理类 +import com.dsideal.Ai.Plugin.MilvusPlugin; // Milvus连接池管理类 import com.jfinal.aop.Before; import com.jfinal.core.Controller; // JFinal框架基础控制器 import com.jfinal.ext.interceptor.GET; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseClass.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseClass.java similarity index 99% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseClass.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseClass.java index 425ccb4b..29213b50 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseClass.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseClass.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseGlobal.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseGlobal.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseGlobal.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseGlobal.java index 16890d1d..05202bba 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseGlobal.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseGlobal.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseGlobalType.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseGlobalType.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseGlobalType.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseGlobalType.java index eb53ba12..8bc6ab91 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseGlobalType.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseGlobalType.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseGraduation.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseGraduation.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseGraduation.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseGraduation.java index 3e417678..f0a41033 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseGraduation.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseGraduation.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseMenu.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseMenu.java similarity index 99% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseMenu.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseMenu.java index 0482bbdb..b9650e37 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseMenu.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseMenu.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseMenuPrivilage.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseMenuPrivilage.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseMenuPrivilage.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseMenuPrivilage.java index 0371ee65..11130d3b 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseMenuPrivilage.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseMenuPrivilage.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseOrgTypePrincipalship.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseOrgTypePrincipalship.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseOrgTypePrincipalship.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseOrgTypePrincipalship.java index 4f347373..3d2b2979 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseOrgTypePrincipalship.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseOrgTypePrincipalship.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseOrganization.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseOrganization.java similarity index 99% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseOrganization.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseOrganization.java index 453e763d..1c2bd13e 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseOrganization.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseOrganization.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBasePrincipalshipMenu.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBasePrincipalshipMenu.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseBasePrincipalshipMenu.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseBasePrincipalshipMenu.java index 7a2c9261..e5047b1a 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBasePrincipalshipMenu.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBasePrincipalshipMenu.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseTerm.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseTerm.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseTerm.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseTerm.java index 95320a3e..3f94f9fa 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseBaseTerm.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseBaseTerm.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseCityCoordinate.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseCityCoordinate.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseCityCoordinate.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseCityCoordinate.java index 221257f2..4e321633 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseCityCoordinate.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseCityCoordinate.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseClass.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseClass.java similarity index 62% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseClass.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseClass.java index d86b7144..7c8343c6 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseClass.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseClass.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseBaseClass; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmArea.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmArea.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmArea.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmArea.java index 7a9b05f1..b62ba28d 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmArea.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmArea.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmBz.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmBz.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmBz.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmBz.java index b3e42e19..11b0da81 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmBz.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmBz.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmIdentity.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmIdentity.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmIdentity.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmIdentity.java index a4c5b7bd..051cccf8 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmIdentity.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmIdentity.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmMz.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmMz.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmMz.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmMz.java index 2d9875fc..824ac61b 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmMz.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmMz.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSchoollevel.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSchoollevel.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSchoollevel.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSchoollevel.java index b3d354d7..a1e74c04 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSchoollevel.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSchoollevel.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSchoolproperty.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSchoolproperty.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSchoolproperty.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSchoolproperty.java index 15a4483a..f7f29ffb 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSchoolproperty.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSchoolproperty.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSchooltype.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSchooltype.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSchooltype.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSchooltype.java index 255899f5..96c5a857 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSchooltype.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSchooltype.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSchooltypeStage.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSchooltypeStage.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSchooltypeStage.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSchooltypeStage.java index 788902be..a258be76 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSchooltypeStage.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSchooltypeStage.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmStage.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmStage.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmStage.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmStage.java index 8828eadf..643cdf27 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmStage.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmStage.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmStatusStudent.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmStatusStudent.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmStatusStudent.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmStatusStudent.java index 3ba51bce..07382a56 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmStatusStudent.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmStatusStudent.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmStatusTeacher.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmStatusTeacher.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmStatusTeacher.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmStatusTeacher.java index 427c4460..259d7270 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmStatusTeacher.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmStatusTeacher.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmStudentSource.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmStudentSource.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmStudentSource.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmStudentSource.java index 08d3a18f..cc9f9c35 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmStudentSource.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmStudentSource.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSubject.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSubject.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSubject.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSubject.java index 2530ee39..bce09a66 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmSubject.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmSubject.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmXb.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmXb.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmXb.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmXb.java index 2c30903f..e86e07ca 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmXb.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmXb.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmXl.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmXl.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmXl.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmXl.java index 4261c59a..f2240f01 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmXl.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmXl.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmZc.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmZc.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmZc.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmZc.java index 12f4fd9a..ade0ca6b 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmZc.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmZc.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmZzmm.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmZzmm.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseDmZzmm.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmZzmm.java index 105e150a..db010cbb 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseDmZzmm.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseDmZzmm.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseGlobal.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseGlobal.java similarity index 62% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseGlobal.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseGlobal.java index 084bed0b..5022d18c 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseGlobal.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseGlobal.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseBaseGlobal; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseGlobalType.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseGlobalType.java similarity index 63% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseGlobalType.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseGlobalType.java index ffa9306f..88bf22af 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseGlobalType.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseGlobalType.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseBaseGlobalType; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseGraduation.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseGraduation.java similarity index 63% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseGraduation.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseGraduation.java index 08458c67..a617daf1 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseGraduation.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseGraduation.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseBaseGraduation; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseImportStudentByExcel.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseImportStudentByExcel.java similarity index 99% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseImportStudentByExcel.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseImportStudentByExcel.java index 09d0b77a..ddd1fe08 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseImportStudentByExcel.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseImportStudentByExcel.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseImportTeacherByExcel.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseImportTeacherByExcel.java similarity index 99% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseImportTeacherByExcel.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseImportTeacherByExcel.java index ab25c305..2e154c78 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseImportTeacherByExcel.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseImportTeacherByExcel.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseMenu.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseMenu.java similarity index 61% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseMenu.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseMenu.java index 7fbce1bb..c20d7501 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseMenu.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseMenu.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseBaseMenu; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseMenuPrivilage.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseMenuPrivilage.java similarity index 63% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseMenuPrivilage.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseMenuPrivilage.java index 6c33d9c4..c62177f8 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseMenuPrivilage.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseMenuPrivilage.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseBaseMenuPrivilage; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseOrgTypePrincipalship.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseOrgTypePrincipalship.java similarity index 65% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseOrgTypePrincipalship.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseOrgTypePrincipalship.java index d741e9ce..cecbf4a9 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseOrgTypePrincipalship.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseOrgTypePrincipalship.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseBaseOrgTypePrincipalship; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseOrganization.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseOrganization.java similarity index 63% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseOrganization.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseOrganization.java index b4df9bc6..20faad51 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseOrganization.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseOrganization.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseBaseOrganization; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BasePersonDuty.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BasePersonDuty.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/Res/Model/BasePersonDuty.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BasePersonDuty.java index 43832d6c..0811c4c9 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BasePersonDuty.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BasePersonDuty.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BasePrincipalshipMenu.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BasePrincipalshipMenu.java similarity index 64% rename from dsRes/src/main/java/com/dsideal/Res/Model/BasePrincipalshipMenu.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BasePrincipalshipMenu.java index 0a649be7..466371d5 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BasePrincipalshipMenu.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BasePrincipalshipMenu.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseBasePrincipalshipMenu; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseSysIdentity.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseSysIdentity.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseSysIdentity.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseSysIdentity.java index 2307987e..a249c480 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseSysIdentity.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseSysIdentity.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseSysLoginLog.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseSysLoginLog.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseSysLoginLog.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseSysLoginLog.java index 410d976e..d6805136 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseSysLoginLog.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseSysLoginLog.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseSysLoginperson.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseSysLoginperson.java similarity index 99% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseSysLoginperson.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseSysLoginperson.java index 8631b610..b75d8916 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseSysLoginperson.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseSysLoginperson.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseTerm.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseTerm.java similarity index 61% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseTerm.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseTerm.java index 1e3fa5b3..54ea8031 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseTerm.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseTerm.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseBaseTerm; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseTest.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseTest.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseTest.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseTest.java index b0c4cc13..4e13d74e 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseTest.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseTest.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseTransferApply.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseTransferApply.java similarity index 99% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseTransferApply.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseTransferApply.java index 1203d58c..3c60aff9 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseTransferApply.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseTransferApply.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/BaseTransferApplyStatus.java b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseTransferApplyStatus.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/Res/Model/BaseTransferApplyStatus.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/BaseTransferApplyStatus.java index 3c219d55..df91b935 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/BaseTransferApplyStatus.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/BaseTransferApplyStatus.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.Model; import com.jfinal.plugin.activerecord.IBean; diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/CityCoordinate.java b/dsRes/src/main/java/com/dsideal/Ai/Model/CityCoordinate.java similarity index 63% rename from dsRes/src/main/java/com/dsideal/Res/Model/CityCoordinate.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/CityCoordinate.java index c579941a..abbc624f 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/CityCoordinate.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/CityCoordinate.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseCityCoordinate; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmArea.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmArea.java similarity index 61% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmArea.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmArea.java index b9e9f8ce..00f47db6 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmArea.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmArea.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmArea; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmBz.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmBz.java similarity index 60% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmBz.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmBz.java index 461462d3..f824352d 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmBz.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmBz.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmBz; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmIdentity.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmIdentity.java similarity index 62% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmIdentity.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmIdentity.java index 938bd259..da368685 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmIdentity.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmIdentity.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmIdentity; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmMz.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmMz.java similarity index 60% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmMz.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmMz.java index 6858db4e..f157b797 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmMz.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmMz.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmMz; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmSchoollevel.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmSchoollevel.java similarity index 62% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmSchoollevel.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmSchoollevel.java index cb393266..1edd9c68 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmSchoollevel.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmSchoollevel.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmSchoollevel; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmSchoolproperty.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmSchoolproperty.java similarity index 63% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmSchoolproperty.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmSchoolproperty.java index e1f2a1e1..f44a14f7 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmSchoolproperty.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmSchoolproperty.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmSchoolproperty; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmSchooltype.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmSchooltype.java similarity index 62% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmSchooltype.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmSchooltype.java index 08331624..b5680b95 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmSchooltype.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmSchooltype.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmSchooltype; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmSchooltypeStage.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmSchooltypeStage.java similarity index 63% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmSchooltypeStage.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmSchooltypeStage.java index 848bff88..5986557e 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmSchooltypeStage.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmSchooltypeStage.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmSchooltypeStage; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmStage.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmStage.java similarity index 61% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmStage.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmStage.java index 86e17769..6460da75 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmStage.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmStage.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmStage; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmStatusStudent.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmStatusStudent.java similarity index 63% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmStatusStudent.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmStatusStudent.java index 4a3bec8a..8b959507 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmStatusStudent.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmStatusStudent.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmStatusStudent; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmStatusTeacher.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmStatusTeacher.java similarity index 63% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmStatusTeacher.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmStatusTeacher.java index b80ce5b0..e3b40996 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmStatusTeacher.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmStatusTeacher.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmStatusTeacher; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmStudentSource.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmStudentSource.java similarity index 63% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmStudentSource.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmStudentSource.java index f38551fe..a519c21d 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmStudentSource.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmStudentSource.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmStudentSource; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmSubject.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmSubject.java similarity index 62% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmSubject.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmSubject.java index b3691a0e..76d22ad6 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmSubject.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmSubject.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmSubject; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmXb.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmXb.java similarity index 60% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmXb.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmXb.java index f4d9a22b..fcfb760e 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmXb.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmXb.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmXb; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmXl.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmXl.java similarity index 60% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmXl.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmXl.java index d7615900..f779813a 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmXl.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmXl.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmXl; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmZc.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmZc.java similarity index 60% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmZc.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmZc.java index c4d54537..27479a00 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmZc.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmZc.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmZc; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/DmZzmm.java b/dsRes/src/main/java/com/dsideal/Ai/Model/DmZzmm.java similarity index 61% rename from dsRes/src/main/java/com/dsideal/Res/Model/DmZzmm.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/DmZzmm.java index 385a47f2..76787c51 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/DmZzmm.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/DmZzmm.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseDmZzmm; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/ImportStudentByExcel.java b/dsRes/src/main/java/com/dsideal/Ai/Model/ImportStudentByExcel.java similarity index 64% rename from dsRes/src/main/java/com/dsideal/Res/Model/ImportStudentByExcel.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/ImportStudentByExcel.java index f0d317fa..ecf5b4ef 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/ImportStudentByExcel.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/ImportStudentByExcel.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseImportStudentByExcel; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/ImportTeacherByExcel.java b/dsRes/src/main/java/com/dsideal/Ai/Model/ImportTeacherByExcel.java similarity index 64% rename from dsRes/src/main/java/com/dsideal/Res/Model/ImportTeacherByExcel.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/ImportTeacherByExcel.java index 7025627e..fc5c598c 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/ImportTeacherByExcel.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/ImportTeacherByExcel.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseImportTeacherByExcel; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/PersonDuty.java b/dsRes/src/main/java/com/dsideal/Ai/Model/PersonDuty.java similarity index 62% rename from dsRes/src/main/java/com/dsideal/Res/Model/PersonDuty.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/PersonDuty.java index a151983d..30f8a992 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/PersonDuty.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/PersonDuty.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BasePersonDuty; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/SysIdentity.java b/dsRes/src/main/java/com/dsideal/Ai/Model/SysIdentity.java similarity index 62% rename from dsRes/src/main/java/com/dsideal/Res/Model/SysIdentity.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/SysIdentity.java index 0b40e998..f5352790 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/SysIdentity.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/SysIdentity.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseSysIdentity; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/SysLoginLog.java b/dsRes/src/main/java/com/dsideal/Ai/Model/SysLoginLog.java similarity index 62% rename from dsRes/src/main/java/com/dsideal/Res/Model/SysLoginLog.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/SysLoginLog.java index a7c77959..85f6a443 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/SysLoginLog.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/SysLoginLog.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseSysLoginLog; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/SysLoginperson.java b/dsRes/src/main/java/com/dsideal/Ai/Model/SysLoginperson.java similarity index 63% rename from dsRes/src/main/java/com/dsideal/Res/Model/SysLoginperson.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/SysLoginperson.java index 2cdc47a2..ddeb8fef 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/SysLoginperson.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/SysLoginperson.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseSysLoginperson; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/Test.java b/dsRes/src/main/java/com/dsideal/Ai/Model/Test.java similarity index 60% rename from dsRes/src/main/java/com/dsideal/Res/Model/Test.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/Test.java index 90a10b7a..54df0ec5 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/Test.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/Test.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseTest; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/TransferApply.java b/dsRes/src/main/java/com/dsideal/Ai/Model/TransferApply.java similarity index 62% rename from dsRes/src/main/java/com/dsideal/Res/Model/TransferApply.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/TransferApply.java index 4828fc40..6101d4dd 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/TransferApply.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/TransferApply.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseTransferApply; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/TransferApplyStatus.java b/dsRes/src/main/java/com/dsideal/Ai/Model/TransferApplyStatus.java similarity index 64% rename from dsRes/src/main/java/com/dsideal/Res/Model/TransferApplyStatus.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/TransferApplyStatus.java index 485408b7..512af8a6 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/TransferApplyStatus.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/TransferApplyStatus.java @@ -1,6 +1,4 @@ -package com.dsideal.Res.Model; - -import com.dsideal.Res.Model.BaseTransferApplyStatus; +package com.dsideal.Ai.Model; /** * Generated by JFinal. diff --git a/dsRes/src/main/java/com/dsideal/Res/Model/_MappingKit.java b/dsRes/src/main/java/com/dsideal/Ai/Model/_MappingKit.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/Res/Model/_MappingKit.java rename to dsRes/src/main/java/com/dsideal/Ai/Model/_MappingKit.java index 97e64512..2aac39f5 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Model/_MappingKit.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Model/_MappingKit.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Model; +package com.dsideal.Ai.Model; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; diff --git a/dsRes/src/main/java/com/dsideal/Res/Neo4j/Controller/Neo4jDemoController.java b/dsRes/src/main/java/com/dsideal/Ai/Neo4j/Controller/Neo4jDemoController.java similarity index 88% rename from dsRes/src/main/java/com/dsideal/Res/Neo4j/Controller/Neo4jDemoController.java rename to dsRes/src/main/java/com/dsideal/Ai/Neo4j/Controller/Neo4jDemoController.java index ebdbd445..ce789cd2 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Neo4j/Controller/Neo4jDemoController.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Neo4j/Controller/Neo4jDemoController.java @@ -1,6 +1,6 @@ -package com.dsideal.Res.Neo4j.Controller; +package com.dsideal.Ai.Neo4j.Controller; -import com.dsideal.Res.Plugin.Neo4jPlugin; +import com.dsideal.Ai.Plugin.Neo4jPlugin; import com.jfinal.aop.Before; import com.jfinal.core.Controller; import com.jfinal.ext.interceptor.GET; diff --git a/dsRes/src/main/java/com/dsideal/Res/Plugin/MilvusPlugin.java b/dsRes/src/main/java/com/dsideal/Ai/Plugin/MilvusPlugin.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Plugin/MilvusPlugin.java rename to dsRes/src/main/java/com/dsideal/Ai/Plugin/MilvusPlugin.java index 569e2101..7f59afa9 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Plugin/MilvusPlugin.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Plugin/MilvusPlugin.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Plugin; +package com.dsideal.Ai.Plugin; import com.jfinal.plugin.IPlugin; import io.milvus.pool.MilvusClientV2Pool; // Milvus V2版本连接池类 diff --git a/dsRes/src/main/java/com/dsideal/Res/Plugin/Neo4jPlugin.java b/dsRes/src/main/java/com/dsideal/Ai/Plugin/Neo4jPlugin.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Plugin/Neo4jPlugin.java rename to dsRes/src/main/java/com/dsideal/Ai/Plugin/Neo4jPlugin.java index 291f70cb..ab7470c2 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Plugin/Neo4jPlugin.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Plugin/Neo4jPlugin.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Plugin; +package com.dsideal.Ai.Plugin; import com.jfinal.plugin.IPlugin; import lombok.Getter; diff --git a/dsRes/src/main/java/com/dsideal/Res/Plugin/PostmanDocPlugin.java b/dsRes/src/main/java/com/dsideal/Ai/Plugin/PostmanDocPlugin.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/Res/Plugin/PostmanDocPlugin.java rename to dsRes/src/main/java/com/dsideal/Ai/Plugin/PostmanDocPlugin.java index a6e585dd..461ee2ee 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Plugin/PostmanDocPlugin.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Plugin/PostmanDocPlugin.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Plugin; +package com.dsideal.Ai.Plugin; import freemarker.template.Template; import freemarker.template.TemplateException; diff --git a/dsRes/src/main/java/com/dsideal/Res/Res/Controller/ResourceController.java b/dsRes/src/main/java/com/dsideal/Ai/Res/Controller/ResourceController.java similarity index 92% rename from dsRes/src/main/java/com/dsideal/Res/Res/Controller/ResourceController.java rename to dsRes/src/main/java/com/dsideal/Ai/Res/Controller/ResourceController.java index 1e3b4f06..67416761 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Res/Controller/ResourceController.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Res/Controller/ResourceController.java @@ -1,13 +1,13 @@ -package com.dsideal.Res.Res.Controller; +package com.dsideal.Ai.Res.Controller; -import com.dsideal.Res.Base.Model.BaseModel; -import com.dsideal.Res.Interceptor.EmptyInterface; -import com.dsideal.Res.Interceptor.IsNumericInterface; -import com.dsideal.Res.Res.Model.ResourceModel; -import com.dsideal.Res.Util.CommonUtil; -import com.dsideal.Res.Util.JwtUtil; -import com.dsideal.Res.Util.MinioUtils; -import com.dsideal.Res.Util.RetKit; +import com.dsideal.Ai.Base.Model.BaseModel; +import com.dsideal.Ai.Interceptor.EmptyInterface; +import com.dsideal.Ai.Interceptor.IsNumericInterface; +import com.dsideal.Ai.Res.Model.ResourceModel; +import com.dsideal.Ai.Util.CommonUtil; +import com.dsideal.Ai.Util.JwtUtil; +import com.dsideal.Ai.Util.MinioUtils; +import com.dsideal.Ai.Util.RetKit; import com.jfinal.aop.Before; import com.jfinal.core.Controller; import com.jfinal.ext.interceptor.GET; diff --git a/dsRes/src/main/java/com/dsideal/Res/Res/Model/ResourceModel.java b/dsRes/src/main/java/com/dsideal/Ai/Res/Model/ResourceModel.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Res/Model/ResourceModel.java rename to dsRes/src/main/java/com/dsideal/Ai/Res/Model/ResourceModel.java index e7d64c9d..e96ab0ac 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Res/Model/ResourceModel.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Res/Model/ResourceModel.java @@ -1,8 +1,7 @@ -package com.dsideal.Res.Res.Model; +package com.dsideal.Ai.Res.Model; import cn.hutool.core.date.DateTime; import com.dsideal.Config.PropKit; -import com.dsideal.Res.ResApplication; import com.jfinal.kit.Kv; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Db; diff --git a/dsRes/src/main/java/com/dsideal/Res/ResApplication.java b/dsRes/src/main/java/com/dsideal/Ai/ResApplication.java similarity index 87% rename from dsRes/src/main/java/com/dsideal/Res/ResApplication.java rename to dsRes/src/main/java/com/dsideal/Ai/ResApplication.java index d8bbd827..1667f4a8 100644 --- a/dsRes/src/main/java/com/dsideal/Res/ResApplication.java +++ b/dsRes/src/main/java/com/dsideal/Ai/ResApplication.java @@ -1,17 +1,17 @@ -package com.dsideal.Res; +package com.dsideal.Ai; import cn.hutool.core.io.FileUtil; import com.dsideal.Config.PropKit; -import com.dsideal.Res.Base.Controller.BaseController; -import com.dsideal.Res.Index.IndexController; -import com.dsideal.Res.Interceptor.*; -import com.dsideal.Res.Milvus.Controller.MilvusDemoController; -import com.dsideal.Res.Model._MappingKit; -import com.dsideal.Res.Neo4j.Controller.Neo4jDemoController; -import com.dsideal.Res.Plugin.MilvusPlugin; -import com.dsideal.Res.Plugin.Neo4jPlugin; -import com.dsideal.Res.Res.Controller.ResourceController; -import com.dsideal.Res.Util.LogBackLogFactory; +import com.dsideal.Ai.Base.Controller.BaseController; +import com.dsideal.Ai.Index.IndexController; +import com.dsideal.Ai.Interceptor.*; +import com.dsideal.Ai.Milvus.Controller.MilvusDemoController; +import com.dsideal.Ai.Model._MappingKit; +import com.dsideal.Ai.Neo4j.Controller.Neo4jDemoController; +import com.dsideal.Ai.Plugin.MilvusPlugin; +import com.dsideal.Ai.Plugin.Neo4jPlugin; +import com.dsideal.Ai.Res.Controller.ResourceController; +import com.dsideal.Ai.Util.LogBackLogFactory; import com.jfinal.config.*; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; import com.jfinal.plugin.activerecord.dialect.MysqlDialect; diff --git a/dsRes/src/main/java/com/dsideal/Res/Test/TestGenerator.java b/dsRes/src/main/java/com/dsideal/Ai/Test/TestGenerator.java similarity index 69% rename from dsRes/src/main/java/com/dsideal/Res/Test/TestGenerator.java rename to dsRes/src/main/java/com/dsideal/Ai/Test/TestGenerator.java index ee0e9b9d..746ef370 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Test/TestGenerator.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Test/TestGenerator.java @@ -1,8 +1,7 @@ -package com.dsideal.Res.Test; +package com.dsideal.Ai.Test; -import com.dsideal.Res.Model.SysLoginperson; -import com.dsideal.Res.Model.Test; -import com.dsideal.Res.Util.DbInit; +import com.dsideal.Ai.Model.Test; +import com.dsideal.Ai.Util.DbInit; import java.util.List; diff --git a/dsRes/src/main/java/com/dsideal/Res/Test/TestUploadToMinio.java b/dsRes/src/main/java/com/dsideal/Ai/Test/TestUploadToMinio.java similarity index 78% rename from dsRes/src/main/java/com/dsideal/Res/Test/TestUploadToMinio.java rename to dsRes/src/main/java/com/dsideal/Ai/Test/TestUploadToMinio.java index 36223c22..22cdc3eb 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Test/TestUploadToMinio.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Test/TestUploadToMinio.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Test; +package com.dsideal.Ai.Test; import com.jfinal.kit.Prop; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/CommonUtil.java b/dsRes/src/main/java/com/dsideal/Ai/Util/CommonUtil.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Util/CommonUtil.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/CommonUtil.java index 1aebc8d0..ff0b0a5c 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/CommonUtil.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/CommonUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/CookieUtil.java b/dsRes/src/main/java/com/dsideal/Ai/Util/CookieUtil.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/CookieUtil.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/CookieUtil.java index b2e157a2..31e54188 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/CookieUtil.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/CookieUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/DbInit.java b/dsRes/src/main/java/com/dsideal/Ai/Util/DbInit.java similarity index 89% rename from dsRes/src/main/java/com/dsideal/Res/Util/DbInit.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/DbInit.java index 04e0633c..0f800344 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/DbInit.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/DbInit.java @@ -1,8 +1,8 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.dsideal.Config.PropKit; -import com.dsideal.Res.Model._MappingKit; -import com.dsideal.Res.ResApplication; +import com.dsideal.Ai.Model._MappingKit; +import com.dsideal.Ai.ResApplication; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; import com.jfinal.plugin.activerecord.dialect.MysqlDialect; import com.jfinal.plugin.druid.DruidPlugin; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/ExcelExportUtil.java b/dsRes/src/main/java/com/dsideal/Ai/Util/ExcelExportUtil.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/Res/Util/ExcelExportUtil.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/ExcelExportUtil.java index e0cc0f21..5bdba0dc 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/ExcelExportUtil.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/ExcelExportUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/FileSizeUtil.java b/dsRes/src/main/java/com/dsideal/Ai/Util/FileSizeUtil.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Util/FileSizeUtil.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/FileSizeUtil.java index ea0deb6e..75f5ae7e 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/FileSizeUtil.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/FileSizeUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import java.io.File; import java.io.FileInputStream; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/FileUtil.java b/dsRes/src/main/java/com/dsideal/Ai/Util/FileUtil.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/Res/Util/FileUtil.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/FileUtil.java index 0377e481..67503173 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/FileUtil.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/FileUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.alibaba.fastjson.JSONObject; import java.io.*; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/HttpClient.java b/dsRes/src/main/java/com/dsideal/Ai/Util/HttpClient.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Util/HttpClient.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/HttpClient.java index a6bb9530..f30b44ee 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/HttpClient.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/HttpClient.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.dsideal.Config.GatewayConfig; import okhttp3.*; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/IDCardUtil.java b/dsRes/src/main/java/com/dsideal/Ai/Util/IDCardUtil.java similarity index 97% rename from dsAi/src/main/java/com/dsideal/Res/Util/IDCardUtil.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/IDCardUtil.java index 30ca9429..1956426d 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/IDCardUtil.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/IDCardUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.alibaba.fastjson.JSONObject; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/IdCardGenerator.java b/dsRes/src/main/java/com/dsideal/Ai/Util/IdCardGenerator.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/Res/Util/IdCardGenerator.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/IdCardGenerator.java index a136de60..e951f303 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/IdCardGenerator.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/IdCardGenerator.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import java.util.Calendar; import java.util.Collection; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/IpUtil.java b/dsRes/src/main/java/com/dsideal/Ai/Util/IpUtil.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/Res/Util/IpUtil.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/IpUtil.java index 37341253..8e998339 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/IpUtil.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/IpUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/JwtUtil.java b/dsRes/src/main/java/com/dsideal/Ai/Util/JwtUtil.java similarity index 94% rename from dsRes/src/main/java/com/dsideal/Res/Util/JwtUtil.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/JwtUtil.java index 91794942..ed26ce4f 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/JwtUtil.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/JwtUtil.java @@ -1,7 +1,6 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.dsideal.Config.PropKit; -import com.dsideal.Res.ResApplication; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/LogBackLog.java b/dsRes/src/main/java/com/dsideal/Ai/Util/LogBackLog.java similarity index 93% rename from dsRes/src/main/java/com/dsideal/Res/Util/LogBackLog.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/LogBackLog.java index 6fdf4e7e..3b1e3bda 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/LogBackLog.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/LogBackLog.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.jfinal.log.Log; import org.slf4j.Logger; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/LogBackLogFactory.java b/dsRes/src/main/java/com/dsideal/Ai/Util/LogBackLogFactory.java similarity index 87% rename from dsRes/src/main/java/com/dsideal/Res/Util/LogBackLogFactory.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/LogBackLogFactory.java index 3d712f9e..9faa9ef9 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/LogBackLogFactory.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/LogBackLogFactory.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.jfinal.log.ILogFactory; import com.jfinal.log.Log; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/MinioUtils.java b/dsRes/src/main/java/com/dsideal/Ai/Util/MinioUtils.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Util/MinioUtils.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/MinioUtils.java index 1c361923..a7dc4173 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/MinioUtils.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/MinioUtils.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import cn.hutool.core.io.FileUtil; import com.dsideal.Config.PropKit; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/PassWordUtil.java b/dsRes/src/main/java/com/dsideal/Ai/Util/PassWordUtil.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/PassWordUtil.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/PassWordUtil.java index 64111cac..7de7dc11 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/PassWordUtil.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/PassWordUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import java.security.SecureRandom; import java.util.ArrayList; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/PkUtil.java b/dsRes/src/main/java/com/dsideal/Ai/Util/PkUtil.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/PkUtil.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/PkUtil.java index 3c79898d..543585dc 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/PkUtil.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/PkUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Record; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/RandomGeneratorUtil.java b/dsRes/src/main/java/com/dsideal/Ai/Util/RandomGeneratorUtil.java similarity index 99% rename from dsAi/src/main/java/com/dsideal/Res/Util/RandomGeneratorUtil.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/RandomGeneratorUtil.java index 9a18f4ed..e5e62e41 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/RandomGeneratorUtil.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/RandomGeneratorUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import java.util.HashMap; import java.util.Map; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/RedisKit.java b/dsRes/src/main/java/com/dsideal/Ai/Util/RedisKit.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/Res/Util/RedisKit.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/RedisKit.java index 8d95731a..1b1ef3fc 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/RedisKit.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/RedisKit.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.jfinal.plugin.redis.Redis; import redis.clients.jedis.Pipeline; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/RetKit.java b/dsRes/src/main/java/com/dsideal/Ai/Util/RetKit.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/Util/RetKit.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/RetKit.java index 754def6e..c67305e7 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/RetKit.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/RetKit.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Page; diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/RsaUtils.java b/dsRes/src/main/java/com/dsideal/Ai/Util/RsaUtils.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/Res/Util/RsaUtils.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/RsaUtils.java index bf379e86..7fe3cd52 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/RsaUtils.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/RsaUtils.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; import cn.hutool.core.codec.Base64; diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/TelNumGenerator.java b/dsRes/src/main/java/com/dsideal/Ai/Util/TelNumGenerator.java similarity index 92% rename from dsAi/src/main/java/com/dsideal/Res/Util/TelNumGenerator.java rename to dsRes/src/main/java/com/dsideal/Ai/Util/TelNumGenerator.java index bd3c9b1d..7ed7d27a 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/TelNumGenerator.java +++ b/dsRes/src/main/java/com/dsideal/Ai/Util/TelNumGenerator.java @@ -1,4 +1,4 @@ -package com.dsideal.Res.Util; +package com.dsideal.Ai.Util; public class TelNumGenerator { diff --git a/dsRes/src/main/java/com/dsideal/Res/_JFinalDemoGenerator.java b/dsRes/src/main/java/com/dsideal/Ai/_JFinalDemoGenerator.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/Res/_JFinalDemoGenerator.java rename to dsRes/src/main/java/com/dsideal/Ai/_JFinalDemoGenerator.java index f2e9b31a..5180e23f 100644 --- a/dsRes/src/main/java/com/dsideal/Res/_JFinalDemoGenerator.java +++ b/dsRes/src/main/java/com/dsideal/Ai/_JFinalDemoGenerator.java @@ -1,4 +1,4 @@ -package com.dsideal.Res; +package com.dsideal.Ai; import java.time.LocalDate; import java.time.LocalDateTime;