diff --git a/pom.xml b/pom.xml index b2db21c..36e1ddf 100644 --- a/pom.xml +++ b/pom.xml @@ -87,6 +87,13 @@ spring-boot-starter-data-jpa + + + org.redisson + redisson-spring-data-21 + 3.13.2 + + diff --git a/src/main/java/cn/soul2/demo/config/CorsConfig.java b/src/main/java/cn/soul2/demo/config/CorsConfig.java index 63768ae..1e92874 100644 --- a/src/main/java/cn/soul2/demo/config/CorsConfig.java +++ b/src/main/java/cn/soul2/demo/config/CorsConfig.java @@ -5,10 +5,17 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +/** + * 跨域配置 + * + * @author Soul2 + * @date 2022-09-21 + */ + @Configuration public class CorsConfig implements WebMvcConfigurer { - @Value("${cors.allow-origin}") + @Value("${cn.soul2.cors.allow-origin}") private String allowOrigin; @Override diff --git a/src/main/java/cn/soul2/demo/dto/base/PageParams.java b/src/main/java/cn/soul2/demo/dto/base/PageParams.java index b361bad..e97eeef 100644 --- a/src/main/java/cn/soul2/demo/dto/base/PageParams.java +++ b/src/main/java/cn/soul2/demo/dto/base/PageParams.java @@ -14,7 +14,13 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class PageParams { + /** + * 页码 + */ private Integer pageNumber; + /** + * 页面大小 + */ private Integer pageSize; } diff --git a/src/main/java/cn/soul2/demo/repository/IDataTableDemoRepository.java b/src/main/java/cn/soul2/demo/repository/IDataTableDemoRepository.java index b36bd5a..3fff8f5 100644 --- a/src/main/java/cn/soul2/demo/repository/IDataTableDemoRepository.java +++ b/src/main/java/cn/soul2/demo/repository/IDataTableDemoRepository.java @@ -18,10 +18,28 @@ import java.util.Collection; */ public interface IDataTableDemoRepository extends IService { + /** + * 分页查询 + * + * @param dto dto + * @return {@link VPage}<{@link DataTableDemoDO}> + */ VPage page(DemoDTO dto); + /** + * 保存或更新(根据是否有id) + * + * @param entity 实体 + * @return {@link Boolean} + */ Boolean save(DemoSaveOrUpdateDTO entity); + /** + * 删除 + * + * @param ids id + * @return {@link Boolean} + */ Boolean remove(Collection ids); } diff --git a/src/main/java/cn/soul2/demo/service/IDemoService.java b/src/main/java/cn/soul2/demo/service/IDemoService.java index 43d3b0e..daa401e 100644 --- a/src/main/java/cn/soul2/demo/service/IDemoService.java +++ b/src/main/java/cn/soul2/demo/service/IDemoService.java @@ -15,10 +15,28 @@ import java.util.Collection; public interface IDemoService { + /** + * 分页查询 + * + * @param dto dto + * @return {@link Back}<{@link VPage}<{@link DemoVO}>> + */ Back> page(DemoDTO dto); + /** + * 保存或更新 + * + * @param entity 实体 + * @return {@link Back}<{@link Boolean}> + */ Back save(DemoSaveOrUpdateDTO entity); + /** + * 删除 + * + * @param ids id + * @return {@link Back}<{@link Boolean}> + */ Back remove(Collection ids); } diff --git a/src/main/java/cn/soul2/demo/utils/RedisUtils.java b/src/main/java/cn/soul2/demo/utils/RedisUtils.java new file mode 100644 index 0000000..a33da2c --- /dev/null +++ b/src/main/java/cn/soul2/demo/utils/RedisUtils.java @@ -0,0 +1,11 @@ +package cn.soul2.demo.utils; + +/** + * @author Soul2 + * @date 2022-09-21 21:53 + */ + +public class RedisUtils { + + +} diff --git a/src/main/java/cn/soul2/demo/utils/Test.java b/src/main/java/cn/soul2/demo/utils/Test.java index 65b1173..719311b 100644 --- a/src/main/java/cn/soul2/demo/utils/Test.java +++ b/src/main/java/cn/soul2/demo/utils/Test.java @@ -3,6 +3,12 @@ package cn.soul2.demo.utils; import java.time.LocalDate; import java.util.UUID; +/** + * 测试 + * + * @author Soul2 + * @date 2022-09-21 + */ public class Test { public static void main(String[] args) { String ddl = "INSERT INTO cn_soul2.data_table_demo " + diff --git a/src/main/resources/application-cors.yml b/src/main/resources/application-cors.yml index c450caa..8faca43 100644 --- a/src/main/resources/application-cors.yml +++ b/src/main/resources/application-cors.yml @@ -1,19 +1,12 @@ # 允许跨域的地址 - -cors: - allow-origin: http://localhost +cn.soul2: + cors: + allow-origin: http://localhost --- spring: - config: - activate: - on-profile: dev - -cors: - allow-origin: http://localhost:6901 + config.activate.on-profile: dev ---- -spring: - config: - activate: - on-profile: prod +cn.soul2: + cors: + allow-origin: http://localhost:6901 \ No newline at end of file diff --git a/src/main/resources/application-mybatis-plus.yml b/src/main/resources/application-mybatis-plus.yml index 5067a2e..aa4915c 100644 --- a/src/main/resources/application-mybatis-plus.yml +++ b/src/main/resources/application-mybatis-plus.yml @@ -1,5 +1,8 @@ # mybatis-plus 逻辑删除配置 -mybatis-plus.global-config.db-config: - dbType: mysql - logic-delete-value: 1 - logic-not-delete-value: 0 +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志 + global-config.db-config: + dbType: mysql + logic-delete-value: 1 + logic-not-delete-value: 0 diff --git a/src/main/resources/application-redis.yml b/src/main/resources/application-redis.yml new file mode 100644 index 0000000..c51d17e --- /dev/null +++ b/src/main/resources/application-redis.yml @@ -0,0 +1,21 @@ +spring: + redis: + database: 0 + host: localhost + port: 6379 + timeout: 3000 + +--- + +spring: + config.activate.on-profile: local + +--- + +spring: + config.activate.on-profile: dev + redis: + password: 8bg31UY8mg + host: next.soul2.cn + + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ae9b057..e1512a0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,10 +7,5 @@ server: spring: application.name: java-demo - profiles.include: datasource,mybatis-plus,cors + profiles.include: datasource,mybatis-plus,cors,redis - - -mybatis-plus: - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志 \ No newline at end of file