完成项目结构修改

a5bea444 · giaogiao · 6f6c1299 · a5bea444 · a5bea444 · a5bea444
Commit a5bea444 authored Sep 18, 2020 by giaogiao
22 changed files
--- a/README-zh.md
+++ b/README-zh.md
@@ -53,16 +53,19 @@
 ## 项目结构
 ```text
    └── spring-boot-plus
-    ├── admin               SpringBootAdmin Server模块
+    ├── admin               SpringBootAdmin Server服务监控模块
    ├── bootstrap           spring-boot-plus 启动模块
    ├── config              配置模块
    ├── distribution        打包模块
    ├── docs                文档目录
-    ├── example             示例模块，自己的业务可新建多个模块处理
    ├── framework           框架核心模块
    ├── generator           代码生成模块
    ├── scheduled           任务调度模块
-    └── system              系统模块
+    └── api-system          平台管理系统api模块
+    └── api-app             app的api模块
+    └── api-merchant        商家api服务模块
+    └── common              通用模块
 ```
 ### 项目环境 

--- a/README.md
+++ b/README.md
 # 卓美亚航空 - 后端项目
 ## 框架介绍
-> 本项目使用第三方开源脚手架项目: spring-boot-plus
+> 本项目使用第三方开源脚手架项目: spring-boot-plus 参考:README-zh.md
 ## 项目结构
@@ -20,7 +20,9 @@
    └── api-merchant        商家api服务模块
    └── common              通用模块
