blade/BladeX
1
0
Fork 0
mirror of https://github.com/chillzhuang/SpringBlade.git synced 2024-12-22 09:09:24 +08:00
Code Issues Projects Releases Wiki Activity

🎉 4.2.0.RELEASE 重构包名，分类core模块与starter模块

Browse Source
This commit is contained in:
smallchill 2024-09-06 13:57:28 +08:00
parent c3165e2ed6
commit 35f70db177
53 changed files with 134 additions and 487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -1,5 +1,5 @@
<p align="center">
<img src="https://img.shields.io/badge/Release-V4.1.0-green.svg" alt="Downloads">
<img src="https://img.shields.io/badge/Release-V4.2.0-green.svg" alt="Downloads">
<img src="https://img.shields.io/badge/JDK-17+-green.svg" alt="Build Status">
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
<img src="https://img.shields.io/badge/Spring%20Cloud-2023-blue.svg" alt="Coverage Status">
@ -33,9 +33,9 @@
|----------------------|------------|
| Java | 17+ |
| NodeJS | 18+ |
| Spring | 6.1.10 |
| Spring Boot | 3.2.7 |
| Spring Cloud | 2023.0.2 |
| Spring | 6.1.12 |
| Spring Boot | 3.2.9 |
| Spring Cloud | 2023.0.3 |
| Spring Cloud Alibaba | 2023.0.1.0 |
| Nacos Alibaba | 2.3.2 |
| Mybatis Plus | 3.5.7 |
@ -56,8 +56,7 @@ SpringBlade
├── blade-service -- 业务模块
├ ├── blade-desk -- 工作台模块
├ ├── blade-log -- 日志模块
├ ├── blade-system -- 系统模块
├ └── blade-user -- 用户模块
├ └── blade-system -- 系统模块
├── blade-service-api -- 业务模块api封装
├ ├── blade-desk-api -- 工作台api
├ ├── blade-dict-api -- 字典api

