Merge branch 'release/1.6.8'

pom.xml

@@ -4,10 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.alvin.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
+    <groupId>com.alvin.springboot</groupId>
     <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>${app.version}</version>
     <modules>
         <module>springboot-common</module>
         <module>springboot-main</module>
@@ -21,22 +21,32 @@
         <relativePath/>
     </parent>
     <properties>
+        <app.version>1.0-SNAPSHOT</app.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
     </properties>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>versions-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+
 
     <!--锁定springCloud版本-->
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.alvin.springboot</groupId>
+                <artifactId>springboot-common</artifactId>
+                <version>${app.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alvin.springboot</groupId>
+                <artifactId>springboot-dao</artifactId>
+                <version>${app.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alvin.springboot</groupId>
+                <artifactId>springboot-main</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>

springboot-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.alvin.springboot</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>${app.version}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-dao/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.alvin.springboot</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>${app.version}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,7 +29,6 @@
         <dependency>
             <groupId>com.alvin.springboot</groupId>
             <artifactId>springboot-common</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
         <!--mysql-->
         <dependency>

springboot-main/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.alvin.springboot</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>${app.version}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -67,13 +67,10 @@
         <dependency>
             <groupId>com.alvin.springboot</groupId>
             <artifactId>springboot-dao</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.alvin.springboot</groupId>
             <artifactId>springboot-common</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
 

springboot-main/src/main/java/com/alvin/controller/AppController.java

@@ -4,7 +4,10 @@ import com.alvin.annotation.ResponseResult;
 import com.alvin.common.entity.PageResult;
 import com.alvin.common.entity.Result;
 import com.alvin.entity.User;
+import com.alvin.service.AppService;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -15,7 +18,9 @@ import java.util.Collections;
 @RestController
 @RequestMapping("/user")
 @ResponseResult
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class AppController {
+    private final AppService appService;
 
     /**
      * 找到一个

springboot-main/src/main/java/com/alvin/controller/BaseController.java

@@ -3,7 +3,6 @@ package com.alvin.controller;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.ModelAttribute;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -15,9 +14,4 @@ public class BaseController {
     protected HttpServletRequest request;
     @Autowired
     protected HttpServletResponse response;
-
-    @ModelAttribute
-    public void setReqAndRes(HttpServletRequest request, HttpServletResponse response){
-
-    }
 }

springboot-main/src/main/java/com/alvin/service/AppService.java

@@ -0,0 +1,4 @@
+package com.alvin.service;
+
+public interface AppService {
+}

springboot-main/src/main/java/com/alvin/service/impl/AppServiceImpl.java

@@ -0,0 +1,8 @@
+package com.alvin.service.impl;
+
+import com.alvin.service.AppService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AppServiceImpl implements AppService {
+}