spring boot 升级到2.0

houko · houko · commit a6496f8662c1 · 2018-04-09T10:39:33.000+08:00
diff --git a/core/src/main/java/info/xiaomo/core/base/BaseDao.java b/core/src/main/java/info/xiaomo/core/base/BaseDao.java
@@ -10,14 +10,6 @@
 @Repository
 public interface BaseDao<T> extends JpaRepository<T, Long> {
 
-    /**
-     * 根据id查
-     *
-     * @param id
-     * @return
-     */
-    T findById(Long id);
-
     /**
      * 根据名字查
      *
diff --git a/javase/src/main/java/info/xiaomo/javase/QuestionMain.java b/javase/src/main/java/info/xiaomo/javase/QuestionMain.java
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import springfox.documentation.annotations.ApiIgnore;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
@@ -43,9 +43,9 @@
 @EnableJpaRepositories("info.xiaomo.*.dao")
 @EnableSwagger2
 @RestController
-public class QuestionMain extends WebMvcConfigurerAdapter {
+public class QuestionMain implements WebMvcConfigurer {
 
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) {
         SpringApplication.run(QuestionMain.class, args);
     }
 
diff --git a/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java b/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java
@@ -19,12 +19,4 @@
  */
 @Repository
 public interface QuestionDao extends JpaRepository<QuestionModel, Long> {
-
-    /**
-     * 根据Id查找
-     *
-     * @param id
-     * @return
-     */
-    QuestionModel findById(Long id);
 }
diff --git a/javase/src/main/java/info/xiaomo/javase/service/impl/QuestionServiceImpl.java b/javase/src/main/java/info/xiaomo/javase/service/impl/QuestionServiceImpl.java
@@ -6,6 +6,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 /**
  * 把今天最好的表现当作明天最新的起点．．～
  * いま 最高の表現 として 明日最新の始発．．～
@@ -32,12 +34,13 @@ public QuestionServiceImpl(QuestionDao questionDao) {
 
     @Override
     public QuestionModel findById(Long id) {
-        return questionDao.findById(id);
+        Optional<QuestionModel> optionalModel = questionDao.findById(id);
+        return optionalModel.orElse(null);
     }
 
     @Override
     public boolean add(QuestionModel questionModel) {
-        QuestionModel save = questionDao.save(questionModel);
-        return save != null;
+        questionDao.save(questionModel);
+        return true;
     }
 }
diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/service/impl/MongoUserServiceImpl.java b/mongodb/src/main/java/info/xiaomo/mongodb/service/impl/MongoUserServiceImpl.java
@@ -7,6 +7,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 把今天最好的表现当作明天最新的起点．．～
@@ -38,7 +39,8 @@ public List<MongoUser> findAll() {
 
     @Override
     public MongoUser findById(Long id) {
-        return dao.findOne(id);
+        Optional<MongoUser> optionalUser = dao.findById(id);
+        return optionalUser.orElse(null);
     }
 
     @Override
@@ -53,7 +55,11 @@ public MongoUser add(MongoUser mongoUser) {
 
     @Override
     public void delete(Long id) {
-        dao.delete(id);
+        Optional<MongoUser> optional = dao.findById(id);
+        if (!optional.isPresent()) {
+            return;
+        }
+        dao.delete(optional.get());
     }
 
     @Override
diff --git a/multipleSource/src/main/java/info/xiaomo/multiplesource/MultipleSourceMain.java b/multipleSource/src/main/java/info/xiaomo/multiplesource/MultipleSourceMain.java
@@ -3,8 +3,8 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/pom.xml b/pom.xml
@@ -84,7 +84,7 @@
         <!-- html  -->
         <jsoup.version>1.10.1</jsoup.version>
         <!-- spring-boot version -->
-        <spring-boot.version>1.5.8.RELEASE</spring-boot.version>
+        <spring-boot.version>2.0.0.RELEASE</spring-boot.version>
         <!-- compiler-plugin version -->
         <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <!-- surefile-plugin test util -->
@@ -103,7 +103,6 @@
         <jxl.version>2.6.12</jxl.version>
         <!-- microsoft office -->
         <poi.version>3.10-beta2</poi.version>
-        <kotlin.version>1.1.51</kotlin.version>
     </properties>
 
 
@@ -215,20 +214,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jre8</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test</artifactId>
-            <version>${kotlin.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
 
@@ -270,31 +255,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${kotlin.version}</version>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>test-compile</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>test-compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <jvmTarget>1.8</jvmTarget>
-                </configuration>
-            </plugin>
-
         </plugins>
     </build>
 </project>
diff --git a/redis/pom.xml b/redis/pom.xml
@@ -20,7 +20,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
-            <version>1.5.8.RELEASE</version>
         </dependency>
     </dependencies>
 
diff --git a/website/src/main/java/info/xiaomo/website/XiaomoMain.java b/website/src/main/java/info/xiaomo/website/XiaomoMain.java
@@ -15,7 +15,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import springfox.documentation.annotations.ApiIgnore;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
@@ -48,9 +48,9 @@
 @EnableCaching
 @EnableSwagger2
 @Controller
-public class XiaomoMain extends WebMvcConfigurerAdapter {
+public class XiaomoMain implements WebMvcConfigurer {
 
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) {
         SpringApplication.run(XiaomoMain.class, args);
     }
 
diff --git a/website/src/main/java/info/xiaomo/website/controller/UserController.java b/website/src/main/java/info/xiaomo/website/controller/UserController.java
@@ -19,10 +19,14 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.text.ParseException;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 把今天最好的表现当作明天最新的起点．．～
@@ -61,12 +65,10 @@ public UserController(UserService service) {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path"),
     })
+    @SuppressWarnings("unchecked")
     public Result findUserById(@PathVariable("id") Long id) {
-        UserModel userModel = service.findUserById(id);
-        if (userModel == null) {
-            return new Result(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage());
-        }
-        return new Result<>(userModel);
+        Optional<UserModel> optional = service.findUserById(id);
+        return optional.map(Result::new).orElseGet(() -> new Result(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage()));
     }
 
     /**
@@ -98,7 +100,7 @@ public Result addUser(@RequestBody UserModel user) {
             @ApiImplicitParam(name = "密码", required = true, dataType = "String", paramType = "path")
     })
     @RequestMapping(value = "register/{email}/{password}", method = RequestMethod.POST)
-    public Result register(@PathVariable("email") String email, @PathVariable("password") String password) throws Exception {
+    public Result register(@PathVariable("email") String email, @PathVariable("password") String password) {
         UserModel userModel = service.findUserByEmail(email);
         //邮箱被占用
         if (userModel != null) {
@@ -221,7 +223,7 @@ public Result deleteUserById(@PathVariable("id") Long id) throws UserNotFoundExc
     @ApiOperation(value = "处理激活", notes = "处理激活", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @RequestMapping(value = "validateEmail", method = RequestMethod.POST)
     public Result validateEmail(@RequestBody UserModel user
-    ) throws ServiceException, ParseException, UserNotFoundException {
+    ) throws ServiceException {
         //数据访问层，通过email获取用户信息
         UserModel userModel = service.findUserByEmail(user.getEmail());
         if (userModel != null) {
diff --git a/website/src/main/java/info/xiaomo/website/service/UserService.java b/website/src/main/java/info/xiaomo/website/service/UserService.java
@@ -6,6 +6,7 @@
 import org.springframework.data.domain.Page;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 把今天最好的表现当作明天最新的起点．．～
@@ -27,7 +28,7 @@ public interface UserService {
      * @param id id
      * @return UserModel
      */
-    UserModel findUserById(Long id);
+    Optional<UserModel> findUserById(Long id);
 
     /**
      * 根据邮件查用户
diff --git a/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java b/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java
@@ -12,6 +12,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * │＼＿＿╭╭╭╭╭＿＿／│
@@ -52,7 +53,8 @@ public AdminModel findAdminUserByUserName(String userName) {
 
     @Override
     public AdminModel findAdminUserById(Long id) {
-        return dao.findOne(id);
+        Optional<AdminModel> optionalModel = dao.findById(id);
+        return optionalModel.orElse(null);
     }
 
     @Override
@@ -65,44 +67,47 @@ public AdminModel addAdminUser(AdminModel model) {
 
     @Override
     public AdminModel updateAdminUser(AdminModel model) throws UserNotFoundException {
-        AdminModel userUpdate = dao.findOne(model.getId());
-        if (userUpdate == null) {
+        Optional<AdminModel> optionalModel = dao.findById(model.getId());
+        if (!optionalModel.isPresent()) {
             throw new UserNotFoundException();
         }
+        AdminModel adminModel = optionalModel.get();
         if (model.getPassword() != null) {
-            userUpdate.setPassword(model.getPassword());
+            adminModel.setPassword(model.getPassword());
         }
         if (model.getUserName() != null) {
-            userUpdate.setUserName(model.getUserName());
+            adminModel.setUserName(model.getUserName());
         }
-        userUpdate.setUpdateTime(new Date());
-        return dao.save(userUpdate);
+        adminModel.setUpdateTime(new Date());
+        return dao.save(adminModel);
     }
 
     @Override
     public Page<AdminModel> getAdminUsers(int start, int pageSize) {
         Sort sort = new Sort(Sort.Direction.DESC, "createTime");
-        return dao.findAll(new PageRequest(start - 1, pageSize, sort));
+        return dao.findAll(PageRequest.of(start - 1, pageSize, sort));
     }
 
     @Override
     public AdminModel deleteAdminUserById(Long id) throws UserNotFoundException {
-        AdminModel adminModel = dao.findOne(id);
-        if (adminModel == null) {
+        Optional<AdminModel> optionalModel = dao.findById(id);
+        if (!optionalModel.isPresent()) {
             throw new UserNotFoundException();
         }
-        dao.delete(adminModel.getId());
+        AdminModel adminModel = optionalModel.get();
+        dao.delete(adminModel);
         return adminModel;
     }
 
     @Override
     public AdminModel forbidAdminUserById(Long id) throws UserNotFoundException {
-        AdminModel model = dao.findOne(id);
-        if (model == null) {
+        Optional<AdminModel> optionalModel = dao.findById(id);
+        if (!optionalModel.isPresent()) {
             throw new UserNotFoundException();
         }
-        model.setStatus(2);
-        return dao.save(model);
+        AdminModel adminModel = optionalModel.get();
+        adminModel.setStatus(2);
+        return dao.save(adminModel);
     }
 
     @Override
diff --git a/website/src/main/java/info/xiaomo/website/service/impl/ChangeLogServiceImpl.java b/website/src/main/java/info/xiaomo/website/service/impl/ChangeLogServiceImpl.java
diff --git a/website/src/main/java/info/xiaomo/website/service/impl/LinkServiceImpl.java b/website/src/main/java/info/xiaomo/website/service/impl/LinkServiceImpl.java
diff --git a/website/src/main/java/info/xiaomo/website/service/impl/TechnologyServiceImpl.java b/website/src/main/java/info/xiaomo/website/service/impl/TechnologyServiceImpl.java
diff --git a/website/src/main/java/info/xiaomo/website/service/impl/UserServiceImpl.java b/website/src/main/java/info/xiaomo/website/service/impl/UserServiceImpl.java
diff --git a/website/src/main/java/info/xiaomo/website/service/impl/WorksServiceImpl.java b/website/src/main/java/info/xiaomo/website/service/impl/WorksServiceImpl.java