8
blade-auth/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<artifactId>blade-auth</artifactId>
@ -35,12 +35,12 @@
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-log</artifactId>
<artifactId>blade-starter-log</artifactId>
<version>${blade.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-social</artifactId>
<artifactId>blade-starter-social</artifactId>
<version>${blade.tool.version}</version>
</dependency>
<dependency>
@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-swagger</artifactId>
<artifactId>blade-starter-swagger</artifactId>
<version>${blade.tool.version}</version>
</dependency>
<!-- Captcha -->

4
blade-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -22,7 +22,7 @@
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-loadbalancer</artifactId>
<artifactId>blade-starter-loadbalancer</artifactId>
<version>${blade.tool.version}</version>
</dependency>
<dependency>

2
blade-gateway/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-admin/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
blade-ops/blade-develop/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -30,7 +30,7 @@
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-develop</artifactId>
<artifactId>blade-starter-develop</artifactId>
<version>${blade.tool.version}</version>
</dependency>
<dependency>

4
blade-ops/blade-report/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -24,7 +24,7 @@
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-report</artifactId>
<artifactId>blade-starter-report</artifactId>
<version>${blade.tool.version}</version>
</dependency>
<dependency>

4
blade-ops/blade-resource/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-oss</artifactId>
<artifactId>blade-starter-oss</artifactId>
<version>${blade.tool.version}</version>
</dependency>
</dependencies>

4
blade-ops/blade-seata-order/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -27,7 +27,7 @@
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-transaction</artifactId>
<artifactId>blade-starter-transaction</artifactId>
<version>${blade.tool.version}</version>
</dependency>
</dependencies>

4
blade-ops/blade-seata-storage/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -27,7 +27,7 @@
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-transaction</artifactId>
<artifactId>blade-starter-transaction</artifactId>
<version>${blade.tool.version}</version>
</dependency>
</dependencies>

4
blade-ops/pom.xml
View File

@ -5,13 +5,13 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-ops</artifactId>
<name>${project.artifactId}</name>
<version>4.1.0</version>
<version>4.2.0</version>
<packaging>pom</packaging>
<modules>
<module>blade-admin</module>

2
blade-service-api/blade-demo-api/pom.xml
View File

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

2
blade-service-api/blade-desk-api/pom.xml
View File

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

2
blade-service-api/blade-dict-api/pom.xml
View File

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

4
blade-service-api/blade-scope-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -22,7 +22,7 @@
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-datascope</artifactId>
<artifactId>blade-starter-datascope</artifactId>
<version>${blade.tool.version}</version>
</dependency>
</dependencies>

2
blade-service-api/blade-system-api/pom.xml
View File

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

2
blade-service-api/blade-user-api/pom.xml
View File

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

2
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java
View File

@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RequestParam;
* @author Chill
*/
@FeignClient(
value = AppConstant.APPLICATION_USER_NAME,
value = AppConstant.APPLICATION_SYSTEM_NAME,
fallback = IUserClientFallback.class
)
public interface IUserClient {

6
blade-service-api/pom.xml
View File

@ -5,13 +5,13 @@
<parent>
<artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-service-api</artifactId>
<name>${project.artifactId}</name>
<version>4.1.0</version>
<version>4.2.0</version>
<packaging>pom</packaging>
<description>SpringBlade 微服务API集合</description>
@ -27,7 +27,7 @@
<dependencies>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-mybatis</artifactId>
<artifactId>blade-starter-mybatis</artifactId>
<version>${blade.tool.version}</version>
</dependency>
<dependency>

8
blade-service/blade-demo/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -22,7 +22,7 @@
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-swagger</artifactId>
<artifactId>blade-starter-swagger</artifactId>
<version>${blade.tool.version}</version>
</dependency>
<dependency>
@ -32,8 +32,8 @@
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>2.5.6</version>
<artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
<version>4.3.0</version>
</dependency>
</dependencies>

2
blade-service/blade-demo/src/main/java/com/example/demo/launcher/DemoLauncherServiceImpl.java
View File

@ -35,6 +35,8 @@ public class DemoLauncherServiceImpl implements LauncherService {
PropsUtil.setProperty(props, "spring.cloud.nacos.config.ext-config[0].data-id", NacosConstant.dataId("blade-demo", profile));
PropsUtil.setProperty(props, "spring.cloud.nacos.config.ext-config[0].group", NacosConstant.NACOS_CONFIG_GROUP);
PropsUtil.setProperty(props, "spring.cloud.nacos.config.ext-config[0].refresh", NacosConstant.NACOS_CONFIG_REFRESH);
// 开启多数据源
PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "true");
// 自定义命名空间
// PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", LauncherConstant.NACOS_NAMESPACE);
// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", LauncherConstant.NACOS_NAMESPACE);

4
blade-service/blade-desk/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-service</artifactId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -24,7 +24,7 @@
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-swagger</artifactId>
<artifactId>blade-starter-swagger</artifactId>
<version>${blade.tool.version}</version>
</dependency>
<dependency>

2
blade-service/blade-log/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

37
blade-service/blade-system/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -35,11 +35,36 @@
<artifactId>blade-user-api</artifactId>
<version>${blade.project.version}</version>
</dependency>
<!--Zipkin-->
<!--<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zipkin</artifactId>
</dependency>-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>${easyexcel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
<version>${poi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>ooxml-schemas</artifactId>
<version>1.4</version>
</dependency>
</dependencies>
<build>

12
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java → blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.user.controller;
package org.springblade.system.controller;
import com.alibaba.excel.EasyExcel;
@ -40,11 +40,11 @@ import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.excel.UserExcel;
import org.springblade.system.user.excel.UserImportListener;
import org.springblade.system.user.service.IUserService;
import org.springblade.system.excel.UserExcel;
import org.springblade.system.excel.UserImportListener;
import org.springblade.system.service.IUserService;
import org.springblade.system.user.vo.UserVO;
import org.springblade.system.user.wrapper.UserWrapper;
import org.springblade.system.wrapper.UserWrapper;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -64,7 +64,7 @@ import java.util.Map;
* @author Chill
*/
@RestController
@RequestMapping
@RequestMapping("/user")
@AllArgsConstructor
public class UserController {

2
blade-service/blade-user/src/main/java/org/springblade/system/user/excel/UserExcel.java → blade-service/blade-system/src/main/java/org/springblade/system/excel/UserExcel.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.user.excel;
package org.springblade.system.excel;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;

4
blade-service/blade-user/src/main/java/org/springblade/system/user/excel/UserImportListener.java → blade-service/blade-system/src/main/java/org/springblade/system/excel/UserImportListener.java
View File

@ -1,11 +1,11 @@
package org.springblade.system.user.excel;
package org.springblade.system.excel;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.RequiredArgsConstructor;
import org.springblade.system.user.service.IUserService;
import org.springblade.system.service.IUserService;
import java.util.ArrayList;
import java.util.List;

5
blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java → blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java
View File

@ -13,15 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.user.feign;
package org.springblade.system.feign;
import io.swagger.v3.oas.annotations.Hidden;
import lombok.AllArgsConstructor;
import org.springblade.core.tool.api.R;
import org.springblade.system.service.IUserService;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.entity.UserInfo;
import org.springblade.system.user.entity.UserOauth;
import org.springblade.system.user.service.IUserService;
import org.springblade.system.user.feign.IUserClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;

4
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java → blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.java
View File

@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.user.mapper;
package org.springblade.system.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.excel.UserExcel;
import org.springblade.system.excel.UserExcel;
import java.util.List;

4
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml → blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml
View File

@ -1,6 +1,6 @@
<?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.system.user.mapper.UserMapper">
<mapper namespace="org.springblade.system.mapper.UserMapper">
<!-- 通用查询映射结果 -->
<resultMap id="userResultMap" type="org.springblade.system.user.entity.User">
@ -89,7 +89,7 @@
and is_deleted = 0
</select>
<select id="exportUser" resultType="org.springblade.system.user.excel.UserExcel">
<select id="exportUser" resultType="org.springblade.system.excel.UserExcel">
SELECT id, tenant_id, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
</select>

2
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserOauthMapper.java → blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserOauthMapper.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.user.mapper;
package org.springblade.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springblade.system.user.entity.UserOauth;

2
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserOauthMapper.xml → blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserOauthMapper.xml
View File

@ -1,6 +1,6 @@
<?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.system.user.mapper.UserOauthMapper">
<mapper namespace="org.springblade.system.mapper.UserOauthMapper">
<!-- 通用查询映射结果 -->
<resultMap id="userResultMap" type="org.springblade.system.user.entity.UserOauth">

2
blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserOauthService.java → blade-service/blade-system/src/main/java/org/springblade/system/service/IUserOauthService.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.user.service;
package org.springblade.system.service;
import com.baomidou.mybatisplus.extension.service.IService;

4
blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java → blade-service/blade-system/src/main/java/org/springblade/system/service/IUserService.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.user.service;
package org.springblade.system.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@ -22,7 +22,7 @@ import org.springblade.core.mp.base.BaseService;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.entity.UserInfo;
import org.springblade.system.user.entity.UserOauth;
import org.springblade.system.user.excel.UserExcel;
import org.springblade.system.excel.UserExcel;
import java.util.List;

6
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserOauthServiceImpl.java → blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserOauthServiceImpl.java
View File

@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.user.service.impl;
package org.springblade.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.springblade.system.user.entity.UserOauth;
import org.springblade.system.user.mapper.UserOauthMapper;
import org.springblade.system.user.service.IUserOauthService;
import org.springblade.system.mapper.UserOauthMapper;
import org.springblade.system.service.IUserOauthService;
import org.springframework.stereotype.Service;
/**

10
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java → blade-service/blade-system/src/main/java/org/springblade/system/service/impl/UserServiceImpl.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.user.service.impl;
package org.springblade.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@ -30,10 +30,10 @@ import org.springblade.system.feign.ISysClient;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.entity.UserInfo;
import org.springblade.system.user.entity.UserOauth;
import org.springblade.system.user.excel.UserExcel;
import org.springblade.system.user.mapper.UserMapper;
import org.springblade.system.user.service.IUserOauthService;
import org.springblade.system.user.service.IUserService;
import org.springblade.system.excel.UserExcel;
import org.springblade.system.mapper.UserMapper;
import org.springblade.system.service.IUserOauthService;
import org.springblade.system.service.IUserService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

4
blade-service/blade-user/src/main/java/org/springblade/system/user/wrapper/UserWrapper.java → blade-service/blade-system/src/main/java/org/springblade/system/wrapper/UserWrapper.java
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.user.wrapper;
package org.springblade.system.wrapper;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.api.R;
@ -22,7 +22,7 @@ import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.system.feign.IDictClient;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.service.IUserService;
import org.springblade.system.service.IUserService;
import org.springblade.system.user.vo.UserVO;
import java.util.List;

15
blade-service/blade-user/Dockerfile
View File

@ -1,15 +0,0 @@
FROM bladex/alpine-java:openjdk17_cn_slim
MAINTAINER bladejava@qq.com
RUN mkdir -p /blade/user
WORKDIR /blade/user
EXPOSE 8102
ADD ./target/blade-user.jar ./app.jar
ENTRYPOINT ["java", "--add-opens java.base/java.lang.reflect=ALL-UNNAMED", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
CMD ["--spring.profiles.active=test"]

60
blade-service/blade-user/pom.xml
View File

@ -1,60 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId>
<version>4.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-user</artifactId>
<name>${project.artifactId}</name>
<version>${blade.project.version}</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId>
<version>${blade.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-user-api</artifactId>
<version>${blade.project.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-dict-api</artifactId>
<version>${blade.project.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-system-api</artifactId>
<version>${blade.project.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>${easyexcel.version}</version>
</dependency>
<!--Zipkin-->
<!--<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zipkin</artifactId>
</dependency>-->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

34
blade-service/blade-user/src/main/java/org/springblade/system/user/UserApplication.java
View File

@ -1,34 +0,0 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springblade.system.user;
import org.springblade.core.cloud.client.BladeCloudApplication;
import org.springblade.core.launch.BladeApplication;
import org.springblade.core.launch.constant.AppConstant;
/**
* 用户启动器
*
* @author Chill
*/
@BladeCloudApplication
public class UserApplication {
public static void main(String[] args) {
BladeApplication.run(AppConstant.APPLICATION_USER_NAME, UserApplication.class, args);
}
}

10
blade-service/blade-user/src/main/resources/application-dev.yml
View File

@ -1,10 +0,0 @@
#服务器端口
server:
port: 8102
#数据源配置
spring:
datasource:
url: ${blade.datasource.dev.url}
username: ${blade.datasource.dev.username}
password: ${blade.datasource.dev.password}

10
blade-service/blade-user/src/main/resources/application-prod.yml
View File

@ -1,10 +0,0 @@
#服务器端口
server:
port: 8102
#数据源配置
spring:
datasource:
url: ${blade.datasource.prod.url}
username: ${blade.datasource.prod.username}
password: ${blade.datasource.prod.password}

10
blade-service/blade-user/src/main/resources/application-test.yml
View File

@ -1,10 +0,0 @@
#服务器端口
server:
port: 8102
#数据源配置
spring:
datasource:
url: ${blade.datasource.test.url}
username: ${blade.datasource.test.username}
password: ${blade.datasource.test.password}

5
blade-service/pom.xml
View File

@ -7,12 +7,12 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<artifactId>blade-service</artifactId>
<name>${project.artifactId}</name>
<version>4.1.0</version>
<version>4.2.0</version>
<packaging>pom</packaging>
<description>SpringBlade 微服务集合</description>
@ -20,7 +20,6 @@
<module>blade-desk</module>
<module>blade-log</module>
<module>blade-system</module>
<module>blade-user</module>
<module>blade-demo</module>
</modules>

2
doc/nacos/blade.yaml
View File

@ -73,7 +73,7 @@ knife4j:
swagger:
title: SpringBlade 接口文档系统
description: SpringBlade 接口文档系统
version: 4.1.0
version: 4.2.0
license: Powered By SpringBlade
licenseUrl: https://bladex.cn
terms-of-service-url: https://bladex.cn

2
doc/sql/blade/blade-saber-mysql.sql
View File

File diff suppressed because one or more lines are too long

2
doc/sql/blade/blade-sword-mysql.sql
View File

File diff suppressed because one or more lines are too long

13
pom.xml
View File

@ -5,12 +5,12 @@
<groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId>
<version>4.1.0</version>
<version>4.2.0</version>
<packaging>pom</packaging>
<properties>
<blade.tool.version>4.1.0</blade.tool.version>
<blade.project.version>4.1.0</blade.project.version>
<blade.tool.version>4.2.0</blade.tool.version>
<blade.project.version>4.2.0</blade.project.version>
<java.version>17</java.version>
<maven.plugin.version>3.11.0</maven.plugin.version>
@ -19,12 +19,13 @@
<protostuff.version>1.6.0</protostuff.version>
<captcha.version>1.6.2</captcha.version>
<easyexcel.version>3.3.4</easyexcel.version>
<poi.version>4.1.2</poi.version>
<mica.auto.version>3.1.3</mica.auto.version>
<spring.version>6.1.10</spring.version>
<spring.boot.version>3.2.7</spring.boot.version>
<spring.version>6.1.12</spring.version>
<spring.boot.version>3.2.9</spring.boot.version>
<spring.boot.admin.version>3.2.3</spring.boot.admin.version>
<spring.cloud.version>2023.0.2</spring.cloud.version>
<spring.cloud.version>2023.0.3</spring.cloud.version>
<alibaba.cloud.version>2023.0.1.0</alibaba.cloud.version>
<alibaba.nacos.version>2.3.2</alibaba.nacos.version>

2
script/docker/.env
View File

@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade
TAG=4.1.0
TAG=4.2.0

2
script/docker/deploy.sh
View File

@ -46,7 +46,7 @@ base(){
#启动程序模块
modules(){
docker-compose up -d blade-gateway1 blade-gateway2 blade-admin blade-auth1 blade-auth2 blade-user blade-desk blade-system blade-log blade-report blade-develop
docker-compose up -d blade-gateway1 blade-gateway2 blade-admin blade-auth1 blade-auth2 blade-desk blade-system blade-log blade-report blade-develop
}
#关闭所有模块

7
script/docker/docker-compose.yml
View File

@ -133,13 +133,6 @@ services:
networks:
- blade_net
blade-user:
image: "${REGISTER}/blade-user:${TAG}"
privileged: true
restart: always
networks:
- blade_net
blade-system:
image: "${REGISTER}/blade-system:${TAG}"
privileged: true

258
script/kuboard/kuboard_spring-blade.yaml
View File

@ -152,7 +152,7 @@ spec:
spec:
containers:
- name: blade-admin
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:4.1.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-admin:4.2.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -386,7 +386,7 @@ spec:
spec:
containers:
- name: blade-auth
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:4.1.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-auth:4.2.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -625,7 +625,7 @@ spec:
spec:
containers:
- name: blade-desk
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:4.1.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-desk:4.2.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -864,7 +864,7 @@ spec:
spec:
containers:
- name: blade-develop
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:4.1.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-develop:4.2.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -1096,7 +1096,7 @@ spec:
spec:
containers:
- name: blade-gateway
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:4.1.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-gateway:4.2.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -1331,7 +1331,7 @@ spec:
spec:
containers:
- name: blade-log
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:4.1.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-log:4.2.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -1565,7 +1565,7 @@ spec:
spec:
containers:
- name: blade-report
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:4.1.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-report:4.2.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -1799,7 +1799,7 @@ spec:
spec:
containers:
- name: blade-resource
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:4.1.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-resource:4.2.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -2033,7 +2033,7 @@ spec:
spec:
containers:
- name: blade-system
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:4.1.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-system:4.2.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -2111,240 +2111,6 @@ status:
reason: NewReplicaSetAvailable
message: ReplicaSet "blade-system-8dd57fd47" has successfully progressed.
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: blade-user
namespace: spring-blade
uid: 597b4693-e9a6-4d56-b040-84839e6e760e
resourceVersion: '257611'
generation: 2
creationTimestamp: '2021-05-04T08:05:59Z'
labels:
k8s.kuboard.cn/layer: svc
k8s.kuboard.cn/name: blade-user
annotations:
deployment.kubernetes.io/revision: '1'
k8s.kuboard.cn/workload: blade-user
managedFields:
- manager: Mozilla
operation: Update
apiVersion: apps/v1
time: '2021-05-04T08:05:59Z'
fieldsType: FieldsV1
fieldsV1:
'f:metadata':
'f:annotations':
.: {}
'f:k8s.kuboard.cn/workload': {}
'f:labels':
.: {}
'f:k8s.kuboard.cn/layer': {}
'f:k8s.kuboard.cn/name': {}
'f:spec':
'f:progressDeadlineSeconds': {}
'f:replicas': {}
'f:revisionHistoryLimit': {}
'f:selector': {}
'f:strategy':
'f:rollingUpdate':
.: {}
'f:maxSurge': {}
'f:maxUnavailable': {}
'f:type': {}
'f:template':
'f:metadata':
'f:labels':
.: {}
'f:k8s.kuboard.cn/layer': {}
'f:k8s.kuboard.cn/name': {}
'f:spec':
'f:containers':
'k:{"name":"blade-user"}':
.: {}
'f:args': {}
'f:envFrom': {}
'f:image': {}
'f:imagePullPolicy': {}
'f:livenessProbe':
.: {}
'f:failureThreshold': {}
'f:httpGet':
.: {}
'f:path': {}
'f:port': {}
'f:scheme': {}
'f:periodSeconds': {}
'f:successThreshold': {}
'f:timeoutSeconds': {}
'f:name': {}
'f:ports':
.: {}
'k:{"containerPort":80,"protocol":"TCP"}':
.: {}
'f:containerPort': {}
'f:name': {}
'f:protocol': {}
'f:readinessProbe':
.: {}
'f:failureThreshold': {}
'f:httpGet':
.: {}
'f:path': {}
'f:port': {}
'f:scheme': {}
'f:periodSeconds': {}
'f:successThreshold': {}
'f:timeoutSeconds': {}
'f:resources':
.: {}
'f:limits':
.: {}
'f:memory': {}
'f:requests':
.: {}
'f:memory': {}
'f:startupProbe':
.: {}
'f:failureThreshold': {}
'f:httpGet':
.: {}
'f:path': {}
'f:port': {}
'f:scheme': {}
'f:periodSeconds': {}
'f:successThreshold': {}
'f:timeoutSeconds': {}
'f:terminationMessagePath': {}
'f:terminationMessagePolicy': {}
'f:dnsPolicy': {}
'f:restartPolicy': {}
'f:schedulerName': {}
'f:securityContext': {}
'f:terminationGracePeriodSeconds': {}
- manager: kube-controller-manager
operation: Update
apiVersion: apps/v1
time: '2021-05-04T08:06:59Z'
fieldsType: FieldsV1
fieldsV1:
'f:metadata':
'f:annotations':
'f:deployment.kubernetes.io/revision': {}
'f:status':
'f:conditions':
.: {}
'k:{"type":"Available"}':
.: {}
'f:lastTransitionTime': {}
'f:lastUpdateTime': {}
'f:message': {}
'f:reason': {}
'f:status': {}
'f:type': {}
'k:{"type":"Progressing"}':
.: {}
'f:lastTransitionTime': {}
'f:lastUpdateTime': {}
'f:message': {}
'f:reason': {}
'f:status': {}
'f:type': {}
'f:observedGeneration': {}
spec:
replicas: 0
selector:
matchLabels:
k8s.kuboard.cn/layer: svc
k8s.kuboard.cn/name: blade-user
template:
metadata:
creationTimestamp: null
labels:
k8s.kuboard.cn/layer: svc
k8s.kuboard.cn/name: blade-user
spec:
containers:
- name: blade-user
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-user:4.1.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
- '--spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR}'
- >-
--spring.cloud.sentinel.transport.dashboard=${SENTINEL_DASHBOARD_ADDR}
- '--server.port=80'
ports:
- name: server
containerPort: 80
protocol: TCP
envFrom:
- configMapRef:
name: blade-config
resources:
limits:
memory: 2Gi
requests:
memory: 200Mi
livenessProbe:
httpGet:
path: /actuator/health
port: 80
scheme: HTTP
timeoutSeconds: 1
periodSeconds: 10
successThreshold: 1
failureThreshold: 3
readinessProbe:
httpGet:
path: /actuator/health
port: 80
scheme: HTTP
timeoutSeconds: 1
periodSeconds: 10
successThreshold: 1
failureThreshold: 3
startupProbe:
httpGet:
path: /actuator/health
port: 80
scheme: HTTP
timeoutSeconds: 1
periodSeconds: 10
successThreshold: 1
failureThreshold: 20
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
imagePullPolicy: Always
restartPolicy: Always
terminationGracePeriodSeconds: 30
dnsPolicy: ClusterFirst
securityContext: {}
schedulerName: default-scheduler
strategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 25%
maxSurge: 25%
revisionHistoryLimit: 10
progressDeadlineSeconds: 600
status:
observedGeneration: 2
conditions:
- type: Available
status: 'True'
lastUpdateTime: '2021-05-04T08:06:59Z'
lastTransitionTime: '2021-05-04T08:06:59Z'
reason: MinimumReplicasAvailable
message: Deployment has minimum availability.
- type: Progressing
status: 'True'
lastUpdateTime: '2021-05-04T08:06:59Z'
lastTransitionTime: '2021-05-04T08:05:59Z'
reason: NewReplicaSetAvailable
message: ReplicaSet "blade-user-795df5c657" has successfully progressed.
---
kind: Deployment
apiVersion: apps/v1
@ -2496,7 +2262,7 @@ spec:
spec:
containers:
- name: saber-web
image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:4.1.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-web:4.2.0'
ports:
- name: web
containerPort: 80
@ -2721,7 +2487,7 @@ spec:
spec:
containers:
- name: blade-swagger
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:4.1.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/blade-swagger:4.2.0'
args:
- '--spring.profiles.active=${PROFILE}'
- '--spring.cloud.nacos.config.server-addr=${NACOS_SERVER_ADDR}'
@ -3749,7 +3515,7 @@ spec:
spec:
containers:
- name: mysql
image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v4.1.0'
image: 'swr.cn-east-2.myhuaweicloud.com/blade/saber-db:v4.2.0'
ports:
- name: mysql
containerPort: 3306

2
script/kuboard/saber-db/blade-saber-mysql.sql
View File

File diff suppressed because one or more lines are too long