diff --git a/README.md b/README.md index 4570768..ce0bfc9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- Downloads + Downloads Build Status Build Status Coverage Status @@ -65,7 +65,7 @@ SpringBlade * Archer-全能代码生成系统：[https://archer.bladex.vip](https://archer.bladex.vip) ## 技术文档 -* [开发手册一览](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade开发手册) +* [SpringBlade开发手册一览](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade开发手册) * [常见问题集锦](https://sns.bladex.vip/article-14966.html) ## 项目地址 diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 4b1245e..21ceca9 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ SpringBlade org.springblade - 2.5.1 + 2.5.2 blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index b79bcd0..2a862d4 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index eab0b19..fb1092d 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-gateway/src/main/java/org/springblade/gateway/utils/JwtUtil.java b/blade-gateway/src/main/java/org/springblade/gateway/utils/JwtUtil.java index c422fc3..289ea6a 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/utils/JwtUtil.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/utils/JwtUtil.java @@ -17,6 +17,7 @@ package org.springblade.gateway.utils; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; +import org.springblade.core.launch.constant.TokenConstant; import java.nio.charset.StandardCharsets; import java.util.Base64; @@ -28,8 +29,8 @@ import java.util.Base64; */ public class JwtUtil { - public static String SIGN_KEY = "BladeX"; - public static String BEARER = "bearer"; + public static String SIGN_KEY = TokenConstant.SIGN_KEY; + public static String BEARER = TokenConstant.BEARER; public static Integer AUTH_LENGTH = 7; public static String BASE64_SECURITY = Base64.getEncoder().encodeToString(SIGN_KEY.getBytes(StandardCharsets.UTF_8)); diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 6eeedc1..3b81fcd 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-ops/blade-admin/src/main/resources/bootstrap.yml b/blade-ops/blade-admin/src/main/resources/bootstrap.yml index af767c9..7e296f7 100644 --- a/blade-ops/blade-admin/src/main/resources/bootstrap.yml +++ b/blade-ops/blade-admin/src/main/resources/bootstrap.yml @@ -14,4 +14,6 @@ spring: boot: admin: discovery: - ignored-services: consul + ignored-services: + - consul + - serverAddr diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 634fa59..564a7f4 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index 0435fb5..b785add 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-ops/blade-resource/src/main/resources/application.yml b/blade-ops/blade-resource/src/main/resources/application.yml index 53b18bc..f3bbd5f 100644 --- a/blade-ops/blade-resource/src/main/resources/application.yml +++ b/blade-ops/blade-resource/src/main/resources/application.yml @@ -6,7 +6,7 @@ oss: enable: true name: qiniu tenant-mode: true - endpoint: prt1thnw3.bkt.clouddn.com + endpoint: http://prt1thnw3.bkt.clouddn.com access-key: N_Loh1ngBqcJovwiAJqR91Ifj2vgOWHOf8AwBA_h secret-key: AuzuA1KHAbkIndCU0dB3Zfii2O3crHNODDmpxHRS bucket-name: blade diff --git a/blade-ops/blade-seata-order/pom.xml b/blade-ops/blade-seata-order/pom.xml index 53f4bf3..3b17a96 100644 --- a/blade-ops/blade-seata-order/pom.xml +++ b/blade-ops/blade-seata-order/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-ops/blade-seata-storage/pom.xml b/blade-ops/blade-seata-storage/pom.xml index 433f8ac..3e676a9 100644 --- a/blade-ops/blade-seata-storage/pom.xml +++ b/blade-ops/blade-seata-storage/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index d567efb..6fcd2c8 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 0608f4c..a0d36a7 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index 5a6b3db..b3ff5dd 100644 --- a/blade-service-api/blade-dict-api/pom.xml +++ b/blade-service-api/blade-dict-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index 651735b..95b4d61 100644 --- a/blade-service-api/blade-system-api/pom.xml +++ b/blade-service-api/blade-system-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index bc2d0c8..4c52b9e 100644 --- a/blade-service-api/blade-user-api/pom.xml +++ b/blade-service-api/blade-user-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java index 5bbe58d..ce37a3c 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java @@ -60,6 +60,10 @@ public class User extends TenantEntity { * 真名 */ private String realName; + /** + * 头像 + */ + private String avatar; /** * 邮箱 */ diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 25add24..099cd22 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ SpringBlade org.springblade - 2.5.1 + 2.5.2 4.0.0 blade-service-api ${project.artifactId} - 2.5.1 + 2.5.2 pom SpringBlade 微服务API集合 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index de71b86..4d4c171 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index 423f5ce..29db6a4 100644 --- a/blade-service/blade-log/pom.xml +++ b/blade-service/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 006c984..2119d45 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index f092fa4..8ccb0cf 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.5.1 + 2.5.2 4.0.0 diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java index 0ca2632..bf88317 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java @@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import javax.validation.Valid; +import java.util.List; import java.util.Map; /** @@ -59,6 +60,17 @@ public class UserController { return R.data(UserWrapper.build().entityVO(detail)); } + /** + * 查询单条 + */ + @ApiOperationSupport(order =2) + @ApiOperation(value = "查看详情", notes = "传入id") + @GetMapping("/info") + public R info(BladeUser user) { + User detail = userService.getById(user.getUserId()); + return R.data(UserWrapper.build().entityVO(detail)); + } + /** * 用户列表 */ @@ -67,7 +79,7 @@ public class UserController { @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"), @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string") }) - @ApiOperationSupport(order = 2) + @ApiOperationSupport(order = 3) @ApiOperation(value = "列表", notes = "传入account和realName") public R> list(@ApiIgnore @RequestParam Map user, Query query, BladeUser bladeUser) { QueryWrapper queryWrapper = Condition.getQueryWrapper(user, User.class); @@ -79,7 +91,7 @@ public class UserController { * 新增或修改 */ @PostMapping("/submit") - @ApiOperationSupport(order = 3) + @ApiOperationSupport(order = 4) @ApiOperation(value = "新增或修改", notes = "传入User") public R submit(@Valid @RequestBody User user) { return R.status(userService.submit(user)); @@ -89,7 +101,7 @@ public class UserController { * 修改 */ @PostMapping("/update") - @ApiOperationSupport(order = 4) + @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入User") public R update(@Valid @RequestBody User user) { return R.status(userService.updateById(user)); @@ -99,7 +111,7 @@ public class UserController { * 删除 */ @PostMapping("/remove") - @ApiOperationSupport(order = 5) + @ApiOperationSupport(order = 6) @ApiOperation(value = "删除", notes = "传入地基和") public R remove(@RequestParam String ids) { return R.status(userService.deleteLogic(Func.toIntList(ids))); @@ -114,7 +126,7 @@ public class UserController { * @return */ @PostMapping("/grant") - @ApiOperationSupport(order = 6) + @ApiOperationSupport(order = 7) @ApiOperation(value = "权限设置", notes = "传入roleId集合以及menuId集合") public R grant(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds, @ApiParam(value = "roleId集合", required = true) @RequestParam String roleIds) { @@ -123,11 +135,43 @@ public class UserController { } @PostMapping("/reset-password") - @ApiOperationSupport(order = 7) + @ApiOperationSupport(order = 8) @ApiOperation(value = "初始化密码", notes = "传入userId集合") public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds) { boolean temp = userService.resetPassword(userIds); return R.status(temp); } + /** + * 修改密码 + * + * @param oldPassword + * @param newPassword + * @param newPassword1 + * @return + */ + @PostMapping("/update-password") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "修改密码", notes = "传入密码") + public R updatePassword(BladeUser user, @ApiParam(value = "旧密码", required = true) @RequestParam String oldPassword, + @ApiParam(value = "新密码", required = true) @RequestParam String newPassword, + @ApiParam(value = "新密码", required = true) @RequestParam String newPassword1) { + boolean temp = userService.updatePassword(user.getUserId(), oldPassword, newPassword, newPassword1); + return R.status(temp); + } + + /** + * 用户列表 + * + * @param user + * @return + */ + @GetMapping("/user-list") + @ApiOperationSupport(order = 10) + @ApiOperation(value = "用户列表", notes = "传入user") + public R> userList(User user) { + List list = userService.list(Condition.getQueryWrapper(user)); + return R.data(list); + } + } diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java index 0760286..87f28c2 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java @@ -82,6 +82,17 @@ public interface IUserService extends BaseService { */ boolean resetPassword(String userIds); + /** + * 修改密码 + * + * @param userId + * @param oldPassword + * @param newPassword + * @param newPassword1 + * @return + */ + boolean updatePassword(Integer userId, String oldPassword, String newPassword, String newPassword1); + /** * 获取角色名 * diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java index 134e6d1..9c3c3c0 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.exceptions.ApiException; import org.springblade.common.constant.CommonConstant; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.DigestUtil; @@ -96,6 +97,18 @@ public class UserServiceImpl extends BaseServiceImpl implement return this.update(user, Wrappers.update().lambda().in(User::getId, Func.toIntList(userIds))); } + @Override + public boolean updatePassword(Integer userId, String oldPassword, String newPassword, String newPassword1) { + User user = getById(userId); + if (!newPassword.equals(newPassword1)) { + throw new ServiceException("请输入正确的确认密码!"); + } + if (!user.getPassword().equals(DigestUtil.encrypt(oldPassword))) { + throw new ServiceException("原密码不正确!"); + } + return this.update(Wrappers.update().lambda().set(User::getPassword, DigestUtil.encrypt(newPassword)).eq(User::getId, userId)); + } + @Override public List getRoleName(String roleIds) { return baseMapper.getRoleName(Func.toStrArray(roleIds)); diff --git a/blade-service/pom.xml b/blade-service/pom.xml index c95761f..559114a 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade SpringBlade - 2.5.1 + 2.5.2 blade-service ${project.artifactId} - 2.5.1 + 2.5.2 pom SpringBlade 微服务集合 diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index 67dbd29..553fcc6 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -73,16 +73,15 @@ blade: exclude-patterns: - /weixin secure: - url: - exclude-patterns: + skip-url: - /test/** - client: - - client-id: sword - path-patterns: - - /sword/** - - client-id: saber - path-patterns: - - /saber/** + client: + - client-id: sword + path-patterns: + - /sword/** + - client-id: saber + path-patterns: + - /saber/** tenant: column: tenant_id tables: diff --git a/doc/sql/blade-saber-mysql.sql b/doc/sql/blade-saber-mysql.sql index 6d91076..cde9882 100644 --- a/doc/sql/blade-saber-mysql.sql +++ b/doc/sql/blade-saber-mysql.sql @@ -394,6 +394,7 @@ CREATE TABLE `blade_user` ( `password` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密码', `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '昵称', `real_name` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '真名', + `avatar` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '头像', `email` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '邮箱', `phone` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机', `birthday` datetime(0) NULL DEFAULT NULL COMMENT '生日', @@ -413,7 +414,7 @@ CREATE TABLE `blade_user` ( -- Records of blade_user -- ---------------------------- BEGIN; -INSERT INTO `blade_user` VALUES (1, '000000', 'admin', '90b9aa7e25f80cf4f64e990b78a9fc5ebd6cecad', '管理员', '管理员', 'admin@bladex.vip', '22233322', '2018-08-08 00:00:00', 1, '1', '1', 1, '2018-08-08 00:00:00', 1, '2018-08-08 00:00:00', 1, 0); +INSERT INTO `blade_user` VALUES (1, '000000', 'admin', '90b9aa7e25f80cf4f64e990b78a9fc5ebd6cecad', '管理员', '管理员', '', 'admin@bladex.vip', '22233322', '2018-08-08 00:00:00', 1, '1', '1', 1, '2018-08-08 00:00:00', 1, '2018-08-08 00:00:00', 1, 0); COMMIT; SET FOREIGN_KEY_CHECKS = 1; diff --git a/doc/sql/blade-sword-mysql.sql b/doc/sql/blade-sword-mysql.sql index 94d5bf9..40e9109 100644 --- a/doc/sql/blade-sword-mysql.sql +++ b/doc/sql/blade-sword-mysql.sql @@ -394,6 +394,7 @@ CREATE TABLE `blade_user` ( `password` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密码', `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '昵称', `real_name` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '真名', + `avatar` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '头像', `email` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '邮箱', `phone` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机', `birthday` datetime(0) NULL DEFAULT NULL COMMENT '生日', @@ -413,7 +414,7 @@ CREATE TABLE `blade_user` ( -- Records of blade_user -- ---------------------------- BEGIN; -INSERT INTO `blade_user` VALUES (1, '000000', 'admin', '90b9aa7e25f80cf4f64e990b78a9fc5ebd6cecad', '管理员', '管理员', 'admin@bladex.vip', '22233322', '2018-08-08 00:00:00', 1, '1', '1', 1, '2018-08-08 00:00:00', 1, '2018-08-08 00:00:00', 1, 0); +INSERT INTO `blade_user` VALUES (1, '000000', 'admin', '90b9aa7e25f80cf4f64e990b78a9fc5ebd6cecad', '管理员', '管理员', '', 'admin@bladex.vip', '22233322', '2018-08-08 00:00:00', 1, '1', '1', 1, '2018-08-08 00:00:00', 1, '2018-08-08 00:00:00', 1, 0); COMMIT; SET FOREIGN_KEY_CHECKS = 1; diff --git a/doc/sql/blade-update-2.5.1～2.5.2.sql b/doc/sql/blade-update-2.5.1～2.5.2.sql new file mode 100644 index 0000000..862d42a --- /dev/null +++ b/doc/sql/blade-update-2.5.1～2.5.2.sql @@ -0,0 +1,2 @@ +ALTER TABLE `blade`.`blade_user` + ADD COLUMN `avatar` varchar(2000) NULL COMMENT '头像' AFTER `real_name`; diff --git a/pom.xml b/pom.xml index 1986ef9..046ff6f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springblade SpringBlade - 2.5.1 + 2.5.2 pom - 2.5.1 - 2.5.1 + 2.5.2 + 2.5.2 1.8 2.9.2 diff --git a/script/docker/.env b/script/docker/.env index cc81ca8..c5cb1dd 100644 --- a/script/docker/.env +++ b/script/docker/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=2.5.1 +TAG=2.5.2