-> 参考:README-zh.md
+## 安装软件
+redis
+mysql5.7
--- a/api-app/pom.xml
+++ b/api-app/pom.xml
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2019-2029 geekidea(https://github.com/geekidea)
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="http://maven.apache.org/POM/4.0.0"

--- a/api-app/src/main/java/com/jumeirah/api/app/controller/AppHelloWorldController.java
+++ b/api-app/src/main/java/com/jumeirah/api/app/controller/AppHelloWorldController.java
-/*
- * Copyright 2019-2029 geekidea(https://github.com/geekidea)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.jumeirah.api.app.controller;

--- a/api-merchant/pom.xml
+++ b/api-merchant/pom.xml
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2019-2029 geekidea(https://github.com/geekidea)
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="http://maven.apache.org/POM/4.0.0"

--- a/common/src/main/java/com/jumeirah/common/controller/DownloadController.java
+++ b/common/src/main/java/com/jumeirah/common/controller/DownloadController.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
-package com.jumeirah.common.controller;
+package com.jumeirah.api.system.controller;
 import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;

--- a/common/src/main/java/com/jumeirah/common/controller/HelloWorldController.java
+++ b/common/src/main/java/com/jumeirah/common/controller/HelloWorldController.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
-package com.jumeirah.common.controller;
+package com.jumeirah.api.system.controller;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
@@ -36,7 +36,7 @@ import java.io.IOException;
 @Slf4j
 @Api(value = "Hello World", tags = {"Hello World"})
 @RestController
-@RequestMapping("/hello")
+@RequestMapping("/system/hello")
 public class HelloWorldController {
    /**
@@ -49,8 +49,8 @@ public class HelloWorldController {
    @OperationLog(name = "helloWorld")
    @ApiOperation(value = "Hello World", response = String.class)
    public ApiResult<String> helloWorld() throws IOException {
-        log.debug("Hello World...");
+        log.debug("Hello World.../system");
-        return ApiResult.ok("Hello World");
+        return ApiResult.ok("Hello World/system");
    }
 }
--- a/common/src/main/java/com/jumeirah/common/controller/LoginController.java
+++ b/common/src/main/java/com/jumeirah/common/controller/LoginController.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
-package com.jumeirah.common.controller;
+package com.jumeirah.api.system.controller;
 import com.alibaba.fastjson.JSON;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;

--- a/common/src/main/java/com/jumeirah/common/controller/RegisterController.java
+++ b/common/src/main/java/com/jumeirah/common/controller/RegisterController.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
-package com.jumeirah.common.controller;
+package com.jumeirah.api.system.controller;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.log.annotation.Module;

--- a/common/src/main/java/com/jumeirah/common/controller/ResourceController.java
+++ b/common/src/main/java/com/jumeirah/common/controller/ResourceController.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
-package com.jumeirah.common.controller;
+package com.jumeirah.api.system.controller;
 import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;

--- a/common/src/main/java/com/jumeirah/common/controller/SysDepartmentController.java
+++ b/common/src/main/java/com/jumeirah/common/controller/SysDepartmentController.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
-package com.jumeirah.common.controller;
+package com.jumeirah.api.system.controller;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;

--- a/common/src/main/java/com/jumeirah/common/controller/SysPermissionController.java
+++ b/common/src/main/java/com/jumeirah/common/controller/SysPermissionController.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
-package com.jumeirah.common.controller;
+package com.jumeirah.api.system.controller;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;

--- a/common/src/main/java/com/jumeirah/common/controller/SysRoleController.java
+++ b/common/src/main/java/com/jumeirah/common/controller/SysRoleController.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
-package com.jumeirah.common.controller;
+package com.jumeirah.api.system.controller;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;

--- a/common/src/main/java/com/jumeirah/common/controller/SysUserController.java
+++ b/common/src/main/java/com/jumeirah/common/controller/SysUserController.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
-package com.jumeirah.common.controller;
+package com.jumeirah.api.system.controller;
 import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;

--- a/common/src/main/java/com/jumeirah/common/controller/UploadController.java
+++ b/common/src/main/java/com/jumeirah/common/controller/UploadController.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
-package com.jumeirah.common.controller;
+package com.jumeirah.api.system.controller;
 import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;

--- a/common/src/main/java/com/jumeirah/common/controller/VerificationCodeController.java
+++ b/common/src/main/java/com/jumeirah/common/controller/VerificationCodeController.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
-package com.jumeirah.common.controller;
+package com.jumeirah.api.system.controller;
 import io.geekidea.springbootplus.config.constant.CommonConstant;
 import io.geekidea.springbootplus.config.constant.CommonRedisKey;

--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2019-2029 geekidea(https://github.com/geekidea)
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

--- a/config/src/main/resources/config/application.yml
+++ b/config/src/main/resources/config/application.yml
@@ -2,7 +2,7 @@
 ############################# 访问路径、端口tomcat start #############################
 server:
-  port: 8888
+  port: 8889
  servlet:
    context-path: /api
  tomcat:
@@ -14,7 +14,7 @@ server:
 ################################ spring config start ###############################
 spring:
  application:
-    name: spring-boot-plus
+    name: jumeirah
  http:
    encoding:
      charset: UTF-8
@@ -189,13 +189,13 @@ spring-boot-plus:
      # 排除Swagger
      - ${spring-boot-plus.swagger-paths}
      # 排除actuator
-      - /actuator/**
+#      - /actuator/**
      - # 排除首页
      - /,/index.html
      # 排除测试路径
      - /hello/world,/fooBar/**,/exampleOrder/**
      - /app/hello/*
+      - /system/hello/*
    # 多行字符串权限配置
    filter-chain-definitions: |
@@ -305,11 +305,11 @@ spring-boot-plus:
    enable: true
    base:
      # 扫描的包，多个包使用逗号隔开
-      package: io.geekidea.springbootplus,com.example
+      package: io.geekidea.springbootplus,com.jumeirah
    contact:
-      email: geekidea@qq.com
+      email: jumeirah
-      name: springboot.plus
+      name: jumeirah
-      url: https://springboot.plus
+      url: jumeirah
    description:
    title: ${spring.application.name} API Documents
    url: https://springboot.plus

--- a/docker/jar/Dockerfile
+++ b/docker/jar/Dockerfile
--- a/docker/readme.md
+++ b/docker/readme.md
--- a/jenkins/JenkinsFile
+++ b/jenkins/JenkinsFile
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
        <module>admin</module>
        <module>bootstrap</module>
        <module>config</module>
-        <module>distribution</module>
+<!--        <module>distribution</module>-->
        <module>framework</module>
        <module>generator</module>
        <module>scheduled</module>