diff --git a/README.md b/README.md index 454ee2c52b7b68108d67062d5e862b7daef1c1c6..71e6357c2f2f5629bf0ca092eb8e94414375b862 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,9 @@ * 账号密码：admin/admin * 应用监控账号密码：admin/admin * 配置中心账号密码：nacos/nacos - + * APM监控账号密码：admin/admin * **[项目更新日志](https://www.kancloud.cn/zlt2000/microservices-platform/936235)** - * **[文档更新日志](https://www.kancloud.cn/zlt2000/microservices-platform/936236)** - * 前后端分离的企业级微服务架构 * 基于`Spring Boot 2.0.X`、`Spring Cloud Finchley`和`Spring Cloud Alibaba` * 深度定制`Spring Security`真正实现了基于`RBAC`、`jwt`和`oauth2`的无状态统一权限认证的解决方案 @@ -28,7 +26,15 @@ * 注重代码规范，严格控制包依赖，每个工程基本都是最小依赖 * 非常适合学习和企业中使用 -## 2. 功能介绍 +  + +## 2. 总体服务拓扑图 + +![](https://gitee.com/zlt2000/images/raw/master/服务拓扑图.png) + +  + +## 3. 功能介绍 * **统一认证功能** * 支持oauth2的四种模式登录 @@ -49,6 +55,10 @@ * 支持CI/CD持续集成(包括前端和后端) * **系统监控功能** * 服务调用链监控 + * 应用拓扑图 + + * 慢服务检测 + * 应用监控(应用健康、JVM、内存、线程) * 错误日志查询 * 慢查询SQL监控 @@ -66,7 +76,9 @@ * 统一跨域处理 * 统一异常处理 -## 3. 模块说明 +  + +## 4. 模块说明 ```lua central-platform -- 父项目，公共依赖 @@ -103,13 +115,19 @@ central-platform -- 父项目，公共依赖 │ │ ├─back-web -- 后台前端[8066] ``` -## 4. 截图（点击可大图预览） +  + +## 5. 截图（点击可大图预览） + + + + diff --git a/zlt-business/file-center/src/main/java/com/central/FileCenterApp.java b/zlt-business/file-center/src/main/java/com/central/FileCenterApp.java index cc496ebc035bf83ee202d89831a0e3bcb56c81f4..ce714a3d62f92e69fbeed0ee4ca7e11160ff8f69 100644 --- a/zlt-business/file-center/src/main/java/com/central/FileCenterApp.java +++ b/zlt-business/file-center/src/main/java/com/central/FileCenterApp.java @@ -5,8 +5,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** - * @author zlt * 文件中心 + * @author 作者 owen E-mail: 624191343@qq.com */ @EnableDiscoveryClient @SpringBootApplication diff --git a/zlt-business/file-center/src/main/java/com/central/file/config/AliyunOSSConfig.java b/zlt-business/file-center/src/main/java/com/central/file/config/AliyunOSSConfig.java index 03d81f26cef60a5cd6a6fc45f349655e560d6e4d..bc807f2a64c1e28a26c54eb832a60c307c7202a4 100644 --- a/zlt-business/file-center/src/main/java/com/central/file/config/AliyunOSSConfig.java +++ b/zlt-business/file-center/src/main/java/com/central/file/config/AliyunOSSConfig.java @@ -8,8 +8,9 @@ import org.springframework.context.annotation.Configuration; import com.aliyun.oss.OSSClient; /** - * @author zlt * 阿里云配置 + * + * @author 作者 owen E-mail: 624191343@qq.com */ @Configuration public class AliyunOSSConfig { diff --git a/zlt-business/file-center/src/main/java/com/central/file/config/OssServiceFactory.java b/zlt-business/file-center/src/main/java/com/central/file/config/OssServiceFactory.java index 5205b4e92480eb1c589ff67dfa090f935a703e20..d857e18e4a5ba6f47c363d3c922f1398fc5a1ef8 100644 --- a/zlt-business/file-center/src/main/java/com/central/file/config/OssServiceFactory.java +++ b/zlt-business/file-center/src/main/java/com/central/file/config/OssServiceFactory.java @@ -13,9 +13,10 @@ import org.springframework.context.annotation.Configuration; import com.central.file.model.FileType; /** - * @author zlt * FileService工厂
* 将各个实现类放入map + * + * @author 作者 owen E-mail: 624191343@qq.com */ @Configuration public class OssServiceFactory { diff --git a/zlt-business/file-center/src/main/java/com/central/file/config/QiniuOSSConfig.java b/zlt-business/file-center/src/main/java/com/central/file/config/QiniuOSSConfig.java index c957cbea58ccff40b4db9ebe5b871d3822432f3a..3eada458d801e630000a2a365b780ffe717b6cf7 100644 --- a/zlt-business/file-center/src/main/java/com/central/file/config/QiniuOSSConfig.java +++ b/zlt-business/file-center/src/main/java/com/central/file/config/QiniuOSSConfig.java @@ -10,8 +10,9 @@ import com.qiniu.storage.UploadManager; import com.qiniu.util.Auth; /** - * @author zlt * 七牛云配置 + * + * @author 作者 owen E-mail: 624191343@qq.com */ @Configuration public class QiniuOSSConfig { diff --git a/zlt-business/file-center/src/main/java/com/central/file/controller/FileController.java b/zlt-business/file-center/src/main/java/com/central/file/controller/FileController.java index 749434620aa14ce2a534d834f4a20c5977f3dddc..9423fde8995813cc27c3ef3846549886d502fc0f 100644 --- a/zlt-business/file-center/src/main/java/com/central/file/controller/FileController.java +++ b/zlt-business/file-center/src/main/java/com/central/file/controller/FileController.java @@ -22,7 +22,7 @@ import com.central.file.model.FileType; * 文件上传 同步oss db双写 目前仅实现了阿里云,七牛云 * 参考src/main/view/upload.html * - * @author zlt + * @author 作者 owen E-mail: 624191343@qq.com */ @RestController public class FileController { diff --git a/zlt-business/file-center/src/main/java/com/central/file/model/FileInfo.java b/zlt-business/file-center/src/main/java/com/central/file/model/FileInfo.java index 9cf8122e8101e1bdfa67aca60919f52fcf03a196..a6622a7b5bb3d653012294092130fb4a66ddd72c 100644 --- a/zlt-business/file-center/src/main/java/com/central/file/model/FileInfo.java +++ b/zlt-business/file-center/src/main/java/com/central/file/model/FileInfo.java @@ -12,8 +12,9 @@ import java.io.Serializable; import java.util.Date; /** - * @author zlt * file实体类 + * + * @author 作者 owen E-mail: 624191343@qq.com */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/zlt-business/file-center/src/main/java/com/central/file/model/FileType.java b/zlt-business/file-center/src/main/java/com/central/file/model/FileType.java index e22a3f025197f9e2a44dca149791dfcc78e16779..78c106a81decff6d8f8a10418091e52c6bde30d9 100644 --- a/zlt-business/file-center/src/main/java/com/central/file/model/FileType.java +++ b/zlt-business/file-center/src/main/java/com/central/file/model/FileType.java @@ -1,8 +1,9 @@ package com.central.file.model; /** - * @author zlt * 仅支持阿里云 oss ,七牛云等 + * + * @author 作者 owen E-mail: 624191343@qq.com */ public enum FileType { //七牛 diff --git a/zlt-business/file-center/src/main/java/com/central/file/service/IFileService.java b/zlt-business/file-center/src/main/java/com/central/file/service/IFileService.java index 841ec2ef5a62be1543c82d7c5a85b72f4e29eb5d..a67841ff8652c10d3cdfad17b3ebd7bbf2fea5fc 100644 --- a/zlt-business/file-center/src/main/java/com/central/file/service/IFileService.java +++ b/zlt-business/file-center/src/main/java/com/central/file/service/IFileService.java @@ -9,8 +9,9 @@ import org.springframework.web.multipart.MultipartFile; import com.central.file.model.FileInfo; /** - * @author zlt * 文件service 目前仅支持阿里云oss,七牛云 + * + * @author 作者 owen E-mail: 624191343@qq.com */ public interface IFileService extends IService { FileInfo upload(MultipartFile file ) throws Exception; diff --git a/zlt-business/file-center/src/main/java/com/central/file/service/impl/AbstractIFileService.java b/zlt-business/file-center/src/main/java/com/central/file/service/impl/AbstractIFileService.java index 6312214bd1de0f5dffbf28b37fdc047f1d78bed9..42d0f64d297cfd5703f79f439188ac1394433706 100644 --- a/zlt-business/file-center/src/main/java/com/central/file/service/impl/AbstractIFileService.java +++ b/zlt-business/file-center/src/main/java/com/central/file/service/impl/AbstractIFileService.java @@ -18,10 +18,11 @@ import com.central.file.utils.FileUtil; import lombok.extern.slf4j.Slf4j; /** - * @author zlt * AbstractIFileService 抽取类 * 根据filetype 实例化具体oss对象 -*/ + * + * @author 作者 owen E-mail: 624191343@qq.com + */ @Slf4j public abstract class AbstractIFileService extends ServiceImpl implements IFileService { @Override diff --git a/zlt-business/file-center/src/main/java/com/central/file/service/impl/AliyunOssServiceImplI.java b/zlt-business/file-center/src/main/java/com/central/file/service/impl/AliyunOssServiceImplI.java index d7ad9f7740ead6df64334afc4732ef92109fba65..452b90610349c0fcb6edf107c8607bb8e4b962d0 100644 --- a/zlt-business/file-center/src/main/java/com/central/file/service/impl/AliyunOssServiceImplI.java +++ b/zlt-business/file-center/src/main/java/com/central/file/service/impl/AliyunOssServiceImplI.java @@ -10,8 +10,9 @@ import com.central.file.model.FileInfo; import com.central.file.model.FileType; /** - * @author zlt * 阿里云oss存储文件 + * + * @author 作者 owen E-mail: 624191343@qq.com */ @Service("aliyunOssServiceImpl") public class AliyunOssServiceImplI extends AbstractIFileService { diff --git a/zlt-business/file-center/src/main/java/com/central/file/service/impl/QiniuOssServiceImplI.java b/zlt-business/file-center/src/main/java/com/central/file/service/impl/QiniuOssServiceImplI.java index a866f0d7a22486cc6dd85d2c082921da9ea84c5f..3f35a01a5839709d63ce21299570e3b6bb6b4b84 100644 --- a/zlt-business/file-center/src/main/java/com/central/file/service/impl/QiniuOssServiceImplI.java +++ b/zlt-business/file-center/src/main/java/com/central/file/service/impl/QiniuOssServiceImplI.java @@ -17,8 +17,9 @@ import com.qiniu.util.Auth; import com.qiniu.util.StringMap; /** - * @author zlt * 七牛云oss存储文件 + * + * @author 作者 owen E-mail: 624191343@qq.com */ @Slf4j @Service("qiniuOssServiceImpl") diff --git a/zlt-business/file-center/src/main/java/com/central/file/utils/FileUtil.java b/zlt-business/file-center/src/main/java/com/central/file/utils/FileUtil.java index 0387b34c2ac4f716f86c172da5fb8627e7be98b7..8efe3d7bc6312650e9c9a7b786fc4cc3649047db 100644 --- a/zlt-business/file-center/src/main/java/com/central/file/utils/FileUtil.java +++ b/zlt-business/file-center/src/main/java/com/central/file/utils/FileUtil.java @@ -11,9 +11,10 @@ import org.apache.commons.codec.digest.DigestUtils; import org.springframework.web.multipart.MultipartFile; /** - * @author zlt * 文件工具类 -*/ + * + * @author 作者 owen E-mail: 624191343@qq.com + */ @Slf4j public class FileUtil { private FileUtil() { diff --git a/zlt-business/user-center/src/main/java/com/central/UserCenterApp.java b/zlt-business/user-center/src/main/java/com/central/UserCenterApp.java index 728c5c901b69d99cd1b6afebdadb186a0f8b28c0..1f3ed5ece557f3e3905154cc9da033d95fa874e0 100644 --- a/zlt-business/user-center/src/main/java/com/central/UserCenterApp.java +++ b/zlt-business/user-center/src/main/java/com/central/UserCenterApp.java @@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.transaction.annotation.EnableTransactionManagement; /** - * @author zlt + * @author 作者 owen E-mail: 624191343@qq.com */ @EnableLoginArgResolver @EnableDiscoveryClient diff --git a/zlt-business/user-center/src/main/java/com/central/user/controller/SysMenuController.java b/zlt-business/user-center/src/main/java/com/central/user/controller/SysMenuController.java index 01078fd980a4004a13ebc4ff59e0fba90ffc1b78..531844f59e9df585591ce2dde5af21c6baab10b7 100644 --- a/zlt-business/user-center/src/main/java/com/central/user/controller/SysMenuController.java +++ b/zlt-business/user-center/src/main/java/com/central/user/controller/SysMenuController.java @@ -21,7 +21,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** - * @author zlt + * @author 作者 owen E-mail: 624191343@qq.com */ @RestController @Api(tags = "菜单模块api") diff --git a/zlt-business/user-center/src/main/java/com/central/user/controller/SysRoleController.java b/zlt-business/user-center/src/main/java/com/central/user/controller/SysRoleController.java index d4e46d8222b3dc9092c4b735c57982d5b213e435..6f0b236f244627e148752f1f8ed1e7d250c8b0a0 100644 --- a/zlt-business/user-center/src/main/java/com/central/user/controller/SysRoleController.java +++ b/zlt-business/user-center/src/main/java/com/central/user/controller/SysRoleController.java @@ -21,7 +21,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** - * @author zlt + * @author 作者 owen E-mail: 624191343@qq.com * 角色管理 */ @Slf4j diff --git a/zlt-business/user-center/src/main/java/com/central/user/controller/SysUserController.java b/zlt-business/user-center/src/main/java/com/central/user/controller/SysUserController.java index 02461b2a2884723419cf09c6944187a29b8f630e..343da33856f1e522bdda0e6ea1722afe0a3d14c1 100644 --- a/zlt-business/user-center/src/main/java/com/central/user/controller/SysUserController.java +++ b/zlt-business/user-center/src/main/java/com/central/user/controller/SysUserController.java @@ -32,7 +32,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; /** - * @author zlt + * @author 作者 owen E-mail: 624191343@qq.com * 用户 */ @Slf4j diff --git a/zlt-business/user-center/src/main/java/com/central/user/service/impl/SysMenuServiceImpl.java b/zlt-business/user-center/src/main/java/com/central/user/service/impl/SysMenuServiceImpl.java index 0f4f60fe4a4c756e454cd9899da5b86cce02e134..f127cee646a1fe28da70dcf1cc32a2eef6c27e85 100644 --- a/zlt-business/user-center/src/main/java/com/central/user/service/impl/SysMenuServiceImpl.java +++ b/zlt-business/user-center/src/main/java/com/central/user/service/impl/SysMenuServiceImpl.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Resource; /** - * @author zlt + * @author 作者 owen E-mail: 624191343@qq.com */ @Slf4j @Service diff --git a/zlt-business/user-center/src/main/java/com/central/user/service/impl/SysRoleServiceImpl.java b/zlt-business/user-center/src/main/java/com/central/user/service/impl/SysRoleServiceImpl.java index c22119e4af77e38041c2615aea8ab8192566d2be..30295ebe4f8a611eeac811cb320032abfc4e0902 100644 --- a/zlt-business/user-center/src/main/java/com/central/user/service/impl/SysRoleServiceImpl.java +++ b/zlt-business/user-center/src/main/java/com/central/user/service/impl/SysRoleServiceImpl.java @@ -24,7 +24,7 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Resource; /** - * @author zlt + * @author 作者 owen E-mail: 624191343@qq.com */ @Slf4j @Service diff --git a/zlt-business/user-center/src/main/java/com/central/user/service/impl/SysUserServiceImpl.java b/zlt-business/user-center/src/main/java/com/central/user/service/impl/SysUserServiceImpl.java index 1983495a822395cb7840e31d7ffae2334f06775d..49c8a13ef754442743cb8f17c3e9aa46d87b05db 100644 --- a/zlt-business/user-center/src/main/java/com/central/user/service/impl/SysUserServiceImpl.java +++ b/zlt-business/user-center/src/main/java/com/central/user/service/impl/SysUserServiceImpl.java @@ -31,9 +31,7 @@ import lombok.extern.slf4j.Slf4j; import javax.annotation.Resource; /** - * userService - * - * @author zlt + * @author 作者 owen E-mail: 624191343@qq.com */ @Slf4j @Service diff --git a/zlt-gateway/zuul-gateway/src/main/java/com/central/gateway/filter/pre/UserInfoHeaderFilter.java b/zlt-gateway/zuul-gateway/src/main/java/com/central/gateway/filter/pre/UserInfoHeaderFilter.java index 540c1deeb592dfe8abc5184aa892c5045fb61ced..4b6bc707e3bc57be015bb0d223a521c8b8c2168c 100644 --- a/zlt-gateway/zuul-gateway/src/main/java/com/central/gateway/filter/pre/UserInfoHeaderFilter.java +++ b/zlt-gateway/zuul-gateway/src/main/java/com/central/gateway/filter/pre/UserInfoHeaderFilter.java @@ -44,7 +44,7 @@ public class UserInfoHeaderFilter extends ZuulFilter { String userInfo; if (principal instanceof SysUser) { SysUser user = (SysUser) principal; - userInfo = user.getUsername() + SecurityConstants.USER_SPLIT + user.getId(); + userInfo = user.getUsername(); } else { //jwt的token只有name userInfo = authentication.getName();