diff --git a/README.md b/README.md index abc1656..a67f563 100644 --- a/README.md +++ b/README.md @@ -1,57 +1,29 @@ -# 欢迎查看micro-fast项目说明 +# 欢迎查看ms项目说明 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) ## 项目简介 - `micro-fast`使用mybatis,spring系列框架作为基础，致力于打造一套中小企业分布式系统解决方案.借助于springCould微服务框架，对原框架进行整合扩展使用 -云架构进行开发 + `micro-fast`使用mybatis,spring系列框架作为基础，致力于打造一套中小企业系统解决方案.项目中对常用技术进行封装便于复用以及提高 +开发效率，还提供了一个借助springcloud实现的一个分布式项目． ## 模块介绍 -### SSM公共模块 common - common模块对SSM框架进行了整合，借助springboot实现了模块的热插拔，具有可复用性和可扩展性 -### 配置中心 config-server - 配置中心默认启动端口号9999,健康检查端口号19999.访问地址www.config.server.com -### 注册中心 eureka-server - 注册中心默认启动端口号10002，健康检查端口号20002．访问地址www.eureka.server.com．为保证服务的稳定可靠，可以创建多个注册中心，实现服务注 -册的备份冗余，实现高可用性 -### 注册中心２ eureka-server2 - 注册中心２默认启动端口号10003，健康检查端口号20003．访问地址www.eureka.server2.com -### 用户权限管理中心 upms - 用户权限管理中心默认启动端口号10004，健康检查端口号20004．访问地址www.upms.com -### 内容管理系统　cms - 内容管理系统默认启动端口号10005，健康检查端口号20005,访问地址www.cms.com -### 用户中心　ucenter - 用户中心默认启动端口号10006,健康检查端口20006,访问地址www.ucenter.com -### 服务网关　gateway - 服务网关默认启动端口号10007,健康检查端口号20007,访问地址www.gateway.com -### 后台管理界面 manage-system - 使用vue.js搭建后台管理界面 -## 项目相关约束 -### 遵循类似于springboot约定大与配置的原则．本项目开发约束如下： -#### 关于使用docker方式运行项目 - 可以使用传统方式运行，可以使用docker容器的方式运行．程序的启动顺序是配置中心，注册中心，其他服务。无论是使何种方式运行，保证除配置中心外，其 -他所有服务都能从配置中加载到对应的配置文件，其他所有的服务都能注册到注册中心。所以运行的时候一定要将除配置中心外所有服务的注册空间的配置空间都指 -定正确，本项目中本地运行时则是都指定到本机的ip地址 -#### common模块的相关约束 -得益于springboot的自动配置以及条件化装配的机制．我们可以扩展封装自己的ssm-boot,也是就是本项目中的commom，本项目的自定义扩展配置如下： -- `jdbc.master.username`　用户名(必要参数) -- `jdbc.master.password`　密码是使用common模块中的AESUtil加密过后的(必要参数) -- `jdbc.master.url`　　　　数据库连接的url(必要参数) -- `jdbc.master.driverClass` 数据库连接驱动类(必要参数) -- `druid.master.servletInitParams`　druid数据连接池的servlet的初始化参数,默认的druid账号密码是root,studyj2e.如果需要自定义可以传入自己的配 -置，使用key:value的数组的形式. -- `druid.master.servletUrl`　druid数据库连接池的访问路径，默认访问路径是/druid/* -- `druid.master.beanNames` druid要监控的bean的名字，多个使用逗号分割 -- `druid.master.defaultAutoCommit`　事务是否自动提交，默认为true -- `druid.master.initialSize`　连接池的初始化大小，默认是20 -- `druid.master.maxActive`　连接池的最大的数量,默认是50 -- `druid.master.minIdle`连接池的最小空闲数量,默认是10 -- `druid.master.maxWait`　当连接池中连接已经用完了，等待建立一个新连接的最大毫秒数,默认是1000 -- `druid.master.minEvictableIdleTimeMillis`　等待到达多长时间释放连接池，默认是3600000 -- `mybatis.typeAliasesPackage`　pojo包所在的位置(必要参数) -- `mybatis.mappers`　mapper映射文件所在的路径(必要参数) -- `mybatis.pageHelperProperties`　pagehelper分页插件的properties配置形式是key:value数组的形式，默认方言是mysql,如果需要自定义可以传入自己的配置，使用key:value的数 - 组的形式. -- 除此之外`mybatis`的`dao`层扫描的配置需要在项目中自行配置 -- 除此之外`common`实现了主从两个数据源的配置，从数据库的配置只需将`master`替换为`slave`.主从数据源默认使用相同的`druid`监控视图.其中对于`beanbeanNames`的监控配置，`servletUrl`的配 - 置,`servletInitParams`的配置在`master`中进行配置，需要在使用的项目之中去除默认的数据源自动装配`@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)` -- 对于数据源的切换方法是使用aop的方式对`@SwitchDataSource('数据源的名字')`进行拦截动态切换数据源，主数据源的名字是`master`,从数据源的名字是`slave`.对于没有注解默认的数据源是`master`. -## 开发进度 -![开发进度](all/design/images/progress.png) + +``` lua +micro-fast +├── boot-starter -- 借助spring boot自建快速启动项目 +| ├── boot-starter-elasticsearch -- elasticsearch快速启用 +| ├── boot-starter-fastdfs-client -- fastdfs客户端 +| ├── boot-starter-security -- 权限认证　 +| | ├── boot-starter-security-core -- 权限认证核心项目 +| | ├── boot-starter-security-browser -- 浏览器权限认证 +| | ├── boot-starter-security-app -- app权限认证 +| | └── boot-starter-security-demo -- 权限认证示例项目 +| ├── boot-starter-ssm -- ssm公共配置 +| └── boot-starter-util　-- 常用工具 +├── ms -- 分布式系统 +| ├── config-server　-- 配置管理中心 +| ├── register-center1　-- 高可用注册中心 +| ├── register-center2　-- 高可用注册中心 +| ├── gateway -- 服务网关 +| ├── upms -- 权限管理系统 +| ├── ucenter -- 用户中心 +| └── cms -- cms系统 +``` + diff --git a/bash.sh b/bash.sh deleted file mode 100644 index f1f641a..0000000 --- a/bash.sh +++ /dev/null @@ -1 +0,0 @@ -#!/usr/bin/env bash diff --git a/boot-starter-elasticsearch/.gitignore b/boot-starter/boot-starter-elasticsearch/.gitignore similarity index 100% rename from boot-starter-elasticsearch/.gitignore rename to boot-starter/boot-starter-elasticsearch/.gitignore diff --git a/boot-starter-elasticsearch/README.md b/boot-starter/boot-starter-elasticsearch/README.md similarity index 100% rename from boot-starter-elasticsearch/README.md rename to boot-starter/boot-starter-elasticsearch/README.md diff --git a/boot-starter-elasticsearch/pom.xml b/boot-starter/boot-starter-elasticsearch/pom.xml similarity index 97% rename from boot-starter-elasticsearch/pom.xml rename to boot-starter/boot-starter-elasticsearch/pom.xml index 4b9454f..c115b45 100644 --- a/boot-starter-elasticsearch/pom.xml +++ b/boot-starter/boot-starter-elasticsearch/pom.xml @@ -11,7 +11,7 @@ com.micro.fast - micro-fast + boot-starter 0.0.1-SNAPSHOT diff --git a/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/BootStarterElasticsearchApplication.java b/boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/BootStarterElasticsearchApplication.java similarity index 100% rename from boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/BootStarterElasticsearchApplication.java rename to boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/BootStarterElasticsearchApplication.java diff --git a/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/ElasticsearchConfig.java b/boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/ElasticsearchConfig.java similarity index 100% rename from boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/ElasticsearchConfig.java rename to boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/ElasticsearchConfig.java diff --git a/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/package-info.java b/boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/package-info.java similarity index 100% rename from boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/package-info.java rename to boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/package-info.java diff --git a/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/param/ElasticsearchParamConfig.java b/boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/param/ElasticsearchParamConfig.java similarity index 100% rename from boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/param/ElasticsearchParamConfig.java rename to boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/param/ElasticsearchParamConfig.java diff --git a/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/param/package-info.java b/boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/param/package-info.java similarity index 100% rename from boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/param/package-info.java rename to boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/config/param/package-info.java diff --git a/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/package-info.java b/boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/package-info.java similarity index 100% rename from boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/package-info.java rename to boot-starter/boot-starter-elasticsearch/src/main/java/com/micro/fast/elasticsearch/package-info.java diff --git a/boot-starter-elasticsearch/src/main/resources/META-INF/spring.factories b/boot-starter/boot-starter-elasticsearch/src/main/resources/META-INF/spring.factories similarity index 100% rename from boot-starter-elasticsearch/src/main/resources/META-INF/spring.factories rename to boot-starter/boot-starter-elasticsearch/src/main/resources/META-INF/spring.factories diff --git a/boot-starter-elasticsearch/src/main/resources/application.yml b/boot-starter/boot-starter-elasticsearch/src/main/resources/application.yml similarity index 100% rename from boot-starter-elasticsearch/src/main/resources/application.yml rename to boot-starter/boot-starter-elasticsearch/src/main/resources/application.yml diff --git a/boot-starter-elasticsearch/src/test/java/com/micro/fast/elasticsearch/BootStarterElasticsearchApplicationTests.java b/boot-starter/boot-starter-elasticsearch/src/test/java/com/micro/fast/elasticsearch/BootStarterElasticsearchApplicationTests.java similarity index 100% rename from boot-starter-elasticsearch/src/test/java/com/micro/fast/elasticsearch/BootStarterElasticsearchApplicationTests.java rename to boot-starter/boot-starter-elasticsearch/src/test/java/com/micro/fast/elasticsearch/BootStarterElasticsearchApplicationTests.java diff --git a/boot-starter-fastdfs-client/.gitignore b/boot-starter/boot-starter-fastdfs-client/.gitignore similarity index 100% rename from boot-starter-fastdfs-client/.gitignore rename to boot-starter/boot-starter-fastdfs-client/.gitignore diff --git a/boot-starter-fastdfs-client/README.md b/boot-starter/boot-starter-fastdfs-client/README.md similarity index 100% rename from boot-starter-fastdfs-client/README.md rename to boot-starter/boot-starter-fastdfs-client/README.md diff --git a/boot-starter-fastdfs-client/pom.xml b/boot-starter/boot-starter-fastdfs-client/pom.xml similarity index 97% rename from boot-starter-fastdfs-client/pom.xml rename to boot-starter/boot-starter-fastdfs-client/pom.xml index da057a7..afe3168 100644 --- a/boot-starter-fastdfs-client/pom.xml +++ b/boot-starter/boot-starter-fastdfs-client/pom.xml @@ -11,7 +11,7 @@ com.micro.fast - micro-fast + boot-starter 0.0.1-SNAPSHOT diff --git a/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/BootStartFastdfsClientApplication.java b/boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/BootStartFastdfsClientApplication.java similarity index 100% rename from boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/BootStartFastdfsClientApplication.java rename to boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/BootStartFastdfsClientApplication.java diff --git a/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/FastDFSClientConfig.java b/boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/FastDFSClientConfig.java similarity index 100% rename from boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/FastDFSClientConfig.java rename to boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/FastDFSClientConfig.java diff --git a/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/package-info.java b/boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/package-info.java similarity index 100% rename from boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/package-info.java rename to boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/package-info.java diff --git a/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/param/FastDFSClientParamConfig.java b/boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/param/FastDFSClientParamConfig.java similarity index 100% rename from boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/param/FastDFSClientParamConfig.java rename to boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/param/FastDFSClientParamConfig.java diff --git a/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/param/package-info.java b/boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/param/package-info.java similarity index 100% rename from boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/param/package-info.java rename to boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/config/param/package-info.java diff --git a/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/package-info.java b/boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/package-info.java similarity index 100% rename from boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/package-info.java rename to boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/package-info.java diff --git a/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/util/package-info.java b/boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/util/package-info.java similarity index 100% rename from boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/util/package-info.java rename to boot-starter/boot-starter-fastdfs-client/src/main/java/com/micro/fast/fastdfs/util/package-info.java diff --git a/boot-starter-fastdfs-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/boot-starter/boot-starter-fastdfs-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from boot-starter-fastdfs-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to boot-starter/boot-starter-fastdfs-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/boot-starter-fastdfs-client/src/main/resources/META-INF/spring.factories b/boot-starter/boot-starter-fastdfs-client/src/main/resources/META-INF/spring.factories similarity index 100% rename from boot-starter-fastdfs-client/src/main/resources/META-INF/spring.factories rename to boot-starter/boot-starter-fastdfs-client/src/main/resources/META-INF/spring.factories diff --git a/boot-starter-fastdfs-client/src/main/resources/application.yml b/boot-starter/boot-starter-fastdfs-client/src/main/resources/application.yml similarity index 100% rename from boot-starter-fastdfs-client/src/main/resources/application.yml rename to boot-starter/boot-starter-fastdfs-client/src/main/resources/application.yml diff --git a/boot-starter-fastdfs-client/src/test/java/com/micro/fast/fastdfs/BootStartFastdfsClientApplicationTests.java b/boot-starter/boot-starter-fastdfs-client/src/test/java/com/micro/fast/fastdfs/BootStartFastdfsClientApplicationTests.java similarity index 100% rename from boot-starter-fastdfs-client/src/test/java/com/micro/fast/fastdfs/BootStartFastdfsClientApplicationTests.java rename to boot-starter/boot-starter-fastdfs-client/src/test/java/com/micro/fast/fastdfs/BootStartFastdfsClientApplicationTests.java diff --git a/boot-starter-security-app/.gitignore b/boot-starter/boot-starter-security/boot-starter-security-app/.gitignore similarity index 100% rename from boot-starter-security-app/.gitignore rename to boot-starter/boot-starter-security/boot-starter-security-app/.gitignore diff --git a/boot-starter-security-app/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-app/pom.xml similarity index 96% rename from boot-starter-security-app/pom.xml rename to boot-starter/boot-starter-security/boot-starter-security-app/pom.xml index d1a0ef8..f0ee1cb 100644 --- a/boot-starter-security-app/pom.xml +++ b/boot-starter/boot-starter-security/boot-starter-security-app/pom.xml @@ -11,7 +11,7 @@ com.micro.fast - micro-fast + boot-starter-security 0.0.1-SNAPSHOT diff --git a/boot-starter-security-app/src/main/java/com/micro/fast/security/app/BootStarterSecurityAppApplication.java b/boot-starter/boot-starter-security/boot-starter-security-app/src/main/java/com/micro/fast/security/app/BootStarterSecurityAppApplication.java similarity index 100% rename from boot-starter-security-app/src/main/java/com/micro/fast/security/app/BootStarterSecurityAppApplication.java rename to boot-starter/boot-starter-security/boot-starter-security-app/src/main/java/com/micro/fast/security/app/BootStarterSecurityAppApplication.java diff --git a/boot-starter-security-app/src/main/resources/application.properties b/boot-starter/boot-starter-security/boot-starter-security-app/src/main/resources/application.properties similarity index 100% rename from boot-starter-security-app/src/main/resources/application.properties rename to boot-starter/boot-starter-security/boot-starter-security-app/src/main/resources/application.properties diff --git a/boot-starter-security-app/src/test/java/com/micro/fast/security/app/BootStarterSecurityAppApplicationTests.java b/boot-starter/boot-starter-security/boot-starter-security-app/src/test/java/com/micro/fast/security/app/BootStarterSecurityAppApplicationTests.java similarity index 100% rename from boot-starter-security-app/src/test/java/com/micro/fast/security/app/BootStarterSecurityAppApplicationTests.java rename to boot-starter/boot-starter-security/boot-starter-security-app/src/test/java/com/micro/fast/security/app/BootStarterSecurityAppApplicationTests.java diff --git a/boot-starter-security-browser/.gitignore b/boot-starter/boot-starter-security/boot-starter-security-browser/.gitignore similarity index 100% rename from boot-starter-security-browser/.gitignore rename to boot-starter/boot-starter-security/boot-starter-security-browser/.gitignore diff --git a/boot-starter-security-browser/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-browser/pom.xml similarity index 96% rename from boot-starter-security-browser/pom.xml rename to boot-starter/boot-starter-security/boot-starter-security-browser/pom.xml index 0d8260a..fd28e4a 100644 --- a/boot-starter-security-browser/pom.xml +++ b/boot-starter/boot-starter-security/boot-starter-security-browser/pom.xml @@ -11,7 +11,7 @@ com.micro.fast - micro-fast + boot-starter-security 0.0.1-SNAPSHOT diff --git a/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/BootTstarterSecurityBrowserApplication.java b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/BootTstarterSecurityBrowserApplication.java similarity index 100% rename from boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/BootTstarterSecurityBrowserApplication.java rename to boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/BootTstarterSecurityBrowserApplication.java diff --git a/boot-starter-security-browser/src/main/resources/application.properties b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/resources/application.properties similarity index 100% rename from boot-starter-security-browser/src/main/resources/application.properties rename to boot-starter/boot-starter-security/boot-starter-security-browser/src/main/resources/application.properties diff --git a/boot-starter-security-browser/src/test/java/com/micro/fast/security/browser/BootTstarterSecurityBrowserApplicationTests.java b/boot-starter/boot-starter-security/boot-starter-security-browser/src/test/java/com/micro/fast/security/browser/BootTstarterSecurityBrowserApplicationTests.java similarity index 100% rename from boot-starter-security-browser/src/test/java/com/micro/fast/security/browser/BootTstarterSecurityBrowserApplicationTests.java rename to boot-starter/boot-starter-security/boot-starter-security-browser/src/test/java/com/micro/fast/security/browser/BootTstarterSecurityBrowserApplicationTests.java diff --git a/boot-starter-security-core/.gitignore b/boot-starter/boot-starter-security/boot-starter-security-core/.gitignore similarity index 100% rename from boot-starter-security-core/.gitignore rename to boot-starter/boot-starter-security/boot-starter-security-core/.gitignore diff --git a/boot-starter-security-core/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-core/pom.xml similarity index 98% rename from boot-starter-security-core/pom.xml rename to boot-starter/boot-starter-security/boot-starter-security-core/pom.xml index e3130b2..d6ad595 100644 --- a/boot-starter-security-core/pom.xml +++ b/boot-starter/boot-starter-security/boot-starter-security-core/pom.xml @@ -11,7 +11,7 @@ com.micro.fast - micro-fast + boot-starter-security 0.0.1-SNAPSHOT diff --git a/boot-starter-security-core/src/main/java/com/micro/fast/security/core/BootStarterSecurityCoreApplication.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/BootStarterSecurityCoreApplication.java similarity index 100% rename from boot-starter-security-core/src/main/java/com/micro/fast/security/core/BootStarterSecurityCoreApplication.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/java/com/micro/fast/security/core/BootStarterSecurityCoreApplication.java diff --git a/boot-starter-security-core/src/main/resources/application.properties b/boot-starter/boot-starter-security/boot-starter-security-core/src/main/resources/application.properties similarity index 100% rename from boot-starter-security-core/src/main/resources/application.properties rename to boot-starter/boot-starter-security/boot-starter-security-core/src/main/resources/application.properties diff --git a/boot-starter-security-core/src/test/java/com/micro/fast/security/core/BootStarterSecurityCoreApplicationTests.java b/boot-starter/boot-starter-security/boot-starter-security-core/src/test/java/com/micro/fast/security/core/BootStarterSecurityCoreApplicationTests.java similarity index 100% rename from boot-starter-security-core/src/test/java/com/micro/fast/security/core/BootStarterSecurityCoreApplicationTests.java rename to boot-starter/boot-starter-security/boot-starter-security-core/src/test/java/com/micro/fast/security/core/BootStarterSecurityCoreApplicationTests.java diff --git a/boot-starter-security-demo/.gitignore b/boot-starter/boot-starter-security/boot-starter-security-demo/.gitignore similarity index 100% rename from boot-starter-security-demo/.gitignore rename to boot-starter/boot-starter-security/boot-starter-security-demo/.gitignore diff --git a/boot-starter-security-demo/pom.xml b/boot-starter/boot-starter-security/boot-starter-security-demo/pom.xml similarity index 92% rename from boot-starter-security-demo/pom.xml rename to boot-starter/boot-starter-security/boot-starter-security-demo/pom.xml index 2d83d9b..4eba03b 100644 --- a/boot-starter-security-demo/pom.xml +++ b/boot-starter/boot-starter-security/boot-starter-security-demo/pom.xml @@ -11,7 +11,7 @@ com.micro.fast - micro-fast + boot-starter-security 0.0.1-SNAPSHOT @@ -44,6 +44,7 @@ maven-javadoc-plugin + boot-starter-security-demo diff --git a/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java similarity index 62% rename from boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java rename to boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java index cc41b3f..386a55b 100644 --- a/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java +++ b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplication.java @@ -2,11 +2,19 @@ package com.micro.fast.security.demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; @SpringBootApplication +@RestController public class BootStarterSecurityDemoApplication { public static void main(String[] args) { SpringApplication.run(BootStarterSecurityDemoApplication.class, args); } + @GetMapping("/hello") + public String hello(){ + + return "hello security"; + } } diff --git a/boot-starter-security-demo/src/main/resources/application.yml b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml similarity index 87% rename from boot-starter-security-demo/src/main/resources/application.yml rename to boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml index 9c6e22f..54a1d1e 100644 --- a/boot-starter-security-demo/src/main/resources/application.yml +++ b/boot-starter/boot-starter-security/boot-starter-security-demo/src/main/resources/application.yml @@ -6,4 +6,7 @@ spring: username: root password: studyj2e driver-class-name: com.mysql.jdbc.Driver +security: + basic: + enabled: false diff --git a/boot-starter-security-demo/src/test/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplicationTests.java b/boot-starter/boot-starter-security/boot-starter-security-demo/src/test/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplicationTests.java similarity index 100% rename from boot-starter-security-demo/src/test/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplicationTests.java rename to boot-starter/boot-starter-security/boot-starter-security-demo/src/test/java/com/micro/fast/security/demo/BootStarterSecurityDemoApplicationTests.java diff --git a/boot-starter/boot-starter-security/pom.xml b/boot-starter/boot-starter-security/pom.xml new file mode 100644 index 0000000..66249e3 --- /dev/null +++ b/boot-starter/boot-starter-security/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + boot-starter-security + pom + + boot-starter-security + Spring boot starter + + + com.micro.fast + boot-starter + 0.0.1-SNAPSHOT + + + boot-starter-security-core + boot-starter-security-app + boot-starter-security-browser + boot-starter-security-demo + + + diff --git a/common/.gitignore b/boot-starter/boot-starter-ssm/.gitignore similarity index 100% rename from common/.gitignore rename to boot-starter/boot-starter-ssm/.gitignore diff --git a/boot-starter/boot-starter-ssm/README.md b/boot-starter/boot-starter-ssm/README.md new file mode 100644 index 0000000..77c0eb2 --- /dev/null +++ b/boot-starter/boot-starter-ssm/README.md @@ -0,0 +1,29 @@ +# 欢迎查看boot-starter-ssm项目说明 +[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) +## 项目介绍 + `boot-starter-ssm`项目用于快速开启spring集成mybatis的项目,将本项目使用maven发布到本地仓库,在其他项 + 目中引入该依赖进行相关配置即可使用. +### boot-starter-ssm项目的参数配置 +得益于springboot的自动配置以及条件化装配的机制．我们可以扩展封装自己的ssm-boot,也是就是本项目中的commom，本项目的自定义扩展配置如下： +- `jdbc.master.username`　用户名(必要参数) +- `jdbc.master.password`　密码是使用common模块中的AESUtil加密过后的(必要参数) +- `jdbc.master.url`　　　　数据库连接的url(必要参数) +- `jdbc.master.driverClass` 数据库连接驱动类(必要参数) +- `druid.master.servletInitParams`　druid数据连接池的servlet的初始化参数,默认的druid账号密码是root,studyj2e.如果需要自定义可以传入自己的配 +置，使用key:value的数组的形式. +- `druid.master.servletUrl`　druid数据库连接池的访问路径，默认访问路径是/druid/* +- `druid.master.beanNames` druid要监控的bean的名字，多个使用逗号分割 +- `druid.master.defaultAutoCommit`　事务是否自动提交，默认为true +- `druid.master.initialSize`　连接池的初始化大小，默认是20 +- `druid.master.maxActive`　连接池的最大的数量,默认是50 +- `druid.master.minIdle`连接池的最小空闲数量,默认是10 +- `druid.master.maxWait`　当连接池中连接已经用完了，等待建立一个新连接的最大毫秒数,默认是1000 +- `druid.master.minEvictableIdleTimeMillis`　等待到达多长时间释放连接池，默认是3600000 +- `mybatis.typeAliasesPackage`　pojo包所在的位置(必要参数) +- `mybatis.mappers`　mapper映射文件所在的路径(必要参数) +- `mybatis.pageHelperProperties`　pagehelper分页插件的properties配置形式是key:value数组的形式，默认方言是mysql,如果需要自定义可以传入自己的配置，使用key:value的数 + 组的形式. +- 除此之外`mybatis`的`dao`层扫描的配置需要在项目中自行配置 +- 除此之外`common`实现了主从两个数据源的配置，从数据库的配置只需将`master`替换为`slave`.主从数据源默认使用相同的`druid`监控视图.其中对于`beanbeanNames`的监控配置，`servletUrl`的配 + 置,`servletInitParams`的配置在`master`中进行配置，需要在使用的项目之中去除默认的数据源自动装配`@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)` +- 对于数据源的切换方法是使用aop的方式对`@SwitchDataSource('数据源的名字')`进行拦截动态切换数据源，主数据源的名字是`master`,从数据源的名字是`slave`.对于没有注解默认的数据源是`master`. \ No newline at end of file diff --git a/common/pom.xml b/boot-starter/boot-starter-ssm/pom.xml similarity index 95% rename from common/pom.xml rename to boot-starter/boot-starter-ssm/pom.xml index eee62cd..a5e3e36 100644 --- a/common/pom.xml +++ b/boot-starter/boot-starter-ssm/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - common + boot-starter-ssm jar - common - common + boot-starter-ssm + boot-starter-ssm com.micro.fast - micro-fast + boot-starter 0.0.1-SNAPSHOT diff --git a/common/src/main/java/com/micro/fast/common/CommonApplication.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/CommonApplication.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/CommonApplication.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/CommonApplication.java diff --git a/common/src/main/java/com/micro/fast/common/annotation/SwitchDataSource.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/annotation/SwitchDataSource.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/annotation/SwitchDataSource.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/annotation/SwitchDataSource.java diff --git a/common/src/main/java/com/micro/fast/common/annotation/package-info.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/annotation/package-info.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/annotation/package-info.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/annotation/package-info.java diff --git a/common/src/main/java/com/micro/fast/common/aspect/DynamicDataSourceAspect.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/aspect/DynamicDataSourceAspect.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/aspect/DynamicDataSourceAspect.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/aspect/DynamicDataSourceAspect.java diff --git a/common/src/main/java/com/micro/fast/common/aspect/package-info.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/aspect/package-info.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/aspect/package-info.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/aspect/package-info.java diff --git a/common/src/main/java/com/micro/fast/common/condition/SalveDataSourceCondition.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/condition/SalveDataSourceCondition.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/condition/SalveDataSourceCondition.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/condition/SalveDataSourceCondition.java diff --git a/common/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceMasterConfig.java diff --git a/common/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DataSourceSlaveConfig.java diff --git a/common/src/main/java/com/micro/fast/common/config/DynamicDataSourceConfig.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DynamicDataSourceConfig.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/config/DynamicDataSourceConfig.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/DynamicDataSourceConfig.java diff --git a/common/src/main/java/com/micro/fast/common/config/SqlSessionFactoryConfig.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/SqlSessionFactoryConfig.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/config/SqlSessionFactoryConfig.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/SqlSessionFactoryConfig.java diff --git a/common/src/main/java/com/micro/fast/common/config/package-info.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/package-info.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/config/package-info.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/package-info.java diff --git a/common/src/main/java/com/micro/fast/common/config/param/DruidMasterParamConfig.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/param/DruidMasterParamConfig.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/config/param/DruidMasterParamConfig.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/param/DruidMasterParamConfig.java diff --git a/common/src/main/java/com/micro/fast/common/config/param/DruidSlaveParamConfig.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/param/DruidSlaveParamConfig.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/config/param/DruidSlaveParamConfig.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/param/DruidSlaveParamConfig.java diff --git a/common/src/main/java/com/micro/fast/common/config/param/JdbcConnectionMasterParamConfig.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/param/JdbcConnectionMasterParamConfig.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/config/param/JdbcConnectionMasterParamConfig.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/param/JdbcConnectionMasterParamConfig.java diff --git a/common/src/main/java/com/micro/fast/common/config/param/JdbcConnectionSlaveParamConfig.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/param/JdbcConnectionSlaveParamConfig.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/config/param/JdbcConnectionSlaveParamConfig.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/param/JdbcConnectionSlaveParamConfig.java diff --git a/common/src/main/java/com/micro/fast/common/config/param/MybatisParamConfig.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/param/MybatisParamConfig.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/config/param/MybatisParamConfig.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/param/MybatisParamConfig.java diff --git a/common/src/main/java/com/micro/fast/common/config/param/package-info.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/param/package-info.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/config/param/package-info.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/config/param/package-info.java diff --git a/common/src/main/java/com/micro/fast/common/dao/DataSourceContextHolder.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/dao/DataSourceContextHolder.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/dao/DataSourceContextHolder.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/dao/DataSourceContextHolder.java diff --git a/common/src/main/java/com/micro/fast/common/dao/DynamicDataSource.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/dao/DynamicDataSource.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/dao/DynamicDataSource.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/dao/DynamicDataSource.java diff --git a/common/src/main/java/com/micro/fast/common/exception/package-info.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception/package-info.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/exception/package-info.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception/package-info.java diff --git a/common/src/main/java/com/micro/fast/common/package-info.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/package-info.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/package-info.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/package-info.java diff --git a/common/src/main/java/com/micro/fast/common/response/Const.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/Const.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/response/Const.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/Const.java diff --git a/common/src/main/java/com/micro/fast/common/response/ServerResponse.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/ServerResponse.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/response/ServerResponse.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/ServerResponse.java diff --git a/common/src/main/java/com/micro/fast/common/response/package-info.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/package-info.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/response/package-info.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/package-info.java diff --git a/common/src/main/java/com/micro/fast/common/util/My.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/util/My.java similarity index 100% rename from common/src/main/java/com/micro/fast/common/util/My.java rename to boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/util/My.java diff --git a/common/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/boot-starter/boot-starter-ssm/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from common/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to boot-starter/boot-starter-ssm/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/common/src/main/resources/META-INF/spring.factories b/boot-starter/boot-starter-ssm/src/main/resources/META-INF/spring.factories similarity index 100% rename from common/src/main/resources/META-INF/spring.factories rename to boot-starter/boot-starter-ssm/src/main/resources/META-INF/spring.factories diff --git a/boot-starter-util/pom.xml b/boot-starter/boot-starter-util/pom.xml similarity index 96% rename from boot-starter-util/pom.xml rename to boot-starter/boot-starter-util/pom.xml index a0a34e7..ff3dde2 100644 --- a/boot-starter-util/pom.xml +++ b/boot-starter/boot-starter-util/pom.xml @@ -5,12 +5,12 @@ boot-starter-util jar - util + boot-starter-util micro-fast-util com.micro.fast - micro-fast + boot-starter 0.0.1-SNAPSHOT diff --git a/boot-starter-util/src/main/java/com/micro/fast/util/AESUtil.java b/boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/AESUtil.java similarity index 100% rename from boot-starter-util/src/main/java/com/micro/fast/util/AESUtil.java rename to boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/AESUtil.java diff --git a/boot-starter-util/src/main/java/com/micro/fast/util/FileUtils.java b/boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/FileUtils.java similarity index 100% rename from boot-starter-util/src/main/java/com/micro/fast/util/FileUtils.java rename to boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/FileUtils.java diff --git a/boot-starter-util/src/main/java/com/micro/fast/util/MD5Util.java b/boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/MD5Util.java similarity index 100% rename from boot-starter-util/src/main/java/com/micro/fast/util/MD5Util.java rename to boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/MD5Util.java diff --git a/boot-starter-util/src/main/java/com/micro/fast/util/My.java b/boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/My.java similarity index 100% rename from boot-starter-util/src/main/java/com/micro/fast/util/My.java rename to boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/My.java diff --git a/boot-starter-util/src/main/java/com/micro/fast/util/WatermarkerUtil.java b/boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/WatermarkerUtil.java similarity index 100% rename from boot-starter-util/src/main/java/com/micro/fast/util/WatermarkerUtil.java rename to boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/WatermarkerUtil.java diff --git a/boot-starter-util/src/main/java/com/micro/fast/util/package-info.java b/boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/package-info.java similarity index 100% rename from boot-starter-util/src/main/java/com/micro/fast/util/package-info.java rename to boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/package-info.java diff --git a/boot-starter/pom.xml b/boot-starter/pom.xml new file mode 100644 index 0000000..34cb397 --- /dev/null +++ b/boot-starter/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + boot-starter + pom + + boot-starter + Spring boot starter + + + com.micro.fast + micro-fast + 0.0.1-SNAPSHOT + + + + boot-starter-util + boot-starter-fastdfs-client + boot-starter-elasticsearch + boot-starter-security + boot-starter-ssm + + diff --git a/ms/.gitignore b/ms/.gitignore new file mode 100644 index 0000000..b9c94c1 --- /dev/null +++ b/ms/.gitignore @@ -0,0 +1,42 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ + +### maven ### +target +out +.mvn +mvnw +mvnw.cmd +classes +将删除 .gitignore +将删除 README.md +将删除 package-lock.json +将删除 package.json +将删除 public/ +将删除 src/ + +### jRebel ### +.rebel.xml.bak +rebel.xml \ No newline at end of file diff --git a/ms/README.md b/ms/README.md new file mode 100644 index 0000000..bb0d2e2 --- /dev/null +++ b/ms/README.md @@ -0,0 +1,31 @@ +# 欢迎查看ms项目说明 +[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) +## 项目简介 + `ms`使用mybatis,spring系列框架作为基础，致力于打造一套中小企业分布式系统解决方案.借助于springCould微服务框架，对原框架进行整合扩展使用 +云架构进行开发 +## 模块介绍 +### 配置中心 config-server + 配置中心默认启动端口号9999,健康检查端口号19999.访问地址www.config.server.com +### 注册中心 eureka-server + 注册中心默认启动端口号10002，健康检查端口号20002．访问地址www.eureka.server.com．为保证服务的稳定可靠，可以创建多个注册中心，实现服务注 +册的备份冗余，实现高可用性 +### 注册中心２ eureka-server2 + 注册中心２默认启动端口号10003，健康检查端口号20003．访问地址www.eureka.server2.com +### 用户权限管理中心 upms + 用户权限管理中心默认启动端口号10004，健康检查端口号20004．访问地址www.upms.com +### 内容管理系统　cms + 内容管理系统默认启动端口号10005，健康检查端口号20005,访问地址www.cms.com +### 用户中心　ucenter + 用户中心默认启动端口号10006,健康检查端口20006,访问地址www.ucenter.com +### 服务网关　gateway + 服务网关默认启动端口号10007,健康检查端口号20007,访问地址www.gateway.com +### 后台管理界面 manage-system + 使用vue.js搭建后台管理界面 +## 项目相关约束 +### 遵循类似于springboot约定大与配置的原则．本项目开发约束如下： +参照boot-starter-ssm项目说明[boot-starter-ssm](../boot-starter/boot-starter-ssm/README.md) +#### 关于使用docker方式运行项目 + 可以使用传统方式运行，可以使用docker容器的方式运行．程序的启动顺序是配置中心，注册中心，其他服务。无论是使何种方式运行，保证除配置中心外，其 +他所有服务都能从配置中加载到对应的配置文件，其他所有的服务都能注册到注册中心。所以运行的时候一定要将除配置中心外所有服务的注册空间的配置空间都指 +定正确，本项目中本地运行时则是都指定到本机的ip地址 + diff --git a/cms/.gitignore b/ms/cms/.gitignore similarity index 100% rename from cms/.gitignore rename to ms/cms/.gitignore diff --git a/cms/pom.xml b/ms/cms/pom.xml similarity index 98% rename from cms/pom.xml rename to ms/cms/pom.xml index be02016..bce7118 100644 --- a/cms/pom.xml +++ b/ms/cms/pom.xml @@ -11,7 +11,7 @@ com.micro.fast - micro-fast + ms 0.0.1-SNAPSHOT @@ -19,7 +19,7 @@ com.micro.fast - common + boot-starter-ssm ${micro.fast.version} diff --git a/cms/src/main/java/com/micro/fast/cms/CmsApplication.java b/ms/cms/src/main/java/com/micro/fast/cms/CmsApplication.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/CmsApplication.java rename to ms/cms/src/main/java/com/micro/fast/cms/CmsApplication.java diff --git a/cms/src/main/java/com/micro/fast/cms/common/package-info.java b/ms/cms/src/main/java/com/micro/fast/cms/common/package-info.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/common/package-info.java rename to ms/cms/src/main/java/com/micro/fast/cms/common/package-info.java diff --git a/cms/src/main/java/com/micro/fast/cms/controller/package-info.java b/ms/cms/src/main/java/com/micro/fast/cms/controller/package-info.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/controller/package-info.java rename to ms/cms/src/main/java/com/micro/fast/cms/controller/package-info.java diff --git a/cms/src/main/java/com/micro/fast/cms/dao/CmsArticleCategoryMapper.java b/ms/cms/src/main/java/com/micro/fast/cms/dao/CmsArticleCategoryMapper.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/dao/CmsArticleCategoryMapper.java rename to ms/cms/src/main/java/com/micro/fast/cms/dao/CmsArticleCategoryMapper.java diff --git a/cms/src/main/java/com/micro/fast/cms/dao/CmsArticleMapper.java b/ms/cms/src/main/java/com/micro/fast/cms/dao/CmsArticleMapper.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/dao/CmsArticleMapper.java rename to ms/cms/src/main/java/com/micro/fast/cms/dao/CmsArticleMapper.java diff --git a/cms/src/main/java/com/micro/fast/cms/dao/CmsArticleTagMapper.java b/ms/cms/src/main/java/com/micro/fast/cms/dao/CmsArticleTagMapper.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/dao/CmsArticleTagMapper.java rename to ms/cms/src/main/java/com/micro/fast/cms/dao/CmsArticleTagMapper.java diff --git a/cms/src/main/java/com/micro/fast/cms/dao/CmsCategoryMapper.java b/ms/cms/src/main/java/com/micro/fast/cms/dao/CmsCategoryMapper.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/dao/CmsCategoryMapper.java rename to ms/cms/src/main/java/com/micro/fast/cms/dao/CmsCategoryMapper.java diff --git a/cms/src/main/java/com/micro/fast/cms/dao/CmsCategoryTagMapper.java b/ms/cms/src/main/java/com/micro/fast/cms/dao/CmsCategoryTagMapper.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/dao/CmsCategoryTagMapper.java rename to ms/cms/src/main/java/com/micro/fast/cms/dao/CmsCategoryTagMapper.java diff --git a/cms/src/main/java/com/micro/fast/cms/dao/CmsCommentMapper.java b/ms/cms/src/main/java/com/micro/fast/cms/dao/CmsCommentMapper.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/dao/CmsCommentMapper.java rename to ms/cms/src/main/java/com/micro/fast/cms/dao/CmsCommentMapper.java diff --git a/cms/src/main/java/com/micro/fast/cms/dao/CmsMenuMapper.java b/ms/cms/src/main/java/com/micro/fast/cms/dao/CmsMenuMapper.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/dao/CmsMenuMapper.java rename to ms/cms/src/main/java/com/micro/fast/cms/dao/CmsMenuMapper.java diff --git a/cms/src/main/java/com/micro/fast/cms/dao/CmsPageMapper.java b/ms/cms/src/main/java/com/micro/fast/cms/dao/CmsPageMapper.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/dao/CmsPageMapper.java rename to ms/cms/src/main/java/com/micro/fast/cms/dao/CmsPageMapper.java diff --git a/cms/src/main/java/com/micro/fast/cms/dao/CmsSettingMapper.java b/ms/cms/src/main/java/com/micro/fast/cms/dao/CmsSettingMapper.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/dao/CmsSettingMapper.java rename to ms/cms/src/main/java/com/micro/fast/cms/dao/CmsSettingMapper.java diff --git a/cms/src/main/java/com/micro/fast/cms/dao/CmsSystemMapper.java b/ms/cms/src/main/java/com/micro/fast/cms/dao/CmsSystemMapper.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/dao/CmsSystemMapper.java rename to ms/cms/src/main/java/com/micro/fast/cms/dao/CmsSystemMapper.java diff --git a/cms/src/main/java/com/micro/fast/cms/dao/CmsTagMapper.java b/ms/cms/src/main/java/com/micro/fast/cms/dao/CmsTagMapper.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/dao/CmsTagMapper.java rename to ms/cms/src/main/java/com/micro/fast/cms/dao/CmsTagMapper.java diff --git a/cms/src/main/java/com/micro/fast/cms/dao/CmsTopicMapper.java b/ms/cms/src/main/java/com/micro/fast/cms/dao/CmsTopicMapper.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/dao/CmsTopicMapper.java rename to ms/cms/src/main/java/com/micro/fast/cms/dao/CmsTopicMapper.java diff --git a/cms/src/main/java/com/micro/fast/cms/dao/package-info.java b/ms/cms/src/main/java/com/micro/fast/cms/dao/package-info.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/dao/package-info.java rename to ms/cms/src/main/java/com/micro/fast/cms/dao/package-info.java diff --git a/cms/src/main/java/com/micro/fast/cms/package-info.java b/ms/cms/src/main/java/com/micro/fast/cms/package-info.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/package-info.java rename to ms/cms/src/main/java/com/micro/fast/cms/package-info.java diff --git a/cms/src/main/java/com/micro/fast/cms/pojo/CmsArticle.java b/ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsArticle.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/pojo/CmsArticle.java rename to ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsArticle.java diff --git a/cms/src/main/java/com/micro/fast/cms/pojo/CmsArticleCategory.java b/ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsArticleCategory.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/pojo/CmsArticleCategory.java rename to ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsArticleCategory.java diff --git a/cms/src/main/java/com/micro/fast/cms/pojo/CmsArticleTag.java b/ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsArticleTag.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/pojo/CmsArticleTag.java rename to ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsArticleTag.java diff --git a/cms/src/main/java/com/micro/fast/cms/pojo/CmsCategory.java b/ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsCategory.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/pojo/CmsCategory.java rename to ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsCategory.java diff --git a/cms/src/main/java/com/micro/fast/cms/pojo/CmsCategoryTag.java b/ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsCategoryTag.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/pojo/CmsCategoryTag.java rename to ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsCategoryTag.java diff --git a/cms/src/main/java/com/micro/fast/cms/pojo/CmsComment.java b/ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsComment.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/pojo/CmsComment.java rename to ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsComment.java diff --git a/cms/src/main/java/com/micro/fast/cms/pojo/CmsMenu.java b/ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsMenu.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/pojo/CmsMenu.java rename to ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsMenu.java diff --git a/cms/src/main/java/com/micro/fast/cms/pojo/CmsPage.java b/ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsPage.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/pojo/CmsPage.java rename to ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsPage.java diff --git a/cms/src/main/java/com/micro/fast/cms/pojo/CmsSetting.java b/ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsSetting.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/pojo/CmsSetting.java rename to ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsSetting.java diff --git a/cms/src/main/java/com/micro/fast/cms/pojo/CmsSystem.java b/ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsSystem.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/pojo/CmsSystem.java rename to ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsSystem.java diff --git a/cms/src/main/java/com/micro/fast/cms/pojo/CmsTag.java b/ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsTag.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/pojo/CmsTag.java rename to ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsTag.java diff --git a/cms/src/main/java/com/micro/fast/cms/pojo/CmsTopic.java b/ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsTopic.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/pojo/CmsTopic.java rename to ms/cms/src/main/java/com/micro/fast/cms/pojo/CmsTopic.java diff --git a/cms/src/main/java/com/micro/fast/cms/pojo/package-info.java b/ms/cms/src/main/java/com/micro/fast/cms/pojo/package-info.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/pojo/package-info.java rename to ms/cms/src/main/java/com/micro/fast/cms/pojo/package-info.java diff --git a/cms/src/main/java/com/micro/fast/cms/service/package-info.java b/ms/cms/src/main/java/com/micro/fast/cms/service/package-info.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/service/package-info.java rename to ms/cms/src/main/java/com/micro/fast/cms/service/package-info.java diff --git a/cms/src/main/java/com/micro/fast/cms/vo/package-info.java b/ms/cms/src/main/java/com/micro/fast/cms/vo/package-info.java similarity index 100% rename from cms/src/main/java/com/micro/fast/cms/vo/package-info.java rename to ms/cms/src/main/java/com/micro/fast/cms/vo/package-info.java diff --git a/cms/src/main/resources/bootstrap.yml b/ms/cms/src/main/resources/bootstrap.yml similarity index 100% rename from cms/src/main/resources/bootstrap.yml rename to ms/cms/src/main/resources/bootstrap.yml diff --git a/cms/src/main/resources/generatorConfig.xml b/ms/cms/src/main/resources/generatorConfig.xml similarity index 100% rename from cms/src/main/resources/generatorConfig.xml rename to ms/cms/src/main/resources/generatorConfig.xml diff --git a/cms/src/main/resources/mappers/CmsArticleCategoryMapper.xml b/ms/cms/src/main/resources/mappers/CmsArticleCategoryMapper.xml similarity index 100% rename from cms/src/main/resources/mappers/CmsArticleCategoryMapper.xml rename to ms/cms/src/main/resources/mappers/CmsArticleCategoryMapper.xml diff --git a/cms/src/main/resources/mappers/CmsArticleMapper.xml b/ms/cms/src/main/resources/mappers/CmsArticleMapper.xml similarity index 100% rename from cms/src/main/resources/mappers/CmsArticleMapper.xml rename to ms/cms/src/main/resources/mappers/CmsArticleMapper.xml diff --git a/cms/src/main/resources/mappers/CmsArticleTagMapper.xml b/ms/cms/src/main/resources/mappers/CmsArticleTagMapper.xml similarity index 100% rename from cms/src/main/resources/mappers/CmsArticleTagMapper.xml rename to ms/cms/src/main/resources/mappers/CmsArticleTagMapper.xml diff --git a/cms/src/main/resources/mappers/CmsCategoryMapper.xml b/ms/cms/src/main/resources/mappers/CmsCategoryMapper.xml similarity index 100% rename from cms/src/main/resources/mappers/CmsCategoryMapper.xml rename to ms/cms/src/main/resources/mappers/CmsCategoryMapper.xml diff --git a/cms/src/main/resources/mappers/CmsCategoryTagMapper.xml b/ms/cms/src/main/resources/mappers/CmsCategoryTagMapper.xml similarity index 100% rename from cms/src/main/resources/mappers/CmsCategoryTagMapper.xml rename to ms/cms/src/main/resources/mappers/CmsCategoryTagMapper.xml diff --git a/cms/src/main/resources/mappers/CmsCommentMapper.xml b/ms/cms/src/main/resources/mappers/CmsCommentMapper.xml similarity index 100% rename from cms/src/main/resources/mappers/CmsCommentMapper.xml rename to ms/cms/src/main/resources/mappers/CmsCommentMapper.xml diff --git a/cms/src/main/resources/mappers/CmsMenuMapper.xml b/ms/cms/src/main/resources/mappers/CmsMenuMapper.xml similarity index 100% rename from cms/src/main/resources/mappers/CmsMenuMapper.xml rename to ms/cms/src/main/resources/mappers/CmsMenuMapper.xml diff --git a/cms/src/main/resources/mappers/CmsPageMapper.xml b/ms/cms/src/main/resources/mappers/CmsPageMapper.xml similarity index 100% rename from cms/src/main/resources/mappers/CmsPageMapper.xml rename to ms/cms/src/main/resources/mappers/CmsPageMapper.xml diff --git a/cms/src/main/resources/mappers/CmsSettingMapper.xml b/ms/cms/src/main/resources/mappers/CmsSettingMapper.xml similarity index 100% rename from cms/src/main/resources/mappers/CmsSettingMapper.xml rename to ms/cms/src/main/resources/mappers/CmsSettingMapper.xml diff --git a/cms/src/main/resources/mappers/CmsSystemMapper.xml b/ms/cms/src/main/resources/mappers/CmsSystemMapper.xml similarity index 100% rename from cms/src/main/resources/mappers/CmsSystemMapper.xml rename to ms/cms/src/main/resources/mappers/CmsSystemMapper.xml diff --git a/cms/src/main/resources/mappers/CmsTagMapper.xml b/ms/cms/src/main/resources/mappers/CmsTagMapper.xml similarity index 100% rename from cms/src/main/resources/mappers/CmsTagMapper.xml rename to ms/cms/src/main/resources/mappers/CmsTagMapper.xml diff --git a/cms/src/main/resources/mappers/CmsTopicMapper.xml b/ms/cms/src/main/resources/mappers/CmsTopicMapper.xml similarity index 100% rename from cms/src/main/resources/mappers/CmsTopicMapper.xml rename to ms/cms/src/main/resources/mappers/CmsTopicMapper.xml diff --git a/cms/src/main/resources/mybatisGenerator.properties b/ms/cms/src/main/resources/mybatisGenerator.properties similarity index 100% rename from cms/src/main/resources/mybatisGenerator.properties rename to ms/cms/src/main/resources/mybatisGenerator.properties diff --git a/cms/src/test/java/com/micro/fast/cms/CmsApplicationTests.java b/ms/cms/src/test/java/com/micro/fast/cms/CmsApplicationTests.java similarity index 100% rename from cms/src/test/java/com/micro/fast/cms/CmsApplicationTests.java rename to ms/cms/src/test/java/com/micro/fast/cms/CmsApplicationTests.java diff --git a/config-server/.gitignore b/ms/config-server/.gitignore similarity index 100% rename from config-server/.gitignore rename to ms/config-server/.gitignore diff --git a/config-server/Dockerfile b/ms/config-server/Dockerfile similarity index 100% rename from config-server/Dockerfile rename to ms/config-server/Dockerfile diff --git a/config-server/README.md b/ms/config-server/README.md similarity index 100% rename from config-server/README.md rename to ms/config-server/README.md diff --git a/config-server/container_settings.json b/ms/config-server/container_settings.json similarity index 100% rename from config-server/container_settings.json rename to ms/config-server/container_settings.json diff --git a/config-server/pom.xml b/ms/config-server/pom.xml similarity index 97% rename from config-server/pom.xml rename to ms/config-server/pom.xml index d0649f9..22fa898 100644 --- a/config-server/pom.xml +++ b/ms/config-server/pom.xml @@ -11,7 +11,7 @@ com.micro.fast - micro-fast + ms 0.0.1-SNAPSHOT diff --git a/config-server/src/main/java/com/micro/fast/config/server/ConfigServerApplication.java b/ms/config-server/src/main/java/com/micro/fast/config/server/ConfigServerApplication.java similarity index 100% rename from config-server/src/main/java/com/micro/fast/config/server/ConfigServerApplication.java rename to ms/config-server/src/main/java/com/micro/fast/config/server/ConfigServerApplication.java diff --git a/config-server/src/main/java/com/micro/fast/config/server/package-info.java b/ms/config-server/src/main/java/com/micro/fast/config/server/package-info.java similarity index 100% rename from config-server/src/main/java/com/micro/fast/config/server/package-info.java rename to ms/config-server/src/main/java/com/micro/fast/config/server/package-info.java diff --git a/config-server/src/main/resources/application.yml b/ms/config-server/src/main/resources/application.yml similarity index 86% rename from config-server/src/main/resources/application.yml rename to ms/config-server/src/main/resources/application.yml index 7a6635b..fe34cb3 100644 --- a/config-server/src/main/resources/application.yml +++ b/ms/config-server/src/main/resources/application.yml @@ -7,6 +7,8 @@ spring: server: git: uri: https://git.oschina.net/kklt1996/config-server/ + username: kklt1996 + password: studyj2e server: port: 9999 # 健康检查的相关配置 diff --git a/config-server/src/test/java/com/micro/fast/config/server/ConfigServerApplicationTests.java b/ms/config-server/src/test/java/com/micro/fast/config/server/ConfigServerApplicationTests.java similarity index 100% rename from config-server/src/test/java/com/micro/fast/config/server/ConfigServerApplicationTests.java rename to ms/config-server/src/test/java/com/micro/fast/config/server/ConfigServerApplicationTests.java diff --git a/gateway/.gitignore b/ms/gateway/.gitignore similarity index 100% rename from gateway/.gitignore rename to ms/gateway/.gitignore diff --git a/gateway/pom.xml b/ms/gateway/pom.xml similarity index 99% rename from gateway/pom.xml rename to ms/gateway/pom.xml index 2c82d1d..2ca87f2 100644 --- a/gateway/pom.xml +++ b/ms/gateway/pom.xml @@ -11,7 +11,7 @@ com.micro.fast - micro-fast + ms 0.0.1-SNAPSHOT diff --git a/gateway/src/main/java/com/micro/fast/gateway/GatewayApplication.java b/ms/gateway/src/main/java/com/micro/fast/gateway/GatewayApplication.java similarity index 100% rename from gateway/src/main/java/com/micro/fast/gateway/GatewayApplication.java rename to ms/gateway/src/main/java/com/micro/fast/gateway/GatewayApplication.java diff --git a/gateway/src/main/resources/bootstrap.yml b/ms/gateway/src/main/resources/bootstrap.yml similarity index 100% rename from gateway/src/main/resources/bootstrap.yml rename to ms/gateway/src/main/resources/bootstrap.yml diff --git a/gateway/src/test/java/com/micro/fast/gateway/GatewayApplicationTests.java b/ms/gateway/src/test/java/com/micro/fast/gateway/GatewayApplicationTests.java similarity index 100% rename from gateway/src/test/java/com/micro/fast/gateway/GatewayApplicationTests.java rename to ms/gateway/src/test/java/com/micro/fast/gateway/GatewayApplicationTests.java diff --git a/ms/pom.xml b/ms/pom.xml new file mode 100644 index 0000000..9438c20 --- /dev/null +++ b/ms/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + ms + pom + + ms + ms + + + com.micro.fast + micro-fast + 0.0.1-SNAPSHOT + + + + config-server + eureka-server + eureka-server2 + gateway + upms + cms + ucenter + + diff --git a/eureka-server/.gitignore b/ms/register-center1/.gitignore similarity index 100% rename from eureka-server/.gitignore rename to ms/register-center1/.gitignore diff --git a/eureka-server/Dockerfile b/ms/register-center1/Dockerfile similarity index 100% rename from eureka-server/Dockerfile rename to ms/register-center1/Dockerfile diff --git a/eureka-server/README.md b/ms/register-center1/README.md similarity index 100% rename from eureka-server/README.md rename to ms/register-center1/README.md diff --git a/eureka-server/container_settings.json b/ms/register-center1/container_settings.json similarity index 100% rename from eureka-server/container_settings.json rename to ms/register-center1/container_settings.json diff --git a/eureka-server/pom.xml b/ms/register-center1/pom.xml similarity index 95% rename from eureka-server/pom.xml rename to ms/register-center1/pom.xml index e6ed688..c832fb4 100644 --- a/eureka-server/pom.xml +++ b/ms/register-center1/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - eureka-server + register-center1 jar - eureka-server + register-center1 eureka-server com.micro.fast - micro-fast + ms 0.0.1-SNAPSHOT diff --git a/eureka-server/src/main/java/com/micro/fast/eureka/server/EurekaServerApplication.java b/ms/register-center1/src/main/java/com/micro/fast/eureka/server/EurekaServerApplication.java similarity index 100% rename from eureka-server/src/main/java/com/micro/fast/eureka/server/EurekaServerApplication.java rename to ms/register-center1/src/main/java/com/micro/fast/eureka/server/EurekaServerApplication.java diff --git a/eureka-server/src/main/java/com/micro/fast/eureka/server/package-info.java b/ms/register-center1/src/main/java/com/micro/fast/eureka/server/package-info.java similarity index 100% rename from eureka-server/src/main/java/com/micro/fast/eureka/server/package-info.java rename to ms/register-center1/src/main/java/com/micro/fast/eureka/server/package-info.java diff --git a/eureka-server/src/main/resources/bootstrap.yml b/ms/register-center1/src/main/resources/bootstrap.yml similarity index 100% rename from eureka-server/src/main/resources/bootstrap.yml rename to ms/register-center1/src/main/resources/bootstrap.yml diff --git a/eureka-server/src/test/java/com/micro/fast/eureka/server/EurekaServerApplicationTests.java b/ms/register-center1/src/test/java/com/micro/fast/eureka/server/EurekaServerApplicationTests.java similarity index 100% rename from eureka-server/src/test/java/com/micro/fast/eureka/server/EurekaServerApplicationTests.java rename to ms/register-center1/src/test/java/com/micro/fast/eureka/server/EurekaServerApplicationTests.java diff --git a/eureka-server2/.gitignore b/ms/register-center2/.gitignore similarity index 100% rename from eureka-server2/.gitignore rename to ms/register-center2/.gitignore diff --git a/eureka-server2/Dockerfile b/ms/register-center2/Dockerfile similarity index 100% rename from eureka-server2/Dockerfile rename to ms/register-center2/Dockerfile diff --git a/eureka-server2/container_settings.json b/ms/register-center2/container_settings.json similarity index 100% rename from eureka-server2/container_settings.json rename to ms/register-center2/container_settings.json diff --git a/eureka-server2/pom.xml b/ms/register-center2/pom.xml similarity index 94% rename from eureka-server2/pom.xml rename to ms/register-center2/pom.xml index c69b704..3e50df8 100644 --- a/eureka-server2/pom.xml +++ b/ms/register-center2/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - eureka-server2 + register-center2 jar - eureka-server2 + register-center2 eureka-server2 com.micro.fast - micro-fast + ms 0.0.1-SNAPSHOT diff --git a/eureka-server2/src/main/java/com/micro/fast/eureka/server2/EurekaServer2Application.java b/ms/register-center2/src/main/java/com/micro/fast/eureka/server2/EurekaServer2Application.java similarity index 100% rename from eureka-server2/src/main/java/com/micro/fast/eureka/server2/EurekaServer2Application.java rename to ms/register-center2/src/main/java/com/micro/fast/eureka/server2/EurekaServer2Application.java diff --git a/eureka-server2/src/main/java/com/micro/fast/eureka/server2/package-info.java b/ms/register-center2/src/main/java/com/micro/fast/eureka/server2/package-info.java similarity index 100% rename from eureka-server2/src/main/java/com/micro/fast/eureka/server2/package-info.java rename to ms/register-center2/src/main/java/com/micro/fast/eureka/server2/package-info.java diff --git a/eureka-server2/src/main/resources/bootstrap.yml b/ms/register-center2/src/main/resources/bootstrap.yml similarity index 100% rename from eureka-server2/src/main/resources/bootstrap.yml rename to ms/register-center2/src/main/resources/bootstrap.yml diff --git a/eureka-server2/src/test/java/com/micro/fast/eureka/server2/EurekaServer2ApplicationTests.java b/ms/register-center2/src/test/java/com/micro/fast/eureka/server2/EurekaServer2ApplicationTests.java similarity index 100% rename from eureka-server2/src/test/java/com/micro/fast/eureka/server2/EurekaServer2ApplicationTests.java rename to ms/register-center2/src/test/java/com/micro/fast/eureka/server2/EurekaServer2ApplicationTests.java diff --git a/system-management/.babelrc b/ms/system-management/.babelrc similarity index 100% rename from system-management/.babelrc rename to ms/system-management/.babelrc diff --git a/system-management/.editorconfig b/ms/system-management/.editorconfig similarity index 100% rename from system-management/.editorconfig rename to ms/system-management/.editorconfig diff --git a/system-management/.eslintignore b/ms/system-management/.eslintignore similarity index 100% rename from system-management/.eslintignore rename to ms/system-management/.eslintignore diff --git a/system-management/.eslintrc.js b/ms/system-management/.eslintrc.js similarity index 100% rename from system-management/.eslintrc.js rename to ms/system-management/.eslintrc.js diff --git a/system-management/.gitignore b/ms/system-management/.gitignore similarity index 100% rename from system-management/.gitignore rename to ms/system-management/.gitignore diff --git a/system-management/.postcssrc.js b/ms/system-management/.postcssrc.js similarity index 100% rename from system-management/.postcssrc.js rename to ms/system-management/.postcssrc.js diff --git a/system-management/README.md b/ms/system-management/README.md similarity index 100% rename from system-management/README.md rename to ms/system-management/README.md diff --git a/system-management/config/dev.env.js b/ms/system-management/config/dev.env.js similarity index 100% rename from system-management/config/dev.env.js rename to ms/system-management/config/dev.env.js diff --git a/system-management/config/index.js b/ms/system-management/config/index.js similarity index 100% rename from system-management/config/index.js rename to ms/system-management/config/index.js diff --git a/system-management/config/prod.env.js b/ms/system-management/config/prod.env.js similarity index 100% rename from system-management/config/prod.env.js rename to ms/system-management/config/prod.env.js diff --git a/system-management/config/test.env.js b/ms/system-management/config/test.env.js similarity index 100% rename from system-management/config/test.env.js rename to ms/system-management/config/test.env.js diff --git a/system-management/index.html b/ms/system-management/index.html similarity index 100% rename from system-management/index.html rename to ms/system-management/index.html diff --git a/system-management/package.json b/ms/system-management/package.json similarity index 100% rename from system-management/package.json rename to ms/system-management/package.json diff --git a/system-management/src/App.vue b/ms/system-management/src/App.vue similarity index 100% rename from system-management/src/App.vue rename to ms/system-management/src/App.vue diff --git a/system-management/src/assets/logo.png b/ms/system-management/src/assets/logo.png similarity index 100% rename from system-management/src/assets/logo.png rename to ms/system-management/src/assets/logo.png diff --git a/system-management/src/components/Hello.vue b/ms/system-management/src/components/Hello.vue similarity index 100% rename from system-management/src/components/Hello.vue rename to ms/system-management/src/components/Hello.vue diff --git a/system-management/src/main.js b/ms/system-management/src/main.js similarity index 100% rename from system-management/src/main.js rename to ms/system-management/src/main.js diff --git a/system-management/src/router/index.js b/ms/system-management/src/router/index.js similarity index 100% rename from system-management/src/router/index.js rename to ms/system-management/src/router/index.js diff --git a/system-management/static/.gitkeep b/ms/system-management/static/.gitkeep similarity index 100% rename from system-management/static/.gitkeep rename to ms/system-management/static/.gitkeep diff --git a/system-management/test/e2e/custom-assertions/elementCount.js b/ms/system-management/test/e2e/custom-assertions/elementCount.js similarity index 100% rename from system-management/test/e2e/custom-assertions/elementCount.js rename to ms/system-management/test/e2e/custom-assertions/elementCount.js diff --git a/system-management/test/e2e/nightwatch.conf.js b/ms/system-management/test/e2e/nightwatch.conf.js similarity index 100% rename from system-management/test/e2e/nightwatch.conf.js rename to ms/system-management/test/e2e/nightwatch.conf.js diff --git a/system-management/test/e2e/runner.js b/ms/system-management/test/e2e/runner.js similarity index 100% rename from system-management/test/e2e/runner.js rename to ms/system-management/test/e2e/runner.js diff --git a/system-management/test/e2e/specs/test.js b/ms/system-management/test/e2e/specs/test.js similarity index 100% rename from system-management/test/e2e/specs/test.js rename to ms/system-management/test/e2e/specs/test.js diff --git a/system-management/test/unit/.eslintrc b/ms/system-management/test/unit/.eslintrc similarity index 100% rename from system-management/test/unit/.eslintrc rename to ms/system-management/test/unit/.eslintrc diff --git a/system-management/test/unit/index.js b/ms/system-management/test/unit/index.js similarity index 100% rename from system-management/test/unit/index.js rename to ms/system-management/test/unit/index.js diff --git a/system-management/test/unit/karma.conf.js b/ms/system-management/test/unit/karma.conf.js similarity index 100% rename from system-management/test/unit/karma.conf.js rename to ms/system-management/test/unit/karma.conf.js diff --git a/system-management/test/unit/specs/Hello.spec.js b/ms/system-management/test/unit/specs/Hello.spec.js similarity index 100% rename from system-management/test/unit/specs/Hello.spec.js rename to ms/system-management/test/unit/specs/Hello.spec.js diff --git a/ucenter/.gitignore b/ms/ucenter/.gitignore similarity index 100% rename from ucenter/.gitignore rename to ms/ucenter/.gitignore diff --git a/ucenter/pom.xml b/ms/ucenter/pom.xml similarity index 98% rename from ucenter/pom.xml rename to ms/ucenter/pom.xml index 168a461..127de3d 100644 --- a/ucenter/pom.xml +++ b/ms/ucenter/pom.xml @@ -11,7 +11,7 @@ com.micro.fast - micro-fast + ms 0.0.1-SNAPSHOT @@ -29,7 +29,7 @@ com.micro.fast - common + boot-starter-ssm ${micro.fast.version} diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/UcenterApplication.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/UcenterApplication.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/UcenterApplication.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/UcenterApplication.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/common/package-info.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/common/package-info.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/common/package-info.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/common/package-info.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/controller/package-info.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/package-info.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/controller/package-info.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/controller/package-info.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterOauthMapper.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterOauthMapper.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterOauthMapper.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterOauthMapper.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserDetailsMapper.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserDetailsMapper.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserDetailsMapper.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserDetailsMapper.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserLogMapper.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserLogMapper.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserLogMapper.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserLogMapper.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserMapper.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserMapper.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserMapper.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserMapper.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserOauthMapper.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserOauthMapper.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserOauthMapper.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/dao/UcenterUserOauthMapper.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/dao/package-info.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/dao/package-info.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/dao/package-info.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/dao/package-info.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/package-info.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/package-info.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/package-info.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/package-info.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterOauth.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterOauth.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterOauth.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterOauth.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUser.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUser.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUser.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUser.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserDetails.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserDetails.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserDetails.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserDetails.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserLog.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserLog.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserLog.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserLog.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserOauth.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserOauth.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserOauth.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/UcenterUserOauth.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/pojo/package-info.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/package-info.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/pojo/package-info.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/pojo/package-info.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/service/package-info.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/service/package-info.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/service/package-info.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/service/package-info.java diff --git a/ucenter/src/main/java/com/micro/fast/ucenter/vo/package-info.java b/ms/ucenter/src/main/java/com/micro/fast/ucenter/vo/package-info.java similarity index 100% rename from ucenter/src/main/java/com/micro/fast/ucenter/vo/package-info.java rename to ms/ucenter/src/main/java/com/micro/fast/ucenter/vo/package-info.java diff --git a/ucenter/src/main/resources/bootstrap.yml b/ms/ucenter/src/main/resources/bootstrap.yml similarity index 100% rename from ucenter/src/main/resources/bootstrap.yml rename to ms/ucenter/src/main/resources/bootstrap.yml diff --git a/ucenter/src/main/resources/generatorConfig.xml b/ms/ucenter/src/main/resources/generatorConfig.xml similarity index 100% rename from ucenter/src/main/resources/generatorConfig.xml rename to ms/ucenter/src/main/resources/generatorConfig.xml diff --git a/ucenter/src/main/resources/mappers/UcenterOauthMapper.xml b/ms/ucenter/src/main/resources/mappers/UcenterOauthMapper.xml similarity index 100% rename from ucenter/src/main/resources/mappers/UcenterOauthMapper.xml rename to ms/ucenter/src/main/resources/mappers/UcenterOauthMapper.xml diff --git a/ucenter/src/main/resources/mappers/UcenterUserDetailsMapper.xml b/ms/ucenter/src/main/resources/mappers/UcenterUserDetailsMapper.xml similarity index 100% rename from ucenter/src/main/resources/mappers/UcenterUserDetailsMapper.xml rename to ms/ucenter/src/main/resources/mappers/UcenterUserDetailsMapper.xml diff --git a/ucenter/src/main/resources/mappers/UcenterUserLogMapper.xml b/ms/ucenter/src/main/resources/mappers/UcenterUserLogMapper.xml similarity index 100% rename from ucenter/src/main/resources/mappers/UcenterUserLogMapper.xml rename to ms/ucenter/src/main/resources/mappers/UcenterUserLogMapper.xml diff --git a/ucenter/src/main/resources/mappers/UcenterUserMapper.xml b/ms/ucenter/src/main/resources/mappers/UcenterUserMapper.xml similarity index 100% rename from ucenter/src/main/resources/mappers/UcenterUserMapper.xml rename to ms/ucenter/src/main/resources/mappers/UcenterUserMapper.xml diff --git a/ucenter/src/main/resources/mappers/UcenterUserOauthMapper.xml b/ms/ucenter/src/main/resources/mappers/UcenterUserOauthMapper.xml similarity index 100% rename from ucenter/src/main/resources/mappers/UcenterUserOauthMapper.xml rename to ms/ucenter/src/main/resources/mappers/UcenterUserOauthMapper.xml diff --git a/ucenter/src/main/resources/mybatisGenerator.properties b/ms/ucenter/src/main/resources/mybatisGenerator.properties similarity index 100% rename from ucenter/src/main/resources/mybatisGenerator.properties rename to ms/ucenter/src/main/resources/mybatisGenerator.properties diff --git a/ucenter/src/test/java/com/micro/fast/ucenter/UcenterApplicationTests.java b/ms/ucenter/src/test/java/com/micro/fast/ucenter/UcenterApplicationTests.java similarity index 100% rename from ucenter/src/test/java/com/micro/fast/ucenter/UcenterApplicationTests.java rename to ms/ucenter/src/test/java/com/micro/fast/ucenter/UcenterApplicationTests.java diff --git a/upms/.gitignore b/ms/upms/.gitignore similarity index 100% rename from upms/.gitignore rename to ms/upms/.gitignore diff --git a/upms/Dockerfile b/ms/upms/Dockerfile similarity index 100% rename from upms/Dockerfile rename to ms/upms/Dockerfile diff --git a/upms/README.md b/ms/upms/README.md similarity index 100% rename from upms/README.md rename to ms/upms/README.md diff --git a/upms/container_settings.json b/ms/upms/container_settings.json similarity index 100% rename from upms/container_settings.json rename to ms/upms/container_settings.json diff --git a/upms/pom.xml b/ms/upms/pom.xml similarity index 98% rename from upms/pom.xml rename to ms/upms/pom.xml index 6b75417..75358d0 100644 --- a/upms/pom.xml +++ b/ms/upms/pom.xml @@ -11,7 +11,7 @@ com.micro.fast - micro-fast + ms 0.0.1-SNAPSHOT @@ -19,7 +19,7 @@ com.micro.fast - common + boot-starter-ssm ${micro.fast.version} diff --git a/upms/src/main/java/com/micro/fast/upms/UpmsApplication.java b/ms/upms/src/main/java/com/micro/fast/upms/UpmsApplication.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/UpmsApplication.java rename to ms/upms/src/main/java/com/micro/fast/upms/UpmsApplication.java diff --git a/upms/src/main/java/com/micro/fast/upms/common/package-info.java b/ms/upms/src/main/java/com/micro/fast/upms/common/package-info.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/common/package-info.java rename to ms/upms/src/main/java/com/micro/fast/upms/common/package-info.java diff --git a/upms/src/main/java/com/micro/fast/upms/controller/package-info.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/package-info.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/controller/package-info.java rename to ms/upms/src/main/java/com/micro/fast/upms/controller/package-info.java diff --git a/upms/src/main/java/com/micro/fast/upms/dao/UpmsLogMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsLogMapper.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/dao/UpmsLogMapper.java rename to ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsLogMapper.java diff --git a/upms/src/main/java/com/micro/fast/upms/dao/UpmsOrganizationMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsOrganizationMapper.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/dao/UpmsOrganizationMapper.java rename to ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsOrganizationMapper.java diff --git a/upms/src/main/java/com/micro/fast/upms/dao/UpmsPermissionMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsPermissionMapper.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/dao/UpmsPermissionMapper.java rename to ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsPermissionMapper.java diff --git a/upms/src/main/java/com/micro/fast/upms/dao/UpmsRoleMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsRoleMapper.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/dao/UpmsRoleMapper.java rename to ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsRoleMapper.java diff --git a/upms/src/main/java/com/micro/fast/upms/dao/UpmsRolePermissionMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsRolePermissionMapper.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/dao/UpmsRolePermissionMapper.java rename to ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsRolePermissionMapper.java diff --git a/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java rename to ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java diff --git a/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserOrganizationMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserOrganizationMapper.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/dao/UpmsUserOrganizationMapper.java rename to ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserOrganizationMapper.java diff --git a/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserPermissionMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserPermissionMapper.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/dao/UpmsUserPermissionMapper.java rename to ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserPermissionMapper.java diff --git a/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserRoleMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserRoleMapper.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/dao/UpmsUserRoleMapper.java rename to ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserRoleMapper.java diff --git a/upms/src/main/java/com/micro/fast/upms/dao/package-info.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/package-info.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/dao/package-info.java rename to ms/upms/src/main/java/com/micro/fast/upms/dao/package-info.java diff --git a/upms/src/main/java/com/micro/fast/upms/package-info.java b/ms/upms/src/main/java/com/micro/fast/upms/package-info.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/package-info.java rename to ms/upms/src/main/java/com/micro/fast/upms/package-info.java diff --git a/upms/src/main/java/com/micro/fast/upms/pojo/UpmsLog.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsLog.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/pojo/UpmsLog.java rename to ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsLog.java diff --git a/upms/src/main/java/com/micro/fast/upms/pojo/UpmsOrganization.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsOrganization.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/pojo/UpmsOrganization.java rename to ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsOrganization.java diff --git a/upms/src/main/java/com/micro/fast/upms/pojo/UpmsPermission.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsPermission.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/pojo/UpmsPermission.java rename to ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsPermission.java diff --git a/upms/src/main/java/com/micro/fast/upms/pojo/UpmsRole.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsRole.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/pojo/UpmsRole.java rename to ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsRole.java diff --git a/upms/src/main/java/com/micro/fast/upms/pojo/UpmsRolePermission.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsRolePermission.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/pojo/UpmsRolePermission.java rename to ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsRolePermission.java diff --git a/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java rename to ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java diff --git a/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserOrganization.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserOrganization.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserOrganization.java rename to ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserOrganization.java diff --git a/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserPermission.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserPermission.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserPermission.java rename to ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserPermission.java diff --git a/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserRole.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserRole.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserRole.java rename to ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUserRole.java diff --git a/upms/src/main/java/com/micro/fast/upms/pojo/package-info.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/package-info.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/pojo/package-info.java rename to ms/upms/src/main/java/com/micro/fast/upms/pojo/package-info.java diff --git a/upms/src/main/java/com/micro/fast/upms/service/package-info.java b/ms/upms/src/main/java/com/micro/fast/upms/service/package-info.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/service/package-info.java rename to ms/upms/src/main/java/com/micro/fast/upms/service/package-info.java diff --git a/upms/src/main/java/com/micro/fast/upms/vo/package-info.java b/ms/upms/src/main/java/com/micro/fast/upms/vo/package-info.java similarity index 100% rename from upms/src/main/java/com/micro/fast/upms/vo/package-info.java rename to ms/upms/src/main/java/com/micro/fast/upms/vo/package-info.java diff --git a/upms/src/main/resources/application.yml b/ms/upms/src/main/resources/application.yml similarity index 100% rename from upms/src/main/resources/application.yml rename to ms/upms/src/main/resources/application.yml diff --git a/upms/src/main/resources/bootstrap.yml b/ms/upms/src/main/resources/bootstrap.yml similarity index 100% rename from upms/src/main/resources/bootstrap.yml rename to ms/upms/src/main/resources/bootstrap.yml diff --git a/upms/src/main/resources/generatorConfig.xml b/ms/upms/src/main/resources/generatorConfig.xml similarity index 100% rename from upms/src/main/resources/generatorConfig.xml rename to ms/upms/src/main/resources/generatorConfig.xml diff --git a/upms/src/main/resources/mappers/UpmsLogMapper.xml b/ms/upms/src/main/resources/mappers/UpmsLogMapper.xml similarity index 100% rename from upms/src/main/resources/mappers/UpmsLogMapper.xml rename to ms/upms/src/main/resources/mappers/UpmsLogMapper.xml diff --git a/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml b/ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml similarity index 100% rename from upms/src/main/resources/mappers/UpmsOrganizationMapper.xml rename to ms/upms/src/main/resources/mappers/UpmsOrganizationMapper.xml diff --git a/upms/src/main/resources/mappers/UpmsPermissionMapper.xml b/ms/upms/src/main/resources/mappers/UpmsPermissionMapper.xml similarity index 100% rename from upms/src/main/resources/mappers/UpmsPermissionMapper.xml rename to ms/upms/src/main/resources/mappers/UpmsPermissionMapper.xml diff --git a/upms/src/main/resources/mappers/UpmsRoleMapper.xml b/ms/upms/src/main/resources/mappers/UpmsRoleMapper.xml similarity index 100% rename from upms/src/main/resources/mappers/UpmsRoleMapper.xml rename to ms/upms/src/main/resources/mappers/UpmsRoleMapper.xml diff --git a/upms/src/main/resources/mappers/UpmsRolePermissionMapper.xml b/ms/upms/src/main/resources/mappers/UpmsRolePermissionMapper.xml similarity index 100% rename from upms/src/main/resources/mappers/UpmsRolePermissionMapper.xml rename to ms/upms/src/main/resources/mappers/UpmsRolePermissionMapper.xml diff --git a/upms/src/main/resources/mappers/UpmsUserMapper.xml b/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml similarity index 100% rename from upms/src/main/resources/mappers/UpmsUserMapper.xml rename to ms/upms/src/main/resources/mappers/UpmsUserMapper.xml diff --git a/upms/src/main/resources/mappers/UpmsUserOrganizationMapper.xml b/ms/upms/src/main/resources/mappers/UpmsUserOrganizationMapper.xml similarity index 100% rename from upms/src/main/resources/mappers/UpmsUserOrganizationMapper.xml rename to ms/upms/src/main/resources/mappers/UpmsUserOrganizationMapper.xml diff --git a/upms/src/main/resources/mappers/UpmsUserPermissionMapper.xml b/ms/upms/src/main/resources/mappers/UpmsUserPermissionMapper.xml similarity index 100% rename from upms/src/main/resources/mappers/UpmsUserPermissionMapper.xml rename to ms/upms/src/main/resources/mappers/UpmsUserPermissionMapper.xml diff --git a/upms/src/main/resources/mappers/UpmsUserRoleMapper.xml b/ms/upms/src/main/resources/mappers/UpmsUserRoleMapper.xml similarity index 100% rename from upms/src/main/resources/mappers/UpmsUserRoleMapper.xml rename to ms/upms/src/main/resources/mappers/UpmsUserRoleMapper.xml diff --git a/upms/src/main/resources/mybatisGenerator.properties b/ms/upms/src/main/resources/mybatisGenerator.properties similarity index 100% rename from upms/src/main/resources/mybatisGenerator.properties rename to ms/upms/src/main/resources/mybatisGenerator.properties diff --git a/upms/src/main/resources/ref/upms_database.png b/ms/upms/src/main/resources/ref/upms_database.png similarity index 100% rename from upms/src/main/resources/ref/upms_database.png rename to ms/upms/src/main/resources/ref/upms_database.png diff --git a/upms/src/test/java/com/micro/fast/upms/UpmsApplicationTests.java b/ms/upms/src/test/java/com/micro/fast/upms/UpmsApplicationTests.java similarity index 100% rename from upms/src/test/java/com/micro/fast/upms/UpmsApplicationTests.java rename to ms/upms/src/test/java/com/micro/fast/upms/UpmsApplicationTests.java diff --git a/pom.xml b/pom.xml index 5ab821c..6c9a06a 100644 --- a/pom.xml +++ b/pom.xml @@ -20,20 +20,8 @@ - boot-starter-security-core - boot-starter-security-browser - boot-starter-security-app - boot-starter-elasticsearch - boot-starter-fastdfs-client - boot-starter-util - common - config-server - eureka-server - eureka-server2 - gateway - upms - cms - ucenter + boot-starter + ms