diff --git a/library/skyeye-dev/.idea/compiler.xml b/library/skyeye-dev/.idea/compiler.xml index 2c3cf5a..140d7fd 100644 --- a/library/skyeye-dev/.idea/compiler.xml +++ b/library/skyeye-dev/.idea/compiler.xml @@ -31,6 +31,7 @@ + diff --git a/library/skyeye-dev/.idea/misc.xml b/library/skyeye-dev/.idea/misc.xml index 63019e7..4574b1f 100644 --- a/library/skyeye-dev/.idea/misc.xml +++ b/library/skyeye-dev/.idea/misc.xml @@ -11,5 +11,5 @@ - + \ No newline at end of file diff --git a/library/skyeye-dev/.idea/workspace.xml b/library/skyeye-dev/.idea/workspace.xml index e8b58fa..d7badd8 100644 --- a/library/skyeye-dev/.idea/workspace.xml +++ b/library/skyeye-dev/.idea/workspace.xml @@ -4,14 +4,150 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - { "associatedIndex": 8 @@ -37,6 +173,8 @@ "Maven.skyeye-common [clean].executor": "Run", "Maven.skyeye-common [compile].executor": "Run", "Maven.skyeye-common [install].executor": "Run", + "Maven.skyeye-common-dev [clean].executor": "Run", + "Maven.skyeye-common-dev [compile].executor": "Run", "Maven.skyeye-db [clean].executor": "Run", "Maven.skyeye-db [compile].executor": "Run", "Maven.skyeye-db [install].executor": "Run", @@ -62,11 +200,14 @@ "RunOnceActivity.ShowReadmeOnStart": "true", "RunOnceActivity.git.unshallow": "true", "RunOnceActivity.typescript.service.memoryLimit.init": "true", - "git-widget-placeholder": "dev-2.7.8", + "git-widget-placeholder": "main", "ignore.virus.scanning.warn.message": "true", "kotlin-language-version-configured": "true", - "last_opened_file_path": "D:/logisen/ddd/skyeye-dev", + "last_opened_file_path": "D:/workspace/skyeyesystem/library/skyeye-dev", "nodejs_package_manager_path": "npm", + "project.structure.last.edited": "Project", + "project.structure.proportion": "0.0", + "project.structure.side.proportion": "0.0", "vue.rearranger.settings.migration": "true" } }]]> @@ -100,6 +241,7 @@ + diff --git a/library/skyeye-dev/pom.xml b/library/skyeye-dev/pom.xml index d0385eb..a69b651 100644 --- a/library/skyeye-dev/pom.xml +++ b/library/skyeye-dev/pom.xml @@ -11,7 +11,7 @@ 4.0.0 com.zhangy - skyeye-dev + skyeye-common-dev 1.0.0.RELEASE pom skyeye library diff --git a/library/skyeye-dev/skyeye-common/pom.xml b/library/skyeye-dev/skyeye-common/pom.xml index 826f644..4448486 100644 --- a/library/skyeye-dev/skyeye-common/pom.xml +++ b/library/skyeye-dev/skyeye-common/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - skyeye-dev + skyeye-common-dev com.zhangy 1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-common/target/maven-archiver/pom.properties b/library/skyeye-dev/skyeye-common/target/maven-archiver/pom.properties deleted file mode 100644 index 6ac9d09..0000000 --- a/library/skyeye-dev/skyeye-common/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=skyeye-common -groupId=com.zhangy -version=1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/library/skyeye-dev/skyeye-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 11f828d..4dac365 100644 --- a/library/skyeye-dev/skyeye-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/library/skyeye-dev/skyeye-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,12 +1,12 @@ -D:\logisen\ddd\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\pojo\CommonConstant.java -D:\logisen\ddd\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\pojo\param\IdParam.java -D:\logisen\ddd\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\pojo\SecurityConstants.java -D:\logisen\ddd\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\utils\CookieUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\utils\SpringUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\pojo\result\ResultConstant.java -D:\logisen\ddd\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\pojo\tree\TreeNode.java -D:\logisen\ddd\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\utils\WebUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\pojo\result\Result.java -D:\logisen\ddd\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\utils\CommonUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\utils\JwtUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\utils\IPUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\pojo\param\IdParam.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\utils\WebUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\pojo\result\Result.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\utils\SpringUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\pojo\SecurityConstants.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\utils\JwtUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\pojo\CommonConstant.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\utils\CookieUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\utils\IPUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\pojo\result\ResultConstant.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\pojo\tree\TreeNode.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-common\src\main\java\com\zhangy\skyeye\common\utils\CommonUtil.java diff --git a/library/skyeye-dev/skyeye-common/target/skyeye-common-1.0.0.RELEASE.jar b/library/skyeye-dev/skyeye-common/target/skyeye-common-1.0.0.RELEASE.jar deleted file mode 100644 index 122c117..0000000 Binary files a/library/skyeye-dev/skyeye-common/target/skyeye-common-1.0.0.RELEASE.jar and /dev/null differ diff --git a/library/skyeye-dev/skyeye-db/pom.xml b/library/skyeye-dev/skyeye-db/pom.xml index 61d23d8..6249f2a 100644 --- a/library/skyeye-dev/skyeye-db/pom.xml +++ b/library/skyeye-dev/skyeye-db/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - skyeye-dev + skyeye-common-dev com.zhangy 1.0.0.RELEASE @@ -34,7 +34,7 @@ druid-spring-boot-starter - + com.zhangy skyeye-common diff --git a/library/skyeye-dev/skyeye-db/src/main/java/com/zhangy/skyeye/db/config/DTMybatisPlusConfig.java b/library/skyeye-dev/skyeye-db/src/main/java/com/zhangy/skyeye/db/config/DTMybatisPlusConfig.java index 0161abc..3fd0439 100644 --- a/library/skyeye-dev/skyeye-db/src/main/java/com/zhangy/skyeye/db/config/DTMybatisPlusConfig.java +++ b/library/skyeye-dev/skyeye-db/src/main/java/com/zhangy/skyeye/db/config/DTMybatisPlusConfig.java @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration; import java.util.HashMap; -@MapperScan("com.tiamo.dt.**.mapper") +@MapperScan("com.zhangy.skyeye.**.mapper") @Configuration public class DTMybatisPlusConfig { diff --git a/library/skyeye-dev/skyeye-db/src/main/resources/META-INF/spring.factories b/library/skyeye-dev/skyeye-db/src/main/resources/META-INF/spring.factories index f0e7ff3..8590dc6 100644 --- a/library/skyeye-dev/skyeye-db/src/main/resources/META-INF/spring.factories +++ b/library/skyeye-dev/skyeye-db/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.tiamo.dt.dev.db.config.DTDruidConfig,\ - com.tiamo.dt.dev.db.config.DTMybatisPlusConfig + com.zhangy.skyeye.db.config.DTDruidConfig,\ + com.zhangy.skyeye.db.config.DTMybatisPlusConfig diff --git a/library/skyeye-dev/skyeye-db/target/classes/META-INF/spring.factories b/library/skyeye-dev/skyeye-db/target/classes/META-INF/spring.factories index f0e7ff3..8590dc6 100644 --- a/library/skyeye-dev/skyeye-db/target/classes/META-INF/spring.factories +++ b/library/skyeye-dev/skyeye-db/target/classes/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.tiamo.dt.dev.db.config.DTDruidConfig,\ - com.tiamo.dt.dev.db.config.DTMybatisPlusConfig + com.zhangy.skyeye.db.config.DTDruidConfig,\ + com.zhangy.skyeye.db.config.DTMybatisPlusConfig diff --git a/library/skyeye-dev/skyeye-db/target/classes/com/zhangy/skyeye/db/config/DTMybatisPlusConfig.class b/library/skyeye-dev/skyeye-db/target/classes/com/zhangy/skyeye/db/config/DTMybatisPlusConfig.class index 451ec70..bcd2a68 100644 Binary files a/library/skyeye-dev/skyeye-db/target/classes/com/zhangy/skyeye/db/config/DTMybatisPlusConfig.class and b/library/skyeye-dev/skyeye-db/target/classes/com/zhangy/skyeye/db/config/DTMybatisPlusConfig.class differ diff --git a/library/skyeye-dev/skyeye-db/target/maven-archiver/pom.properties b/library/skyeye-dev/skyeye-db/target/maven-archiver/pom.properties deleted file mode 100644 index bc96b8f..0000000 --- a/library/skyeye-dev/skyeye-db/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=skyeye-db -groupId=com.zhangy -version=1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-db/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/library/skyeye-dev/skyeye-db/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 5e4d5ef..ab5bb7d 100644 --- a/library/skyeye-dev/skyeye-db/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/library/skyeye-dev/skyeye-db/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,6 +1,6 @@ -D:\logisen\ddd\skyeye-dev\skyeye-db\src\main\java\com\zhangy\skyeye\db\utils\MPUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-db\src\main\java\com\zhangy\skyeye\db\config\DynamicTableNameHelper.java -D:\logisen\ddd\skyeye-dev\skyeye-db\src\main\java\com\zhangy\skyeye\db\config\DTDruidConfig.java -D:\logisen\ddd\skyeye-dev\skyeye-db\src\main\java\com\zhangy\skyeye\db\pojo\props\Knife4jProperties.java -D:\logisen\ddd\skyeye-dev\skyeye-db\src\main\java\com\zhangy\skyeye\db\pojo\page\PageParam.java -D:\logisen\ddd\skyeye-dev\skyeye-db\src\main\java\com\zhangy\skyeye\db\config\DTMybatisPlusConfig.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-db\src\main\java\com\zhangy\skyeye\db\config\DTMybatisPlusConfig.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-db\src\main\java\com\zhangy\skyeye\db\pojo\page\PageParam.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-db\src\main\java\com\zhangy\skyeye\db\config\DynamicTableNameHelper.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-db\src\main\java\com\zhangy\skyeye\db\config\DTDruidConfig.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-db\src\main\java\com\zhangy\skyeye\db\pojo\props\Knife4jProperties.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-db\src\main\java\com\zhangy\skyeye\db\utils\MPUtil.java diff --git a/library/skyeye-dev/skyeye-db/target/skyeye-db-1.0.0.RELEASE.jar b/library/skyeye-dev/skyeye-db/target/skyeye-db-1.0.0.RELEASE.jar deleted file mode 100644 index 11138af..0000000 Binary files a/library/skyeye-dev/skyeye-db/target/skyeye-db-1.0.0.RELEASE.jar and /dev/null differ diff --git a/library/skyeye-dev/skyeye-generator/pom.xml b/library/skyeye-dev/skyeye-generator/pom.xml index 234953b..b609a5a 100644 --- a/library/skyeye-dev/skyeye-generator/pom.xml +++ b/library/skyeye-dev/skyeye-generator/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - skyeye-dev + skyeye-common-dev com.zhangy 1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-generator/src/main/java/com/zhangy/skyeye/generator/GeneratorApi.java b/library/skyeye-dev/skyeye-generator/src/main/java/com/zhangy/skyeye/generator/GeneratorApi.java index 216271c..094cba9 100644 --- a/library/skyeye-dev/skyeye-generator/src/main/java/com/zhangy/skyeye/generator/GeneratorApi.java +++ b/library/skyeye-dev/skyeye-generator/src/main/java/com/zhangy/skyeye/generator/GeneratorApi.java @@ -44,7 +44,7 @@ public class GeneratorApi { /** * 作者 */ - private String author = "Tiamo"; + private String author = "Zhangy"; /** * 代码生成的包名 */ @@ -127,7 +127,6 @@ public class GeneratorApi { } // 自定义 controller 父类 -// strategy.setSuperControllerClass("com.tiamo.dev.db.controller.BaseController"); strategy.setEntityBuilderModel(false); strategy.setEntityLombokModel(true); strategy.setRestControllerStyle(true); diff --git a/library/skyeye-dev/skyeye-generator/src/main/resources/templates/controller.java.vm b/library/skyeye-dev/skyeye-generator/src/main/resources/templates/controller.java.vm index 63bcbe9..974968a 100644 --- a/library/skyeye-dev/skyeye-generator/src/main/resources/templates/controller.java.vm +++ b/library/skyeye-dev/skyeye-generator/src/main/resources/templates/controller.java.vm @@ -24,8 +24,8 @@ import $!{package.Entity}.$!{entity}; import $!{package.Service}.$!{table.serviceName}; import result.pojo.com.zhangy.skyeye.common.Result; import param.pojo.com.zhangy.skyeye.common.IdParam; -import com.tiamo.dt.dev.db.utils.MPUtil; -import com.tiamo.dt.dev.db.pojo.page.PageParam; +import com.zhangy.skyeye.db.utils.MPUtil; +import com.zhangy.skyeye.db.pojo.page.PageParam; import java.util.List; diff --git a/library/skyeye-dev/skyeye-generator/src/main/resources/templates/service.java.vm b/library/skyeye-dev/skyeye-generator/src/main/resources/templates/service.java.vm index 818903a..91778f8 100644 --- a/library/skyeye-dev/skyeye-generator/src/main/resources/templates/service.java.vm +++ b/library/skyeye-dev/skyeye-generator/src/main/resources/templates/service.java.vm @@ -1,7 +1,7 @@ package ${package.Service}; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.tiamo.dt.dev.db.pojo.page.PageParam; +import com.zhangy.skyeye.db.pojo.page.PageParam; import ${package.Entity}.${entity}; import ${superServiceClassPackage}; diff --git a/library/skyeye-dev/skyeye-generator/src/main/resources/templates/serviceImpl.java.vm b/library/skyeye-dev/skyeye-generator/src/main/resources/templates/serviceImpl.java.vm index ddb67cb..df915e0 100644 --- a/library/skyeye-dev/skyeye-generator/src/main/resources/templates/serviceImpl.java.vm +++ b/library/skyeye-dev/skyeye-generator/src/main/resources/templates/serviceImpl.java.vm @@ -1,8 +1,8 @@ package ${package.ServiceImpl}; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.tiamo.dt.dev.db.pojo.page.PageParam; -import com.tiamo.dt.dev.db.utils.MPUtil; +import com.zhangy.skyeye.db.pojo.page.PageParam; +import com.zhangy.skyeye.db.utils.MPUtil; import ${package.Entity}.${entity}; import ${package.Mapper}.${table.mapperName}; import ${package.Service}.${table.serviceName}; diff --git a/library/skyeye-dev/skyeye-generator/target/classes/com/zhangy/skyeye/generator/GeneratorApi$1.class b/library/skyeye-dev/skyeye-generator/target/classes/com/zhangy/skyeye/generator/GeneratorApi$1.class index 02457be..f399faa 100644 Binary files a/library/skyeye-dev/skyeye-generator/target/classes/com/zhangy/skyeye/generator/GeneratorApi$1.class and b/library/skyeye-dev/skyeye-generator/target/classes/com/zhangy/skyeye/generator/GeneratorApi$1.class differ diff --git a/library/skyeye-dev/skyeye-generator/target/classes/com/zhangy/skyeye/generator/GeneratorApi$2.class b/library/skyeye-dev/skyeye-generator/target/classes/com/zhangy/skyeye/generator/GeneratorApi$2.class index 7e51bfd..01850e0 100644 Binary files a/library/skyeye-dev/skyeye-generator/target/classes/com/zhangy/skyeye/generator/GeneratorApi$2.class and b/library/skyeye-dev/skyeye-generator/target/classes/com/zhangy/skyeye/generator/GeneratorApi$2.class differ diff --git a/library/skyeye-dev/skyeye-generator/target/classes/com/zhangy/skyeye/generator/GeneratorApi.class b/library/skyeye-dev/skyeye-generator/target/classes/com/zhangy/skyeye/generator/GeneratorApi.class index 16b501c..a82d012 100644 Binary files a/library/skyeye-dev/skyeye-generator/target/classes/com/zhangy/skyeye/generator/GeneratorApi.class and b/library/skyeye-dev/skyeye-generator/target/classes/com/zhangy/skyeye/generator/GeneratorApi.class differ diff --git a/library/skyeye-dev/skyeye-generator/target/classes/templates/controller.java.vm b/library/skyeye-dev/skyeye-generator/target/classes/templates/controller.java.vm index 63bcbe9..974968a 100644 --- a/library/skyeye-dev/skyeye-generator/target/classes/templates/controller.java.vm +++ b/library/skyeye-dev/skyeye-generator/target/classes/templates/controller.java.vm @@ -24,8 +24,8 @@ import $!{package.Entity}.$!{entity}; import $!{package.Service}.$!{table.serviceName}; import result.pojo.com.zhangy.skyeye.common.Result; import param.pojo.com.zhangy.skyeye.common.IdParam; -import com.tiamo.dt.dev.db.utils.MPUtil; -import com.tiamo.dt.dev.db.pojo.page.PageParam; +import com.zhangy.skyeye.db.utils.MPUtil; +import com.zhangy.skyeye.db.pojo.page.PageParam; import java.util.List; diff --git a/library/skyeye-dev/skyeye-generator/target/classes/templates/service.java.vm b/library/skyeye-dev/skyeye-generator/target/classes/templates/service.java.vm index 818903a..91778f8 100644 --- a/library/skyeye-dev/skyeye-generator/target/classes/templates/service.java.vm +++ b/library/skyeye-dev/skyeye-generator/target/classes/templates/service.java.vm @@ -1,7 +1,7 @@ package ${package.Service}; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.tiamo.dt.dev.db.pojo.page.PageParam; +import com.zhangy.skyeye.db.pojo.page.PageParam; import ${package.Entity}.${entity}; import ${superServiceClassPackage}; diff --git a/library/skyeye-dev/skyeye-generator/target/classes/templates/serviceImpl.java.vm b/library/skyeye-dev/skyeye-generator/target/classes/templates/serviceImpl.java.vm index ddb67cb..df915e0 100644 --- a/library/skyeye-dev/skyeye-generator/target/classes/templates/serviceImpl.java.vm +++ b/library/skyeye-dev/skyeye-generator/target/classes/templates/serviceImpl.java.vm @@ -1,8 +1,8 @@ package ${package.ServiceImpl}; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.tiamo.dt.dev.db.pojo.page.PageParam; -import com.tiamo.dt.dev.db.utils.MPUtil; +import com.zhangy.skyeye.db.pojo.page.PageParam; +import com.zhangy.skyeye.db.utils.MPUtil; import ${package.Entity}.${entity}; import ${package.Mapper}.${table.mapperName}; import ${package.Service}.${table.serviceName}; diff --git a/library/skyeye-dev/skyeye-generator/target/maven-archiver/pom.properties b/library/skyeye-dev/skyeye-generator/target/maven-archiver/pom.properties deleted file mode 100644 index 68fd68e..0000000 --- a/library/skyeye-dev/skyeye-generator/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=skyeye-generator -groupId=com.zhangy -version=1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/library/skyeye-dev/skyeye-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 24e52dc..a3bb7b0 100644 --- a/library/skyeye-dev/skyeye-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/library/skyeye-dev/skyeye-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1 +1 @@ -D:\logisen\ddd\skyeye-dev\skyeye-generator\src\main\java\com\zhangy\skyeye\generator\GeneratorApi.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-generator\src\main\java\com\zhangy\skyeye\generator\GeneratorApi.java diff --git a/library/skyeye-dev/skyeye-generator/target/skyeye-generator-1.0.0.RELEASE.jar b/library/skyeye-dev/skyeye-generator/target/skyeye-generator-1.0.0.RELEASE.jar deleted file mode 100644 index 291eaab..0000000 Binary files a/library/skyeye-dev/skyeye-generator/target/skyeye-generator-1.0.0.RELEASE.jar and /dev/null differ diff --git a/library/skyeye-dev/skyeye-job/pom.xml b/library/skyeye-dev/skyeye-job/pom.xml index a04d7eb..80d8948 100644 --- a/library/skyeye-dev/skyeye-job/pom.xml +++ b/library/skyeye-dev/skyeye-job/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - skyeye-dev + skyeye-common-dev com.zhangy 1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-job/target/maven-archiver/pom.properties b/library/skyeye-dev/skyeye-job/target/maven-archiver/pom.properties deleted file mode 100644 index b34cda6..0000000 --- a/library/skyeye-dev/skyeye-job/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=skyeye-job -groupId=com.zhangy -version=1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-job/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/library/skyeye-dev/skyeye-job/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 7e277d5..cf40593 100644 --- a/library/skyeye-dev/skyeye-job/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/library/skyeye-dev/skyeye-job/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,5 +1,5 @@ -D:\logisen\ddd\skyeye-dev\skyeye-job\src\main\java\com\zhangy\skyeye\job\properties\XxlExecutorProperties.java -D:\logisen\ddd\skyeye-dev\skyeye-job\src\main\java\com\zhangy\skyeye\job\properties\XxlAdminProperties.java -D:\logisen\ddd\skyeye-dev\skyeye-job\src\main\java\com\zhangy\skyeye\job\XxlJobAutoConfiguration.java -D:\logisen\ddd\skyeye-dev\skyeye-job\src\main\java\com\zhangy\skyeye\job\properties\XxlJobProperties.java -D:\logisen\ddd\skyeye-dev\skyeye-job\src\main\java\com\zhangy\skyeye\job\annotation\EnableDtXxlJob.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-job\src\main\java\com\zhangy\skyeye\job\annotation\EnableDtXxlJob.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-job\src\main\java\com\zhangy\skyeye\job\properties\XxlJobProperties.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-job\src\main\java\com\zhangy\skyeye\job\properties\XxlAdminProperties.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-job\src\main\java\com\zhangy\skyeye\job\properties\XxlExecutorProperties.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-job\src\main\java\com\zhangy\skyeye\job\XxlJobAutoConfiguration.java diff --git a/library/skyeye-dev/skyeye-job/target/skyeye-job-1.0.0.RELEASE.jar b/library/skyeye-dev/skyeye-job/target/skyeye-job-1.0.0.RELEASE.jar deleted file mode 100644 index ba2707a..0000000 Binary files a/library/skyeye-dev/skyeye-job/target/skyeye-job-1.0.0.RELEASE.jar and /dev/null differ diff --git a/library/skyeye-dev/skyeye-knife4j/pom.xml b/library/skyeye-dev/skyeye-knife4j/pom.xml index 5d9a0ce..9dfc08e 100644 --- a/library/skyeye-dev/skyeye-knife4j/pom.xml +++ b/library/skyeye-dev/skyeye-knife4j/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - skyeye-dev + skyeye-common-dev com.zhangy 1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-knife4j/src/main/java/com/zhangy/skyeye/knife4j/config/DTKnife4jConfig.java b/library/skyeye-dev/skyeye-knife4j/src/main/java/com/zhangy/skyeye/knife4j/config/DTKnife4jConfig.java index 487f45d..a938e43 100644 --- a/library/skyeye-dev/skyeye-knife4j/src/main/java/com/zhangy/skyeye/knife4j/config/DTKnife4jConfig.java +++ b/library/skyeye-dev/skyeye-knife4j/src/main/java/com/zhangy/skyeye/knife4j/config/DTKnife4jConfig.java @@ -39,9 +39,9 @@ public class DTKnife4jConfig { return new ApiInfoBuilder() .title(knife4jProperties.getTitle()) .description(knife4jProperties.getDescription()) - .termsOfServiceUrl("www.tiamotech.com") + .termsOfServiceUrl("www.zhangytech.com") .version(knife4jProperties.getVersion()) - .contact(new Contact("tiamo", "www.tiamotech.com", "tiamo@tiamotech.com")) + .contact(new Contact("zhangy", "www.zhangytech.com", "zhangy@zhangytech.com")) .build(); } diff --git a/library/skyeye-dev/skyeye-knife4j/src/main/java/com/zhangy/skyeye/knife4j/config/DTKnife4jPropertiesAutoConfig.java b/library/skyeye-dev/skyeye-knife4j/src/main/java/com/zhangy/skyeye/knife4j/config/DTKnife4jPropertiesAutoConfig.java index 6b275c0..9489f35 100644 --- a/library/skyeye-dev/skyeye-knife4j/src/main/java/com/zhangy/skyeye/knife4j/config/DTKnife4jPropertiesAutoConfig.java +++ b/library/skyeye-dev/skyeye-knife4j/src/main/java/com/zhangy/skyeye/knife4j/config/DTKnife4jPropertiesAutoConfig.java @@ -18,7 +18,7 @@ public class DTKnife4jPropertiesAutoConfig { * Knife4j */ @Bean - @ConfigurationProperties(prefix = "tiamo.knife4j") + @ConfigurationProperties(prefix = "zhangy.knife4j") @ConditionalOnMissingBean(Knife4jProperties.class) public Knife4jProperties druidProperties() { return new Knife4jProperties(); diff --git a/library/skyeye-dev/skyeye-knife4j/src/main/resources/META-INF/spring.factories b/library/skyeye-dev/skyeye-knife4j/src/main/resources/META-INF/spring.factories index f0452cf..c94b6e0 100644 --- a/library/skyeye-dev/skyeye-knife4j/src/main/resources/META-INF/spring.factories +++ b/library/skyeye-dev/skyeye-knife4j/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.tiamo.dt.dev.knife4j.config.DTKnife4jPropertiesAutoConfig,\ - com.tiamo.dt.dev.knife4j.config.DTKnife4jConfig + com.zhangy.skyeye.knife4j.config.DTKnife4jPropertiesAutoConfig,\ + com.zhangy.skyeye.knife4j.config.DTKnife4jConfig diff --git a/library/skyeye-dev/skyeye-knife4j/target/classes/META-INF/spring.factories b/library/skyeye-dev/skyeye-knife4j/target/classes/META-INF/spring.factories index f0452cf..c94b6e0 100644 --- a/library/skyeye-dev/skyeye-knife4j/target/classes/META-INF/spring.factories +++ b/library/skyeye-dev/skyeye-knife4j/target/classes/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.tiamo.dt.dev.knife4j.config.DTKnife4jPropertiesAutoConfig,\ - com.tiamo.dt.dev.knife4j.config.DTKnife4jConfig + com.zhangy.skyeye.knife4j.config.DTKnife4jPropertiesAutoConfig,\ + com.zhangy.skyeye.knife4j.config.DTKnife4jConfig diff --git a/library/skyeye-dev/skyeye-knife4j/target/classes/com/zhangy/skyeye/knife4j/config/DTKnife4jConfig.class b/library/skyeye-dev/skyeye-knife4j/target/classes/com/zhangy/skyeye/knife4j/config/DTKnife4jConfig.class index 9076076..fbf1b31 100644 Binary files a/library/skyeye-dev/skyeye-knife4j/target/classes/com/zhangy/skyeye/knife4j/config/DTKnife4jConfig.class and b/library/skyeye-dev/skyeye-knife4j/target/classes/com/zhangy/skyeye/knife4j/config/DTKnife4jConfig.class differ diff --git a/library/skyeye-dev/skyeye-knife4j/target/classes/com/zhangy/skyeye/knife4j/config/DTKnife4jPropertiesAutoConfig.class b/library/skyeye-dev/skyeye-knife4j/target/classes/com/zhangy/skyeye/knife4j/config/DTKnife4jPropertiesAutoConfig.class index 779de2e..9473163 100644 Binary files a/library/skyeye-dev/skyeye-knife4j/target/classes/com/zhangy/skyeye/knife4j/config/DTKnife4jPropertiesAutoConfig.class and b/library/skyeye-dev/skyeye-knife4j/target/classes/com/zhangy/skyeye/knife4j/config/DTKnife4jPropertiesAutoConfig.class differ diff --git a/library/skyeye-dev/skyeye-knife4j/target/maven-archiver/pom.properties b/library/skyeye-dev/skyeye-knife4j/target/maven-archiver/pom.properties deleted file mode 100644 index 652427c..0000000 --- a/library/skyeye-dev/skyeye-knife4j/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=skyeye-knife4j -groupId=com.zhangy -version=1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-knife4j/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/library/skyeye-dev/skyeye-knife4j/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 16eb8d3..1aaeba5 100644 --- a/library/skyeye-dev/skyeye-knife4j/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/library/skyeye-dev/skyeye-knife4j/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,3 @@ -D:\logisen\ddd\skyeye-dev\skyeye-knife4j\src\main\java\com\zhangy\skyeye\knife4j\config\DTKnife4jPropertiesAutoConfig.java -D:\logisen\ddd\skyeye-dev\skyeye-knife4j\src\main\java\com\zhangy\skyeye\knife4j\config\DTKnife4jConfig.java -D:\logisen\ddd\skyeye-dev\skyeye-knife4j\src\main\java\com\zhangy\skyeye\knife4j\props\Knife4jProperties.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-knife4j\src\main\java\com\zhangy\skyeye\knife4j\config\DTKnife4jConfig.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-knife4j\src\main\java\com\zhangy\skyeye\knife4j\props\Knife4jProperties.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-knife4j\src\main\java\com\zhangy\skyeye\knife4j\config\DTKnife4jPropertiesAutoConfig.java diff --git a/library/skyeye-dev/skyeye-knife4j/target/skyeye-knife4j-1.0.0.RELEASE.jar b/library/skyeye-dev/skyeye-knife4j/target/skyeye-knife4j-1.0.0.RELEASE.jar deleted file mode 100644 index bf74c54..0000000 Binary files a/library/skyeye-dev/skyeye-knife4j/target/skyeye-knife4j-1.0.0.RELEASE.jar and /dev/null differ diff --git a/library/skyeye-dev/skyeye-quartz/pom.xml b/library/skyeye-dev/skyeye-quartz/pom.xml index 311f7e2..39ceaca 100644 --- a/library/skyeye-dev/skyeye-quartz/pom.xml +++ b/library/skyeye-dev/skyeye-quartz/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - skyeye-dev + skyeye-common-dev com.zhangy 1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-quartz/src/main/resources/META-INF/spring.factories b/library/skyeye-dev/skyeye-quartz/src/main/resources/META-INF/spring.factories index c1b8b3f..78ebb76 100644 --- a/library/skyeye-dev/skyeye-quartz/src/main/resources/META-INF/spring.factories +++ b/library/skyeye-dev/skyeye-quartz/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.tiamo.dt.dev.quartz.config.QuartzConfig + com.zhangy.skyeye.quartz.config.QuartzConfig diff --git a/library/skyeye-dev/skyeye-quartz/target/classes/META-INF/spring.factories b/library/skyeye-dev/skyeye-quartz/target/classes/META-INF/spring.factories index c1b8b3f..78ebb76 100644 --- a/library/skyeye-dev/skyeye-quartz/target/classes/META-INF/spring.factories +++ b/library/skyeye-dev/skyeye-quartz/target/classes/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.tiamo.dt.dev.quartz.config.QuartzConfig + com.zhangy.skyeye.quartz.config.QuartzConfig diff --git a/library/skyeye-dev/skyeye-quartz/target/maven-archiver/pom.properties b/library/skyeye-dev/skyeye-quartz/target/maven-archiver/pom.properties deleted file mode 100644 index c7bd980..0000000 --- a/library/skyeye-dev/skyeye-quartz/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=skyeye-quartz -groupId=com.zhangy -version=1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/library/skyeye-dev/skyeye-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 93c2952..aed0a00 100644 --- a/library/skyeye-dev/skyeye-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/library/skyeye-dev/skyeye-quartz/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,3 @@ -D:\logisen\ddd\skyeye-dev\skyeye-quartz\src\main\java\com\zhangy\skyeye\quartz\config\QuartzConfig.java -D:\logisen\ddd\skyeye-dev\skyeye-quartz\src\main\java\com\zhangy\skyeye\quartz\util\ScheduleUtils.java -D:\logisen\ddd\skyeye-dev\skyeye-quartz\src\main\java\com\zhangy\skyeye\quartz\util\CronUtils.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-quartz\src\main\java\com\zhangy\skyeye\quartz\util\CronUtils.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-quartz\src\main\java\com\zhangy\skyeye\quartz\config\QuartzConfig.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-quartz\src\main\java\com\zhangy\skyeye\quartz\util\ScheduleUtils.java diff --git a/library/skyeye-dev/skyeye-quartz/target/skyeye-quartz-1.0.0.RELEASE.jar b/library/skyeye-dev/skyeye-quartz/target/skyeye-quartz-1.0.0.RELEASE.jar deleted file mode 100644 index 161ce73..0000000 Binary files a/library/skyeye-dev/skyeye-quartz/target/skyeye-quartz-1.0.0.RELEASE.jar and /dev/null differ diff --git a/library/skyeye-dev/skyeye-redis/pom.xml b/library/skyeye-dev/skyeye-redis/pom.xml index a9afeb2..e453f6f 100644 --- a/library/skyeye-dev/skyeye-redis/pom.xml +++ b/library/skyeye-dev/skyeye-redis/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - skyeye-dev + skyeye-common-dev com.zhangy 1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-redis/src/main/resources/META-INF/spring.factories b/library/skyeye-dev/skyeye-redis/src/main/resources/META-INF/spring.factories index 3ba0428..d81f7fe 100644 --- a/library/skyeye-dev/skyeye-redis/src/main/resources/META-INF/spring.factories +++ b/library/skyeye-dev/skyeye-redis/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.tiamo.dt.dev.redis.config.DTRedisTemplateConfiguration + com.zhangy.skyeye.redis.config.DTRedisTemplateConfiguration diff --git a/library/skyeye-dev/skyeye-redis/target/classes/META-INF/spring.factories b/library/skyeye-dev/skyeye-redis/target/classes/META-INF/spring.factories index 3ba0428..d81f7fe 100644 --- a/library/skyeye-dev/skyeye-redis/target/classes/META-INF/spring.factories +++ b/library/skyeye-dev/skyeye-redis/target/classes/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.tiamo.dt.dev.redis.config.DTRedisTemplateConfiguration + com.zhangy.skyeye.redis.config.DTRedisTemplateConfiguration diff --git a/library/skyeye-dev/skyeye-redis/target/maven-archiver/pom.properties b/library/skyeye-dev/skyeye-redis/target/maven-archiver/pom.properties deleted file mode 100644 index 8647f30..0000000 --- a/library/skyeye-dev/skyeye-redis/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=skyeye-redis -groupId=com.zhangy -version=1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-redis/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/library/skyeye-dev/skyeye-redis/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 8d3f76a..52e70aa 100644 --- a/library/skyeye-dev/skyeye-redis/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/library/skyeye-dev/skyeye-redis/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,3 @@ -D:\logisen\ddd\skyeye-dev\skyeye-redis\src\main\java\com\zhangy\skyeye\redis\config\RedisKeySerializer.java -D:\logisen\ddd\skyeye-dev\skyeye-redis\src\main\java\com\zhangy\skyeye\redis\utils\RedisUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-redis\src\main\java\com\zhangy\skyeye\redis\config\DTRedisTemplateConfiguration.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-redis\src\main\java\com\zhangy\skyeye\redis\utils\RedisUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-redis\src\main\java\com\zhangy\skyeye\redis\config\RedisKeySerializer.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-redis\src\main\java\com\zhangy\skyeye\redis\config\DTRedisTemplateConfiguration.java diff --git a/library/skyeye-dev/skyeye-redis/target/skyeye-redis-1.0.0.RELEASE.jar b/library/skyeye-dev/skyeye-redis/target/skyeye-redis-1.0.0.RELEASE.jar deleted file mode 100644 index eb0b90e..0000000 Binary files a/library/skyeye-dev/skyeye-redis/target/skyeye-redis-1.0.0.RELEASE.jar and /dev/null differ diff --git a/library/skyeye-dev/skyeye-util/pom.xml b/library/skyeye-dev/skyeye-util/pom.xml index a4e48ff..7fdd532 100644 --- a/library/skyeye-dev/skyeye-util/pom.xml +++ b/library/skyeye-dev/skyeye-util/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - skyeye-dev + skyeye-common-dev com.zhangy 1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-util/target/maven-archiver/pom.properties b/library/skyeye-dev/skyeye-util/target/maven-archiver/pom.properties deleted file mode 100644 index 18f82f6..0000000 --- a/library/skyeye-dev/skyeye-util/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=skyeye-util -groupId=com.zhangy -version=1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-util/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/library/skyeye-dev/skyeye-util/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index e3c31fe..305b5ca 100644 --- a/library/skyeye-dev/skyeye-util/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/library/skyeye-dev/skyeye-util/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,9 +1,9 @@ -D:\logisen\ddd\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\NoticeUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\PinYinUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\BigDecimalUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\other\TemporalUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\GeoUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\LdtUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\IMGUtil.java -D:\logisen\ddd\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\Base64Util.java -D:\logisen\ddd\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\other\TemporalAccessorUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\NoticeUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\other\TemporalUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\IMGUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\GeoUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\Base64Util.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\BigDecimalUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\PinYinUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\utils\LdtUtil.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-util\src\main\java\com\zhangy\skyeye\util\other\TemporalAccessorUtil.java diff --git a/library/skyeye-dev/skyeye-util/target/skyeye-util-1.0.0.RELEASE.jar b/library/skyeye-dev/skyeye-util/target/skyeye-util-1.0.0.RELEASE.jar deleted file mode 100644 index 600ce37..0000000 Binary files a/library/skyeye-dev/skyeye-util/target/skyeye-util-1.0.0.RELEASE.jar and /dev/null differ diff --git a/library/skyeye-dev/skyeye-websocket/pom.xml b/library/skyeye-dev/skyeye-websocket/pom.xml index 64e31de..4f752f1 100644 --- a/library/skyeye-dev/skyeye-websocket/pom.xml +++ b/library/skyeye-dev/skyeye-websocket/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - skyeye-dev + skyeye-common-dev com.zhangy 1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-websocket/src/main/java/com/zhangy/skyeye/service/DtWebsocketConfig.java b/library/skyeye-dev/skyeye-websocket/src/main/java/com/zhangy/skyeye/service/DtWebsocketConfig.java index 7053c4f..c682d17 100644 --- a/library/skyeye-dev/skyeye-websocket/src/main/java/com/zhangy/skyeye/service/DtWebsocketConfig.java +++ b/library/skyeye-dev/skyeye-websocket/src/main/java/com/zhangy/skyeye/service/DtWebsocketConfig.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.config.annotation.EnableWebSocket; import org.springframework.web.socket.server.standard.ServerEndpointExporter; -@ConditionalOnProperty(name = "tiamo.dev.websocket.tomcat", havingValue = "false", matchIfMissing = true) +@ConditionalOnProperty(name = "zhangy.dev.websocket.tomcat", havingValue = "false", matchIfMissing = true) @Configuration @EnableWebSocket public class DtWebsocketConfig { diff --git a/library/skyeye-dev/skyeye-websocket/target/classes/com/zhangy/skyeye/service/DtWebsocketConfig.class b/library/skyeye-dev/skyeye-websocket/target/classes/com/zhangy/skyeye/service/DtWebsocketConfig.class index 1a33362..72f4b4a 100644 Binary files a/library/skyeye-dev/skyeye-websocket/target/classes/com/zhangy/skyeye/service/DtWebsocketConfig.class and b/library/skyeye-dev/skyeye-websocket/target/classes/com/zhangy/skyeye/service/DtWebsocketConfig.class differ diff --git a/library/skyeye-dev/skyeye-websocket/target/maven-archiver/pom.properties b/library/skyeye-dev/skyeye-websocket/target/maven-archiver/pom.properties deleted file mode 100644 index b2b4128..0000000 --- a/library/skyeye-dev/skyeye-websocket/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=skyeye-websocket -groupId=com.zhangy -version=1.0.0.RELEASE diff --git a/library/skyeye-dev/skyeye-websocket/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/library/skyeye-dev/skyeye-websocket/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index d7f8515..7db4d6b 100644 --- a/library/skyeye-dev/skyeye-websocket/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/library/skyeye-dev/skyeye-websocket/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,2 +1,2 @@ -D:\logisen\ddd\skyeye-dev\skyeye-websocket\src\main\java\com\zhangy\skyeye\websocket\config\DTStompWebSocketConfig.java -D:\logisen\ddd\skyeye-dev\skyeye-websocket\src\main\java\com\zhangy\skyeye\service\DtWebsocketConfig.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-websocket\src\main\java\com\zhangy\skyeye\service\DtWebsocketConfig.java +D:\workspace\skyeyesystem\library\skyeye-dev\skyeye-websocket\src\main\java\com\zhangy\skyeye\websocket\config\DTStompWebSocketConfig.java diff --git a/library/skyeye-dev/skyeye-websocket/target/skyeye-websocket-1.0.0.RELEASE.jar b/library/skyeye-dev/skyeye-websocket/target/skyeye-websocket-1.0.0.RELEASE.jar deleted file mode 100644 index f2626c1..0000000 Binary files a/library/skyeye-dev/skyeye-websocket/target/skyeye-websocket-1.0.0.RELEASE.jar and /dev/null differ