Bunny-Cli/java-single
Bunny-Cli
/
java-single
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev #9

Merged
bunny merged 4 commits from dev into master 2024-07-28 00:40:14 +08:00
Conversation 0 Commits 4 Files Changed 18 +57 -108
10 changed files with 57 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 25d27ffa69 - Show all commits

20
common/common-generator/pom.xml
View File

@ -18,31 +18,11 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<version>2.1</version> <version>2.1</version>
</dependency> </dependency>
<!--mysql-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- mysql连接池 -->
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>5.1.0</version>
</dependency>
<!-- mybatis-plus -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
</dependency>
<!-- 数据库代码生成器 - 新版 --> <!-- 数据库代码生成器 - 新版 -->
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>

20
common/pom.xml
View File

@ -25,5 +25,25 @@
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId> <artifactId>jjwt</artifactId>
</dependency> </dependency>
<!-- hutool -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<!-- fastjson2 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
<!--mysql-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- mysql连接池 -->
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

18
common/service-utils/pom.xml
View File

@ -22,6 +22,10 @@
<artifactId>dao</artifactId> <artifactId>dao</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- 解决 javax.xml.bind 错误 --> <!-- 解决 javax.xml.bind 错误 -->
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
@ -34,15 +38,6 @@
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>4.5.14</version> <version>4.5.14</version>
</dependency> </dependency>
<!-- knife4j -->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- redis --> <!-- redis -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -54,11 +49,6 @@
<artifactId>redisson</artifactId> <artifactId>redisson</artifactId>
<version>3.26.1</version> <version>3.26.1</version>
</dependency> </dependency>
<!-- pagehelper -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
</dependency>
<!-- 查询ip地址 --> <!-- 查询ip地址 -->
<dependency> <dependency>
<groupId>org.lionsoul</groupId> <groupId>org.lionsoul</groupId>

13
common/service-utils/src/main/java/cn/bunny/common/service/config/Knife4jConfig.java
View File

@ -15,13 +15,12 @@ import org.springframework.context.annotation.Configuration;
public class Knife4jConfig { public class Knife4jConfig {
@Bean @Bean
public OpenAPI openAPI() { public OpenAPI openAPI() {
log.info("Knife4jConfig===>配置knife4j");
// 作者等信息 // 作者等信息
Contact contact = new Contact().name("Bunny").email("1319900154@qq.com").url("http://z-bunny.com"); 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"); 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()); return new OpenAPI().info(info).externalDocs(new ExternalDocumentation());
} }
@ -29,18 +28,12 @@ public class Knife4jConfig {
// 前台相关分类接口 // 前台相关分类接口
@Bean @Bean
public GroupedOpenApi groupedOpenApi() { public GroupedOpenApi groupedOpenApi() {
return GroupedOpenApi.builder().group("前台接口管理").pathsToMatch("/api/**").build(); return GroupedOpenApi.builder().group("web前台接口管理").pathsToMatch("/api/**").build();
} }
// 管理员相关分类接口 // 管理员相关分类接口
@Bean @Bean
public GroupedOpenApi groupedOpenAdminApi() { public GroupedOpenApi groupedOpenAdminApi() {
return GroupedOpenApi.builder().group("管理员接口请求").pathsToMatch("/admin/**").build(); return GroupedOpenApi.builder().group("admin管理员接口请求").pathsToMatch("/admin/**").build();
}
// 测试相关分类接口
@Bean
public GroupedOpenApi testGroupedOpenApi() {
return GroupedOpenApi.builder().group("测试相关分类接口").pathsToMatch("/test/**").build();
} }
} }

6
common/service-utils/src/main/java/cn/bunny/common/service/config/MybatisPlusConfig.java
View File

@ -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.BlockAttackInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.github.pagehelper.PageInterceptor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -34,9 +33,4 @@ public class MybatisPlusConfig {
return interceptor; return interceptor;
} }
@Bean// pagehelper分页插件需要配的拦截器
public PageInterceptor pageInterceptor() {
return new PageInterceptor();
}
} }

37
dao/pom.xml
View File

