🎉 增加不同包名的demo

blade-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.0.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example-api/blade-dubbo-provider-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.0.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example-api/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.0.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-example-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.0.1.RELEASE</version>
+    <version>2.0.2.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务范例API集合</description>
 

blade-example/blade-dubbo-consumer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.0.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example/blade-dubbo-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.0.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-example/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.0.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-example</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.0.1.RELEASE</version>
+    <version>2.0.2.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务范例集合</description>
 

blade-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.0.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service-api/blade-demo-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.0.2.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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;

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;

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;
 
 /**
  * 通知公告视图类

blade-service-api/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.0.2.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-service-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.0.1.RELEASE</version>
+    <version>2.0.2.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务API集合</description>
 

blade-service/blade-demo/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-service</artifactId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.0.2.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

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;

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 {
 

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}")

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;
 

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;

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;

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;

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;
 

blade-service/blade-demo/src/main/java/com/example/demo/mapper/NoticeMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.demo.mapper.NoticeMapper">
+<mapper namespace="com.example.demo.mapper.NoticeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="noticeResultMap" type="org.springblade.demo.entity.Notice">
+    <resultMap id="noticeResultMap" type="com.example.demo.entity.Notice">
         <result column="id" property="id"/>
         <result column="create_user" property="createUser"/>
         <result column="create_time" property="createTime"/>

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;

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;
 
 /**
  * 服务类

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;
 
 /**

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

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

blade-service/pom.xml

@@ -7,12 +7,12 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>BladeX-Biz</artifactId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.0.2.RELEASE</version>
     </parent>
 
     <artifactId>blade-service</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.0.1.RELEASE</version>
+    <version>2.0.2.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务集合</description>
 

pom.xml

@@ -5,12 +5,12 @@
 
     <groupId>org.springblade</groupId>
     <artifactId>BladeX-Biz</artifactId>
-    <version>2.0.1.RELEASE</version>
+    <version>2.0.2.RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
-        <bladex.tool.version>2.0.1.RELEASE</bladex.tool.version>
-        <bladex.project.version>2.0.1.RELEASE</bladex.project.version>
+        <bladex.tool.version>2.0.2.RELEASE</bladex.tool.version>
+        <bladex.project.version>2.0.2.RELEASE</bladex.project.version>
 
         <java.version>1.8</java.version>
         <swagger.version>2.9.2</swagger.version>

script/docker/.env

@@ -1,2 +1,2 @@
 REGISTER=192.168.0.157/blade
-TAG=2.0.1.RELEASE
+TAG=2.0.2.RELEASE