Merge pull request #15 from xiaomoinfo/develop

Develop

Author: houko

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);
-
     /**
      * 根据名字查
      *

freemarker/src/main/resources/config/banner-girl.txt

@@ -16,4 +16,4 @@
   ...:::           ::::::::::::'              ``::.
  ```` ':.          ':::::::::'                  ::::..
                     '.:::::'                    ':'````..
-:: Spring Boot ::        (v1.5.8.RELEASE)
+:: Spring Boot ::        (v2.0.0.RELEASE)

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);
     }
 

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);
 }

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;
     }
 }

javase/src/main/resources/config/banner-girl.txt

@@ -17,4 +17,4 @@
   ...:::           ::::::::::::'              ``::.
  ```` ':.          ':::::::::'                  ::::..
                     '.:::::'                    ':'````..
-:: Spring Boot ::        (v1.5.8.RELEASE)
+:: Spring Boot ::        (v2.0.0.RELEASE)

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

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;

multipleSource/src/main/resources/config/banner-girl.txt

@@ -16,4 +16,4 @@
   ...:::           ::::::::::::'              ``::.
  ```` ':.          ':::::::::'                  ::::..
                     '.:::::'                    ':'````..
-:: Spring Boot ::        (v1.5.8.RELEASE)
+:: Spring Boot ::        (v2.0.0.RELEASE)

mybatis/src/main/resources/config/banner-girl.txt

@@ -16,4 +16,4 @@
   ...:::           ::::::::::::'              ``::.
  ```` ':.          ':::::::::'                  ::::..
                     '.:::::'                    ':'````..
-:: Spring Boot ::        (v1.5.8.RELEASE)
+:: Spring Boot ::        (v2.0.0.RELEASE)