@ -23,28 +23,6 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<!-- hutool -->
<!-- hu tool -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<!-- fastjson2 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
<!--mysql-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- mysql连接池 -->
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>5.1.0</version>
</dependency>
<!-- mybatis-plus --> <!-- mybatis-plus -->
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
@ -55,21 +33,6 @@
<groupId>com.github.xiaoymin</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId> <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
</dependency> </dependency>
<!-- spring-security -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<!-- spring-security-test -->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
</dependency>
<!-- spring-web -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- 实体类注解 --> <!-- 实体类注解 -->
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>

16
pom.xml
View File

@ -40,6 +40,7 @@
<pagehelper.version>6.1.0</pagehelper.version> <pagehelper.version>6.1.0</pagehelper.version>
<velocity.version>2.2</velocity.version> <velocity.version>2.2</velocity.version>
<velocity-tools.version>3.1</velocity-tools.version> <velocity-tools.version>3.1</velocity-tools.version>
<HikariCP.version>5.1.0</HikariCP.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
@ -72,6 +73,12 @@
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version> <version>${mysql.version}</version>
</dependency> </dependency>
<!-- mysql连接池 -->
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>${HikariCP.version}</version>
</dependency>
<!-- knife4j --> <!-- knife4j -->
<dependency> <dependency>
<groupId>com.github.xiaoymin</groupId> <groupId>com.github.xiaoymin</groupId>
@ -96,7 +103,7 @@
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>${lombok.version}</version> <version>${lombok.version}</version>
</dependency> </dependency>
<!-- hu tool --> <!-- hutool -->
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>
@ -131,17 +138,12 @@
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
<version>${jodatime.version}</version> <version>${jodatime.version}</version>
</dependency> </dependency>
<!-- pagehelper --> <!-- fasterxml -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.datatype</groupId> <groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId> <artifactId>jackson-datatype-jsr310</artifactId>
<version>2.12.3</version> <version>2.12.3</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>${pagehelper.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

27
service/pom.xml
View File

@ -20,21 +20,33 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>cn.bunny</groupId>
<artifactId>dao</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<!-- spring-security -->
<dependency> <dependency>
<groupId>cn.bunny</groupId> <groupId>cn.bunny</groupId>
<artifactId>spring-security</artifactId> <artifactId>spring-security</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</dependency> </dependency>
<!-- spring-security-test -->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
</dependency>
<!-- spring-security -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<!-- mail模块 -->
<dependency> <dependency>
<groupId>cn.bunny</groupId> <groupId>cn.bunny</groupId>
<artifactId>module-mail</artifactId> <artifactId>module-mail</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>cn.bunny</groupId>
<artifactId>module-minio</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<!-- 单元测试 --> <!-- 单元测试 -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -46,11 +58,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
</dependency> </dependency>
<!-- websocket -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!-- asp 切面 --> <!-- asp 切面 -->
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>

6
service/src/main/resources/application-dev.yml
View File

@ -1,19 +1,19 @@
bunny: bunny:
datasource: datasource:
host: 192.168.1.4 host: 192.168.3.100
port: 3305 port: 3305
sqlData: bunny_docs sqlData: bunny_docs
username: root username: root
password: "02120212" password: "02120212"
redis: redis:
host: 192.168.1.4 host: 1192.168.3.100
port: 6379 port: 6379
database: 3 database: 3
password: "123456" password: "123456"
minio: minio:
endpointUrl: "http://192.168.1.4:9000" endpointUrl: "http://192.168.3.100:9000"
bucket-name: test bucket-name: test
accessKey: bunny accessKey: bunny
secretKey: "02120212" secretKey: "02120212"

2
service/src/main/resources/application-prod.yml
View File

@ -13,7 +13,7 @@ bunny:
password: "123456" password: "123456"
minio: minio:
endpointUrl: "http://192.168.1.4:9000" endpointUrl: "http://192.168.3.100:9000"
bucket-name: test bucket-name: test
accessKey: bunny accessKey: bunny
secretKey: "02120212" secretKey: "02120212"