diff --git a/common/common-generator/pom.xml b/common/common-generator/pom.xml index c99ab7e..8a81ce5 100644 --- a/common/common-generator/pom.xml +++ b/common/common-generator/pom.xml @@ -18,31 +18,11 @@ - - org.projectlombok - lombok - javax.xml.bind jaxb-api 2.1 - - - mysql - mysql-connector-java - - - - com.zaxxer - HikariCP - 5.1.0 - - - - com.baomidou - mybatis-plus-spring-boot3-starter - com.baomidou diff --git a/common/pom.xml b/common/pom.xml index f82ae99..05e0527 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -25,5 +25,25 @@ io.jsonwebtoken jjwt + + + cn.hutool + hutool-all + + + + com.alibaba.fastjson2 + fastjson2 + + + + mysql + mysql-connector-java + + + + com.zaxxer + HikariCP + diff --git a/common/service-utils/pom.xml b/common/service-utils/pom.xml index 32bafae..6cf708f 100644 --- a/common/service-utils/pom.xml +++ b/common/service-utils/pom.xml @@ -22,6 +22,10 @@ dao 0.0.1-SNAPSHOT + + org.springframework.boot + spring-boot-starter-web + javax.xml.bind @@ -34,15 +38,6 @@ httpclient 4.5.14 - - - com.github.xiaoymin - knife4j-openapi3-jakarta-spring-boot-starter - - - org.springframework.boot - spring-boot-starter-web - org.springframework.boot @@ -54,11 +49,6 @@ redisson 3.26.1 - - - com.github.pagehelper - pagehelper - org.lionsoul diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/config/Knife4jConfig.java b/common/service-utils/src/main/java/cn/bunny/common/service/config/Knife4jConfig.java index 5abefce..6eff47b 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/config/Knife4jConfig.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/config/Knife4jConfig.java @@ -15,13 +15,12 @@ import org.springframework.context.annotation.Configuration; public class Knife4jConfig { @Bean public OpenAPI openAPI() { - log.info("Knife4jConfig===>配置knife4j"); // 作者等信息 Contact contact = new Contact().name("Bunny").email("1319900154@qq.com").url("http://z-bunny.com"); // 使用协议 License license = new License().name("MIT").url("http://MUT.com"); // 相关信息 - Info info = new Info().title("Bunny-Java-Template").description("Bunny的Java模板").version("v1.0.0").contact(contact).license(license); + Info info = new Info().title("Bunny-Java-Template").description("Bunny的Java模板").version("v1.0.0").contact(contact).license(license).termsOfService("记得给我start"); return new OpenAPI().info(info).externalDocs(new ExternalDocumentation()); } @@ -29,18 +28,12 @@ public class Knife4jConfig { // 前台相关分类接口 @Bean public GroupedOpenApi groupedOpenApi() { - return GroupedOpenApi.builder().group("前台接口管理").pathsToMatch("/api/**").build(); + return GroupedOpenApi.builder().group("web前台接口管理").pathsToMatch("/api/**").build(); } // 管理员相关分类接口 @Bean public GroupedOpenApi groupedOpenAdminApi() { - return GroupedOpenApi.builder().group("管理员接口请求").pathsToMatch("/admin/**").build(); - } - - // 测试相关分类接口 - @Bean - public GroupedOpenApi testGroupedOpenApi() { - return GroupedOpenApi.builder().group("测试相关分类接口").pathsToMatch("/test/**").build(); + return GroupedOpenApi.builder().group("admin管理员接口请求").pathsToMatch("/admin/**").build(); } } diff --git a/common/service-utils/src/main/java/cn/bunny/common/service/config/MybatisPlusConfig.java b/common/service-utils/src/main/java/cn/bunny/common/service/config/MybatisPlusConfig.java index 013c778..519a465 100644 --- a/common/service-utils/src/main/java/cn/bunny/common/service/config/MybatisPlusConfig.java +++ b/common/service-utils/src/main/java/cn/bunny/common/service/config/MybatisPlusConfig.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.github.pagehelper.PageInterceptor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -34,9 +33,4 @@ public class MybatisPlusConfig { return interceptor; } - - @Bean// pagehelper分页插件需要配的拦截器 - public PageInterceptor pageInterceptor() { - return new PageInterceptor(); - } } diff --git a/dao/pom.xml b/dao/pom.xml index ac62f0e..dfcd89a 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -23,28 +23,6 @@ org.projectlombok lombok - - - - cn.hutool - hutool-all - - - - com.alibaba.fastjson2 - fastjson2 - - - - mysql - mysql-connector-java - - - - com.zaxxer - HikariCP - 5.1.0 - com.baomidou @@ -55,21 +33,6 @@ com.github.xiaoymin knife4j-openapi3-jakarta-spring-boot-starter - - - org.springframework.boot - spring-boot-starter-security - - - - org.springframework.security - spring-security-test - - - - org.springframework.boot - spring-boot-starter-web - io.swagger diff --git a/pom.xml b/pom.xml index 1937036..b87e949 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,7 @@ 6.1.0 2.2 3.1 + 5.1.0 @@ -72,6 +73,12 @@ mysql-connector-java ${mysql.version} + + + com.zaxxer + HikariCP + ${HikariCP.version} + com.github.xiaoymin @@ -96,7 +103,7 @@ lombok ${lombok.version} - + cn.hutool hutool-all @@ -131,17 +138,12 @@ joda-time ${jodatime.version} - + com.fasterxml.jackson.datatype jackson-datatype-jsr310 2.12.3 - - com.github.pagehelper - pagehelper - ${pagehelper.version} - diff --git a/service/pom.xml b/service/pom.xml index 9234c70..01add39 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -20,21 +20,33 @@ + + cn.bunny + dao + 0.0.1-SNAPSHOT + + cn.bunny spring-security 0.0.1-SNAPSHOT + + + org.springframework.security + spring-security-test + + + + org.springframework.boot + spring-boot-starter-security + + cn.bunny module-mail 0.0.1-SNAPSHOT - - cn.bunny - module-minio - 0.0.1-SNAPSHOT - junit @@ -46,11 +58,6 @@ org.springframework.boot spring-boot-starter-test - - - org.springframework.boot - spring-boot-starter-websocket - org.aspectj diff --git a/service/src/main/resources/application-dev.yml b/service/src/main/resources/application-dev.yml index 0eae702..f2147b4 100644 --- a/service/src/main/resources/application-dev.yml +++ b/service/src/main/resources/application-dev.yml @@ -1,19 +1,19 @@ bunny: datasource: - host: 192.168.1.4 + host: 192.168.3.100 port: 3305 sqlData: bunny_docs username: root password: "02120212" redis: - host: 192.168.1.4 + host: 1192.168.3.100 port: 6379 database: 3 password: "123456" minio: - endpointUrl: "http://192.168.1.4:9000" + endpointUrl: "http://192.168.3.100:9000" bucket-name: test accessKey: bunny secretKey: "02120212" \ No newline at end of file diff --git a/service/src/main/resources/application-prod.yml b/service/src/main/resources/application-prod.yml index de30295..035261d 100644 --- a/service/src/main/resources/application-prod.yml +++ b/service/src/main/resources/application-prod.yml @@ -13,7 +13,7 @@ bunny: password: "123456" minio: - endpointUrl: "http://192.168.1.4:9000" + endpointUrl: "http://192.168.3.100:9000" bucket-name: test accessKey: bunny secretKey: "02120212" \ No newline at end of file