diff --git a/pom.xml b/pom.xml index 9bdcc88..52e6222 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ true - com.imyeyu.server.TimiServerAPI + com.imyeyu.api.TimiServerAPI ${project.artifactId} diff --git a/src/main/java/com/imyeyu/server/TimiServerAPI.java b/src/main/java/com/imyeyu/api/TimiServerAPI.java similarity index 95% rename from src/main/java/com/imyeyu/server/TimiServerAPI.java rename to src/main/java/com/imyeyu/api/TimiServerAPI.java index 3dbf101..25a059a 100644 --- a/src/main/java/com/imyeyu/server/TimiServerAPI.java +++ b/src/main/java/com/imyeyu/api/TimiServerAPI.java @@ -1,4 +1,4 @@ -package com.imyeyu.server; +package com.imyeyu.api; import com.imyeyu.io.IO; import com.imyeyu.java.TimiJava; @@ -27,7 +27,7 @@ import java.io.File; * @since 2021-02-23 21:35 */ @Slf4j -@SpringBootApplication(scanBasePackages = {"com.imyeyu.server", "com.imyeyu.spring"}) +@SpringBootApplication(scanBasePackages = {"com.imyeyu.api", "com.imyeyu.spring"}) @EnableTransactionManagement public class TimiServerAPI implements OS.FileSystem, ApplicationContextAware { diff --git a/src/main/java/com/imyeyu/server/annotation/CaptchaValid.java b/src/main/java/com/imyeyu/api/annotation/CaptchaValid.java similarity index 83% rename from src/main/java/com/imyeyu/server/annotation/CaptchaValid.java rename to src/main/java/com/imyeyu/api/annotation/CaptchaValid.java index 033b477..2461324 100644 --- a/src/main/java/com/imyeyu/server/annotation/CaptchaValid.java +++ b/src/main/java/com/imyeyu/api/annotation/CaptchaValid.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.annotation; +package com.imyeyu.api.annotation; -import com.imyeyu.server.bean.CaptchaFrom; +import com.imyeyu.api.bean.CaptchaFrom; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/imyeyu/server/annotation/CaptchaValidInterceptor.java b/src/main/java/com/imyeyu/api/annotation/CaptchaValidInterceptor.java similarity index 89% rename from src/main/java/com/imyeyu/server/annotation/CaptchaValidInterceptor.java rename to src/main/java/com/imyeyu/api/annotation/CaptchaValidInterceptor.java index 07ccf0b..9a52e11 100644 --- a/src/main/java/com/imyeyu/server/annotation/CaptchaValidInterceptor.java +++ b/src/main/java/com/imyeyu/api/annotation/CaptchaValidInterceptor.java @@ -1,8 +1,8 @@ -package com.imyeyu.server.annotation; +package com.imyeyu.api.annotation; import lombok.extern.slf4j.Slf4j; -import com.imyeyu.server.bean.CaptchaFrom; -import com.imyeyu.server.util.CaptchaManager; +import com.imyeyu.api.bean.CaptchaFrom; +import com.imyeyu.api.util.CaptchaManager; import com.imyeyu.spring.bean.CaptchaData; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; @@ -33,7 +33,7 @@ public class CaptchaValidInterceptor { private CaptchaManager captchaManager; /** 注入注解 */ - @Pointcut("@annotation(com.imyeyu.server.annotation.CaptchaValid)") + @Pointcut("@annotation(com.imyeyu.api.annotation.CaptchaValid)") public void captchaPointCut() { } diff --git a/src/main/java/com/imyeyu/server/annotation/EnableSetting.java b/src/main/java/com/imyeyu/api/annotation/EnableSetting.java similarity index 83% rename from src/main/java/com/imyeyu/server/annotation/EnableSetting.java rename to src/main/java/com/imyeyu/api/annotation/EnableSetting.java index f78ae6f..9beebdb 100644 --- a/src/main/java/com/imyeyu/server/annotation/EnableSetting.java +++ b/src/main/java/com/imyeyu/api/annotation/EnableSetting.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.annotation; +package com.imyeyu.api.annotation; -import com.imyeyu.server.modules.common.bean.SettingKey; +import com.imyeyu.api.modules.common.bean.SettingKey; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/imyeyu/server/annotation/EnableSettingInterceptor.java b/src/main/java/com/imyeyu/api/annotation/EnableSettingInterceptor.java similarity index 92% rename from src/main/java/com/imyeyu/server/annotation/EnableSettingInterceptor.java rename to src/main/java/com/imyeyu/api/annotation/EnableSettingInterceptor.java index 1ee0698..2cd390c 100644 --- a/src/main/java/com/imyeyu/server/annotation/EnableSettingInterceptor.java +++ b/src/main/java/com/imyeyu/api/annotation/EnableSettingInterceptor.java @@ -1,11 +1,11 @@ -package com.imyeyu.server.annotation; +package com.imyeyu.api.annotation; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import com.imyeyu.java.bean.timi.TimiCode; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.modules.common.service.SettingService; +import com.imyeyu.api.modules.common.service.SettingService; import org.springframework.context.annotation.Lazy; import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/imyeyu/server/annotation/RequestRateLimitInterceptor.java b/src/main/java/com/imyeyu/api/annotation/RequestRateLimitInterceptor.java similarity index 97% rename from src/main/java/com/imyeyu/server/annotation/RequestRateLimitInterceptor.java rename to src/main/java/com/imyeyu/api/annotation/RequestRateLimitInterceptor.java index 5eab945..09f79fe 100644 --- a/src/main/java/com/imyeyu/server/annotation/RequestRateLimitInterceptor.java +++ b/src/main/java/com/imyeyu/api/annotation/RequestRateLimitInterceptor.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.annotation; +package com.imyeyu.api.annotation; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/imyeyu/server/annotation/RequiredTokenInterceptor.java b/src/main/java/com/imyeyu/api/annotation/RequiredTokenInterceptor.java similarity index 91% rename from src/main/java/com/imyeyu/server/annotation/RequiredTokenInterceptor.java rename to src/main/java/com/imyeyu/api/annotation/RequiredTokenInterceptor.java index 7aec62e..17fd3d4 100644 --- a/src/main/java/com/imyeyu/server/annotation/RequiredTokenInterceptor.java +++ b/src/main/java/com/imyeyu/api/annotation/RequiredTokenInterceptor.java @@ -1,11 +1,11 @@ -package com.imyeyu.server.annotation; +package com.imyeyu.api.annotation; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import com.imyeyu.java.bean.timi.TimiCode; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.modules.blog.util.UserToken; +import com.imyeyu.api.modules.blog.util.UserToken; import com.imyeyu.spring.TimiSpring; import com.imyeyu.spring.annotation.RequiredToken; import com.imyeyu.spring.annotation.RequiredTokenAbstractInterceptor; diff --git a/src/main/java/com/imyeyu/server/bean/CaptchaFrom.java b/src/main/java/com/imyeyu/api/bean/CaptchaFrom.java similarity index 92% rename from src/main/java/com/imyeyu/server/bean/CaptchaFrom.java rename to src/main/java/com/imyeyu/api/bean/CaptchaFrom.java index 9804aef..907a3e1 100644 --- a/src/main/java/com/imyeyu/server/bean/CaptchaFrom.java +++ b/src/main/java/com/imyeyu/api/bean/CaptchaFrom.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.bean; +package com.imyeyu.api.bean; /** * 验证码来源 diff --git a/src/main/java/com/imyeyu/server/bean/IOCBeans.java b/src/main/java/com/imyeyu/api/bean/IOCBeans.java similarity index 89% rename from src/main/java/com/imyeyu/server/bean/IOCBeans.java rename to src/main/java/com/imyeyu/api/bean/IOCBeans.java index 6c04a71..6447e08 100644 --- a/src/main/java/com/imyeyu/server/bean/IOCBeans.java +++ b/src/main/java/com/imyeyu/api/bean/IOCBeans.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.bean; +package com.imyeyu.api.bean; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/imyeyu/server/bean/MultilingualHandler.java b/src/main/java/com/imyeyu/api/bean/MultilingualHandler.java similarity index 93% rename from src/main/java/com/imyeyu/server/bean/MultilingualHandler.java rename to src/main/java/com/imyeyu/api/bean/MultilingualHandler.java index 693f19d..e5a067e 100644 --- a/src/main/java/com/imyeyu/server/bean/MultilingualHandler.java +++ b/src/main/java/com/imyeyu/api/bean/MultilingualHandler.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.bean; +package com.imyeyu.api.bean; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/imyeyu/server/bean/ResourceFile.java b/src/main/java/com/imyeyu/api/bean/ResourceFile.java similarity index 93% rename from src/main/java/com/imyeyu/server/bean/ResourceFile.java rename to src/main/java/com/imyeyu/api/bean/ResourceFile.java index 4cd59f0..7ede4dc 100644 --- a/src/main/java/com/imyeyu/server/bean/ResourceFile.java +++ b/src/main/java/com/imyeyu/api/bean/ResourceFile.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.bean; +package com.imyeyu.api.bean; import lombok.Data; import com.imyeyu.utils.OS; diff --git a/src/main/java/com/imyeyu/server/config/AsyncConfig.java b/src/main/java/com/imyeyu/api/config/AsyncConfig.java similarity index 96% rename from src/main/java/com/imyeyu/server/config/AsyncConfig.java rename to src/main/java/com/imyeyu/api/config/AsyncConfig.java index 5797fec..b38eeae 100644 --- a/src/main/java/com/imyeyu/server/config/AsyncConfig.java +++ b/src/main/java/com/imyeyu/api/config/AsyncConfig.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.config; +package com.imyeyu.api.config; import jakarta.validation.constraints.NotNull; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/imyeyu/server/config/BeanConfig.java b/src/main/java/com/imyeyu/api/config/BeanConfig.java similarity index 87% rename from src/main/java/com/imyeyu/server/config/BeanConfig.java rename to src/main/java/com/imyeyu/api/config/BeanConfig.java index 2b1d2b0..4965856 100644 --- a/src/main/java/com/imyeyu/server/config/BeanConfig.java +++ b/src/main/java/com/imyeyu/api/config/BeanConfig.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.config; +package com.imyeyu.api.config; import com.google.gson.Gson; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/imyeyu/server/config/CORSConfig.java b/src/main/java/com/imyeyu/api/config/CORSConfig.java similarity index 98% rename from src/main/java/com/imyeyu/server/config/CORSConfig.java rename to src/main/java/com/imyeyu/api/config/CORSConfig.java index 57aedae..ab8b885 100644 --- a/src/main/java/com/imyeyu/server/config/CORSConfig.java +++ b/src/main/java/com/imyeyu/api/config/CORSConfig.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.config; +package com.imyeyu.api.config; import jakarta.servlet.Filter; import lombok.Data; diff --git a/src/main/java/com/imyeyu/server/config/MongoConfig.java b/src/main/java/com/imyeyu/api/config/MongoConfig.java similarity index 94% rename from src/main/java/com/imyeyu/server/config/MongoConfig.java rename to src/main/java/com/imyeyu/api/config/MongoConfig.java index a5c02f5..5b04f47 100644 --- a/src/main/java/com/imyeyu/server/config/MongoConfig.java +++ b/src/main/java/com/imyeyu/api/config/MongoConfig.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.config; +package com.imyeyu.api.config; import com.mongodb.client.MongoClient; import com.mongodb.client.gridfs.GridFSBucket; diff --git a/src/main/java/com/imyeyu/server/config/RedisConfig.java b/src/main/java/com/imyeyu/api/config/RedisConfig.java similarity index 97% rename from src/main/java/com/imyeyu/server/config/RedisConfig.java rename to src/main/java/com/imyeyu/api/config/RedisConfig.java index 54c1877..50c751b 100644 --- a/src/main/java/com/imyeyu/server/config/RedisConfig.java +++ b/src/main/java/com/imyeyu/api/config/RedisConfig.java @@ -1,9 +1,9 @@ -package com.imyeyu.server.config; +package com.imyeyu.api.config; import lombok.Data; import lombok.EqualsAndHashCode; -import com.imyeyu.server.modules.blog.entity.ArticleRanking; -import com.imyeyu.server.modules.common.entity.Multilingual; +import com.imyeyu.api.modules.blog.entity.ArticleRanking; +import com.imyeyu.api.modules.common.entity.Multilingual; import com.imyeyu.spring.bean.RedisConfigParams; import com.imyeyu.spring.config.AbstractRedisConfig; import com.imyeyu.spring.util.Redis; diff --git a/src/main/java/com/imyeyu/server/config/SchedulerConfig.java b/src/main/java/com/imyeyu/api/config/SchedulerConfig.java similarity index 96% rename from src/main/java/com/imyeyu/server/config/SchedulerConfig.java rename to src/main/java/com/imyeyu/api/config/SchedulerConfig.java index e06d811..6800db6 100644 --- a/src/main/java/com/imyeyu/server/config/SchedulerConfig.java +++ b/src/main/java/com/imyeyu/api/config/SchedulerConfig.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.config; +package com.imyeyu.api.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/imyeyu/server/config/ThreadPoolConfig.java b/src/main/java/com/imyeyu/api/config/ThreadPoolConfig.java similarity index 97% rename from src/main/java/com/imyeyu/server/config/ThreadPoolConfig.java rename to src/main/java/com/imyeyu/api/config/ThreadPoolConfig.java index 9cc9eed..d4d3604 100644 --- a/src/main/java/com/imyeyu/server/config/ThreadPoolConfig.java +++ b/src/main/java/com/imyeyu/api/config/ThreadPoolConfig.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.config; +package com.imyeyu.api.config; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/imyeyu/server/config/WebConfig.java b/src/main/java/com/imyeyu/api/config/WebConfig.java similarity index 81% rename from src/main/java/com/imyeyu/server/config/WebConfig.java rename to src/main/java/com/imyeyu/api/config/WebConfig.java index c4ec2cd..c77efee 100644 --- a/src/main/java/com/imyeyu/server/config/WebConfig.java +++ b/src/main/java/com/imyeyu/api/config/WebConfig.java @@ -1,17 +1,17 @@ -package com.imyeyu.server.config; +package com.imyeyu.api.config; import com.google.gson.GsonBuilder; -import com.imyeyu.server.annotation.EnableSettingInterceptor; -import com.imyeyu.server.annotation.RequestRateLimitInterceptor; -import com.imyeyu.server.annotation.RequiredTokenInterceptor; -import com.imyeyu.server.modules.common.entity.Attachment; -import com.imyeyu.server.modules.common.vo.user.UserProfileView; -import com.imyeyu.server.modules.common.vo.user.UserView; -import com.imyeyu.server.modules.minecraft.annotation.RequiredFMCServerTokenInterceptor; -import com.imyeyu.server.modules.minecraft.entity.MinecraftPlayer; -import com.imyeyu.server.modules.mirror.vo.MirrorView; -import com.imyeyu.server.modules.system.util.SystemAPIInterceptor; -import com.imyeyu.server.util.GsonSerializerAdapter; +import com.imyeyu.api.annotation.EnableSettingInterceptor; +import com.imyeyu.api.annotation.RequestRateLimitInterceptor; +import com.imyeyu.api.annotation.RequiredTokenInterceptor; +import com.imyeyu.api.modules.common.entity.Attachment; +import com.imyeyu.api.modules.common.vo.user.UserProfileView; +import com.imyeyu.api.modules.common.vo.user.UserView; +import com.imyeyu.api.modules.minecraft.annotation.RequiredFMCServerTokenInterceptor; +import com.imyeyu.api.modules.minecraft.entity.MinecraftPlayer; +import com.imyeyu.api.modules.mirror.vo.MirrorView; +import com.imyeyu.api.modules.system.util.SystemAPIInterceptor; +import com.imyeyu.api.util.GsonSerializerAdapter; import com.imyeyu.spring.annotation.RequestSingleParamResolver; import jakarta.validation.constraints.NotNull; import lombok.NonNull; diff --git a/src/main/java/com/imyeyu/server/config/dbsource/ForeverMCDBConfig.java b/src/main/java/com/imyeyu/api/config/dbsource/ForeverMCDBConfig.java similarity index 91% rename from src/main/java/com/imyeyu/server/config/dbsource/ForeverMCDBConfig.java rename to src/main/java/com/imyeyu/api/config/dbsource/ForeverMCDBConfig.java index 2304f10..99d3135 100644 --- a/src/main/java/com/imyeyu/server/config/dbsource/ForeverMCDBConfig.java +++ b/src/main/java/com/imyeyu/api/config/dbsource/ForeverMCDBConfig.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.config.dbsource; +package com.imyeyu.api.config.dbsource; import com.zaxxer.hikari.HikariDataSource; import com.imyeyu.utils.Time; @@ -24,7 +24,7 @@ import java.sql.SQLException; * @since 2022-11-29 22:39 */ @Configuration -@MapperScan(basePackages = "com.imyeyu.server.modules.forevermc.mapper", sqlSessionFactoryRef = "foreverMCSqlSessionFactory") +@MapperScan(basePackages = "com.imyeyu.api.modules.forevermc.mapper", sqlSessionFactoryRef = "foreverMCSqlSessionFactory") public class ForeverMCDBConfig { public static final String ROLLBACKER = "foreverMCTransactionManager"; @@ -58,7 +58,7 @@ public class ForeverMCDBConfig { SqlSessionFactoryBean bean = new SqlSessionFactoryBean(); bean.setDataSource(datasource); - bean.setTypeAliasesPackage("com.imyeyu.server.modules.forevermc.entity"); + bean.setTypeAliasesPackage("com.imyeyu.api.modules.forevermc.entity"); bean.setConfiguration(config); return bean.getObject(); } diff --git a/src/main/java/com/imyeyu/server/config/dbsource/GiteaDBConfig.java b/src/main/java/com/imyeyu/api/config/dbsource/GiteaDBConfig.java similarity index 95% rename from src/main/java/com/imyeyu/server/config/dbsource/GiteaDBConfig.java rename to src/main/java/com/imyeyu/api/config/dbsource/GiteaDBConfig.java index aa7e747..a8279a5 100644 --- a/src/main/java/com/imyeyu/server/config/dbsource/GiteaDBConfig.java +++ b/src/main/java/com/imyeyu/api/config/dbsource/GiteaDBConfig.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.config.dbsource; +package com.imyeyu.api.config.dbsource; import com.imyeyu.utils.Time; import com.zaxxer.hikari.HikariDataSource; @@ -31,7 +31,7 @@ import java.util.List; */ @Configuration @MapperScan(basePackages = { - "com.imyeyu.server.modules.gitea.mapper", + "com.imyeyu.api.modules.gitea.mapper", }, sqlSessionFactoryRef = "giteaSqlSessionFactory") public class GiteaDBConfig { @@ -75,10 +75,10 @@ public class GiteaDBConfig { } } String[] typeAliases = { - "com.imyeyu.server.modules.gitea.entity", + "com.imyeyu.api.modules.gitea.entity", }; String[] typeHandlers = { - "com.imyeyu.server.handler" + "com.imyeyu.api.handler" }; SqlSessionFactoryBean bean = new SqlSessionFactoryBean(); diff --git a/src/main/java/com/imyeyu/server/config/dbsource/TimiServerDBConfig.java b/src/main/java/com/imyeyu/api/config/dbsource/TimiServerDBConfig.java similarity index 83% rename from src/main/java/com/imyeyu/server/config/dbsource/TimiServerDBConfig.java rename to src/main/java/com/imyeyu/api/config/dbsource/TimiServerDBConfig.java index 4eb4059..89348c1 100644 --- a/src/main/java/com/imyeyu/server/config/dbsource/TimiServerDBConfig.java +++ b/src/main/java/com/imyeyu/api/config/dbsource/TimiServerDBConfig.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.config.dbsource; +package com.imyeyu.api.config.dbsource; import com.zaxxer.hikari.HikariDataSource; import com.imyeyu.utils.Time; @@ -31,14 +31,14 @@ import java.util.List; */ @Configuration @MapperScan(basePackages = { - "com.imyeyu.server.modules.git.mapper", - "com.imyeyu.server.modules.bill.mapper", - "com.imyeyu.server.modules.blog.mapper", - "com.imyeyu.server.modules.lyric.mapper", - "com.imyeyu.server.modules.mirror.mapper", - "com.imyeyu.server.modules.system.mapper", - "com.imyeyu.server.modules.common.mapper", - "com.imyeyu.server.modules.minecraft.mapper" + "com.imyeyu.api.modules.git.mapper", + "com.imyeyu.api.modules.bill.mapper", + "com.imyeyu.api.modules.blog.mapper", + "com.imyeyu.api.modules.lyric.mapper", + "com.imyeyu.api.modules.mirror.mapper", + "com.imyeyu.api.modules.system.mapper", + "com.imyeyu.api.modules.common.mapper", + "com.imyeyu.api.modules.minecraft.mapper" }, sqlSessionFactoryRef = "timiServerSqlSessionFactory") public class TimiServerDBConfig { @@ -86,17 +86,17 @@ public class TimiServerDBConfig { } } String[] typeAliases = { - "com.imyeyu.server.modules.git.entity", - "com.imyeyu.server.modules.bill.entity", - "com.imyeyu.server.modules.blog.entity", - "com.imyeyu.server.modules.lyric.entity", - "com.imyeyu.server.modules.mirror.entity", - "com.imyeyu.server.modules.system.entity", - "com.imyeyu.server.modules.common.entity", - "com.imyeyu.server.modules.minecraft.entity" + "com.imyeyu.api.modules.git.entity", + "com.imyeyu.api.modules.bill.entity", + "com.imyeyu.api.modules.blog.entity", + "com.imyeyu.api.modules.lyric.entity", + "com.imyeyu.api.modules.mirror.entity", + "com.imyeyu.api.modules.system.entity", + "com.imyeyu.api.modules.common.entity", + "com.imyeyu.api.modules.minecraft.entity" }; String[] typeHandlers = { - "com.imyeyu.server.handler" + "com.imyeyu.api.handler" }; SqlSessionFactoryBean bean = new SqlSessionFactoryBean(); diff --git a/src/main/java/com/imyeyu/server/handler/GsonHandler.java b/src/main/java/com/imyeyu/api/handler/GsonHandler.java similarity index 97% rename from src/main/java/com/imyeyu/server/handler/GsonHandler.java rename to src/main/java/com/imyeyu/api/handler/GsonHandler.java index 49afd15..7506e9e 100644 --- a/src/main/java/com/imyeyu/server/handler/GsonHandler.java +++ b/src/main/java/com/imyeyu/api/handler/GsonHandler.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.handler; +package com.imyeyu.api.handler; import com.google.gson.JsonElement; import com.google.gson.JsonParser; diff --git a/src/main/java/com/imyeyu/server/modules/bill/controller/BillController.java b/src/main/java/com/imyeyu/api/modules/bill/controller/BillController.java similarity index 81% rename from src/main/java/com/imyeyu/server/modules/bill/controller/BillController.java rename to src/main/java/com/imyeyu/api/modules/bill/controller/BillController.java index 1880fd4..d324d04 100644 --- a/src/main/java/com/imyeyu/server/modules/bill/controller/BillController.java +++ b/src/main/java/com/imyeyu/api/modules/bill/controller/BillController.java @@ -1,14 +1,14 @@ -package com.imyeyu.server.modules.bill.controller; +package com.imyeyu.api.modules.bill.controller; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import com.imyeyu.java.bean.timi.TimiCode; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.modules.bill.entity.Bill; -import com.imyeyu.server.modules.bill.service.BillService; -import com.imyeyu.server.modules.common.bean.SettingKey; -import com.imyeyu.server.modules.common.service.SettingService; +import com.imyeyu.api.modules.bill.entity.Bill; +import com.imyeyu.api.modules.bill.service.BillService; +import com.imyeyu.api.modules.common.bean.SettingKey; +import com.imyeyu.api.modules.common.service.SettingService; import com.imyeyu.spring.TimiSpring; import com.imyeyu.spring.annotation.AOPLog; import com.imyeyu.spring.annotation.RequestRateLimit; diff --git a/src/main/java/com/imyeyu/server/modules/bill/entity/Bill.java b/src/main/java/com/imyeyu/api/modules/bill/entity/Bill.java similarity index 97% rename from src/main/java/com/imyeyu/server/modules/bill/entity/Bill.java rename to src/main/java/com/imyeyu/api/modules/bill/entity/Bill.java index 4896c40..3769ecd 100644 --- a/src/main/java/com/imyeyu/server/modules/bill/entity/Bill.java +++ b/src/main/java/com/imyeyu/api/modules/bill/entity/Bill.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.bill.entity; +package com.imyeyu.api.modules.bill.entity; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/imyeyu/server/modules/bill/mapper/BillMapper.java b/src/main/java/com/imyeyu/api/modules/bill/mapper/BillMapper.java similarity index 65% rename from src/main/java/com/imyeyu/server/modules/bill/mapper/BillMapper.java rename to src/main/java/com/imyeyu/api/modules/bill/mapper/BillMapper.java index 75a7be3..780f9ca 100644 --- a/src/main/java/com/imyeyu/server/modules/bill/mapper/BillMapper.java +++ b/src/main/java/com/imyeyu/api/modules/bill/mapper/BillMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.bill.mapper; +package com.imyeyu.api.modules.bill.mapper; -import com.imyeyu.server.modules.bill.entity.Bill; +import com.imyeyu.api.modules.bill.entity.Bill; import com.imyeyu.spring.mapper.BaseMapper; /** diff --git a/src/main/java/com/imyeyu/server/modules/bill/service/BillService.java b/src/main/java/com/imyeyu/api/modules/bill/service/BillService.java similarity index 66% rename from src/main/java/com/imyeyu/server/modules/bill/service/BillService.java rename to src/main/java/com/imyeyu/api/modules/bill/service/BillService.java index 82a6771..887ca96 100644 --- a/src/main/java/com/imyeyu/server/modules/bill/service/BillService.java +++ b/src/main/java/com/imyeyu/api/modules/bill/service/BillService.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.bill.service; +package com.imyeyu.api.modules.bill.service; -import com.imyeyu.server.modules.bill.entity.Bill; +import com.imyeyu.api.modules.bill.entity.Bill; import com.imyeyu.spring.service.CreatableService; /** diff --git a/src/main/java/com/imyeyu/server/modules/bill/service/implement/BillServiceImplement.java b/src/main/java/com/imyeyu/api/modules/bill/service/implement/BillServiceImplement.java similarity index 69% rename from src/main/java/com/imyeyu/server/modules/bill/service/implement/BillServiceImplement.java rename to src/main/java/com/imyeyu/api/modules/bill/service/implement/BillServiceImplement.java index 26aa7e4..ce1af39 100644 --- a/src/main/java/com/imyeyu/server/modules/bill/service/implement/BillServiceImplement.java +++ b/src/main/java/com/imyeyu/api/modules/bill/service/implement/BillServiceImplement.java @@ -1,8 +1,8 @@ -package com.imyeyu.server.modules.bill.service.implement; +package com.imyeyu.api.modules.bill.service.implement; -import com.imyeyu.server.modules.bill.entity.Bill; -import com.imyeyu.server.modules.bill.mapper.BillMapper; -import com.imyeyu.server.modules.bill.service.BillService; +import com.imyeyu.api.modules.bill.entity.Bill; +import com.imyeyu.api.modules.bill.mapper.BillMapper; +import com.imyeyu.api.modules.bill.service.BillService; import com.imyeyu.spring.mapper.BaseMapper; import com.imyeyu.spring.service.AbstractEntityService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/imyeyu/server/modules/blog/controller/ArticleController.java b/src/main/java/com/imyeyu/api/modules/blog/controller/ArticleController.java similarity index 85% rename from src/main/java/com/imyeyu/server/modules/blog/controller/ArticleController.java rename to src/main/java/com/imyeyu/api/modules/blog/controller/ArticleController.java index b3c4b39..4e788f9 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/controller/ArticleController.java +++ b/src/main/java/com/imyeyu/api/modules/blog/controller/ArticleController.java @@ -1,10 +1,10 @@ -package com.imyeyu.server.modules.blog.controller; +package com.imyeyu.api.modules.blog.controller; -import com.imyeyu.server.modules.blog.entity.Article; -import com.imyeyu.server.modules.blog.entity.ArticleRanking; -import com.imyeyu.server.modules.blog.service.ArticleService; -import com.imyeyu.server.modules.blog.vo.article.ArticleView; -import com.imyeyu.server.modules.blog.vo.article.KeywordPage; +import com.imyeyu.api.modules.blog.entity.Article; +import com.imyeyu.api.modules.blog.entity.ArticleRanking; +import com.imyeyu.api.modules.blog.service.ArticleService; +import com.imyeyu.api.modules.blog.vo.article.ArticleView; +import com.imyeyu.api.modules.blog.vo.article.KeywordPage; import com.imyeyu.spring.annotation.AOPLog; import com.imyeyu.spring.annotation.RequestRateLimit; import com.imyeyu.spring.bean.Page; diff --git a/src/main/java/com/imyeyu/server/modules/blog/controller/BlogController.java b/src/main/java/com/imyeyu/api/modules/blog/controller/BlogController.java similarity index 79% rename from src/main/java/com/imyeyu/server/modules/blog/controller/BlogController.java rename to src/main/java/com/imyeyu/api/modules/blog/controller/BlogController.java index a5302ee..701d29d 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/controller/BlogController.java +++ b/src/main/java/com/imyeyu/api/modules/blog/controller/BlogController.java @@ -1,9 +1,9 @@ -package com.imyeyu.server.modules.blog.controller; +package com.imyeyu.api.modules.blog.controller; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import com.imyeyu.server.modules.blog.entity.Friend; -import com.imyeyu.server.modules.blog.service.FriendService; +import com.imyeyu.api.modules.blog.entity.Friend; +import com.imyeyu.api.modules.blog.service.FriendService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/imyeyu/server/modules/blog/entity/Article.java b/src/main/java/com/imyeyu/api/modules/blog/entity/Article.java similarity index 93% rename from src/main/java/com/imyeyu/server/modules/blog/entity/Article.java rename to src/main/java/com/imyeyu/api/modules/blog/entity/Article.java index 94c6b90..77f15df 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/entity/Article.java +++ b/src/main/java/com/imyeyu/api/modules/blog/entity/Article.java @@ -1,7 +1,7 @@ -package com.imyeyu.server.modules.blog.entity; +package com.imyeyu.api.modules.blog.entity; import com.google.gson.JsonElement; -import com.imyeyu.server.modules.common.bean.CommentSupport; +import com.imyeyu.api.modules.common.bean.CommentSupport; import com.imyeyu.spring.entity.Destroyable; import com.imyeyu.spring.entity.Entity; import lombok.Data; diff --git a/src/main/java/com/imyeyu/server/modules/blog/entity/ArticleRanking.java b/src/main/java/com/imyeyu/api/modules/blog/entity/ArticleRanking.java similarity index 93% rename from src/main/java/com/imyeyu/server/modules/blog/entity/ArticleRanking.java rename to src/main/java/com/imyeyu/api/modules/blog/entity/ArticleRanking.java index 01f2e1d..6ee6cf1 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/entity/ArticleRanking.java +++ b/src/main/java/com/imyeyu/api/modules/blog/entity/ArticleRanking.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.blog.entity; +package com.imyeyu.api.modules.blog.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/blog/entity/CommentRemindQueue.java b/src/main/java/com/imyeyu/api/modules/blog/entity/CommentRemindQueue.java similarity index 88% rename from src/main/java/com/imyeyu/server/modules/blog/entity/CommentRemindQueue.java rename to src/main/java/com/imyeyu/api/modules/blog/entity/CommentRemindQueue.java index e3a0b9d..ad2a12d 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/entity/CommentRemindQueue.java +++ b/src/main/java/com/imyeyu/api/modules/blog/entity/CommentRemindQueue.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.blog.entity; +package com.imyeyu.api.modules.blog.entity; -import com.imyeyu.server.modules.common.vo.comment.CommentReplyView; +import com.imyeyu.api.modules.common.vo.comment.CommentReplyView; import com.imyeyu.spring.annotation.table.AutoUUID; import com.imyeyu.spring.annotation.table.Id; import lombok.Data; diff --git a/src/main/java/com/imyeyu/server/modules/blog/entity/Friend.java b/src/main/java/com/imyeyu/api/modules/blog/entity/Friend.java similarity index 89% rename from src/main/java/com/imyeyu/server/modules/blog/entity/Friend.java rename to src/main/java/com/imyeyu/api/modules/blog/entity/Friend.java index 5a0d550..3655d84 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/entity/Friend.java +++ b/src/main/java/com/imyeyu/api/modules/blog/entity/Friend.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.blog.entity; +package com.imyeyu.api.modules.blog.entity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/imyeyu/server/modules/blog/mapper/ArticleMapper.java b/src/main/java/com/imyeyu/api/modules/blog/mapper/ArticleMapper.java similarity index 85% rename from src/main/java/com/imyeyu/server/modules/blog/mapper/ArticleMapper.java rename to src/main/java/com/imyeyu/api/modules/blog/mapper/ArticleMapper.java index c5840c8..da88c20 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/mapper/ArticleMapper.java +++ b/src/main/java/com/imyeyu/api/modules/blog/mapper/ArticleMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.blog.mapper; +package com.imyeyu.api.modules.blog.mapper; -import com.imyeyu.server.modules.blog.entity.Article; +import com.imyeyu.api.modules.blog.entity.Article; import com.imyeyu.spring.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/imyeyu/server/modules/blog/mapper/FriendMapper.java b/src/main/java/com/imyeyu/api/modules/blog/mapper/FriendMapper.java similarity index 76% rename from src/main/java/com/imyeyu/server/modules/blog/mapper/FriendMapper.java rename to src/main/java/com/imyeyu/api/modules/blog/mapper/FriendMapper.java index 4de7854..12dbe75 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/mapper/FriendMapper.java +++ b/src/main/java/com/imyeyu/api/modules/blog/mapper/FriendMapper.java @@ -1,7 +1,7 @@ -package com.imyeyu.server.modules.blog.mapper; +package com.imyeyu.api.modules.blog.mapper; -import com.imyeyu.server.modules.blog.entity.Friend; +import com.imyeyu.api.modules.blog.entity.Friend; import com.imyeyu.spring.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/imyeyu/server/modules/blog/service/ArticleService.java b/src/main/java/com/imyeyu/api/modules/blog/service/ArticleService.java similarity index 77% rename from src/main/java/com/imyeyu/server/modules/blog/service/ArticleService.java rename to src/main/java/com/imyeyu/api/modules/blog/service/ArticleService.java index 421d912..641fa45 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/service/ArticleService.java +++ b/src/main/java/com/imyeyu/api/modules/blog/service/ArticleService.java @@ -1,10 +1,10 @@ -package com.imyeyu.server.modules.blog.service; +package com.imyeyu.api.modules.blog.service; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.modules.blog.entity.Article; -import com.imyeyu.server.modules.blog.entity.ArticleRanking; -import com.imyeyu.server.modules.blog.vo.article.ArticleView; -import com.imyeyu.server.modules.blog.vo.article.KeywordPage; +import com.imyeyu.api.modules.blog.entity.Article; +import com.imyeyu.api.modules.blog.entity.ArticleRanking; +import com.imyeyu.api.modules.blog.vo.article.ArticleView; +import com.imyeyu.api.modules.blog.vo.article.KeywordPage; import com.imyeyu.spring.bean.PageResult; import com.imyeyu.spring.service.GettableService; import com.imyeyu.spring.service.PageableService; diff --git a/src/main/java/com/imyeyu/server/modules/blog/service/CommentRemindQueueService.java b/src/main/java/com/imyeyu/api/modules/blog/service/CommentRemindQueueService.java similarity index 87% rename from src/main/java/com/imyeyu/server/modules/blog/service/CommentRemindQueueService.java rename to src/main/java/com/imyeyu/api/modules/blog/service/CommentRemindQueueService.java index 1eb4eb0..2ce171b 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/service/CommentRemindQueueService.java +++ b/src/main/java/com/imyeyu/api/modules/blog/service/CommentRemindQueueService.java @@ -1,7 +1,7 @@ -package com.imyeyu.server.modules.blog.service; +package com.imyeyu.api.modules.blog.service; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.modules.blog.entity.CommentRemindQueue; +import com.imyeyu.api.modules.blog.entity.CommentRemindQueue; import com.imyeyu.spring.service.CreatableService; import java.util.List; diff --git a/src/main/java/com/imyeyu/server/modules/blog/service/FriendService.java b/src/main/java/com/imyeyu/api/modules/blog/service/FriendService.java similarity index 61% rename from src/main/java/com/imyeyu/server/modules/blog/service/FriendService.java rename to src/main/java/com/imyeyu/api/modules/blog/service/FriendService.java index d50b14b..99e242e 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/service/FriendService.java +++ b/src/main/java/com/imyeyu/api/modules/blog/service/FriendService.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.blog.service; +package com.imyeyu.api.modules.blog.service; -import com.imyeyu.server.modules.blog.entity.Friend; +import com.imyeyu.api.modules.blog.entity.Friend; import java.util.List; diff --git a/src/main/java/com/imyeyu/server/modules/blog/service/implement/ArticleServiceImplement.java b/src/main/java/com/imyeyu/api/modules/blog/service/implement/ArticleServiceImplement.java similarity index 79% rename from src/main/java/com/imyeyu/server/modules/blog/service/implement/ArticleServiceImplement.java rename to src/main/java/com/imyeyu/api/modules/blog/service/implement/ArticleServiceImplement.java index 5a27f83..2f7b7b5 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/service/implement/ArticleServiceImplement.java +++ b/src/main/java/com/imyeyu/api/modules/blog/service/implement/ArticleServiceImplement.java @@ -1,19 +1,19 @@ -package com.imyeyu.server.modules.blog.service.implement; +package com.imyeyu.api.modules.blog.service.implement; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.config.dbsource.TimiServerDBConfig; -import com.imyeyu.server.modules.blog.entity.Article; -import com.imyeyu.server.modules.blog.entity.ArticleRanking; -import com.imyeyu.server.modules.blog.mapper.ArticleMapper; -import com.imyeyu.server.modules.blog.service.ArticleService; -import com.imyeyu.server.modules.blog.vo.article.ArticleView; -import com.imyeyu.server.modules.blog.vo.article.KeywordPage; -import com.imyeyu.server.modules.common.entity.Attachment; -import com.imyeyu.server.modules.common.entity.Comment; -import com.imyeyu.server.modules.common.entity.Tag; -import com.imyeyu.server.modules.common.mapper.CommentMapper; -import com.imyeyu.server.modules.common.service.AttachmentService; -import com.imyeyu.server.modules.common.service.TagService; +import com.imyeyu.api.config.dbsource.TimiServerDBConfig; +import com.imyeyu.api.modules.blog.entity.Article; +import com.imyeyu.api.modules.blog.entity.ArticleRanking; +import com.imyeyu.api.modules.blog.mapper.ArticleMapper; +import com.imyeyu.api.modules.blog.service.ArticleService; +import com.imyeyu.api.modules.blog.vo.article.ArticleView; +import com.imyeyu.api.modules.blog.vo.article.KeywordPage; +import com.imyeyu.api.modules.common.entity.Attachment; +import com.imyeyu.api.modules.common.entity.Comment; +import com.imyeyu.api.modules.common.entity.Tag; +import com.imyeyu.api.modules.common.mapper.CommentMapper; +import com.imyeyu.api.modules.common.service.AttachmentService; +import com.imyeyu.api.modules.common.service.TagService; import com.imyeyu.spring.TimiSpring; import com.imyeyu.spring.bean.PageResult; import com.imyeyu.spring.mapper.BaseMapper; diff --git a/src/main/java/com/imyeyu/server/modules/blog/service/implement/CommentRemindQueueServiceImplement.java b/src/main/java/com/imyeyu/api/modules/blog/service/implement/CommentRemindQueueServiceImplement.java similarity index 76% rename from src/main/java/com/imyeyu/server/modules/blog/service/implement/CommentRemindQueueServiceImplement.java rename to src/main/java/com/imyeyu/api/modules/blog/service/implement/CommentRemindQueueServiceImplement.java index c18fa54..6460c50 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/service/implement/CommentRemindQueueServiceImplement.java +++ b/src/main/java/com/imyeyu/api/modules/blog/service/implement/CommentRemindQueueServiceImplement.java @@ -1,9 +1,9 @@ -package com.imyeyu.server.modules.blog.service.implement; +package com.imyeyu.api.modules.blog.service.implement; -import com.imyeyu.server.config.dbsource.TimiServerDBConfig; -import com.imyeyu.server.modules.blog.entity.CommentRemindQueue; -import com.imyeyu.server.modules.blog.service.CommentRemindQueueService; -import com.imyeyu.server.modules.common.mapper.CommentRemindQueueMapper; +import com.imyeyu.api.config.dbsource.TimiServerDBConfig; +import com.imyeyu.api.modules.blog.entity.CommentRemindQueue; +import com.imyeyu.api.modules.blog.service.CommentRemindQueueService; +import com.imyeyu.api.modules.common.mapper.CommentRemindQueueMapper; import com.imyeyu.spring.mapper.BaseMapper; import com.imyeyu.spring.service.AbstractEntityService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/imyeyu/server/modules/blog/service/implement/FriendServiceImplement.java b/src/main/java/com/imyeyu/api/modules/blog/service/implement/FriendServiceImplement.java similarity index 63% rename from src/main/java/com/imyeyu/server/modules/blog/service/implement/FriendServiceImplement.java rename to src/main/java/com/imyeyu/api/modules/blog/service/implement/FriendServiceImplement.java index d02c9c8..8afc0c2 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/service/implement/FriendServiceImplement.java +++ b/src/main/java/com/imyeyu/api/modules/blog/service/implement/FriendServiceImplement.java @@ -1,9 +1,9 @@ -package com.imyeyu.server.modules.blog.service.implement; +package com.imyeyu.api.modules.blog.service.implement; import lombok.RequiredArgsConstructor; -import com.imyeyu.server.modules.blog.entity.Friend; -import com.imyeyu.server.modules.blog.mapper.FriendMapper; -import com.imyeyu.server.modules.blog.service.FriendService; +import com.imyeyu.api.modules.blog.entity.Friend; +import com.imyeyu.api.modules.blog.mapper.FriendMapper; +import com.imyeyu.api.modules.blog.service.FriendService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/com/imyeyu/server/modules/blog/util/UserToken.java b/src/main/java/com/imyeyu/api/modules/blog/util/UserToken.java similarity index 91% rename from src/main/java/com/imyeyu/server/modules/blog/util/UserToken.java rename to src/main/java/com/imyeyu/api/modules/blog/util/UserToken.java index 7e67ba5..c3c08d4 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/util/UserToken.java +++ b/src/main/java/com/imyeyu/api/modules/blog/util/UserToken.java @@ -1,13 +1,12 @@ -package com.imyeyu.server.modules.blog.util; +package com.imyeyu.api.modules.blog.util; import com.imyeyu.java.TimiJava; -import com.imyeyu.java.bean.timi.TimiCode; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.config.RedisConfig; -import com.imyeyu.server.modules.common.bean.SettingKey; -import com.imyeyu.server.modules.common.entity.User; -import com.imyeyu.server.modules.common.service.SettingService; -import com.imyeyu.server.modules.common.service.UserService; +import com.imyeyu.api.config.RedisConfig; +import com.imyeyu.api.modules.common.bean.SettingKey; +import com.imyeyu.api.modules.common.entity.User; +import com.imyeyu.api.modules.common.service.SettingService; +import com.imyeyu.api.modules.common.service.UserService; import com.imyeyu.spring.TimiSpring; import com.imyeyu.spring.util.Redis; import com.imyeyu.spring.util.RedisSerializers; diff --git a/src/main/java/com/imyeyu/server/modules/blog/vo/article/ArticleView.java b/src/main/java/com/imyeyu/api/modules/blog/vo/article/ArticleView.java similarity index 59% rename from src/main/java/com/imyeyu/server/modules/blog/vo/article/ArticleView.java rename to src/main/java/com/imyeyu/api/modules/blog/vo/article/ArticleView.java index 8fb3f98..5400e74 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/vo/article/ArticleView.java +++ b/src/main/java/com/imyeyu/api/modules/blog/vo/article/ArticleView.java @@ -1,8 +1,8 @@ -package com.imyeyu.server.modules.blog.vo.article; +package com.imyeyu.api.modules.blog.vo.article; -import com.imyeyu.server.modules.blog.entity.Article; -import com.imyeyu.server.modules.common.entity.Attachment; -import com.imyeyu.server.modules.common.entity.Tag; +import com.imyeyu.api.modules.blog.entity.Article; +import com.imyeyu.api.modules.common.entity.Attachment; +import com.imyeyu.api.modules.common.entity.Tag; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/blog/vo/article/ClassPage.java b/src/main/java/com/imyeyu/api/modules/blog/vo/article/ClassPage.java similarity index 83% rename from src/main/java/com/imyeyu/server/modules/blog/vo/article/ClassPage.java rename to src/main/java/com/imyeyu/api/modules/blog/vo/article/ClassPage.java index 64c5e8b..33b5cbc 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/vo/article/ClassPage.java +++ b/src/main/java/com/imyeyu/api/modules/blog/vo/article/ClassPage.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.blog.vo.article; +package com.imyeyu.api.modules.blog.vo.article; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/blog/vo/article/KeywordPage.java b/src/main/java/com/imyeyu/api/modules/blog/vo/article/KeywordPage.java similarity index 87% rename from src/main/java/com/imyeyu/server/modules/blog/vo/article/KeywordPage.java rename to src/main/java/com/imyeyu/api/modules/blog/vo/article/KeywordPage.java index ab5c063..902e7c7 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/vo/article/KeywordPage.java +++ b/src/main/java/com/imyeyu/api/modules/blog/vo/article/KeywordPage.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.blog.vo.article; +package com.imyeyu.api.modules.blog.vo.article; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/src/main/java/com/imyeyu/server/modules/blog/vo/article/LabelPage.java b/src/main/java/com/imyeyu/api/modules/blog/vo/article/LabelPage.java similarity index 83% rename from src/main/java/com/imyeyu/server/modules/blog/vo/article/LabelPage.java rename to src/main/java/com/imyeyu/api/modules/blog/vo/article/LabelPage.java index d916ac1..712a5fa 100644 --- a/src/main/java/com/imyeyu/server/modules/blog/vo/article/LabelPage.java +++ b/src/main/java/com/imyeyu/api/modules/blog/vo/article/LabelPage.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.blog.vo.article; +package com.imyeyu.api.modules.blog.vo.article; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/common/bean/CommentSupport.java b/src/main/java/com/imyeyu/api/modules/common/bean/CommentSupport.java similarity index 83% rename from src/main/java/com/imyeyu/server/modules/common/bean/CommentSupport.java rename to src/main/java/com/imyeyu/api/modules/common/bean/CommentSupport.java index 099d23d..4bbb82b 100644 --- a/src/main/java/com/imyeyu/server/modules/common/bean/CommentSupport.java +++ b/src/main/java/com/imyeyu/api/modules/common/bean/CommentSupport.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.bean; +package com.imyeyu.api.modules.common.bean; /** * 支持评论的实体 diff --git a/src/main/java/com/imyeyu/server/modules/common/bean/EmailException.java b/src/main/java/com/imyeyu/api/modules/common/bean/EmailException.java similarity index 91% rename from src/main/java/com/imyeyu/server/modules/common/bean/EmailException.java rename to src/main/java/com/imyeyu/api/modules/common/bean/EmailException.java index 05fb34d..42b7154 100644 --- a/src/main/java/com/imyeyu/server/modules/common/bean/EmailException.java +++ b/src/main/java/com/imyeyu/api/modules/common/bean/EmailException.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.bean; +package com.imyeyu.api.modules.common.bean; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/imyeyu/server/modules/common/bean/ImageType.java b/src/main/java/com/imyeyu/api/modules/common/bean/ImageType.java similarity index 77% rename from src/main/java/com/imyeyu/server/modules/common/bean/ImageType.java rename to src/main/java/com/imyeyu/api/modules/common/bean/ImageType.java index adeb9c9..84143e4 100644 --- a/src/main/java/com/imyeyu/server/modules/common/bean/ImageType.java +++ b/src/main/java/com/imyeyu/api/modules/common/bean/ImageType.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.bean; +package com.imyeyu.api.modules.common.bean; /** * diff --git a/src/main/java/com/imyeyu/server/modules/common/bean/SettingKey.java b/src/main/java/com/imyeyu/api/modules/common/bean/SettingKey.java similarity index 97% rename from src/main/java/com/imyeyu/server/modules/common/bean/SettingKey.java rename to src/main/java/com/imyeyu/api/modules/common/bean/SettingKey.java index b7c48f5..0591b17 100644 --- a/src/main/java/com/imyeyu/server/modules/common/bean/SettingKey.java +++ b/src/main/java/com/imyeyu/api/modules/common/bean/SettingKey.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.bean; +package com.imyeyu.api.modules.common.bean; /** * 系统设置 diff --git a/src/main/java/com/imyeyu/server/modules/common/controller/CommentController.java b/src/main/java/com/imyeyu/api/modules/common/controller/CommentController.java similarity index 73% rename from src/main/java/com/imyeyu/server/modules/common/controller/CommentController.java rename to src/main/java/com/imyeyu/api/modules/common/controller/CommentController.java index 5fe5ff8..ce4e382 100644 --- a/src/main/java/com/imyeyu/server/modules/common/controller/CommentController.java +++ b/src/main/java/com/imyeyu/api/modules/common/controller/CommentController.java @@ -1,17 +1,17 @@ -package com.imyeyu.server.modules.common.controller; +package com.imyeyu.api.modules.common.controller; -import com.imyeyu.server.annotation.CaptchaValid; -import com.imyeyu.server.annotation.EnableSetting; -import com.imyeyu.server.bean.CaptchaFrom; -import com.imyeyu.server.modules.common.bean.SettingKey; -import com.imyeyu.server.modules.common.entity.Comment; -import com.imyeyu.server.modules.common.entity.CommentReply; -import com.imyeyu.server.modules.common.service.CommentReplyService; -import com.imyeyu.server.modules.common.service.CommentService; -import com.imyeyu.server.modules.common.vo.comment.CommentReplyPage; -import com.imyeyu.server.modules.common.vo.comment.CommentReplyView; -import com.imyeyu.server.modules.common.vo.comment.CommentView; -import com.imyeyu.server.modules.git.vo.issue.CommentPage; +import com.imyeyu.api.annotation.CaptchaValid; +import com.imyeyu.api.annotation.EnableSetting; +import com.imyeyu.api.bean.CaptchaFrom; +import com.imyeyu.api.modules.common.bean.SettingKey; +import com.imyeyu.api.modules.common.entity.Comment; +import com.imyeyu.api.modules.common.entity.CommentReply; +import com.imyeyu.api.modules.common.service.CommentReplyService; +import com.imyeyu.api.modules.common.service.CommentService; +import com.imyeyu.api.modules.common.vo.comment.CommentReplyPage; +import com.imyeyu.api.modules.common.vo.comment.CommentReplyView; +import com.imyeyu.api.modules.common.vo.comment.CommentView; +import com.imyeyu.api.modules.git.vo.issue.CommentPage; import com.imyeyu.spring.annotation.AOPLog; import com.imyeyu.spring.annotation.RequestRateLimit; import com.imyeyu.spring.bean.CaptchaData; diff --git a/src/main/java/com/imyeyu/server/modules/common/controller/CommonController.java b/src/main/java/com/imyeyu/api/modules/common/controller/CommonController.java similarity index 91% rename from src/main/java/com/imyeyu/server/modules/common/controller/CommonController.java rename to src/main/java/com/imyeyu/api/modules/common/controller/CommonController.java index 91532a2..7453bf7 100644 --- a/src/main/java/com/imyeyu/server/modules/common/controller/CommonController.java +++ b/src/main/java/com/imyeyu/api/modules/common/controller/CommonController.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.controller; +package com.imyeyu.api.modules.common.controller; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -8,24 +8,24 @@ import com.imyeyu.java.bean.timi.TimiCode; import com.imyeyu.java.bean.timi.TimiException; import com.imyeyu.java.ref.Ref; import com.imyeyu.network.Network; -import com.imyeyu.server.bean.CaptchaFrom; -import com.imyeyu.server.modules.common.bean.ImageType; -import com.imyeyu.server.modules.common.bean.SettingKey; -import com.imyeyu.server.modules.common.entity.Attachment; -import com.imyeyu.server.modules.common.entity.Setting; -import com.imyeyu.server.modules.common.entity.Task; -import com.imyeyu.server.modules.common.entity.Template; -import com.imyeyu.server.modules.common.entity.Version; -import com.imyeyu.server.modules.common.service.AttachmentService; -import com.imyeyu.server.modules.common.service.FeedbackService; -import com.imyeyu.server.modules.common.service.SettingService; -import com.imyeyu.server.modules.common.service.TaskService; -import com.imyeyu.server.modules.common.service.TemplateService; -import com.imyeyu.server.modules.common.service.VersionService; -import com.imyeyu.server.modules.common.vo.FeedbackRequest; -import com.imyeyu.server.modules.common.vo.attachment.AttachmentView; -import com.imyeyu.server.modules.system.util.ResourceHandler; -import com.imyeyu.server.util.CaptchaManager; +import com.imyeyu.api.bean.CaptchaFrom; +import com.imyeyu.api.modules.common.bean.ImageType; +import com.imyeyu.api.modules.common.bean.SettingKey; +import com.imyeyu.api.modules.common.entity.Attachment; +import com.imyeyu.api.modules.common.entity.Setting; +import com.imyeyu.api.modules.common.entity.Task; +import com.imyeyu.api.modules.common.entity.Template; +import com.imyeyu.api.modules.common.entity.Version; +import com.imyeyu.api.modules.common.service.AttachmentService; +import com.imyeyu.api.modules.common.service.FeedbackService; +import com.imyeyu.api.modules.common.service.SettingService; +import com.imyeyu.api.modules.common.service.TaskService; +import com.imyeyu.api.modules.common.service.TemplateService; +import com.imyeyu.api.modules.common.service.VersionService; +import com.imyeyu.api.modules.common.vo.FeedbackRequest; +import com.imyeyu.api.modules.common.vo.attachment.AttachmentView; +import com.imyeyu.api.modules.system.util.ResourceHandler; +import com.imyeyu.api.util.CaptchaManager; import com.imyeyu.spring.TimiSpring; import com.imyeyu.spring.annotation.AOPLog; import com.imyeyu.spring.annotation.IgnoreGlobalReturn; diff --git a/src/main/java/com/imyeyu/server/modules/common/controller/IconController.java b/src/main/java/com/imyeyu/api/modules/common/controller/IconController.java similarity index 87% rename from src/main/java/com/imyeyu/server/modules/common/controller/IconController.java rename to src/main/java/com/imyeyu/api/modules/common/controller/IconController.java index 39bfd7c..2c23c04 100644 --- a/src/main/java/com/imyeyu/server/modules/common/controller/IconController.java +++ b/src/main/java/com/imyeyu/api/modules/common/controller/IconController.java @@ -1,10 +1,10 @@ -package com.imyeyu.server.modules.common.controller; +package com.imyeyu.api.modules.common.controller; -import com.imyeyu.server.modules.common.entity.Icon; -import com.imyeyu.server.modules.common.service.IconService; -import com.imyeyu.server.modules.common.vo.icon.AllResponse; -import com.imyeyu.server.modules.common.vo.icon.NamePage; -import com.imyeyu.server.modules.common.vo.icon.UnicodePage; +import com.imyeyu.api.modules.common.entity.Icon; +import com.imyeyu.api.modules.common.service.IconService; +import com.imyeyu.api.modules.common.vo.icon.AllResponse; +import com.imyeyu.api.modules.common.vo.icon.NamePage; +import com.imyeyu.api.modules.common.vo.icon.UnicodePage; import com.imyeyu.spring.annotation.AOPLog; import com.imyeyu.spring.annotation.RequestRateLimit; import com.imyeyu.spring.bean.Page; diff --git a/src/main/java/com/imyeyu/server/modules/common/controller/UserController.java b/src/main/java/com/imyeyu/api/modules/common/controller/UserController.java similarity index 83% rename from src/main/java/com/imyeyu/server/modules/common/controller/UserController.java rename to src/main/java/com/imyeyu/api/modules/common/controller/UserController.java index 96825dd..591efe0 100644 --- a/src/main/java/com/imyeyu/server/modules/common/controller/UserController.java +++ b/src/main/java/com/imyeyu/api/modules/common/controller/UserController.java @@ -1,32 +1,32 @@ -package com.imyeyu.server.modules.common.controller; +package com.imyeyu.api.modules.common.controller; import com.imyeyu.java.TimiJava; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.annotation.CaptchaValid; -import com.imyeyu.server.annotation.EnableSetting; -import com.imyeyu.server.bean.CaptchaFrom; -import com.imyeyu.server.modules.common.bean.SettingKey; -import com.imyeyu.server.modules.common.entity.CommentReply; -import com.imyeyu.server.modules.common.entity.UserConfig; -import com.imyeyu.server.modules.common.entity.UserPrivacy; -import com.imyeyu.server.modules.common.service.CommentReplyService; -import com.imyeyu.server.modules.common.service.CommentService; -import com.imyeyu.server.modules.common.service.UserConfigService; -import com.imyeyu.server.modules.common.service.UserPrivacyService; -import com.imyeyu.server.modules.common.service.UserProfileService; -import com.imyeyu.server.modules.common.service.UserService; -import com.imyeyu.server.modules.common.vo.comment.CommentReplyPage; -import com.imyeyu.server.modules.common.vo.comment.CommentReplyView; -import com.imyeyu.server.modules.common.vo.comment.CommentView; -import com.imyeyu.server.modules.common.vo.comment.UserCommentPage; -import com.imyeyu.server.modules.common.vo.user.EmailVerifyCallbackRequest; -import com.imyeyu.server.modules.common.vo.user.LoginRequest; -import com.imyeyu.server.modules.common.vo.user.LoginResponse; -import com.imyeyu.server.modules.common.vo.user.RegisterRequest; -import com.imyeyu.server.modules.common.vo.user.UpdatePasswordByKeyRequest; -import com.imyeyu.server.modules.common.vo.user.UpdatePasswordRequest; -import com.imyeyu.server.modules.common.vo.user.UserRequest; -import com.imyeyu.server.modules.common.vo.user.UserView; +import com.imyeyu.api.annotation.CaptchaValid; +import com.imyeyu.api.annotation.EnableSetting; +import com.imyeyu.api.bean.CaptchaFrom; +import com.imyeyu.api.modules.common.bean.SettingKey; +import com.imyeyu.api.modules.common.entity.CommentReply; +import com.imyeyu.api.modules.common.entity.UserConfig; +import com.imyeyu.api.modules.common.entity.UserPrivacy; +import com.imyeyu.api.modules.common.service.CommentReplyService; +import com.imyeyu.api.modules.common.service.CommentService; +import com.imyeyu.api.modules.common.service.UserConfigService; +import com.imyeyu.api.modules.common.service.UserPrivacyService; +import com.imyeyu.api.modules.common.service.UserProfileService; +import com.imyeyu.api.modules.common.service.UserService; +import com.imyeyu.api.modules.common.vo.comment.CommentReplyPage; +import com.imyeyu.api.modules.common.vo.comment.CommentReplyView; +import com.imyeyu.api.modules.common.vo.comment.CommentView; +import com.imyeyu.api.modules.common.vo.comment.UserCommentPage; +import com.imyeyu.api.modules.common.vo.user.EmailVerifyCallbackRequest; +import com.imyeyu.api.modules.common.vo.user.LoginRequest; +import com.imyeyu.api.modules.common.vo.user.LoginResponse; +import com.imyeyu.api.modules.common.vo.user.RegisterRequest; +import com.imyeyu.api.modules.common.vo.user.UpdatePasswordByKeyRequest; +import com.imyeyu.api.modules.common.vo.user.UpdatePasswordRequest; +import com.imyeyu.api.modules.common.vo.user.UserRequest; +import com.imyeyu.api.modules.common.vo.user.UserView; import com.imyeyu.spring.annotation.AOPLog; import com.imyeyu.spring.annotation.RequestRateLimit; import com.imyeyu.spring.annotation.RequestSingleParam; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/Attachment.java b/src/main/java/com/imyeyu/api/modules/common/entity/Attachment.java similarity index 91% rename from src/main/java/com/imyeyu/server/modules/common/entity/Attachment.java rename to src/main/java/com/imyeyu/api/modules/common/entity/Attachment.java index b233546..650053e 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/Attachment.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/Attachment.java @@ -1,7 +1,7 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import com.imyeyu.java.ref.Ref; -import com.imyeyu.server.bean.MultilingualHandler; +import com.imyeyu.api.bean.MultilingualHandler; import com.imyeyu.spring.entity.Entity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/Comment.java b/src/main/java/com/imyeyu/api/modules/common/entity/Comment.java similarity index 77% rename from src/main/java/com/imyeyu/server/modules/common/entity/Comment.java rename to src/main/java/com/imyeyu/api/modules/common/entity/Comment.java index f5348bb..4f0d960 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/Comment.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/Comment.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import com.imyeyu.spring.service.GettableService; import jakarta.validation.constraints.NotBlank; @@ -7,12 +7,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; -import com.imyeyu.server.modules.blog.service.implement.ArticleServiceImplement; -import com.imyeyu.server.modules.common.bean.CommentSupport; -import com.imyeyu.server.modules.git.service.implement.IssueServiceImplement; -import com.imyeyu.server.modules.git.service.implement.MergeServiceImplement; +import com.imyeyu.api.modules.blog.service.implement.ArticleServiceImplement; +import com.imyeyu.api.modules.common.bean.CommentSupport; +import com.imyeyu.api.modules.git.service.implement.IssueServiceImplement; +import com.imyeyu.api.modules.git.service.implement.MergeServiceImplement; import com.imyeyu.spring.entity.Entity; -import com.imyeyu.spring.service.BaseService; /** * 评论 diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/CommentReply.java b/src/main/java/com/imyeyu/api/modules/common/entity/CommentReply.java similarity index 95% rename from src/main/java/com/imyeyu/server/modules/common/entity/CommentReply.java rename to src/main/java/com/imyeyu/api/modules/common/entity/CommentReply.java index bcd98f5..c72c663 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/CommentReply.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/CommentReply.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/EmailQueue.java b/src/main/java/com/imyeyu/api/modules/common/entity/EmailQueue.java similarity index 91% rename from src/main/java/com/imyeyu/server/modules/common/entity/EmailQueue.java rename to src/main/java/com/imyeyu/api/modules/common/entity/EmailQueue.java index d2e32c1..f422502 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/EmailQueue.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/EmailQueue.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import com.imyeyu.spring.annotation.table.AutoUUID; import com.imyeyu.spring.annotation.table.Id; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/EmailQueueLog.java b/src/main/java/com/imyeyu/api/modules/common/entity/EmailQueueLog.java similarity index 89% rename from src/main/java/com/imyeyu/server/modules/common/entity/EmailQueueLog.java rename to src/main/java/com/imyeyu/api/modules/common/entity/EmailQueueLog.java index 21a82ac..25ef10c 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/EmailQueueLog.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/EmailQueueLog.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/Feedback.java b/src/main/java/com/imyeyu/api/modules/common/entity/Feedback.java similarity index 87% rename from src/main/java/com/imyeyu/server/modules/common/entity/Feedback.java rename to src/main/java/com/imyeyu/api/modules/common/entity/Feedback.java index b7868f6..90b5ea1 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/Feedback.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/Feedback.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/Icon.java b/src/main/java/com/imyeyu/api/modules/common/entity/Icon.java similarity index 88% rename from src/main/java/com/imyeyu/server/modules/common/entity/Icon.java rename to src/main/java/com/imyeyu/api/modules/common/entity/Icon.java index 152c9a3..bf1bb16 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/Icon.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/Icon.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/Multilingual.java b/src/main/java/com/imyeyu/api/modules/common/entity/Multilingual.java similarity index 94% rename from src/main/java/com/imyeyu/server/modules/common/entity/Multilingual.java rename to src/main/java/com/imyeyu/api/modules/common/entity/Multilingual.java index 29dc150..7b4f744 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/Multilingual.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/Multilingual.java @@ -1,9 +1,9 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import com.imyeyu.java.bean.timi.TimiCode; import com.imyeyu.java.bean.timi.TimiException; import com.imyeyu.java.ref.Ref; -import com.imyeyu.server.TimiServerAPI; +import com.imyeyu.api.TimiServerAPI; import com.imyeyu.spring.entity.Entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/Setting.java b/src/main/java/com/imyeyu/api/modules/common/entity/Setting.java similarity index 85% rename from src/main/java/com/imyeyu/server/modules/common/entity/Setting.java rename to src/main/java/com/imyeyu/api/modules/common/entity/Setting.java index f69e32a..7cb7af2 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/Setting.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/Setting.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; -import com.imyeyu.server.modules.common.bean.SettingKey; +import com.imyeyu.api.modules.common.bean.SettingKey; import com.imyeyu.spring.annotation.table.Id; import com.imyeyu.spring.entity.Creatable; import com.imyeyu.spring.entity.Updatable; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/Tag.java b/src/main/java/com/imyeyu/api/modules/common/entity/Tag.java similarity index 83% rename from src/main/java/com/imyeyu/server/modules/common/entity/Tag.java rename to src/main/java/com/imyeyu/api/modules/common/entity/Tag.java index f08c751..547b88f 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/Tag.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/Tag.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; -import com.imyeyu.server.bean.MultilingualHandler; +import com.imyeyu.api.bean.MultilingualHandler; import com.imyeyu.spring.entity.Entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/Task.java b/src/main/java/com/imyeyu/api/modules/common/entity/Task.java similarity index 92% rename from src/main/java/com/imyeyu/server/modules/common/entity/Task.java rename to src/main/java/com/imyeyu/api/modules/common/entity/Task.java index d97c09c..2039648 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/Task.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/Task.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/TaskDetail.java b/src/main/java/com/imyeyu/api/modules/common/entity/TaskDetail.java similarity index 93% rename from src/main/java/com/imyeyu/server/modules/common/entity/TaskDetail.java rename to src/main/java/com/imyeyu/api/modules/common/entity/TaskDetail.java index 0d046e2..508e59b 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/TaskDetail.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/TaskDetail.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/Template.java b/src/main/java/com/imyeyu/api/modules/common/entity/Template.java similarity index 89% rename from src/main/java/com/imyeyu/server/modules/common/entity/Template.java rename to src/main/java/com/imyeyu/api/modules/common/entity/Template.java index 03a8224..e4ffdee 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/Template.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/Template.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/User.java b/src/main/java/com/imyeyu/api/modules/common/entity/User.java similarity index 95% rename from src/main/java/com/imyeyu/server/modules/common/entity/User.java rename to src/main/java/com/imyeyu/api/modules/common/entity/User.java index 06a92d3..58a3968 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/User.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/User.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/UserConfig.java b/src/main/java/com/imyeyu/api/modules/common/entity/UserConfig.java similarity index 91% rename from src/main/java/com/imyeyu/server/modules/common/entity/UserConfig.java rename to src/main/java/com/imyeyu/api/modules/common/entity/UserConfig.java index e52c37c..0eafd0b 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/UserConfig.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/UserConfig.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import com.imyeyu.spring.annotation.table.Id; import com.imyeyu.spring.entity.Updatable; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/UserPrivacy.java b/src/main/java/com/imyeyu/api/modules/common/entity/UserPrivacy.java similarity index 95% rename from src/main/java/com/imyeyu/server/modules/common/entity/UserPrivacy.java rename to src/main/java/com/imyeyu/api/modules/common/entity/UserPrivacy.java index c76cf9a..0e4e882 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/UserPrivacy.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/UserPrivacy.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import com.imyeyu.java.ref.Ref; import com.imyeyu.spring.annotation.table.Id; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/UserProfile.java b/src/main/java/com/imyeyu/api/modules/common/entity/UserProfile.java similarity index 91% rename from src/main/java/com/imyeyu/server/modules/common/entity/UserProfile.java rename to src/main/java/com/imyeyu/api/modules/common/entity/UserProfile.java index 8d514b5..f78303c 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/UserProfile.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/UserProfile.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; -import com.imyeyu.server.modules.common.bean.ImageType; +import com.imyeyu.api.modules.common.bean.ImageType; import com.imyeyu.spring.annotation.table.Id; import com.imyeyu.spring.entity.Updatable; import jakarta.validation.constraints.Max; diff --git a/src/main/java/com/imyeyu/server/modules/common/entity/Version.java b/src/main/java/com/imyeyu/api/modules/common/entity/Version.java similarity index 87% rename from src/main/java/com/imyeyu/server/modules/common/entity/Version.java rename to src/main/java/com/imyeyu/api/modules/common/entity/Version.java index 00734b1..455b034 100644 --- a/src/main/java/com/imyeyu/server/modules/common/entity/Version.java +++ b/src/main/java/com/imyeyu/api/modules/common/entity/Version.java @@ -1,4 +1,4 @@ -package com.imyeyu.server.modules.common.entity; +package com.imyeyu.api.modules.common.entity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/AttachmentMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/AttachmentMapper.java similarity index 91% rename from src/main/java/com/imyeyu/server/modules/common/mapper/AttachmentMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/AttachmentMapper.java index e4db268..8057e19 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/AttachmentMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/AttachmentMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.Attachment; +import com.imyeyu.api.modules.common.entity.Attachment; import com.imyeyu.spring.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/CommentMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/CommentMapper.java similarity index 87% rename from src/main/java/com/imyeyu/server/modules/common/mapper/CommentMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/CommentMapper.java index 144a372..08a7d1e 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/CommentMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/CommentMapper.java @@ -1,7 +1,7 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.Comment; -import com.imyeyu.server.modules.common.vo.comment.CommentView; +import com.imyeyu.api.modules.common.entity.Comment; +import com.imyeyu.api.modules.common.vo.comment.CommentView; import com.imyeyu.spring.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/CommentRemindQueueMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/CommentRemindQueueMapper.java similarity index 85% rename from src/main/java/com/imyeyu/server/modules/common/mapper/CommentRemindQueueMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/CommentRemindQueueMapper.java index 3bc24b9..9555d73 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/CommentRemindQueueMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/CommentRemindQueueMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.blog.entity.CommentRemindQueue; +import com.imyeyu.api.modules.blog.entity.CommentRemindQueue; import com.imyeyu.spring.mapper.BaseMapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/CommentReplyMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/CommentReplyMapper.java similarity index 82% rename from src/main/java/com/imyeyu/server/modules/common/mapper/CommentReplyMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/CommentReplyMapper.java index 9cce388..422c12b 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/CommentReplyMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/CommentReplyMapper.java @@ -1,9 +1,9 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.CommentReply; -import com.imyeyu.server.modules.common.vo.comment.CommentReplyPage; -import com.imyeyu.server.modules.common.vo.comment.CommentReplyView; +import com.imyeyu.api.modules.common.entity.CommentReply; +import com.imyeyu.api.modules.common.vo.comment.CommentReplyPage; +import com.imyeyu.api.modules.common.vo.comment.CommentReplyView; import com.imyeyu.spring.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/EmailQueueLogMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/EmailQueueLogMapper.java similarity index 61% rename from src/main/java/com/imyeyu/server/modules/common/mapper/EmailQueueLogMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/EmailQueueLogMapper.java index dced490..c845017 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/EmailQueueLogMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/EmailQueueLogMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.EmailQueueLog; +import com.imyeyu.api.modules.common.entity.EmailQueueLog; import com.imyeyu.spring.mapper.BaseMapper; /** diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/EmailQueueMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/EmailQueueMapper.java similarity index 81% rename from src/main/java/com/imyeyu/server/modules/common/mapper/EmailQueueMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/EmailQueueMapper.java index 64c4b6e..cb7fc92 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/EmailQueueMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/EmailQueueMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.EmailQueue; +import com.imyeyu.api.modules.common.entity.EmailQueue; import com.imyeyu.spring.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/FeedbackMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/FeedbackMapper.java similarity index 63% rename from src/main/java/com/imyeyu/server/modules/common/mapper/FeedbackMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/FeedbackMapper.java index f2de4fd..9714af1 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/FeedbackMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/FeedbackMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.Feedback; +import com.imyeyu.api.modules.common.entity.Feedback; import com.imyeyu.spring.mapper.BaseMapper; /** diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/IconMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/IconMapper.java similarity index 91% rename from src/main/java/com/imyeyu/server/modules/common/mapper/IconMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/IconMapper.java index b78d5ff..1e46f01 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/IconMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/IconMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.Icon; +import com.imyeyu.api.modules.common.entity.Icon; import com.imyeyu.spring.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/MultilingualMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/MultilingualMapper.java similarity index 88% rename from src/main/java/com/imyeyu/server/modules/common/mapper/MultilingualMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/MultilingualMapper.java index c05b28d..ff68c7b 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/MultilingualMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/MultilingualMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.Multilingual; +import com.imyeyu.api.modules.common.entity.Multilingual; import com.imyeyu.spring.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/SettingMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/SettingMapper.java similarity index 72% rename from src/main/java/com/imyeyu/server/modules/common/mapper/SettingMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/SettingMapper.java index 5f41a47..a93d8fa 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/SettingMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/SettingMapper.java @@ -1,7 +1,7 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.bean.SettingKey; -import com.imyeyu.server.modules.common.entity.Setting; +import com.imyeyu.api.modules.common.bean.SettingKey; +import com.imyeyu.api.modules.common.entity.Setting; import com.imyeyu.spring.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/TagMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/TagMapper.java similarity index 61% rename from src/main/java/com/imyeyu/server/modules/common/mapper/TagMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/TagMapper.java index de7afd0..538d2e5 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/TagMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/TagMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.Tag; +import com.imyeyu.api.modules.common.entity.Tag; import com.imyeyu.spring.mapper.BaseMapper; /** diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/TaskMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/TaskMapper.java similarity index 61% rename from src/main/java/com/imyeyu/server/modules/common/mapper/TaskMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/TaskMapper.java index dafa493..be47b61 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/TaskMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/TaskMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.Task; +import com.imyeyu.api.modules.common.entity.Task; import java.util.List; diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/TemplateMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/TemplateMapper.java similarity index 78% rename from src/main/java/com/imyeyu/server/modules/common/mapper/TemplateMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/TemplateMapper.java index 899b10a..010f258 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/TemplateMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/TemplateMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.Template; +import com.imyeyu.api.modules.common.entity.Template; import com.imyeyu.spring.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/UserConfigMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/UserConfigMapper.java similarity index 64% rename from src/main/java/com/imyeyu/server/modules/common/mapper/UserConfigMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/UserConfigMapper.java index 5b656c4..e87ec35 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/UserConfigMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/UserConfigMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.UserConfig; +import com.imyeyu.api.modules.common.entity.UserConfig; import com.imyeyu.spring.mapper.BaseMapper; /** diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/UserMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/UserMapper.java similarity index 82% rename from src/main/java/com/imyeyu/server/modules/common/mapper/UserMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/UserMapper.java index 82183d8..ecb65e8 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/UserMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/UserMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.User; +import com.imyeyu.api.modules.common.entity.User; import com.imyeyu.spring.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/UserPrivacyMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/UserPrivacyMapper.java similarity index 64% rename from src/main/java/com/imyeyu/server/modules/common/mapper/UserPrivacyMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/UserPrivacyMapper.java index ff5dece..d6cddf3 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/UserPrivacyMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/UserPrivacyMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.UserPrivacy; +import com.imyeyu.api.modules.common.entity.UserPrivacy; import com.imyeyu.spring.mapper.BaseMapper; /** diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/UserProfileMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/UserProfileMapper.java similarity index 64% rename from src/main/java/com/imyeyu/server/modules/common/mapper/UserProfileMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/UserProfileMapper.java index a2655c9..4a98276 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/UserProfileMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/UserProfileMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.UserProfile; +import com.imyeyu.api.modules.common.entity.UserProfile; import com.imyeyu.spring.mapper.BaseMapper; /** diff --git a/src/main/java/com/imyeyu/server/modules/common/mapper/VersionMapper.java b/src/main/java/com/imyeyu/api/modules/common/mapper/VersionMapper.java similarity index 76% rename from src/main/java/com/imyeyu/server/modules/common/mapper/VersionMapper.java rename to src/main/java/com/imyeyu/api/modules/common/mapper/VersionMapper.java index ed3519c..cea1e28 100644 --- a/src/main/java/com/imyeyu/server/modules/common/mapper/VersionMapper.java +++ b/src/main/java/com/imyeyu/api/modules/common/mapper/VersionMapper.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.mapper; +package com.imyeyu.api.modules.common.mapper; -import com.imyeyu.server.modules.common.entity.Version; +import com.imyeyu.api.modules.common.entity.Version; import com.imyeyu.spring.mapper.BaseMapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/imyeyu/server/modules/common/service/AttachmentService.java b/src/main/java/com/imyeyu/api/modules/common/service/AttachmentService.java similarity index 84% rename from src/main/java/com/imyeyu/server/modules/common/service/AttachmentService.java rename to src/main/java/com/imyeyu/api/modules/common/service/AttachmentService.java index 5ad23e5..d6d60c2 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/AttachmentService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/AttachmentService.java @@ -1,9 +1,9 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.modules.common.entity.Attachment; -import com.imyeyu.server.modules.common.vo.attachment.AttachmentRequest; -import com.imyeyu.server.modules.common.vo.attachment.AttachmentView; +import com.imyeyu.api.modules.common.entity.Attachment; +import com.imyeyu.api.modules.common.vo.attachment.AttachmentRequest; +import com.imyeyu.api.modules.common.vo.attachment.AttachmentView; import com.imyeyu.spring.service.DeletableService; import com.imyeyu.spring.service.DestroyableService; import com.imyeyu.spring.service.GettableService; diff --git a/src/main/java/com/imyeyu/server/modules/common/service/CommentReplyService.java b/src/main/java/com/imyeyu/api/modules/common/service/CommentReplyService.java similarity index 69% rename from src/main/java/com/imyeyu/server/modules/common/service/CommentReplyService.java rename to src/main/java/com/imyeyu/api/modules/common/service/CommentReplyService.java index ae22f99..b27e510 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/CommentReplyService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/CommentReplyService.java @@ -1,8 +1,8 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; -import com.imyeyu.server.modules.common.entity.CommentReply; -import com.imyeyu.server.modules.common.vo.comment.CommentReplyPage; -import com.imyeyu.server.modules.common.vo.comment.CommentReplyView; +import com.imyeyu.api.modules.common.entity.CommentReply; +import com.imyeyu.api.modules.common.vo.comment.CommentReplyPage; +import com.imyeyu.api.modules.common.vo.comment.CommentReplyView; import com.imyeyu.spring.bean.PageResult; import com.imyeyu.spring.service.CreatableService; import com.imyeyu.spring.service.DeletableService; diff --git a/src/main/java/com/imyeyu/server/modules/common/service/CommentService.java b/src/main/java/com/imyeyu/api/modules/common/service/CommentService.java similarity index 70% rename from src/main/java/com/imyeyu/server/modules/common/service/CommentService.java rename to src/main/java/com/imyeyu/api/modules/common/service/CommentService.java index fee0128..7c070ed 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/CommentService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/CommentService.java @@ -1,10 +1,10 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.modules.common.entity.Comment; -import com.imyeyu.server.modules.common.vo.comment.CommentView; -import com.imyeyu.server.modules.common.vo.comment.UserCommentPage; -import com.imyeyu.server.modules.git.vo.issue.CommentPage; +import com.imyeyu.api.modules.common.entity.Comment; +import com.imyeyu.api.modules.common.vo.comment.CommentView; +import com.imyeyu.api.modules.common.vo.comment.UserCommentPage; +import com.imyeyu.api.modules.git.vo.issue.CommentPage; import com.imyeyu.spring.bean.PageResult; import com.imyeyu.spring.service.CreatableService; import com.imyeyu.spring.service.DeletableService; diff --git a/src/main/java/com/imyeyu/server/modules/common/service/EmailQueueService.java b/src/main/java/com/imyeyu/api/modules/common/service/EmailQueueService.java similarity index 85% rename from src/main/java/com/imyeyu/server/modules/common/service/EmailQueueService.java rename to src/main/java/com/imyeyu/api/modules/common/service/EmailQueueService.java index 7c3d48d..d5ba74f 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/EmailQueueService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/EmailQueueService.java @@ -1,8 +1,8 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.modules.common.entity.EmailQueue; -import com.imyeyu.server.modules.common.entity.EmailQueueLog; +import com.imyeyu.api.modules.common.entity.EmailQueue; +import com.imyeyu.api.modules.common.entity.EmailQueueLog; import com.imyeyu.spring.service.CreatableService; import com.imyeyu.spring.service.DestroyableService; diff --git a/src/main/java/com/imyeyu/server/modules/common/service/FeedbackService.java b/src/main/java/com/imyeyu/api/modules/common/service/FeedbackService.java similarity index 57% rename from src/main/java/com/imyeyu/server/modules/common/service/FeedbackService.java rename to src/main/java/com/imyeyu/api/modules/common/service/FeedbackService.java index 5300346..5055cae 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/FeedbackService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/FeedbackService.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; -import com.imyeyu.server.modules.common.vo.FeedbackRequest; +import com.imyeyu.api.modules.common.vo.FeedbackRequest; /** * 反馈服务 diff --git a/src/main/java/com/imyeyu/server/modules/common/service/IconService.java b/src/main/java/com/imyeyu/api/modules/common/service/IconService.java similarity index 56% rename from src/main/java/com/imyeyu/server/modules/common/service/IconService.java rename to src/main/java/com/imyeyu/api/modules/common/service/IconService.java index c22992d..9a801df 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/IconService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/IconService.java @@ -1,9 +1,9 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; -import com.imyeyu.server.modules.common.entity.Icon; -import com.imyeyu.server.modules.common.vo.icon.AllResponse; -import com.imyeyu.server.modules.common.vo.icon.NamePage; -import com.imyeyu.server.modules.common.vo.icon.UnicodePage; +import com.imyeyu.api.modules.common.entity.Icon; +import com.imyeyu.api.modules.common.vo.icon.AllResponse; +import com.imyeyu.api.modules.common.vo.icon.NamePage; +import com.imyeyu.api.modules.common.vo.icon.UnicodePage; import com.imyeyu.spring.bean.PageResult; import com.imyeyu.spring.service.PageableService; diff --git a/src/main/java/com/imyeyu/server/modules/common/service/MultilingualService.java b/src/main/java/com/imyeyu/api/modules/common/service/MultilingualService.java similarity index 80% rename from src/main/java/com/imyeyu/server/modules/common/service/MultilingualService.java rename to src/main/java/com/imyeyu/api/modules/common/service/MultilingualService.java index a20ff46..0a66096 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/MultilingualService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/MultilingualService.java @@ -1,7 +1,7 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; import com.imyeyu.java.bean.Language; -import com.imyeyu.server.modules.common.entity.Multilingual; +import com.imyeyu.api.modules.common.entity.Multilingual; import com.imyeyu.spring.service.UpdatableService; import java.util.List; diff --git a/src/main/java/com/imyeyu/server/modules/common/service/SettingService.java b/src/main/java/com/imyeyu/api/modules/common/service/SettingService.java similarity index 90% rename from src/main/java/com/imyeyu/server/modules/common/service/SettingService.java rename to src/main/java/com/imyeyu/api/modules/common/service/SettingService.java index 4654a94..3e7c84a 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/SettingService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/SettingService.java @@ -1,12 +1,12 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.modules.common.bean.SettingKey; -import com.imyeyu.server.modules.common.entity.Setting; +import com.imyeyu.api.modules.common.bean.SettingKey; +import com.imyeyu.api.modules.common.entity.Setting; import com.imyeyu.spring.service.UpdatableService; import java.util.Arrays; diff --git a/src/main/java/com/imyeyu/server/modules/common/service/TagService.java b/src/main/java/com/imyeyu/api/modules/common/service/TagService.java similarity index 79% rename from src/main/java/com/imyeyu/server/modules/common/service/TagService.java rename to src/main/java/com/imyeyu/api/modules/common/service/TagService.java index 73f45b4..41d41a8 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/TagService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/TagService.java @@ -1,7 +1,7 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.modules.common.entity.Tag; +import com.imyeyu.api.modules.common.entity.Tag; import com.imyeyu.spring.service.CreatableService; import com.imyeyu.spring.service.DeletableService; diff --git a/src/main/java/com/imyeyu/server/modules/common/service/TaskService.java b/src/main/java/com/imyeyu/api/modules/common/service/TaskService.java similarity index 75% rename from src/main/java/com/imyeyu/server/modules/common/service/TaskService.java rename to src/main/java/com/imyeyu/api/modules/common/service/TaskService.java index 5bfae13..7b792ff 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/TaskService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/TaskService.java @@ -1,7 +1,7 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.modules.common.entity.Task; +import com.imyeyu.api.modules.common.entity.Task; import java.util.List; diff --git a/src/main/java/com/imyeyu/server/modules/common/service/TemplateService.java b/src/main/java/com/imyeyu/api/modules/common/service/TemplateService.java similarity index 58% rename from src/main/java/com/imyeyu/server/modules/common/service/TemplateService.java rename to src/main/java/com/imyeyu/api/modules/common/service/TemplateService.java index ee60eb8..f5a21cc 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/TemplateService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/TemplateService.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; -import com.imyeyu.server.modules.common.entity.Template; +import com.imyeyu.api.modules.common.entity.Template; /** * @author 夜雨 diff --git a/src/main/java/com/imyeyu/server/modules/common/service/UserConfigService.java b/src/main/java/com/imyeyu/api/modules/common/service/UserConfigService.java similarity index 77% rename from src/main/java/com/imyeyu/server/modules/common/service/UserConfigService.java rename to src/main/java/com/imyeyu/api/modules/common/service/UserConfigService.java index 55e53e6..96421d7 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/UserConfigService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/UserConfigService.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; -import com.imyeyu.server.modules.common.entity.UserConfig; +import com.imyeyu.api.modules.common.entity.UserConfig; import com.imyeyu.spring.service.CreatableService; import com.imyeyu.spring.service.GettableService; import com.imyeyu.spring.service.UpdatableService; diff --git a/src/main/java/com/imyeyu/server/modules/common/service/UserPrivacyService.java b/src/main/java/com/imyeyu/api/modules/common/service/UserPrivacyService.java similarity index 77% rename from src/main/java/com/imyeyu/server/modules/common/service/UserPrivacyService.java rename to src/main/java/com/imyeyu/api/modules/common/service/UserPrivacyService.java index 71a5dd5..b8535d5 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/UserPrivacyService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/UserPrivacyService.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; -import com.imyeyu.server.modules.common.entity.UserPrivacy; +import com.imyeyu.api.modules.common.entity.UserPrivacy; import com.imyeyu.spring.service.CreatableService; import com.imyeyu.spring.service.GettableService; import com.imyeyu.spring.service.UpdatableService; diff --git a/src/main/java/com/imyeyu/server/modules/common/service/UserProfileService.java b/src/main/java/com/imyeyu/api/modules/common/service/UserProfileService.java similarity index 70% rename from src/main/java/com/imyeyu/server/modules/common/service/UserProfileService.java rename to src/main/java/com/imyeyu/api/modules/common/service/UserProfileService.java index 5ee06ed..f666301 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/UserProfileService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/UserProfileService.java @@ -1,7 +1,7 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; -import com.imyeyu.server.modules.common.entity.UserProfile; -import com.imyeyu.server.modules.common.vo.user.UserRequest; +import com.imyeyu.api.modules.common.entity.UserProfile; +import com.imyeyu.api.modules.common.vo.user.UserRequest; import com.imyeyu.spring.service.CreatableService; import com.imyeyu.spring.service.GettableService; import com.imyeyu.spring.service.UpdatableService; diff --git a/src/main/java/com/imyeyu/server/modules/common/service/UserService.java b/src/main/java/com/imyeyu/api/modules/common/service/UserService.java similarity index 89% rename from src/main/java/com/imyeyu/server/modules/common/service/UserService.java rename to src/main/java/com/imyeyu/api/modules/common/service/UserService.java index f2cc3be..bb8350b 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/UserService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/UserService.java @@ -1,11 +1,11 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.modules.common.entity.User; -import com.imyeyu.server.modules.common.vo.user.LoginRequest; -import com.imyeyu.server.modules.common.vo.user.LoginResponse; -import com.imyeyu.server.modules.common.vo.user.RegisterRequest; -import com.imyeyu.server.modules.common.vo.user.UserView; +import com.imyeyu.api.modules.common.entity.User; +import com.imyeyu.api.modules.common.vo.user.LoginRequest; +import com.imyeyu.api.modules.common.vo.user.LoginResponse; +import com.imyeyu.api.modules.common.vo.user.RegisterRequest; +import com.imyeyu.api.modules.common.vo.user.UserView; import com.imyeyu.spring.service.GettableService; /** diff --git a/src/main/java/com/imyeyu/server/modules/common/service/VersionService.java b/src/main/java/com/imyeyu/api/modules/common/service/VersionService.java similarity index 58% rename from src/main/java/com/imyeyu/server/modules/common/service/VersionService.java rename to src/main/java/com/imyeyu/api/modules/common/service/VersionService.java index 8163692..35e2773 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/VersionService.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/VersionService.java @@ -1,6 +1,6 @@ -package com.imyeyu.server.modules.common.service; +package com.imyeyu.api.modules.common.service; -import com.imyeyu.server.modules.common.entity.Version; +import com.imyeyu.api.modules.common.entity.Version; /** * 版本管理服务 diff --git a/src/main/java/com/imyeyu/server/modules/common/service/implement/AttachmentServiceImplement.java b/src/main/java/com/imyeyu/api/modules/common/service/implement/AttachmentServiceImplement.java similarity index 90% rename from src/main/java/com/imyeyu/server/modules/common/service/implement/AttachmentServiceImplement.java rename to src/main/java/com/imyeyu/api/modules/common/service/implement/AttachmentServiceImplement.java index d21315a..fff0229 100644 --- a/src/main/java/com/imyeyu/server/modules/common/service/implement/AttachmentServiceImplement.java +++ b/src/main/java/com/imyeyu/api/modules/common/service/implement/AttachmentServiceImplement.java @@ -1,15 +1,15 @@ -package com.imyeyu.server.modules.common.service.implement; +package com.imyeyu.api.modules.common.service.implement; import com.imyeyu.io.IO; import com.imyeyu.java.TimiJava; import com.imyeyu.java.bean.timi.TimiCode; import com.imyeyu.java.bean.timi.TimiException; -import com.imyeyu.server.config.dbsource.TimiServerDBConfig; -import com.imyeyu.server.modules.common.entity.Attachment; -import com.imyeyu.server.modules.common.mapper.AttachmentMapper; -import com.imyeyu.server.modules.common.service.AttachmentService; -import com.imyeyu.server.modules.common.vo.attachment.AttachmentRequest; -import com.imyeyu.server.modules.common.vo.attachment.AttachmentView; +import com.imyeyu.api.config.dbsource.TimiServerDBConfig; +import com.imyeyu.api.modules.common.entity.Attachment; +import com.imyeyu.api.modules.common.mapper.AttachmentMapper; +import com.imyeyu.api.modules.common.service.AttachmentService; +import com.imyeyu.api.modules.common.vo.attachment.AttachmentRequest; +import com.imyeyu.api.modules.common.vo.attachment.AttachmentView; import com.imyeyu.spring.mapper.BaseMapper; import com.imyeyu.spring.service.AbstractEntityService; import com.imyeyu.utils.Time; @@ -125,6 +125,7 @@ public class AttachmentServiceImplement extends AbstractEntityServiceUTF-8 [%d{HH:mm:ss.SSS}][%-5level][%-54logger{54}] %msg%n - + ./logs/debug.log @@ -16,7 +16,7 @@ ./logs/debug/debug.%d{yyyy-MM-dd}.log 30 - + diff --git a/src/main/resources/mapper/blog/ArticleMapper.xml b/src/main/resources/mapper/blog/ArticleMapper.xml index a0887a0..5db57c1 100644 --- a/src/main/resources/mapper/blog/ArticleMapper.xml +++ b/src/main/resources/mapper/blog/ArticleMapper.xml @@ -1,6 +1,6 @@ - + article @@ -24,7 +24,7 @@ - SELECT @@ -44,7 +44,7 @@ - SELECT diff --git a/src/main/resources/mapper/common/AttachmentMapper.xml b/src/main/resources/mapper/common/AttachmentMapper.xml index 50c9af5..232cceb 100644 --- a/src/main/resources/mapper/common/AttachmentMapper.xml +++ b/src/main/resources/mapper/common/AttachmentMapper.xml @@ -1,8 +1,8 @@ - + attachment - SELECT * FROM diff --git a/src/main/resources/mapper/common/CommentMapper.xml b/src/main/resources/mapper/common/CommentMapper.xml index 5aaedcf..a7822fe 100644 --- a/src/main/resources/mapper/common/CommentMapper.xml +++ b/src/main/resources/mapper/common/CommentMapper.xml @@ -1,6 +1,6 @@ - + comment - + @@ -85,7 +85,7 @@ - + @@ -127,7 +127,7 @@ - SELECT id, biz_type, diff --git a/src/main/resources/mapper/common/IconMapper.xml b/src/main/resources/mapper/common/IconMapper.xml index f1afd30..2af2307 100644 --- a/src/main/resources/mapper/common/IconMapper.xml +++ b/src/main/resources/mapper/common/IconMapper.xml @@ -1,6 +1,6 @@ - + icon @@ -29,7 +29,7 @@ - SELECT icon.* LIMIT #{offset}, #{limit} \ No newline at end of file diff --git a/src/main/resources/mapper/common/MultilingualMapper.xml b/src/main/resources/mapper/common/MultilingualMapper.xml index 2eb6989..bb410ba 100644 --- a/src/main/resources/mapper/common/MultilingualMapper.xml +++ b/src/main/resources/mapper/common/MultilingualMapper.xml @@ -1,7 +1,7 @@ - - SELECT * FROM multilingual WHERE key IN #{item} diff --git a/src/main/resources/mapper/common/SettingMapper.xml b/src/main/resources/mapper/common/SettingMapper.xml index 80e1e63..205b98e 100644 --- a/src/main/resources/mapper/common/SettingMapper.xml +++ b/src/main/resources/mapper/common/SettingMapper.xml @@ -1,6 +1,6 @@ - + setting SELECT @@ -38,13 +38,13 @@ is_public = 1 AND deleted_at IS NULL - + - + diff --git a/src/main/resources/mapper/common/UserConfigMapper.xml b/src/main/resources/mapper/common/UserConfigMapper.xml index 558780d..19f7d9e 100644 --- a/src/main/resources/mapper/common/UserConfigMapper.xml +++ b/src/main/resources/mapper/common/UserConfigMapper.xml @@ -1,5 +1,5 @@ - + user_config \ No newline at end of file diff --git a/src/main/resources/mapper/common/UserPrivacyMapper.xml b/src/main/resources/mapper/common/UserPrivacyMapper.xml index 3d7ea1f..05497fb 100644 --- a/src/main/resources/mapper/common/UserPrivacyMapper.xml +++ b/src/main/resources/mapper/common/UserPrivacyMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/main/resources/mapper/common/UserProfileMapper.xml b/src/main/resources/mapper/common/UserProfileMapper.xml index 2aad3d2..2e9d523 100644 --- a/src/main/resources/mapper/common/UserProfileMapper.xml +++ b/src/main/resources/mapper/common/UserProfileMapper.xml @@ -1,5 +1,5 @@ - + user_profile \ No newline at end of file diff --git a/src/main/resources/mapper/git/IssueMapper.xml b/src/main/resources/mapper/git/IssueMapper.xml index dd79400..fbbc6b3 100644 --- a/src/main/resources/mapper/git/IssueMapper.xml +++ b/src/main/resources/mapper/git/IssueMapper.xml @@ -1,6 +1,6 @@ - + git_issue repository_id = #{issuePage.repositoryId} @@ -21,7 +21,7 @@ - SELECT id, title, diff --git a/src/main/resources/mapper/git/MergeMapper.xml b/src/main/resources/mapper/git/MergeMapper.xml index 103f55b..e2af187 100644 --- a/src/main/resources/mapper/git/MergeMapper.xml +++ b/src/main/resources/mapper/git/MergeMapper.xml @@ -1,6 +1,6 @@ - + git_merge repository_id = #{mergePage.repositoryId} @@ -21,7 +21,7 @@ - SELECT id, title, diff --git a/src/main/resources/mapper/git/ReleaseMapper.xml b/src/main/resources/mapper/git/ReleaseMapper.xml index 6925f79..d7ef9bb 100644 --- a/src/main/resources/mapper/git/ReleaseMapper.xml +++ b/src/main/resources/mapper/git/ReleaseMapper.xml @@ -1,6 +1,6 @@ - + git_release - + - + diff --git a/src/main/resources/mapper/gitea/ActionMapper.xml b/src/main/resources/mapper/gitea/ActionMapper.xml index a4895bb..4e418de 100644 --- a/src/main/resources/mapper/gitea/ActionMapper.xml +++ b/src/main/resources/mapper/gitea/ActionMapper.xml @@ -1,6 +1,6 @@ - + - SELECT repository.id AS repo_id, repository.name AS repo_name, diff --git a/src/main/resources/mapper/minecraft/PackMapper.xml b/src/main/resources/mapper/minecraft/PackMapper.xml index 952f82d..98ca058 100644 --- a/src/main/resources/mapper/minecraft/PackMapper.xml +++ b/src/main/resources/mapper/minecraft/PackMapper.xml @@ -1,6 +1,6 @@ - + - + - + diff --git a/src/main/resources/mapper/minecraft/PlayerMapper.xml b/src/main/resources/mapper/minecraft/PlayerMapper.xml index 9e21d04..1b09c71 100644 --- a/src/main/resources/mapper/minecraft/PlayerMapper.xml +++ b/src/main/resources/mapper/minecraft/PlayerMapper.xml @@ -1,4 +1,4 @@ - + diff --git a/src/main/resources/mapper/system/AsyncTaskMapper.xml b/src/main/resources/mapper/system/AsyncTaskMapper.xml index e99da35..cfdccf6 100644 --- a/src/main/resources/mapper/system/AsyncTaskMapper.xml +++ b/src/main/resources/mapper/system/AsyncTaskMapper.xml @@ -1,6 +1,6 @@ - + async_task INSERT INTO ( @@ -37,7 +37,7 @@ #{createdAt} ) - + UPDATE SET diff --git a/src/test/java/test/SpringLang.java b/src/test/java/test/SpringLang.java index 4ad5482..cb3bd93 100644 --- a/src/test/java/test/SpringLang.java +++ b/src/test/java/test/SpringLang.java @@ -11,9 +11,9 @@ import com.imyeyu.java.bean.timi.TimiCode; import com.imyeyu.java.bean.timi.TimiException; import com.imyeyu.java.ref.Ref; import com.imyeyu.network.FormMap; -import com.imyeyu.server.TimiServerAPI; -import com.imyeyu.server.modules.common.entity.Multilingual; -import com.imyeyu.server.modules.common.mapper.MultilingualMapper; +import com.imyeyu.api.TimiServerAPI; +import com.imyeyu.api.modules.common.entity.Multilingual; +import com.imyeyu.api.modules.common.mapper.MultilingualMapper; import com.imyeyu.utils.Digest; import com.imyeyu.utils.Encoder; import com.imyeyu.utils.Time; diff --git a/src/test/java/test/SpringTest.java b/src/test/java/test/SpringTest.java index 56380cc..98bdbd9 100644 --- a/src/test/java/test/SpringTest.java +++ b/src/test/java/test/SpringTest.java @@ -1,20 +1,22 @@ package test; import com.google.gson.Gson; -import com.imyeyu.server.TimiServerAPI; -import com.imyeyu.server.modules.blog.entity.Article; -import com.imyeyu.server.modules.blog.mapper.ArticleMapper; -import com.imyeyu.server.modules.common.entity.Icon; -import com.imyeyu.server.modules.common.mapper.AttachmentMapper; -import com.imyeyu.server.modules.common.mapper.IconMapper; -import com.imyeyu.server.modules.common.mapper.MultilingualMapper; -import com.imyeyu.server.modules.common.service.SettingService; -import com.imyeyu.server.modules.forevermc.entity.Server; -import com.imyeyu.server.modules.forevermc.mapper.ServerMapper; +import com.imyeyu.api.TimiServerAPI; +import com.imyeyu.api.modules.blog.entity.Article; +import com.imyeyu.api.modules.blog.mapper.ArticleMapper; +import com.imyeyu.api.modules.common.entity.Icon; +import com.imyeyu.api.modules.common.mapper.AttachmentMapper; +import com.imyeyu.api.modules.common.mapper.IconMapper; +import com.imyeyu.api.modules.common.mapper.MultilingualMapper; +import com.imyeyu.api.modules.common.service.SettingService; +import com.imyeyu.api.modules.forevermc.entity.Server; +import com.imyeyu.api.modules.forevermc.mapper.ServerMapper; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.data.mongodb.gridfs.GridFsTemplate; import org.springframework.test.context.junit4.SpringRunner; import java.util.HashMap; @@ -43,6 +45,14 @@ public class SpringTest { @Autowired private AttachmentMapper attachmentMapper; + @Autowired + private GridFsTemplate gridFsTemplate; + + @Test + public void testMongoDB() { + gridFsTemplate.find(new Query()); + } + @Test public void testBaseMapper() { String id;