diff --git a/blade-common/pom.xml b/blade-common/pom.xml index d072d6550..c326df621 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-example-api/blade-dubbo-provider-api/pom.xml b/blade-example-api/blade-dubbo-provider-api/pom.xml index b3c3e7842..b8937fd26 100644 --- a/blade-example-api/blade-dubbo-provider-api/pom.xml +++ b/blade-example-api/blade-dubbo-provider-api/pom.xml @@ -5,7 +5,7 @@ blade-example-api org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-example-api/pom.xml b/blade-example-api/pom.xml index a143565f8..cedfde9f0 100644 --- a/blade-example-api/pom.xml +++ b/blade-example-api/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 blade-example-api ${project.artifactId} - 2.0.1.RELEASE + 2.0.2.RELEASE pom BladeX 微服务范例API集合 diff --git a/blade-example/blade-dubbo-consumer/pom.xml b/blade-example/blade-dubbo-consumer/pom.xml index 04572c70f..8458e87b2 100644 --- a/blade-example/blade-dubbo-consumer/pom.xml +++ b/blade-example/blade-dubbo-consumer/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-example/blade-dubbo-provider/pom.xml b/blade-example/blade-dubbo-provider/pom.xml index 2107b6ae1..06c3b9614 100644 --- a/blade-example/blade-dubbo-provider/pom.xml +++ b/blade-example/blade-dubbo-provider/pom.xml @@ -5,7 +5,7 @@ blade-example org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-example/pom.xml b/blade-example/pom.xml index 2b4f31ffe..df1428bd5 100644 --- a/blade-example/pom.xml +++ b/blade-example/pom.xml @@ -5,13 +5,13 @@ BladeX-Biz org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 blade-example ${project.artifactId} - 2.0.1.RELEASE + 2.0.2.RELEASE pom BladeX 微服务范例集合 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 8dcc4c5ec..199690331 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ BladeX-Biz org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml index 8d875510a..926a8cb53 100644 --- a/blade-service-api/blade-demo-api/pom.xml +++ b/blade-service-api/blade-demo-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-service-api/blade-demo-api/src/main/java/org/springblade/demo/entity/Notice.java b/blade-service-api/blade-demo-api/src/main/java/com/example/demo/entity/Notice.java similarity index 97% rename from blade-service-api/blade-demo-api/src/main/java/org/springblade/demo/entity/Notice.java rename to blade-service-api/blade-demo-api/src/main/java/com/example/demo/entity/Notice.java index 920110215..edcde9d73 100644 --- a/blade-service-api/blade-demo-api/src/main/java/org/springblade/demo/entity/Notice.java +++ b/blade-service-api/blade-demo-api/src/main/java/com/example/demo/entity/Notice.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.demo.entity; +package com.example.demo.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; diff --git a/blade-service-api/blade-demo-api/src/main/java/org/springblade/demo/feign/INoticeClient.java b/blade-service-api/blade-demo-api/src/main/java/com/example/demo/feign/INoticeClient.java similarity index 94% rename from blade-service-api/blade-demo-api/src/main/java/org/springblade/demo/feign/INoticeClient.java rename to blade-service-api/blade-demo-api/src/main/java/com/example/demo/feign/INoticeClient.java index 5761d2613..740df4be1 100644 --- a/blade-service-api/blade-demo-api/src/main/java/org/springblade/demo/feign/INoticeClient.java +++ b/blade-service-api/blade-demo-api/src/main/java/com/example/demo/feign/INoticeClient.java @@ -14,11 +14,11 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.demo.feign; +package com.example.demo.feign; import org.springblade.core.launch.constant.AppConstant; import org.springblade.core.tool.api.R; -import org.springblade.demo.entity.Notice; +import com.example.demo.entity.Notice; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/blade-service-api/blade-demo-api/src/main/java/org/springblade/demo/vo/NoticeVO.java b/blade-service-api/blade-demo-api/src/main/java/com/example/demo/vo/NoticeVO.java similarity index 80% rename from blade-service-api/blade-demo-api/src/main/java/org/springblade/demo/vo/NoticeVO.java rename to blade-service-api/blade-demo-api/src/main/java/com/example/demo/vo/NoticeVO.java index b1b0a5d47..dfb0a6604 100644 --- a/blade-service-api/blade-demo-api/src/main/java/org/springblade/demo/vo/NoticeVO.java +++ b/blade-service-api/blade-demo-api/src/main/java/com/example/demo/vo/NoticeVO.java @@ -1,9 +1,9 @@ -package org.springblade.demo.vo; +package com.example.demo.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.demo.entity.Notice; +import com.example.demo.entity.Notice; /** * 通知公告视图类 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 8fa56ac07..bd1a31b03 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,14 +5,14 @@ BladeX-Biz org.springblade - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 blade-service-api ${project.artifactId} - 2.0.1.RELEASE + 2.0.2.RELEASE pom BladeX 微服务API集合 diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml index b6c14c68e..b9170b28f 100644 --- a/blade-service/blade-demo/pom.xml +++ b/blade-service/blade-demo/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.0.1.RELEASE + 2.0.2.RELEASE 4.0.0 diff --git a/blade-service/blade-demo/src/main/java/org/springblade/demo/DemoApplication.java b/blade-service/blade-demo/src/main/java/com/example/demo/DemoApplication.java similarity index 97% rename from blade-service/blade-demo/src/main/java/org/springblade/demo/DemoApplication.java rename to blade-service/blade-demo/src/main/java/com/example/demo/DemoApplication.java index ef42715f4..47b27c4ac 100644 --- a/blade-service/blade-demo/src/main/java/org/springblade/demo/DemoApplication.java +++ b/blade-service/blade-demo/src/main/java/com/example/demo/DemoApplication.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.demo; +package com.example.demo; import org.springblade.core.cloud.feign.EnableBladeFeign; import org.springblade.core.launch.BladeApplication; diff --git a/blade-service/blade-demo/src/main/java/org/springblade/demo/config/DemoConfiguration.java b/blade-service/blade-demo/src/main/java/com/example/demo/config/DemoConfiguration.java similarity index 88% rename from blade-service/blade-demo/src/main/java/org/springblade/demo/config/DemoConfiguration.java rename to blade-service/blade-demo/src/main/java/com/example/demo/config/DemoConfiguration.java index 95d68532f..ebce57500 100644 --- a/blade-service/blade-demo/src/main/java/org/springblade/demo/config/DemoConfiguration.java +++ b/blade-service/blade-demo/src/main/java/com/example/demo/config/DemoConfiguration.java @@ -14,11 +14,12 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.demo.config; +package com.example.demo.config; +import com.example.demo.props.DemoProperties; +import org.mybatis.spring.annotation.MapperScan; import org.springblade.core.secure.registry.SecureRegistry; -import org.springblade.demo.props.DemoProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -30,6 +31,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @author Chill */ @Configuration +@MapperScan({"org.springblade.**.mapper.**", "com.example.**.mapper.**"}) @EnableConfigurationProperties(DemoProperties.class) public class DemoConfiguration implements WebMvcConfigurer { diff --git a/blade-service/blade-demo/src/main/java/org/springblade/demo/controller/DemoController.java b/blade-service/blade-demo/src/main/java/com/example/demo/controller/DemoController.java similarity index 90% rename from blade-service/blade-demo/src/main/java/org/springblade/demo/controller/DemoController.java rename to blade-service/blade-demo/src/main/java/com/example/demo/controller/DemoController.java index 5db3a3a3f..0129a6a76 100644 --- a/blade-service/blade-demo/src/main/java/org/springblade/demo/controller/DemoController.java +++ b/blade-service/blade-demo/src/main/java/com/example/demo/controller/DemoController.java @@ -14,9 +14,10 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.demo.controller; +package com.example.demo.controller; -import org.springblade.demo.props.DemoProperties; +import com.example.demo.props.DemoProperties; +import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.web.bind.annotation.GetMapping; @@ -31,6 +32,7 @@ import org.springframework.web.bind.annotation.RestController; @RefreshScope @RestController @RequestMapping("demo") +@Api(value = "配置接口", tags = "即时刷新配置") public class DemoController { @Value("${demo.name}") diff --git a/blade-service/blade-demo/src/main/java/org/springblade/demo/controller/NoticeController.java b/blade-service/blade-demo/src/main/java/com/example/demo/controller/NoticeController.java similarity index 96% rename from blade-service/blade-demo/src/main/java/org/springblade/demo/controller/NoticeController.java rename to blade-service/blade-demo/src/main/java/com/example/demo/controller/NoticeController.java index 78535bf08..f9e4b9fd4 100644 --- a/blade-service/blade-demo/src/main/java/org/springblade/demo/controller/NoticeController.java +++ b/blade-service/blade-demo/src/main/java/com/example/demo/controller/NoticeController.java @@ -14,9 +14,11 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.demo.controller; +package com.example.demo.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.example.demo.entity.Notice; +import com.example.demo.service.INoticeService; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.common.cache.CacheNames; @@ -25,8 +27,6 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.demo.entity.Notice; -import org.springblade.demo.service.INoticeService; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; diff --git a/blade-service/blade-demo/src/main/java/org/springblade/demo/controller/UploadController.java b/blade-service/blade-demo/src/main/java/com/example/demo/controller/UploadController.java similarity index 91% rename from blade-service/blade-demo/src/main/java/org/springblade/demo/controller/UploadController.java rename to blade-service/blade-demo/src/main/java/com/example/demo/controller/UploadController.java index 9c2c69c67..674528d0a 100644 --- a/blade-service/blade-demo/src/main/java/org/springblade/demo/controller/UploadController.java +++ b/blade-service/blade-demo/src/main/java/com/example/demo/controller/UploadController.java @@ -1,5 +1,6 @@ -package org.springblade.demo.controller; +package com.example.demo.controller; +import io.swagger.annotations.Api; import lombok.AllArgsConstructor; import lombok.SneakyThrows; import org.springblade.core.minio.MinioTemplate; @@ -21,6 +22,7 @@ import java.util.Objects; @RestController @AllArgsConstructor @RequestMapping("/notice/upload") +@Api(value = "对象存储接口", tags = "oss上传测试") public class UploadController { private MinioTemplate minioTemplate; diff --git a/blade-service/blade-demo/src/main/java/org/springblade/demo/feign/NoticeClient.java b/blade-service/blade-demo/src/main/java/com/example/demo/feign/NoticeClient.java similarity index 91% rename from blade-service/blade-demo/src/main/java/org/springblade/demo/feign/NoticeClient.java rename to blade-service/blade-demo/src/main/java/com/example/demo/feign/NoticeClient.java index 5b5570b97..81673880d 100644 --- a/blade-service/blade-demo/src/main/java/org/springblade/demo/feign/NoticeClient.java +++ b/blade-service/blade-demo/src/main/java/com/example/demo/feign/NoticeClient.java @@ -14,12 +14,12 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.demo.feign; +package com.example.demo.feign; +import com.example.demo.entity.Notice; +import com.example.demo.mapper.NoticeMapper; import lombok.AllArgsConstructor; import org.springblade.core.tool.api.R; -import org.springblade.demo.mapper.NoticeMapper; -import org.springblade.demo.entity.Notice; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; diff --git a/blade-service/blade-demo/src/main/java/org/springblade/demo/launcher/DemoLauncherServiceImpl.java b/blade-service/blade-demo/src/main/java/com/example/demo/launcher/DemoLauncherServiceImpl.java similarity index 97% rename from blade-service/blade-demo/src/main/java/org/springblade/demo/launcher/DemoLauncherServiceImpl.java rename to blade-service/blade-demo/src/main/java/com/example/demo/launcher/DemoLauncherServiceImpl.java index ea205e17a..bdb91b080 100644 --- a/blade-service/blade-demo/src/main/java/org/springblade/demo/launcher/DemoLauncherServiceImpl.java +++ b/blade-service/blade-demo/src/main/java/com/example/demo/launcher/DemoLauncherServiceImpl.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.demo.launcher; +package com.example.demo.launcher; import org.springblade.core.auto.service.AutoService; import org.springblade.core.launch.constant.NacosConstant; diff --git a/blade-service/blade-demo/src/main/java/org/springblade/demo/mapper/NoticeMapper.java b/blade-service/blade-demo/src/main/java/com/example/demo/mapper/NoticeMapper.java similarity index 94% rename from blade-service/blade-demo/src/main/java/org/springblade/demo/mapper/NoticeMapper.java rename to blade-service/blade-demo/src/main/java/com/example/demo/mapper/NoticeMapper.java index 2a77f9a3d..86102853e 100644 --- a/blade-service/blade-demo/src/main/java/org/springblade/demo/mapper/NoticeMapper.java +++ b/blade-service/blade-demo/src/main/java/com/example/demo/mapper/NoticeMapper.java @@ -14,11 +14,11 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.demo.mapper; +package com.example.demo.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.demo.entity.Notice; +import com.example.demo.entity.Notice; import java.util.List; diff --git a/blade-service/blade-demo/src/main/java/org/springblade/demo/mapper/NoticeMapper.xml b/blade-service/blade-demo/src/main/java/com/example/demo/mapper/NoticeMapper.xml similarity index 90% rename from blade-service/blade-demo/src/main/java/org/springblade/demo/mapper/NoticeMapper.xml rename to blade-service/blade-demo/src/main/java/com/example/demo/mapper/NoticeMapper.xml index 13dae26dd..046ca1354 100644 --- a/blade-service/blade-demo/src/main/java/org/springblade/demo/mapper/NoticeMapper.xml +++ b/blade-service/blade-demo/src/main/java/com/example/demo/mapper/NoticeMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/blade-service/blade-demo/src/main/java/org/springblade/demo/props/DemoProperties.java b/blade-service/blade-demo/src/main/java/com/example/demo/props/DemoProperties.java similarity index 88% rename from blade-service/blade-demo/src/main/java/org/springblade/demo/props/DemoProperties.java rename to blade-service/blade-demo/src/main/java/com/example/demo/props/DemoProperties.java index 0306f7dbd..7c3f70043 100644 --- a/blade-service/blade-demo/src/main/java/org/springblade/demo/props/DemoProperties.java +++ b/blade-service/blade-demo/src/main/java/com/example/demo/props/DemoProperties.java @@ -1,4 +1,4 @@ -package org.springblade.demo.props; +package com.example.demo.props; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/blade-service/blade-demo/src/main/java/org/springblade/demo/service/INoticeService.java b/blade-service/blade-demo/src/main/java/com/example/demo/service/INoticeService.java similarity index 93% rename from blade-service/blade-demo/src/main/java/org/springblade/demo/service/INoticeService.java rename to blade-service/blade-demo/src/main/java/com/example/demo/service/INoticeService.java index e2d10b697..015af8db6 100644 --- a/blade-service/blade-demo/src/main/java/org/springblade/demo/service/INoticeService.java +++ b/blade-service/blade-demo/src/main/java/com/example/demo/service/INoticeService.java @@ -14,11 +14,11 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.demo.service; +package com.example.demo.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; -import org.springblade.demo.entity.Notice; +import com.example.demo.entity.Notice; /** * 服务类 diff --git a/blade-service/blade-demo/src/main/java/org/springblade/demo/service/impl/NoticeServiceImpl.java b/blade-service/blade-demo/src/main/java/com/example/demo/service/impl/NoticeServiceImpl.java similarity index 87% rename from blade-service/blade-demo/src/main/java/org/springblade/demo/service/impl/NoticeServiceImpl.java rename to blade-service/blade-demo/src/main/java/com/example/demo/service/impl/NoticeServiceImpl.java index 4808010d6..60bb06a72 100644 --- a/blade-service/blade-demo/src/main/java/org/springblade/demo/service/impl/NoticeServiceImpl.java +++ b/blade-service/blade-demo/src/main/java/com/example/demo/service/impl/NoticeServiceImpl.java @@ -14,13 +14,13 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package org.springblade.demo.service.impl; +package com.example.demo.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.example.demo.mapper.NoticeMapper; +import com.example.demo.service.INoticeService; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.demo.entity.Notice; -import org.springblade.demo.mapper.NoticeMapper; -import org.springblade.demo.service.INoticeService; +import com.example.demo.entity.Notice; import org.springframework.stereotype.Service; /** diff --git a/blade-service/blade-demo/src/main/resources/application-dev.yml b/blade-service/blade-demo/src/main/resources/application-dev.yml index 5fcbd2711..25056f70f 100644 --- a/blade-service/blade-demo/src/main/resources/application-dev.yml +++ b/blade-service/blade-demo/src/main/resources/application-dev.yml @@ -8,19 +8,3 @@ spring: url: ${blade.datasource.dev.url} username: ${blade.datasource.dev.username} password: ${blade.datasource.dev.password} - -minio: - enable: true - tenant-mode: false - endpoint: http://127.0.0.1:9000 - access-key: D99KGE6ZTQXSATTJWU24 - secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ - bucket-name: bladex - -qiniu: - enable: true - tenant-mode: false - endpoint: prv0t4ij6.bkt.clouddn.com - access-key: N_Loh1ngBqcJovwiAJqR91Ifj2vgOWHOf8AwBA_h - secret-key: AuzuA1KHAbkIndCU0dB3Zfii2O3crHNODDmpxHRS - bucket-name: bladex diff --git a/blade-service/blade-demo/src/main/resources/application.yml b/blade-service/blade-demo/src/main/resources/application.yml new file mode 100644 index 000000000..4fc32d15c --- /dev/null +++ b/blade-service/blade-demo/src/main/resources/application.yml @@ -0,0 +1,27 @@ +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/example/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.example.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: + - org.springbalde + - com.example + +minio: + enable: true + tenant-mode: false + endpoint: http://127.0.0.1:9000 + access-key: D99KGE6ZTQXSATTJWU24 + secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ + bucket-name: bladex + +qiniu: + enable: true + tenant-mode: false + endpoint: prv0t4ij6.bkt.clouddn.com + access-key: N_Loh1ngBqcJovwiAJqR91Ifj2vgOWHOf8AwBA_h + secret-key: AuzuA1KHAbkIndCU0dB3Zfii2O3crHNODDmpxHRS + bucket-name: bladex diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 4ecfb6c10..32a3f5ddd 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade BladeX-Biz - 2.0.1.RELEASE + 2.0.2.RELEASE blade-service ${project.artifactId} - 2.0.1.RELEASE + 2.0.2.RELEASE pom BladeX 微服务集合 diff --git a/pom.xml b/pom.xml index 2153b06f2..af72f57e0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springblade BladeX-Biz - 2.0.1.RELEASE + 2.0.2.RELEASE pom - 2.0.1.RELEASE - 2.0.1.RELEASE + 2.0.2.RELEASE + 2.0.2.RELEASE 1.8 2.9.2 diff --git a/script/docker/.env b/script/docker/.env index c9c89c479..9b5fc7160 100644 --- a/script/docker/.env +++ b/script/docker/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=2.0.1.RELEASE +TAG=2.0.2.RELEASE