From c6b70f31449544bf7190dd359110ab5702fe24f7 Mon Sep 17 00:00:00 2001 From: xiaomo Date: Fri, 2 Mar 2018 20:07:19 +0800 Subject: [PATCH 01/52] controller --- .../xiaomo/website/controller/ChangeLogController.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java b/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java index cd63ad9d..48eaa7d0 100644 --- a/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java +++ b/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java @@ -12,7 +12,11 @@ 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.util.List; @@ -78,7 +82,7 @@ public Result findByName(@PathVariable("name") String name) { if (model == null) { return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } - return new Result(model); + return new Result<>(model); } /** From 80dc1502cab566f8baa65312fb36eda187ab0de1 Mon Sep 17 00:00:00 2001 From: xiaomo Date: Tue, 3 Apr 2018 21:16:20 +0800 Subject: [PATCH 02/52] controller --- freemarker/src/main/resources/config/banner-girl.txt | 2 +- javase/src/main/resources/config/banner-girl.txt | 2 +- multipleSource/src/main/resources/config/banner-girl.txt | 2 +- mybatis/src/main/resources/config/banner-girl.txt | 2 +- thymeleaf/src/main/resources/config/banner-girl.txt | 2 +- website/src/main/resources/config/banner-girl.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/freemarker/src/main/resources/config/banner-girl.txt b/freemarker/src/main/resources/config/banner-girl.txt index c826bcd3..5c648ca3 100644 --- a/freemarker/src/main/resources/config/banner-girl.txt +++ b/freemarker/src/main/resources/config/banner-girl.txt @@ -16,4 +16,4 @@ ...::: ::::::::::::' ``::. ```` ':. ':::::::::' ::::.. '.:::::' ':'````.. -:: Spring Boot :: (v1.5.8.RELEASE) \ No newline at end of file +:: Spring Boot :: (v2.0.0.RELEASE) \ No newline at end of file diff --git a/javase/src/main/resources/config/banner-girl.txt b/javase/src/main/resources/config/banner-girl.txt index 7e149757..934b7d76 100644 --- a/javase/src/main/resources/config/banner-girl.txt +++ b/javase/src/main/resources/config/banner-girl.txt @@ -17,4 +17,4 @@ ...::: ::::::::::::' ``::. ```` ':. ':::::::::' ::::.. '.:::::' ':'````.. -:: Spring Boot :: (v1.5.8.RELEASE) \ No newline at end of file +:: Spring Boot :: (v2.0.0.RELEASE) \ No newline at end of file diff --git a/multipleSource/src/main/resources/config/banner-girl.txt b/multipleSource/src/main/resources/config/banner-girl.txt index c826bcd3..5c648ca3 100644 --- a/multipleSource/src/main/resources/config/banner-girl.txt +++ b/multipleSource/src/main/resources/config/banner-girl.txt @@ -16,4 +16,4 @@ ...::: ::::::::::::' ``::. ```` ':. ':::::::::' ::::.. '.:::::' ':'````.. -:: Spring Boot :: (v1.5.8.RELEASE) \ No newline at end of file +:: Spring Boot :: (v2.0.0.RELEASE) \ No newline at end of file diff --git a/mybatis/src/main/resources/config/banner-girl.txt b/mybatis/src/main/resources/config/banner-girl.txt index c826bcd3..5c648ca3 100644 --- a/mybatis/src/main/resources/config/banner-girl.txt +++ b/mybatis/src/main/resources/config/banner-girl.txt @@ -16,4 +16,4 @@ ...::: ::::::::::::' ``::. ```` ':. ':::::::::' ::::.. '.:::::' ':'````.. -:: Spring Boot :: (v1.5.8.RELEASE) \ No newline at end of file +:: Spring Boot :: (v2.0.0.RELEASE) \ No newline at end of file diff --git a/thymeleaf/src/main/resources/config/banner-girl.txt b/thymeleaf/src/main/resources/config/banner-girl.txt index c826bcd3..5c648ca3 100644 --- a/thymeleaf/src/main/resources/config/banner-girl.txt +++ b/thymeleaf/src/main/resources/config/banner-girl.txt @@ -16,4 +16,4 @@ ...::: ::::::::::::' ``::. ```` ':. ':::::::::' ::::.. '.:::::' ':'````.. -:: Spring Boot :: (v1.5.8.RELEASE) \ No newline at end of file +:: Spring Boot :: (v2.0.0.RELEASE) \ No newline at end of file diff --git a/website/src/main/resources/config/banner-girl.txt b/website/src/main/resources/config/banner-girl.txt index 7e149757..934b7d76 100644 --- a/website/src/main/resources/config/banner-girl.txt +++ b/website/src/main/resources/config/banner-girl.txt @@ -17,4 +17,4 @@ ...::: ::::::::::::' ``::. ```` ':. ':::::::::' ::::.. '.:::::' ':'````.. -:: Spring Boot :: (v1.5.8.RELEASE) \ No newline at end of file +:: Spring Boot :: (v2.0.0.RELEASE) \ No newline at end of file From a6496f8662c198efa7edac5fcb836a679773fbe7 Mon Sep 17 00:00:00 2001 From: xiaomo Date: Mon, 9 Apr 2018 10:39:33 +0800 Subject: [PATCH 03/52] =?UTF-8?q?spring=20boot=20=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=88=B02.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/info/xiaomo/core/base/BaseDao.java | 8 ---- .../java/info/xiaomo/javase/QuestionMain.java | 6 +-- .../info/xiaomo/javase/dao/QuestionDao.java | 8 ---- .../service/impl/QuestionServiceImpl.java | 9 ++-- .../service/impl/MongoUserServiceImpl.java | 10 ++++- .../multiplesource/MultipleSourceMain.java | 2 +- pom.xml | 42 +------------------ redis/pom.xml | 1 - .../java/info/xiaomo/website/XiaomoMain.java | 6 +-- .../website/controller/UserController.java | 20 +++++---- .../xiaomo/website/service/UserService.java | 3 +- .../service/impl/AdminUserServiceImpl.java | 35 +++++++++------- .../service/impl/ChangeLogServiceImpl.java | 28 ++++++++----- .../website/service/impl/LinkServiceImpl.java | 28 ++++++++----- .../service/impl/TechnologyServiceImpl.java | 18 ++++++-- .../website/service/impl/UserServiceImpl.java | 14 ++++--- .../service/impl/WorksServiceImpl.java | 17 +++++--- 17 files changed, 125 insertions(+), 130 deletions(-) diff --git a/core/src/main/java/info/xiaomo/core/base/BaseDao.java b/core/src/main/java/info/xiaomo/core/base/BaseDao.java index 190dcf6e..09067f32 100644 --- 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 extends JpaRepository { - /** - * 根据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 index 34f6f103..6704c6c4 100644 --- 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 index be27b6b8..c66bf5f5 100644 --- 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 { - - /** - * 根据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 index 61683b28..e3d09c51 100644 --- 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 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 index a82c2c55..9b0f0a60 100644 --- 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 findAll() { @Override public MongoUser findById(Long id) { - return dao.findOne(id); + Optional 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 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 index 90bda5b6..fafbf0db 100644 --- 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 index 2606c187..82819a27 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 1.10.1 - 1.5.8.RELEASE + 2.0.0.RELEASE 3.5.1 @@ -103,7 +103,6 @@ 2.6.12 3.10-beta2 - 1.1.51 @@ -215,20 +214,6 @@ - - - org.jetbrains.kotlin - kotlin-stdlib-jre8 - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-test - ${kotlin.version} - test - - - @@ -270,31 +255,6 @@ - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - compile - - compile - - - - test-compile - test-compile - - test-compile - - - - - 1.8 - - - \ No newline at end of file diff --git a/redis/pom.xml b/redis/pom.xml index 7b14e167..348bf85a 100644 --- a/redis/pom.xml +++ b/redis/pom.xml @@ -20,7 +20,6 @@ org.springframework.boot spring-boot-starter-data-redis - 1.5.8.RELEASE diff --git a/website/src/main/java/info/xiaomo/website/XiaomoMain.java b/website/src/main/java/info/xiaomo/website/XiaomoMain.java index 001566a6..74186fec 100644 --- 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 index de2c303f..6a678524 100644 --- 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 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 index ab9a2d47..3d3e204d 100644 --- 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 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 index aa7d1a21..67a4d27c 100644 --- 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 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 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 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 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 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 index c61892b3..62d5648b 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/ChangeLogServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/ChangeLogServiceImpl.java @@ -11,6 +11,7 @@ import java.util.Date; import java.util.List; +import java.util.Optional; /** * 把今天最好的表现当作明天最新的起点．．～ @@ -37,7 +38,8 @@ public ChangeLogServiceImpl(ChangeLogDao dao) { @Override public ChangeLogModel findById(Long id) { - return dao.findOne(id); + Optional changeLogModel = dao.findById(id); + return changeLogModel.orElse(null); } @Override @@ -48,7 +50,7 @@ public ChangeLogModel findByName(String name) { @Override public Page findAll(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 @@ -65,20 +67,26 @@ public ChangeLogModel add(ChangeLogModel model) { @Override public ChangeLogModel update(ChangeLogModel model) { - ChangeLogModel updateModel = dao.findOne(model.getId()); + Optional optionalModel = dao.findById(model.getId()); + if (!optionalModel.isPresent()) { + return null; + } + ChangeLogModel changeLogModel = optionalModel.get(); if (model.getName() != null) { - updateModel.setName(model.getName()); + changeLogModel.setName(model.getName()); } - updateModel.setUpdateTime(new Date()); - return dao.save(updateModel); + changeLogModel.setUpdateTime(new Date()); + return dao.save(changeLogModel); } @Override public ChangeLogModel delete(Long id) { - ChangeLogModel model = dao.findOne(id); - if (model != null) { - dao.delete(id); + Optional optionalLogModel = dao.findById(id); + if (!optionalLogModel.isPresent()) { + return null; } - return model; + ChangeLogModel changeLogModel = optionalLogModel.get(); + dao.delete(changeLogModel); + return changeLogModel; } } 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 index 8e5fec93..cf04ef9a 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/LinkServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/LinkServiceImpl.java @@ -11,6 +11,7 @@ import java.util.Date; import java.util.List; +import java.util.Optional; /** * 把今天最好的表现当作明天最新的起点．．～ @@ -37,7 +38,8 @@ public LinkServiceImpl(LinkDao dao) { @Override public LinkModel findById(Long id) { - return dao.findOne(id); + Optional optionalModel = dao.findById(id); + return optionalModel.orElse(null); } @Override @@ -48,7 +50,7 @@ public LinkModel findByName(String name) { @Override public Page findAll(int start, int pageSize) { Sort sort = new Sort(Sort.Direction.DESC, "order"); - return dao.findAll(new PageRequest(start - 1, pageSize, sort)); + return dao.findAll(PageRequest.of(start - 1, pageSize, sort)); } @Override @@ -65,23 +67,29 @@ public LinkModel add(LinkModel model) { @Override public LinkModel update(LinkModel model) { - LinkModel updateModel = dao.findOne(model.getId()); + Optional optional = dao.findById(model.getId()); + if (!optional.isPresent()) { + return null; + } + LinkModel linkModel = optional.get(); if (model.getName() != null) { - updateModel.setName(model.getName()); + linkModel.setName(model.getName()); } if (model.getUrl() != null) { - updateModel.setUrl(model.getUrl()); + linkModel.setUrl(model.getUrl()); } model.setUpdateTime(new Date()); - return dao.save(updateModel); + return dao.save(linkModel); } @Override public LinkModel delete(Long id) { - LinkModel model = dao.findOne(id); - if (model != null) { - dao.delete(id); + Optional optional = dao.findById(id); + if (!optional.isPresent()) { + return null; } - return model; + LinkModel linkModel = optional.get(); + dao.delete(linkModel); + return linkModel; } } 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 index 4831368c..debfe08c 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/TechnologyServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/TechnologyServiceImpl.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Optional; /** * 把今天最好的表现当作明天最新的起点．．～ @@ -42,12 +43,13 @@ public List findAll() { @Override public Page findAll(int start, int pageSize) { - return dao.findAll(new PageRequest(start - 1, pageSize)); + return dao.findAll(PageRequest.of(start - 1, pageSize)); } @Override public TechnologyModel findById(Long id) { - return dao.findOne(id); + Optional optionalModel = dao.findById(id); + return optionalModel.orElse(null); } @Override @@ -57,7 +59,11 @@ public TechnologyModel findByName(String name) { @Override public TechnologyModel update(TechnologyModel model) { - TechnologyModel result = dao.findOne(model.getId()); + Optional optional = dao.findById(model.getId()); + if (!optional.isPresent()) { + return null; + } + TechnologyModel result = optional.get(); if ("".equals(model.getUrl()) && model.getUrl() != null) { result.setUrl(model.getUrl()); } @@ -84,6 +90,10 @@ public TechnologyModel add(TechnologyModel model) { @Override public void del(Long id) { - dao.delete(id); + Optional optional = dao.findById(id); + if (!optional.isPresent()) { + return; + } + dao.delete(optional.get()); } } 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 index c4de2d3f..4265b711 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/UserServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/UserServiceImpl.java @@ -12,6 +12,7 @@ import java.util.Date; import java.util.List; +import java.util.Optional; /** * 把今天最好的表现当作明天最新的起点．．～ @@ -38,8 +39,8 @@ public UserServiceImpl(UserDao dao) { } @Override - public UserModel findUserById(Long id) { - return dao.findOne(id); + public Optional findUserById(Long id) { + return dao.findById(id); } @Override @@ -86,7 +87,7 @@ public UserModel updateUser(UserModel model) throws UserNotFoundException { @Override public Page findAll(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 @@ -96,11 +97,12 @@ public List findAll() { @Override public UserModel deleteUserById(Long id) throws UserNotFoundException { - UserModel userModel = dao.findOne(id); - if (userModel == null) { + Optional modelOptional = dao.findById(id); + if (!modelOptional.isPresent()) { throw new UserNotFoundException(); } - dao.delete(userModel.getId()); + UserModel userModel = modelOptional.get(); + dao.delete(userModel); return userModel; } 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 index 927d9910..6427b09e 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/WorksServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/WorksServiceImpl.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; +import java.util.Optional; /** * 把今天最好的表现当作明天最新的起点．．～ @@ -42,12 +43,13 @@ public List findAll() { @Override public Page findAll(int start, int pageSize) { - return dao.findAll(new PageRequest(start - 1, pageSize)); + return dao.findAll(PageRequest.of(start - 1, pageSize)); } @Override public WorksModel findById(Long id) { - return dao.findOne(id); + Optional optionalModel = dao.findById(id); + return optionalModel.orElse(null); } @Override @@ -57,10 +59,11 @@ public WorksModel findByName(String name) { @Override public WorksModel update(WorksModel model) { - WorksModel result = dao.findOne(model.getId()); - if (result == null) { + Optional optional = dao.findById(model.getId()); + if (!optional.isPresent()) { return null; } + WorksModel result = optional.get(); if ("".equals(model.getCompleteTime()) && model.getCompleteTime() != null) { result.setCompleteTime(model.getCompleteTime()); } @@ -89,6 +92,10 @@ public WorksModel add(WorksModel model) { @Override public void del(Long id) { - dao.delete(id); + Optional optional = dao.findById(id); + if (!optional.isPresent()) { + return; + } + dao.delete(optional.get()); } } From fade0ab928c7efbc9ca92af7eba0583302b81f1a Mon Sep 17 00:00:00 2001 From: xiaomo Date: Mon, 9 Apr 2018 10:46:19 +0800 Subject: [PATCH 04/52] add md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0ac63a24..715c97a0 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ http://localhost:808/doc.html bootstrap-ui - 2017-11-03 添加kotlin环境配置 - 2017-11-03 按照阿里巴巴编程规范插件P3C优化代码 - 2017-11-03 合并`api`和`website`模块,访问`localhost:8080`会显示网站主页,访问`localhost:8080/api`会显示api管理界面 +- 2018-04-09 将整个项目升级到spring boot2.0 release版本,api有较大变动 From 0759afe2d250c5783022f09645ebf2e49b56cce4 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 25 Oct 2018 10:01:08 +0800 Subject: [PATCH 05/52] update fastjson version --- pom.xml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 82819a27..fb5f84d0 100644 --- a/pom.xml +++ b/pom.xml @@ -80,11 +80,11 @@ 1.3.2 - 1.2.20 + [1.2.31,) 1.10.1 - 2.0.0.RELEASE + 2.0.3.RELEASE 3.5.1 @@ -180,21 +180,11 @@ springfox-swagger2 ${springfox-swagger-ui.version} - - org.mortbay.jasper - jasper-jsp - ${jsper.version} - org.mybatis.spring.boot mybatis-spring-boot-starter ${mybatis.version} - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - org.jsoup jsoup From 087776f8f7af38a217532202ebcd48d273192297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E6=9C=8B?= Date: Wed, 30 Jan 2019 23:12:27 +0900 Subject: [PATCH 06/52] =?UTF-8?q?=E6=9B=B4=E6=96=B0file=20upload=20pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb5f84d0..f949b2d1 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 2.5 - 1.3.2 + [1.3.3,) [1.2.31,) From 0ee1cca1abf0e416e3f4cc7f0664ff96e7b3451b Mon Sep 17 00:00:00 2001 From: xiaomo Date: Sat, 23 Feb 2019 23:41:01 +0900 Subject: [PATCH 07/52] remove aliyun --- pom.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index f949b2d1..23c2af74 100644 --- a/pom.xml +++ b/pom.xml @@ -47,17 +47,17 @@ - - - central - aliyun maven - default - http://maven.aliyun.com/nexus/content/groups/public/ - - true - - - + + + + + + + + + + + From 95fbd674b5249adb4129109c04d1543ac65d7e70 Mon Sep 17 00:00:00 2001 From: xiaomo Date: Sun, 24 Feb 2019 00:29:52 +0900 Subject: [PATCH 08/52] change char util --- .../info/xiaomo/core/untils/CharUtil.java | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/core/src/main/java/info/xiaomo/core/untils/CharUtil.java b/core/src/main/java/info/xiaomo/core/untils/CharUtil.java index 623baf3d..17b3e973 100644 --- a/core/src/main/java/info/xiaomo/core/untils/CharUtil.java +++ b/core/src/main/java/info/xiaomo/core/untils/CharUtil.java @@ -1,6 +1,7 @@ package info.xiaomo.core.untils; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import java.util.Objects; /** @@ -17,7 +18,7 @@ public class CharUtil { public static String iso2gb(String text) { String result; try { - result = new String(text.getBytes("ISO-8859-1"), "GB2312"); + result = new String(text.getBytes(StandardCharsets.ISO_8859_1), "GB2312"); } catch (UnsupportedEncodingException ex) { result = ex.toString(); } @@ -30,7 +31,7 @@ public static String iso2gb(String text) { public static String gb2iso(String text) { String result = ""; try { - result = new String(text.getBytes("GB2312"), "ISO-8859-1"); + result = new String(text.getBytes("GB2312"), StandardCharsets.ISO_8859_1); } catch (UnsupportedEncodingException ex) { ex.printStackTrace(); } @@ -51,7 +52,7 @@ public static String utf8urlencode(String text) { byte[] b = new byte[0]; try { - b = Character.toString(c).getBytes("UTF-8"); + b = Character.toString(c).getBytes(StandardCharsets.UTF_8); } catch (Exception ignored) { } @@ -72,7 +73,7 @@ public static String utf8urlencode(String text) { * Utf8URL解码 */ public static String utf8urldecode(String text) { - String result = ""; + StringBuilder result = new StringBuilder(); int p; if (text != null && text.length() > 0) { text = text.toLowerCase(); @@ -81,13 +82,13 @@ public static String utf8urldecode(String text) { return text; } while (p != -1) { - result += text.substring(0, p); - text = text.substring(p, text.length()); + result.append(text, 0, p); + text = text.substring(p); if (Objects.equals(text, "") || text.length() < 9) { - return result; + return result.toString(); } - result += codetoword(text.substring(0, 9)); - text = text.substring(9, text.length()); + result.append(codetoword(text.substring(0, 9))); + text = text.substring(9); p = text.indexOf("%e"); } } @@ -104,11 +105,7 @@ private static String codetoword(String text) { code[0] = (byte) (Integer.parseInt(text.substring(1, 3), 16) - 256); code[1] = (byte) (Integer.parseInt(text.substring(4, 6), 16) - 256); code[2] = (byte) (Integer.parseInt(text.substring(7, 9), 16) - 256); - try { - result = new String(code, "UTF-8"); - } catch (UnsupportedEncodingException ex) { - result = null; - } + result = new String(code, StandardCharsets.UTF_8); } else { result = text; } From 711990620c610ff2908825983a5f04edd370e76d Mon Sep 17 00:00:00 2001 From: Peng Hu Date: Fri, 8 Mar 2019 10:10:44 +0900 Subject: [PATCH 09/52] Rename README.md to Readme.md --- README.md => Readme.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.md => Readme.md (100%) diff --git a/README.md b/Readme.md similarity index 100% rename from README.md rename to Readme.md From af2116bc0ead528582fcdd971befac27dd99eb95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E6=9C=8B?= Date: Fri, 19 Apr 2019 21:25:05 +0900 Subject: [PATCH 10/52] =?UTF-8?q?=E6=B6=88=E9=99=A4=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/info/xiaomo/mybatis/mapper/UserMapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mybatis/src/main/java/info/xiaomo/mybatis/mapper/UserMapper.java b/mybatis/src/main/java/info/xiaomo/mybatis/mapper/UserMapper.java index 0e37207c..7de341e9 100644 --- a/mybatis/src/main/java/info/xiaomo/mybatis/mapper/UserMapper.java +++ b/mybatis/src/main/java/info/xiaomo/mybatis/mapper/UserMapper.java @@ -3,6 +3,7 @@ import info.xiaomo.mybatis.domain.User; import org.apache.ibatis.annotations.*; +import org.springframework.stereotype.Repository; import java.util.List; import java.util.Map; @@ -11,6 +12,7 @@ * @author : xiaomo */ @Mapper +@Repository public interface UserMapper { @Results({ From 1c403dba94ebe7f4a30fb1d892bdd51d3a192182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Sun, 2 Jun 2019 22:42:00 +0900 Subject: [PATCH 11/52] Update Readme.md --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 715c97a0..daf14300 100644 --- a/Readme.md +++ b/Readme.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/xiaomoinfo/SpringBootUnity.svg?branch=master)](https://travis-ci.org/xiaomoinfo/SpringBootUnity) +[![Build Status](https://travis-ci.org/houko/SpringBootUnity.svg?branch=master)](https://travis-ci.org/houko/SpringBootUnity) [![Backers on Open Collective](https://opencollective.com/SpringBootUnity/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/SpringBootUnity/sponsors/badge.svg)](#sponsors) [![GitHub issues](https://img.shields.io/github/issues/xiaomoinfo/SpringBootUnity.svg)](https://github.com/xiaomoinfo/SpringBootUnity/issues) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/xiaomoinfo/MysqlBlobToJsonTool/master/LICENSE) [![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven/apache-maven.svg)]() From 2eb29dc7e6c4d1d60e6c615010a787cff73ef34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Thu, 13 Jun 2019 16:10:34 +0900 Subject: [PATCH 12/52] Create FUNDING.yml --- .github/FUNDING.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..9d4faec3 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,12 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +otechie: # Replace with a single Otechie username +custom: # Replace with a single custom sponsorship URL From 72f19111b63861e5f3295de7c9ffbea893f8186e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Thu, 13 Jun 2019 16:12:14 +0900 Subject: [PATCH 13/52] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 9d4faec3..0b5d88bf 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -2,7 +2,7 @@ github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] patreon: # Replace with a single Patreon username -open_collective: # Replace with a single Open Collective username +open_collective: SpringBootUnity ko_fi: # Replace with a single Ko-fi username tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry From 6edc01ba63aeff660563b799962f31f2c84385db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Thu, 13 Jun 2019 16:15:22 +0900 Subject: [PATCH 14/52] Update FUNDING.yml --- .github/FUNDING.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 0b5d88bf..e74294c0 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,7 +1,7 @@ # These are supported funding model platforms -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: # Replace with a single Patreon username +github: [houko] +patreon: 15619581 open_collective: SpringBootUnity ko_fi: # Replace with a single Ko-fi username tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel @@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl liberapay: # Replace with a single Liberapay username issuehunt: # Replace with a single IssueHunt username otechie: # Replace with a single Otechie username -custom: # Replace with a single custom sponsorship URL +custom: https:blog.xiaomo.info From dc57307a21bd2084d0317d0f49ecf1123e3e3b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Thu, 13 Jun 2019 16:15:49 +0900 Subject: [PATCH 15/52] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index e74294c0..d31013bf 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,6 +1,6 @@ # These are supported funding model platforms -github: [houko] +github: houko patreon: 15619581 open_collective: SpringBootUnity ko_fi: # Replace with a single Ko-fi username From 813d97ca376b1f6c87c93e50f91bfa4d416645b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Thu, 13 Jun 2019 16:16:05 +0900 Subject: [PATCH 16/52] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index d31013bf..c0be54f1 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,6 +1,6 @@ # These are supported funding model platforms -github: houko +github: # patreon: 15619581 open_collective: SpringBootUnity ko_fi: # Replace with a single Ko-fi username From 78920072c64293824f74f16041617e363b082d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Thu, 13 Jun 2019 16:20:31 +0900 Subject: [PATCH 17/52] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index c0be54f1..d31013bf 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,6 +1,6 @@ # These are supported funding model platforms -github: # +github: houko patreon: 15619581 open_collective: SpringBootUnity ko_fi: # Replace with a single Ko-fi username From f24825833c6034901b999b4fab3e11bd7da62146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Thu, 13 Jun 2019 16:23:50 +0900 Subject: [PATCH 18/52] Update FUNDING.yml --- .github/FUNDING.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index d31013bf..e732a893 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,7 +1,7 @@ # These are supported funding model platforms -github: houko -patreon: 15619581 +github: #houko +patreon: hupeng open_collective: SpringBootUnity ko_fi: # Replace with a single Ko-fi username tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel From 89a929ec64a5d90628c5ea94543eac2c83507c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Thu, 13 Jun 2019 16:27:18 +0900 Subject: [PATCH 19/52] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index e732a893..578da160 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -3,7 +3,7 @@ github: #houko patreon: hupeng open_collective: SpringBootUnity -ko_fi: # Replace with a single Ko-fi username +ko_fi: hupeng tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry liberapay: # Replace with a single Liberapay username From 54d80059e986637fd6aa31f8376814e500d60796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Thu, 13 Jun 2019 16:31:04 +0900 Subject: [PATCH 20/52] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 578da160..eaa6b40f 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -7,6 +7,6 @@ ko_fi: hupeng tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username +issuehunt: houko otechie: # Replace with a single Otechie username custom: https:blog.xiaomo.info From c7c7153ebdcde1082f552de688bc4247fb4b1dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Thu, 13 Jun 2019 16:35:09 +0900 Subject: [PATCH 21/52] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index eaa6b40f..fcb6b4da 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -7,6 +7,6 @@ ko_fi: hupeng tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry liberapay: # Replace with a single Liberapay username -issuehunt: houko +issuehunt: houko/SpringBootUnity otechie: # Replace with a single Otechie username custom: https:blog.xiaomo.info From 60a37b96c970e815050987ab23cd8b4abf1d5eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Thu, 27 Jun 2019 16:17:41 +0900 Subject: [PATCH 22/52] Update Readme.md --- Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Readme.md b/Readme.md index daf14300..c6b30489 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,6 @@ [![Build Status](https://travis-ci.org/houko/SpringBootUnity.svg?branch=master)](https://travis-ci.org/houko/SpringBootUnity) -[![Backers on Open Collective](https://opencollective.com/SpringBootUnity/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/SpringBootUnity/sponsors/badge.svg)](#sponsors) [![GitHub issues](https://img.shields.io/github/issues/xiaomoinfo/SpringBootUnity.svg)](https://github.com/xiaomoinfo/SpringBootUnity/issues) -[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/xiaomoinfo/MysqlBlobToJsonTool/master/LICENSE) +[![Backers on Open Collective](https://opencollective.com/SpringBootUnity/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/SpringBootUnity/sponsors/badge.svg)](#sponsors) [![GitHub issues](https://img.shields.io/github/issues/xiaomoinfo/SpringBootUnity.svg)](https://github.com/hoko/SpringBootUnity/issues) +[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/houko/SpringBootUnity/master/LICENSE) [![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven/apache-maven.svg)]() ### 项目简介 From 4f2ec9db2a98f7581d7e91387faaa263cdc5c821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Thu, 27 Jun 2019 16:18:06 +0900 Subject: [PATCH 23/52] Update Readme.md --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index c6b30489..fecefa28 100644 --- a/Readme.md +++ b/Readme.md @@ -1,5 +1,5 @@ [![Build Status](https://travis-ci.org/houko/SpringBootUnity.svg?branch=master)](https://travis-ci.org/houko/SpringBootUnity) -[![Backers on Open Collective](https://opencollective.com/SpringBootUnity/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/SpringBootUnity/sponsors/badge.svg)](#sponsors) [![GitHub issues](https://img.shields.io/github/issues/xiaomoinfo/SpringBootUnity.svg)](https://github.com/hoko/SpringBootUnity/issues) +[![Backers on Open Collective](https://opencollective.com/SpringBootUnity/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/SpringBootUnity/sponsors/badge.svg)](#sponsors) [![GitHub issues](https://img.shields.io/github/issues/xiaomoinfo/SpringBootUnity.svg)](https://github.com/houko/SpringBootUnity/issues) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/houko/SpringBootUnity/master/LICENSE) [![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven/apache-maven.svg)]() From aea812b18a1db049ede139099d35d0f369a8e8d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Thu, 27 Jun 2019 16:19:35 +0900 Subject: [PATCH 24/52] Update Readme.md --- Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Readme.md b/Readme.md index fecefa28..1a019aec 100644 --- a/Readme.md +++ b/Readme.md @@ -1,5 +1,5 @@ [![Build Status](https://travis-ci.org/houko/SpringBootUnity.svg?branch=master)](https://travis-ci.org/houko/SpringBootUnity) -[![Backers on Open Collective](https://opencollective.com/SpringBootUnity/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/SpringBootUnity/sponsors/badge.svg)](#sponsors) [![GitHub issues](https://img.shields.io/github/issues/xiaomoinfo/SpringBootUnity.svg)](https://github.com/houko/SpringBootUnity/issues) +[![Backers on Open Collective](https://opencollective.com/SpringBootUnity/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/SpringBootUnity/sponsors/badge.svg)](#sponsors) [![GitHub issues](https://img.shields.io/github/issues/houko/SpringBootUnity.svg)](https://github.com/houko/SpringBootUnity/issues) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/houko/SpringBootUnity/master/LICENSE) [![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven/apache-maven.svg)]() @@ -17,7 +17,7 @@ ### 注意事项 -- 本项目代码托管在[github](https://github.com/xiaomoinfo/SpringBootUnity)和[码云](http://git.oschina.net/hupeng/SpringBootUnity)两个地方,最新代码会先推送在github上,码云上会在github上更新完之后进行同步。 +- 本项目代码托管在[github](https://github.com/houko/SpringBootUnity)和[码云](http://git.oschina.net/hupeng/SpringBootUnity)两个地方,最新代码会先推送在github上,码云上会在github上更新完之后进行同步。 - 本项目多数数据库都用到了`hibernate`，如果没有提供`sql`文件。则启动时会根据代码映射自动生成数据库表，请在启动前修改`application.properties`中的数据库连接信息 From 196bc7d752c02c291be280d4dc182f615630c79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=BC=E9=A2=A8=20=E7=BE=BD=E6=9C=88?= Date: Sat, 20 Jul 2019 10:46:22 +0900 Subject: [PATCH 25/52] Update Readme.md --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 1a019aec..c474c64a 100644 --- a/Readme.md +++ b/Readme.md @@ -121,7 +121,7 @@ http://localhost:808/doc.html bootstrap-ui MIT License - Copyright (c) 2017 Peng Hu + Copyright (c) 2019 Peng Hu Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 2845f3212f84d12056aa0fa0e11fdada69c04dfc Mon Sep 17 00:00:00 2001 From: kohou Date: Wed, 24 Jul 2019 10:21:05 +0900 Subject: [PATCH 26/52] change comment --- README.md | 2 +- async/src/main/java/info/xiaomo/anysc/AsyncMain.java | 4 ++-- .../info/xiaomo/anysc/controller/TestController.java | 4 ++-- .../main/java/info/xiaomo/core/base/AuthOperate.java | 2 +- .../java/info/xiaomo/core/base/BaseController.java | 2 +- core/src/main/java/info/xiaomo/core/base/BaseDao.java | 2 +- .../main/java/info/xiaomo/core/base/BaseModel.java | 4 ++-- .../main/java/info/xiaomo/core/base/BaseService.java | 2 +- core/src/main/java/info/xiaomo/core/base/Result.java | 4 ++-- .../java/info/xiaomo/core/constant/CodeConst.java | 4 ++-- .../java/info/xiaomo/core/constant/GenderConst.java | 4 ++-- .../xiaomo/core/exception/UserNotFoundException.java | 4 ++-- .../main/java/info/xiaomo/core/field/LoginField.java | 4 ++-- .../main/java/info/xiaomo/core/filter/CorsFilter.java | 4 ++-- .../main/java/info/xiaomo/core/untils/AuthUtil.java | 4 ++-- .../main/java/info/xiaomo/core/untils/CastUtil.java | 11 ++++++----- .../main/java/info/xiaomo/core/untils/DownUtil.java | 2 +- .../main/java/info/xiaomo/core/untils/HtmlUtil.java | 1 - .../info/xiaomo/core/untils/LunarCalendarUtil.java | 2 +- .../main/java/info/xiaomo/core/untils/MailUtil.java | 4 ++-- .../main/java/info/xiaomo/core/untils/Md5Util.java | 4 ++-- .../java/info/xiaomo/core/untils/SerializeUtil.java | 9 +++++---- .../main/java/info/xiaomo/core/untils/SqlUtil.java | 1 - .../main/java/info/xiaomo/crawler/CrawlerMain.java | 4 ++-- .../java/info/xiaomo/crawler/dao/ShikigamaDao.java | 2 +- .../java/info/xiaomo/crawler/model/MitamaModel.java | 2 +- .../info/xiaomo/crawler/model/ShikigamiModel.java | 2 +- .../info/xiaomo/crawler/schedule/ScheduledTasks.java | 2 +- .../info/xiaomo/crawler/service/ShikigamaService.java | 2 +- .../crawler/service/impl/ShikigamaServiceImpl.java | 2 +- .../info/xiaomo/crawler/spider/OnnmyoujiSpider.java | 2 +- .../java/info/xiaomo/freemarker/FreemarkerMain.java | 4 ++-- .../freemarker/controller/FreemarkerController.java | 4 ++-- .../main/java/info/xiaomo/javase/QuestionMain.java | 4 ++-- .../xiaomo/javase/controller/QuestionController.java | 2 +- .../main/java/info/xiaomo/javase/dao/QuestionDao.java | 2 +- .../java/info/xiaomo/javase/model/QuestionModel.java | 2 +- .../info/xiaomo/javase/service/QuestionService.java | 2 +- .../javase/service/impl/QuestionServiceImpl.java | 2 +- .../main/java/info/xiaomo/mongodb/MongodbMain.java | 4 ++-- .../mongodb/controller/MongoUserController.java | 4 ++-- .../java/info/xiaomo/mongodb/dao/MongoUserDao.java | 4 ++-- .../java/info/xiaomo/mongodb/model/MongoUser.java | 4 ++-- .../info/xiaomo/mongodb/service/MongoUserService.java | 4 ++-- .../mongodb/service/impl/MongoUserServiceImpl.java | 4 ++-- .../xiaomo/multiplesource/MultipleSourceMain.java | 4 ++-- .../controller/MultipleSourceController.java | 4 ++-- .../main/java/info/xiaomo/multiplesource/sql/Sql.java | 3 +-- .../main/java/info/xiaomo/mybatis/MybatisMain.java | 4 ++-- .../mybatis/controller/MybatisUserController.java | 4 ++-- .../main/java/info/xiaomo/rabbitmq/RabbitMqMain.java | 4 ++-- redis/src/main/java/info/xiaomo/redis/RedisMain.java | 4 ++-- .../info/xiaomo/redis/controller/TestController.java | 4 ++-- .../java/info/xiaomo/redis/dao/CommonRedisDao.java | 4 ++-- .../xiaomo/redis/dao/impl/CommonRedisDaoImpl.java | 4 ++-- .../java/info/xiaomo/scheduled/ScheduledMain.java | 4 ++-- .../main/java/info/xiaomo/security/SecurityMain.java | 4 ++-- socket/src/main/java/info/xiaomo/chat/ChatMain.java | 4 ++-- .../java/info/xiaomo/chat/socket/MyWebSocket.java | 4 ++-- .../java/info/xiaomo/thymeleaf/ThymeleafMain.java | 4 ++-- .../thymeleaf/controller/ThymeleafController.java | 4 ++-- .../src/main/java/info/xiaomo/website/XiaomoMain.java | 4 ++-- .../website/controller/AdminUserController.java | 4 ++-- .../website/controller/ChangeLogController.java | 10 +++------- .../xiaomo/website/controller/LinkController.java | 4 ++-- .../xiaomo/website/controller/MailController.java | 4 ++-- .../website/controller/TechnologyController.java | 4 ++-- .../xiaomo/website/controller/UserController.java | 10 +++------- .../xiaomo/website/controller/WorksController.java | 4 ++-- .../java/info/xiaomo/website/dao/AdminUserDao.java | 4 ++-- .../java/info/xiaomo/website/dao/ChangeLogDao.java | 4 ++-- .../main/java/info/xiaomo/website/dao/LinkDao.java | 4 ++-- .../java/info/xiaomo/website/dao/TechnologyDao.java | 4 ++-- .../main/java/info/xiaomo/website/dao/UserDao.java | 4 ++-- .../main/java/info/xiaomo/website/dao/WorksDao.java | 4 ++-- .../java/info/xiaomo/website/dao/base/CommonDao.java | 4 ++-- .../xiaomo/website/interceptor/LoginInterceptor.java | 4 ++-- .../java/info/xiaomo/website/model/AdminModel.java | 4 ++-- .../info/xiaomo/website/model/ChangeLogModel.java | 4 ++-- .../java/info/xiaomo/website/model/LinkModel.java | 4 ++-- .../info/xiaomo/website/model/TechnologyModel.java | 4 ++-- .../java/info/xiaomo/website/model/UserModel.java | 4 ++-- .../java/info/xiaomo/website/model/WorksModel.java | 4 ++-- .../info/xiaomo/website/service/AdminUserService.java | 4 ++-- .../info/xiaomo/website/service/ChangeLogService.java | 4 ++-- .../java/info/xiaomo/website/service/LinkService.java | 4 ++-- .../xiaomo/website/service/TechnologyService.java | 4 ++-- .../java/info/xiaomo/website/service/UserService.java | 4 ++-- .../info/xiaomo/website/service/WorksService.java | 4 ++-- .../website/service/impl/AdminUserServiceImpl.java | 4 ++-- .../website/service/impl/ChangeLogServiceImpl.java | 4 ++-- .../xiaomo/website/service/impl/LinkServiceImpl.java | 4 ++-- .../website/service/impl/TechnologyServiceImpl.java | 4 ++-- .../xiaomo/website/service/impl/UserServiceImpl.java | 4 ++-- .../xiaomo/website/service/impl/WorksServiceImpl.java | 4 ++-- .../main/java/info/xiaomo/website/util/MailUtil.java | 4 ++-- .../java/info/xiaomo/website/view/AdminUserView.java | 4 ++-- .../java/info/xiaomo/website/view/ChangeLogView.java | 4 ++-- .../main/java/info/xiaomo/website/view/LinkView.java | 4 ++-- .../java/info/xiaomo/website/view/TechnologyView.java | 4 ++-- .../main/java/info/xiaomo/website/view/UserView.java | 4 ++-- .../main/java/info/xiaomo/website/view/WorksView.java | 4 ++-- 102 files changed, 189 insertions(+), 198 deletions(-) diff --git a/README.md b/README.md index 715c97a0..2f63cab2 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ http://localhost:808/doc.html bootstrap-ui ### 问题反馈 -1. 欢迎提[issue](https://github.com/xiaomoinfo/SpringBootUnity/issues)一起完善这个项目。 +1. 欢迎提[issue](https://github.com/houko/SpringBootUnity/issues)一起完善这个项目。 2. QQ: 83387856 4. 个人主站: https://xiaomo.info diff --git a/async/src/main/java/info/xiaomo/anysc/AsyncMain.java b/async/src/main/java/info/xiaomo/anysc/AsyncMain.java index e875271b..79e1fce0 100644 --- a/async/src/main/java/info/xiaomo/anysc/AsyncMain.java +++ b/async/src/main/java/info/xiaomo/anysc/AsyncMain.java @@ -13,10 +13,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 15:38 diff --git a/async/src/main/java/info/xiaomo/anysc/controller/TestController.java b/async/src/main/java/info/xiaomo/anysc/controller/TestController.java index 065daeaa..0817a3a8 100644 --- a/async/src/main/java/info/xiaomo/anysc/controller/TestController.java +++ b/async/src/main/java/info/xiaomo/anysc/controller/TestController.java @@ -14,10 +14,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/15 15:12 diff --git a/core/src/main/java/info/xiaomo/core/base/AuthOperate.java b/core/src/main/java/info/xiaomo/core/base/AuthOperate.java index 2200c6ca..76889389 100644 --- a/core/src/main/java/info/xiaomo/core/base/AuthOperate.java +++ b/core/src/main/java/info/xiaomo/core/base/AuthOperate.java @@ -5,7 +5,7 @@ import java.util.Date; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @version : 2017/1/13 9:51 */ public interface AuthOperate { diff --git a/core/src/main/java/info/xiaomo/core/base/BaseController.java b/core/src/main/java/info/xiaomo/core/base/BaseController.java index df64f107..b2f5d2c8 100644 --- a/core/src/main/java/info/xiaomo/core/base/BaseController.java +++ b/core/src/main/java/info/xiaomo/core/base/BaseController.java @@ -10,7 +10,7 @@ import java.util.List; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @version : 2017/1/11 16:41 */ @RestController diff --git a/core/src/main/java/info/xiaomo/core/base/BaseDao.java b/core/src/main/java/info/xiaomo/core/base/BaseDao.java index 09067f32..d9c6941a 100644 --- a/core/src/main/java/info/xiaomo/core/base/BaseDao.java +++ b/core/src/main/java/info/xiaomo/core/base/BaseDao.java @@ -4,7 +4,7 @@ import org.springframework.stereotype.Repository; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @version : 2017/1/13 11:23 */ @Repository diff --git a/core/src/main/java/info/xiaomo/core/base/BaseModel.java b/core/src/main/java/info/xiaomo/core/base/BaseModel.java index 731043d5..37d18bbe 100644 --- a/core/src/main/java/info/xiaomo/core/base/BaseModel.java +++ b/core/src/main/java/info/xiaomo/core/base/BaseModel.java @@ -10,10 +10,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 20:37 diff --git a/core/src/main/java/info/xiaomo/core/base/BaseService.java b/core/src/main/java/info/xiaomo/core/base/BaseService.java index 276bc04f..4ff3a02f 100644 --- a/core/src/main/java/info/xiaomo/core/base/BaseService.java +++ b/core/src/main/java/info/xiaomo/core/base/BaseService.java @@ -6,7 +6,7 @@ import java.util.List; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @version : 2017/1/11 16:42 */ @Service diff --git a/core/src/main/java/info/xiaomo/core/base/Result.java b/core/src/main/java/info/xiaomo/core/base/Result.java index 9b10b437..4ec1cb45 100644 --- a/core/src/main/java/info/xiaomo/core/base/Result.java +++ b/core/src/main/java/info/xiaomo/core/base/Result.java @@ -6,10 +6,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/10/31 15:25 diff --git a/core/src/main/java/info/xiaomo/core/constant/CodeConst.java b/core/src/main/java/info/xiaomo/core/constant/CodeConst.java index 840bfdca..9b411ca5 100644 --- a/core/src/main/java/info/xiaomo/core/constant/CodeConst.java +++ b/core/src/main/java/info/xiaomo/core/constant/CodeConst.java @@ -4,10 +4,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/10/29 10:59 diff --git a/core/src/main/java/info/xiaomo/core/constant/GenderConst.java b/core/src/main/java/info/xiaomo/core/constant/GenderConst.java index 821e9bc6..05694372 100644 --- a/core/src/main/java/info/xiaomo/core/constant/GenderConst.java +++ b/core/src/main/java/info/xiaomo/core/constant/GenderConst.java @@ -4,10 +4,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/1/12 16:37 diff --git a/core/src/main/java/info/xiaomo/core/exception/UserNotFoundException.java b/core/src/main/java/info/xiaomo/core/exception/UserNotFoundException.java index df1a120c..ee06bc04 100644 --- a/core/src/main/java/info/xiaomo/core/exception/UserNotFoundException.java +++ b/core/src/main/java/info/xiaomo/core/exception/UserNotFoundException.java @@ -12,10 +12,10 @@ * ｜╭－－－╮把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 16/4/3 11:08 diff --git a/core/src/main/java/info/xiaomo/core/field/LoginField.java b/core/src/main/java/info/xiaomo/core/field/LoginField.java index 2317485b..e6ea5173 100644 --- a/core/src/main/java/info/xiaomo/core/field/LoginField.java +++ b/core/src/main/java/info/xiaomo/core/field/LoginField.java @@ -4,10 +4,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info(83387856) * Date: 2016/1/8 13:16 * Description: QQ登录常量类 diff --git a/core/src/main/java/info/xiaomo/core/filter/CorsFilter.java b/core/src/main/java/info/xiaomo/core/filter/CorsFilter.java index ca97c7d8..75ccacf3 100644 --- a/core/src/main/java/info/xiaomo/core/filter/CorsFilter.java +++ b/core/src/main/java/info/xiaomo/core/filter/CorsFilter.java @@ -10,10 +10,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1516:25 diff --git a/core/src/main/java/info/xiaomo/core/untils/AuthUtil.java b/core/src/main/java/info/xiaomo/core/untils/AuthUtil.java index 5536f10a..670f0d70 100644 --- a/core/src/main/java/info/xiaomo/core/untils/AuthUtil.java +++ b/core/src/main/java/info/xiaomo/core/untils/AuthUtil.java @@ -6,10 +6,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * @email: xiaomo@xiaomo.info *

* Date: 2016/11/31 9:50 diff --git a/core/src/main/java/info/xiaomo/core/untils/CastUtil.java b/core/src/main/java/info/xiaomo/core/untils/CastUtil.java index 99ff90aa..a3c19f4c 100644 --- a/core/src/main/java/info/xiaomo/core/untils/CastUtil.java +++ b/core/src/main/java/info/xiaomo/core/untils/CastUtil.java @@ -2,6 +2,7 @@ import java.io.*; import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; @@ -10,10 +11,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/22 14:55 @@ -162,7 +163,7 @@ public static String objectToString(Object obj) { ObjectOutputStream e = new ObjectOutputStream(out); e.writeObject(obj); byte[] bytes = out.toByteArray(); - return new String(bytes, "ISO-8859-1"); + return new String(bytes, StandardCharsets.ISO_8859_1); } catch (IOException var4) { var4.printStackTrace(); return null; @@ -172,7 +173,7 @@ public static String objectToString(Object obj) { public static Object stringToObject(String string) { try { - byte[] e = string.getBytes("ISO-8859-1"); + byte[] e = string.getBytes(StandardCharsets.ISO_8859_1); ByteArrayInputStream in = new ByteArrayInputStream(e); ObjectInputStream ois = new ObjectInputStream(in); return ois.readObject(); @@ -290,7 +291,7 @@ public static int[] stringToInts(String str, String regex) { } public static String bytesToHexString(byte[] src) { - StringBuilder stringBuilder = new StringBuilder(""); + StringBuilder stringBuilder = new StringBuilder(); if (src != null && src.length > 0) { for (byte aSrc : src) { int v = aSrc & 255; diff --git a/core/src/main/java/info/xiaomo/core/untils/DownUtil.java b/core/src/main/java/info/xiaomo/core/untils/DownUtil.java index 380d7fcd..3f6d64e0 100644 --- a/core/src/main/java/info/xiaomo/core/untils/DownUtil.java +++ b/core/src/main/java/info/xiaomo/core/untils/DownUtil.java @@ -10,7 +10,7 @@ import java.net.URLConnection; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @created : 2016/12/26 13:25 */ @Slf4j diff --git a/core/src/main/java/info/xiaomo/core/untils/HtmlUtil.java b/core/src/main/java/info/xiaomo/core/untils/HtmlUtil.java index 4e8157a7..975e56ac 100644 --- a/core/src/main/java/info/xiaomo/core/untils/HtmlUtil.java +++ b/core/src/main/java/info/xiaomo/core/untils/HtmlUtil.java @@ -7,7 +7,6 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. *

* * @author : xiaomo diff --git a/core/src/main/java/info/xiaomo/core/untils/LunarCalendarUtil.java b/core/src/main/java/info/xiaomo/core/untils/LunarCalendarUtil.java index b8ed9fc1..5a30f3af 100644 --- a/core/src/main/java/info/xiaomo/core/untils/LunarCalendarUtil.java +++ b/core/src/main/java/info/xiaomo/core/untils/LunarCalendarUtil.java @@ -5,7 +5,7 @@ import java.util.GregorianCalendar; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @version : 2017/1/14 9:59 */ diff --git a/core/src/main/java/info/xiaomo/core/untils/MailUtil.java b/core/src/main/java/info/xiaomo/core/untils/MailUtil.java index e45a2b55..d4c36da7 100644 --- a/core/src/main/java/info/xiaomo/core/untils/MailUtil.java +++ b/core/src/main/java/info/xiaomo/core/untils/MailUtil.java @@ -12,10 +12,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/511:00 diff --git a/core/src/main/java/info/xiaomo/core/untils/Md5Util.java b/core/src/main/java/info/xiaomo/core/untils/Md5Util.java index acd52178..3a14c314 100644 --- a/core/src/main/java/info/xiaomo/core/untils/Md5Util.java +++ b/core/src/main/java/info/xiaomo/core/untils/Md5Util.java @@ -14,10 +14,10 @@ * ｜╭－－－╮把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 16/4/3 10:03 diff --git a/core/src/main/java/info/xiaomo/core/untils/SerializeUtil.java b/core/src/main/java/info/xiaomo/core/untils/SerializeUtil.java index 15d6512d..f6be3ed2 100644 --- a/core/src/main/java/info/xiaomo/core/untils/SerializeUtil.java +++ b/core/src/main/java/info/xiaomo/core/untils/SerializeUtil.java @@ -1,6 +1,7 @@ package info.xiaomo.core.untils; import java.io.*; +import java.nio.charset.StandardCharsets; /** * │＼＿＿╭╭╭╭╭＿＿／│ @@ -14,10 +15,10 @@ * ｜╭－－－╮把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 15/9/6 16:05 @@ -40,7 +41,7 @@ public static String serialize(Object object) { oos = new ObjectOutputStream(baos); oos.writeObject(object); byte[] bytes = baos.toByteArray(); - return new String(bytes, "utf-8"); + return new String(bytes, StandardCharsets.UTF_8); } catch (Exception e) { e.printStackTrace(); } @@ -51,7 +52,7 @@ public static String serialize(Object object) { * 反序列化 */ public static Object unserialize(String s) throws UnsupportedEncodingException { - byte[] bytes = s.getBytes("utf-8"); + byte[] bytes = s.getBytes(StandardCharsets.UTF_8); ByteArrayInputStream bais; try { //反序列化 diff --git a/core/src/main/java/info/xiaomo/core/untils/SqlUtil.java b/core/src/main/java/info/xiaomo/core/untils/SqlUtil.java index c81ed3c5..7e69e630 100644 --- a/core/src/main/java/info/xiaomo/core/untils/SqlUtil.java +++ b/core/src/main/java/info/xiaomo/core/untils/SqlUtil.java @@ -9,7 +9,6 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. *

* * @author : xiaomo diff --git a/crawler/src/main/java/info/xiaomo/crawler/CrawlerMain.java b/crawler/src/main/java/info/xiaomo/crawler/CrawlerMain.java index 2e336982..4f960904 100644 --- a/crawler/src/main/java/info/xiaomo/crawler/CrawlerMain.java +++ b/crawler/src/main/java/info/xiaomo/crawler/CrawlerMain.java @@ -12,11 +12,11 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + *

* * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 15:38 diff --git a/crawler/src/main/java/info/xiaomo/crawler/dao/ShikigamaDao.java b/crawler/src/main/java/info/xiaomo/crawler/dao/ShikigamaDao.java index 3ff5c549..6f3078fc 100644 --- a/crawler/src/main/java/info/xiaomo/crawler/dao/ShikigamaDao.java +++ b/crawler/src/main/java/info/xiaomo/crawler/dao/ShikigamaDao.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Repository; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @created : 2016/12/24 15:55 */ @Repository diff --git a/crawler/src/main/java/info/xiaomo/crawler/model/MitamaModel.java b/crawler/src/main/java/info/xiaomo/crawler/model/MitamaModel.java index 7e9d1343..4eb5ad72 100644 --- a/crawler/src/main/java/info/xiaomo/crawler/model/MitamaModel.java +++ b/crawler/src/main/java/info/xiaomo/crawler/model/MitamaModel.java @@ -4,7 +4,7 @@ import info.xiaomo.core.base.BaseModel; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @created : 2016/12/24 18:06 * 御魂模型 */ diff --git a/crawler/src/main/java/info/xiaomo/crawler/model/ShikigamiModel.java b/crawler/src/main/java/info/xiaomo/crawler/model/ShikigamiModel.java index e7fbfe7f..b208fea5 100644 --- a/crawler/src/main/java/info/xiaomo/crawler/model/ShikigamiModel.java +++ b/crawler/src/main/java/info/xiaomo/crawler/model/ShikigamiModel.java @@ -7,7 +7,7 @@ import javax.persistence.Table; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @created : 2016/12/24 15:09 */ diff --git a/crawler/src/main/java/info/xiaomo/crawler/schedule/ScheduledTasks.java b/crawler/src/main/java/info/xiaomo/crawler/schedule/ScheduledTasks.java index fff4fbe5..1d43fcbe 100644 --- a/crawler/src/main/java/info/xiaomo/crawler/schedule/ScheduledTasks.java +++ b/crawler/src/main/java/info/xiaomo/crawler/schedule/ScheduledTasks.java @@ -15,7 +15,7 @@ import java.util.List; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @created : 2016/12/24 15:59 */ @Component diff --git a/crawler/src/main/java/info/xiaomo/crawler/service/ShikigamaService.java b/crawler/src/main/java/info/xiaomo/crawler/service/ShikigamaService.java index 6197f03d..6f3f6b01 100644 --- a/crawler/src/main/java/info/xiaomo/crawler/service/ShikigamaService.java +++ b/crawler/src/main/java/info/xiaomo/crawler/service/ShikigamaService.java @@ -5,7 +5,7 @@ import java.util.List; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @created : 2016/12/24 15:54 */ public interface ShikigamaService { diff --git a/crawler/src/main/java/info/xiaomo/crawler/service/impl/ShikigamaServiceImpl.java b/crawler/src/main/java/info/xiaomo/crawler/service/impl/ShikigamaServiceImpl.java index 730566dc..0a5bfe42 100644 --- a/crawler/src/main/java/info/xiaomo/crawler/service/impl/ShikigamaServiceImpl.java +++ b/crawler/src/main/java/info/xiaomo/crawler/service/impl/ShikigamaServiceImpl.java @@ -11,7 +11,7 @@ import java.util.List; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @created : 2016/12/24 15:54 */ @Service diff --git a/crawler/src/main/java/info/xiaomo/crawler/spider/OnnmyoujiSpider.java b/crawler/src/main/java/info/xiaomo/crawler/spider/OnnmyoujiSpider.java index ffae8cda..2423e44a 100644 --- a/crawler/src/main/java/info/xiaomo/crawler/spider/OnnmyoujiSpider.java +++ b/crawler/src/main/java/info/xiaomo/crawler/spider/OnnmyoujiSpider.java @@ -11,7 +11,7 @@ import java.util.List; /** - * @author : xiaomo (https://xiaomo.info) (https://github.com/xiaomoinfo) + * @author : xiaomo (https://xiaomo.info) (https://github.com/houko) * @created : 2016/12/24 15:05 * 阴阳师获取数据 */ diff --git a/freemarker/src/main/java/info/xiaomo/freemarker/FreemarkerMain.java b/freemarker/src/main/java/info/xiaomo/freemarker/FreemarkerMain.java index d6bcfd05..d1e9d83c 100644 --- a/freemarker/src/main/java/info/xiaomo/freemarker/FreemarkerMain.java +++ b/freemarker/src/main/java/info/xiaomo/freemarker/FreemarkerMain.java @@ -12,10 +12,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 15:38 diff --git a/freemarker/src/main/java/info/xiaomo/freemarker/controller/FreemarkerController.java b/freemarker/src/main/java/info/xiaomo/freemarker/controller/FreemarkerController.java index 03fc51b8..78a3a90e 100644 --- a/freemarker/src/main/java/info/xiaomo/freemarker/controller/FreemarkerController.java +++ b/freemarker/src/main/java/info/xiaomo/freemarker/controller/FreemarkerController.java @@ -8,10 +8,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/16 10:19 diff --git a/javase/src/main/java/info/xiaomo/javase/QuestionMain.java b/javase/src/main/java/info/xiaomo/javase/QuestionMain.java index 6704c6c4..7cda0422 100644 --- a/javase/src/main/java/info/xiaomo/javase/QuestionMain.java +++ b/javase/src/main/java/info/xiaomo/javase/QuestionMain.java @@ -26,10 +26,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 15:38 diff --git a/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java b/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java index 47dc8d42..90bb52c3 100644 --- a/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java +++ b/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java @@ -18,7 +18,7 @@ * Today the best performance as tomorrow newest starter! * * @author : xiaomo - * github : https://github.com/xiaomoinfo + * github : https://github.com/houko * email : xiaomo@xiaomo.info * QQ : 83387856 * Date : 2017/11/20 19:00 diff --git a/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java b/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java index c66bf5f5..489e8c07 100644 --- a/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java +++ b/javase/src/main/java/info/xiaomo/javase/dao/QuestionDao.java @@ -10,7 +10,7 @@ * Today the best performance as tomorrow newest starter! * * @author : xiaomo - * github : https://github.com/xiaomoinfo + * github : https://github.com/houko * email : xiaomo@xiaomo.info * QQ : 83387856 * Date : 2017/11/20 19:00 diff --git a/javase/src/main/java/info/xiaomo/javase/model/QuestionModel.java b/javase/src/main/java/info/xiaomo/javase/model/QuestionModel.java index e3fb3ed7..39954ae5 100644 --- a/javase/src/main/java/info/xiaomo/javase/model/QuestionModel.java +++ b/javase/src/main/java/info/xiaomo/javase/model/QuestionModel.java @@ -14,7 +14,7 @@ * Today the best performance as tomorrow newest starter! * * @author : xiaomo - * github : https://github.com/xiaomoinfo + * github : https://github.com/houko * email : xiaomo@xiaomo.info * QQ : 83387856 * Date : 2017/11/20 18:57 diff --git a/javase/src/main/java/info/xiaomo/javase/service/QuestionService.java b/javase/src/main/java/info/xiaomo/javase/service/QuestionService.java index 317caa00..f83da182 100644 --- a/javase/src/main/java/info/xiaomo/javase/service/QuestionService.java +++ b/javase/src/main/java/info/xiaomo/javase/service/QuestionService.java @@ -8,7 +8,7 @@ * Today the best performance as tomorrow newest starter! * * @author : xiaomo - * github : https://github.com/xiaomoinfo + * github : https://github.com/houko * email : xiaomo@xiaomo.info * QQ : 83387856 * Date : 2017/11/20 19:00 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 index e3d09c51..246a8c07 100644 --- a/javase/src/main/java/info/xiaomo/javase/service/impl/QuestionServiceImpl.java +++ b/javase/src/main/java/info/xiaomo/javase/service/impl/QuestionServiceImpl.java @@ -14,7 +14,7 @@ * Today the best performance as tomorrow newest starter! * * @author : xiaomo - * github : https://github.com/xiaomoinfo + * github : https://github.com/houko * email : xiaomo@xiaomo.info * QQ : 83387856 * Date : 2017/11/20 19:01 diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/MongodbMain.java b/mongodb/src/main/java/info/xiaomo/mongodb/MongodbMain.java index c916ee3c..0f6c1c2e 100644 --- a/mongodb/src/main/java/info/xiaomo/mongodb/MongodbMain.java +++ b/mongodb/src/main/java/info/xiaomo/mongodb/MongodbMain.java @@ -27,10 +27,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 15:38 diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java b/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java index 1c5bd457..58f1dbdb 100644 --- a/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java +++ b/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java @@ -12,10 +12,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/15 15:49 diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/dao/MongoUserDao.java b/mongodb/src/main/java/info/xiaomo/mongodb/dao/MongoUserDao.java index c4b9c6e3..d86d4de0 100644 --- a/mongodb/src/main/java/info/xiaomo/mongodb/dao/MongoUserDao.java +++ b/mongodb/src/main/java/info/xiaomo/mongodb/dao/MongoUserDao.java @@ -8,10 +8,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/15 15:42 diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/model/MongoUser.java b/mongodb/src/main/java/info/xiaomo/mongodb/model/MongoUser.java index 2363c875..12095176 100644 --- a/mongodb/src/main/java/info/xiaomo/mongodb/model/MongoUser.java +++ b/mongodb/src/main/java/info/xiaomo/mongodb/model/MongoUser.java @@ -12,10 +12,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/15 15:39 diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/service/MongoUserService.java b/mongodb/src/main/java/info/xiaomo/mongodb/service/MongoUserService.java index 5bf3b63d..1eccb9f3 100644 --- a/mongodb/src/main/java/info/xiaomo/mongodb/service/MongoUserService.java +++ b/mongodb/src/main/java/info/xiaomo/mongodb/service/MongoUserService.java @@ -8,10 +8,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/15 15:45 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 index 9b0f0a60..1827c1a3 100644 --- a/mongodb/src/main/java/info/xiaomo/mongodb/service/impl/MongoUserServiceImpl.java +++ b/mongodb/src/main/java/info/xiaomo/mongodb/service/impl/MongoUserServiceImpl.java @@ -13,10 +13,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/15 15:45 diff --git a/multipleSource/src/main/java/info/xiaomo/multiplesource/MultipleSourceMain.java b/multipleSource/src/main/java/info/xiaomo/multiplesource/MultipleSourceMain.java index fafbf0db..bcf2eb5e 100644 --- a/multipleSource/src/main/java/info/xiaomo/multiplesource/MultipleSourceMain.java +++ b/multipleSource/src/main/java/info/xiaomo/multiplesource/MultipleSourceMain.java @@ -15,10 +15,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info * Date: 2016/11/16 10:34 diff --git a/multipleSource/src/main/java/info/xiaomo/multiplesource/controller/MultipleSourceController.java b/multipleSource/src/main/java/info/xiaomo/multiplesource/controller/MultipleSourceController.java index ea142d5a..d2b05caf 100644 --- a/multipleSource/src/main/java/info/xiaomo/multiplesource/controller/MultipleSourceController.java +++ b/multipleSource/src/main/java/info/xiaomo/multiplesource/controller/MultipleSourceController.java @@ -12,10 +12,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/16 10:45 diff --git a/multipleSource/src/main/java/info/xiaomo/multiplesource/sql/Sql.java b/multipleSource/src/main/java/info/xiaomo/multiplesource/sql/Sql.java index 43dbc1cf..1185d127 100644 --- a/multipleSource/src/main/java/info/xiaomo/multiplesource/sql/Sql.java +++ b/multipleSource/src/main/java/info/xiaomo/multiplesource/sql/Sql.java @@ -4,10 +4,9 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/16 11:29 diff --git a/mybatis/src/main/java/info/xiaomo/mybatis/MybatisMain.java b/mybatis/src/main/java/info/xiaomo/mybatis/MybatisMain.java index 4d09e437..b87e5e65 100644 --- a/mybatis/src/main/java/info/xiaomo/mybatis/MybatisMain.java +++ b/mybatis/src/main/java/info/xiaomo/mybatis/MybatisMain.java @@ -10,10 +10,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 15:38 diff --git a/mybatis/src/main/java/info/xiaomo/mybatis/controller/MybatisUserController.java b/mybatis/src/main/java/info/xiaomo/mybatis/controller/MybatisUserController.java index 19d1a423..7b19d769 100644 --- a/mybatis/src/main/java/info/xiaomo/mybatis/controller/MybatisUserController.java +++ b/mybatis/src/main/java/info/xiaomo/mybatis/controller/MybatisUserController.java @@ -13,10 +13,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/16 9:41 diff --git a/rabbitmq/src/main/java/info/xiaomo/rabbitmq/RabbitMqMain.java b/rabbitmq/src/main/java/info/xiaomo/rabbitmq/RabbitMqMain.java index 5c25e2f4..7030a585 100644 --- a/rabbitmq/src/main/java/info/xiaomo/rabbitmq/RabbitMqMain.java +++ b/rabbitmq/src/main/java/info/xiaomo/rabbitmq/RabbitMqMain.java @@ -14,11 +14,11 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + *

* * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 15:38 diff --git a/redis/src/main/java/info/xiaomo/redis/RedisMain.java b/redis/src/main/java/info/xiaomo/redis/RedisMain.java index 9b6b7ed0..1f42cee6 100644 --- a/redis/src/main/java/info/xiaomo/redis/RedisMain.java +++ b/redis/src/main/java/info/xiaomo/redis/RedisMain.java @@ -13,10 +13,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 15:38 diff --git a/redis/src/main/java/info/xiaomo/redis/controller/TestController.java b/redis/src/main/java/info/xiaomo/redis/controller/TestController.java index 49543886..1590409a 100644 --- a/redis/src/main/java/info/xiaomo/redis/controller/TestController.java +++ b/redis/src/main/java/info/xiaomo/redis/controller/TestController.java @@ -12,10 +12,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/14 17:25 diff --git a/redis/src/main/java/info/xiaomo/redis/dao/CommonRedisDao.java b/redis/src/main/java/info/xiaomo/redis/dao/CommonRedisDao.java index 202a4b95..97cd82e6 100644 --- a/redis/src/main/java/info/xiaomo/redis/dao/CommonRedisDao.java +++ b/redis/src/main/java/info/xiaomo/redis/dao/CommonRedisDao.java @@ -9,10 +9,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/14 17:59 diff --git a/redis/src/main/java/info/xiaomo/redis/dao/impl/CommonRedisDaoImpl.java b/redis/src/main/java/info/xiaomo/redis/dao/impl/CommonRedisDaoImpl.java index 7a1ebf21..b9ecb6ea 100644 --- a/redis/src/main/java/info/xiaomo/redis/dao/impl/CommonRedisDaoImpl.java +++ b/redis/src/main/java/info/xiaomo/redis/dao/impl/CommonRedisDaoImpl.java @@ -18,10 +18,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/14 18:00 diff --git a/scheduled/src/main/java/info/xiaomo/scheduled/ScheduledMain.java b/scheduled/src/main/java/info/xiaomo/scheduled/ScheduledMain.java index a0b58808..ada6b33a 100644 --- a/scheduled/src/main/java/info/xiaomo/scheduled/ScheduledMain.java +++ b/scheduled/src/main/java/info/xiaomo/scheduled/ScheduledMain.java @@ -13,10 +13,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 15:31 diff --git a/security/src/main/java/info/xiaomo/security/SecurityMain.java b/security/src/main/java/info/xiaomo/security/SecurityMain.java index 18773e9c..01e306a3 100644 --- a/security/src/main/java/info/xiaomo/security/SecurityMain.java +++ b/security/src/main/java/info/xiaomo/security/SecurityMain.java @@ -18,10 +18,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 15:38 diff --git a/socket/src/main/java/info/xiaomo/chat/ChatMain.java b/socket/src/main/java/info/xiaomo/chat/ChatMain.java index 890fb662..b144a642 100644 --- a/socket/src/main/java/info/xiaomo/chat/ChatMain.java +++ b/socket/src/main/java/info/xiaomo/chat/ChatMain.java @@ -14,10 +14,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 15:38 diff --git a/socket/src/main/java/info/xiaomo/chat/socket/MyWebSocket.java b/socket/src/main/java/info/xiaomo/chat/socket/MyWebSocket.java index 769f0ecf..57dcd631 100644 --- a/socket/src/main/java/info/xiaomo/chat/socket/MyWebSocket.java +++ b/socket/src/main/java/info/xiaomo/chat/socket/MyWebSocket.java @@ -19,11 +19,11 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + *

* * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/3 16:36 diff --git a/thymeleaf/src/main/java/info/xiaomo/thymeleaf/ThymeleafMain.java b/thymeleaf/src/main/java/info/xiaomo/thymeleaf/ThymeleafMain.java index 8468af9d..a561841f 100644 --- a/thymeleaf/src/main/java/info/xiaomo/thymeleaf/ThymeleafMain.java +++ b/thymeleaf/src/main/java/info/xiaomo/thymeleaf/ThymeleafMain.java @@ -12,10 +12,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/12/1 15:38 diff --git a/thymeleaf/src/main/java/info/xiaomo/thymeleaf/controller/ThymeleafController.java b/thymeleaf/src/main/java/info/xiaomo/thymeleaf/controller/ThymeleafController.java index 9e0613e0..ef573df5 100644 --- a/thymeleaf/src/main/java/info/xiaomo/thymeleaf/controller/ThymeleafController.java +++ b/thymeleaf/src/main/java/info/xiaomo/thymeleaf/controller/ThymeleafController.java @@ -8,10 +8,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/16 10:19 diff --git a/website/src/main/java/info/xiaomo/website/XiaomoMain.java b/website/src/main/java/info/xiaomo/website/XiaomoMain.java index 74186fec..1d2c5aa7 100644 --- a/website/src/main/java/info/xiaomo/website/XiaomoMain.java +++ b/website/src/main/java/info/xiaomo/website/XiaomoMain.java @@ -29,10 +29,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 15:38 diff --git a/website/src/main/java/info/xiaomo/website/controller/AdminUserController.java b/website/src/main/java/info/xiaomo/website/controller/AdminUserController.java index 980f2cc1..0756bbdc 100644 --- a/website/src/main/java/info/xiaomo/website/controller/AdminUserController.java +++ b/website/src/main/java/info/xiaomo/website/controller/AdminUserController.java @@ -28,10 +28,10 @@ * ｜╭－－－╮把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 16/4/2 12:47 diff --git a/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java b/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java index 48eaa7d0..0d8783cb 100644 --- a/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java +++ b/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java @@ -12,11 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.http.MediaType; -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 org.springframework.web.bind.annotation.*; import java.util.List; @@ -24,10 +20,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1117:40 diff --git a/website/src/main/java/info/xiaomo/website/controller/LinkController.java b/website/src/main/java/info/xiaomo/website/controller/LinkController.java index 31bacdbe..6aa52756 100644 --- a/website/src/main/java/info/xiaomo/website/controller/LinkController.java +++ b/website/src/main/java/info/xiaomo/website/controller/LinkController.java @@ -20,10 +20,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1119:55 diff --git a/website/src/main/java/info/xiaomo/website/controller/MailController.java b/website/src/main/java/info/xiaomo/website/controller/MailController.java index 98dec377..412496d3 100644 --- a/website/src/main/java/info/xiaomo/website/controller/MailController.java +++ b/website/src/main/java/info/xiaomo/website/controller/MailController.java @@ -9,10 +9,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/14 11:06 diff --git a/website/src/main/java/info/xiaomo/website/controller/TechnologyController.java b/website/src/main/java/info/xiaomo/website/controller/TechnologyController.java index 24bfe974..409c0337 100644 --- a/website/src/main/java/info/xiaomo/website/controller/TechnologyController.java +++ b/website/src/main/java/info/xiaomo/website/controller/TechnologyController.java @@ -20,10 +20,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/3 14:36 diff --git a/website/src/main/java/info/xiaomo/website/controller/UserController.java b/website/src/main/java/info/xiaomo/website/controller/UserController.java index 6a678524..1ab1b414 100644 --- a/website/src/main/java/info/xiaomo/website/controller/UserController.java +++ b/website/src/main/java/info/xiaomo/website/controller/UserController.java @@ -19,11 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.http.MediaType; -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 org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Optional; @@ -32,10 +28,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 17:51 diff --git a/website/src/main/java/info/xiaomo/website/controller/WorksController.java b/website/src/main/java/info/xiaomo/website/controller/WorksController.java index 66fd5a92..6ce9f784 100644 --- a/website/src/main/java/info/xiaomo/website/controller/WorksController.java +++ b/website/src/main/java/info/xiaomo/website/controller/WorksController.java @@ -20,10 +20,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/3 14:36 diff --git a/website/src/main/java/info/xiaomo/website/dao/AdminUserDao.java b/website/src/main/java/info/xiaomo/website/dao/AdminUserDao.java index 98a5a59a..70034482 100644 --- a/website/src/main/java/info/xiaomo/website/dao/AdminUserDao.java +++ b/website/src/main/java/info/xiaomo/website/dao/AdminUserDao.java @@ -16,10 +16,10 @@ * ｜╭－－－╮把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 16/4/2 13:08 diff --git a/website/src/main/java/info/xiaomo/website/dao/ChangeLogDao.java b/website/src/main/java/info/xiaomo/website/dao/ChangeLogDao.java index 21028b52..0953d493 100644 --- a/website/src/main/java/info/xiaomo/website/dao/ChangeLogDao.java +++ b/website/src/main/java/info/xiaomo/website/dao/ChangeLogDao.java @@ -8,10 +8,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1119:52 diff --git a/website/src/main/java/info/xiaomo/website/dao/LinkDao.java b/website/src/main/java/info/xiaomo/website/dao/LinkDao.java index 1329e963..53fbf585 100644 --- a/website/src/main/java/info/xiaomo/website/dao/LinkDao.java +++ b/website/src/main/java/info/xiaomo/website/dao/LinkDao.java @@ -8,10 +8,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1119:52 diff --git a/website/src/main/java/info/xiaomo/website/dao/TechnologyDao.java b/website/src/main/java/info/xiaomo/website/dao/TechnologyDao.java index 97c11036..923c7678 100644 --- a/website/src/main/java/info/xiaomo/website/dao/TechnologyDao.java +++ b/website/src/main/java/info/xiaomo/website/dao/TechnologyDao.java @@ -16,10 +16,10 @@ * ｜╭－－－╮把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 16/4/2 13:08 diff --git a/website/src/main/java/info/xiaomo/website/dao/UserDao.java b/website/src/main/java/info/xiaomo/website/dao/UserDao.java index ca9aa978..810462b6 100644 --- a/website/src/main/java/info/xiaomo/website/dao/UserDao.java +++ b/website/src/main/java/info/xiaomo/website/dao/UserDao.java @@ -16,10 +16,10 @@ * ｜╭－－－╮把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 16/4/3 10:53 diff --git a/website/src/main/java/info/xiaomo/website/dao/WorksDao.java b/website/src/main/java/info/xiaomo/website/dao/WorksDao.java index f617e1ab..0d6a1e89 100644 --- a/website/src/main/java/info/xiaomo/website/dao/WorksDao.java +++ b/website/src/main/java/info/xiaomo/website/dao/WorksDao.java @@ -16,10 +16,10 @@ * ｜╭－－－╮把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 16/4/2 13:08 diff --git a/website/src/main/java/info/xiaomo/website/dao/base/CommonDao.java b/website/src/main/java/info/xiaomo/website/dao/base/CommonDao.java index 520951e4..f208448f 100644 --- a/website/src/main/java/info/xiaomo/website/dao/base/CommonDao.java +++ b/website/src/main/java/info/xiaomo/website/dao/base/CommonDao.java @@ -13,10 +13,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 20:46 diff --git a/website/src/main/java/info/xiaomo/website/interceptor/LoginInterceptor.java b/website/src/main/java/info/xiaomo/website/interceptor/LoginInterceptor.java index 9d17b72d..f3eff131 100644 --- a/website/src/main/java/info/xiaomo/website/interceptor/LoginInterceptor.java +++ b/website/src/main/java/info/xiaomo/website/interceptor/LoginInterceptor.java @@ -11,10 +11,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/21 10:42 diff --git a/website/src/main/java/info/xiaomo/website/model/AdminModel.java b/website/src/main/java/info/xiaomo/website/model/AdminModel.java index 5755900a..7209d379 100644 --- a/website/src/main/java/info/xiaomo/website/model/AdminModel.java +++ b/website/src/main/java/info/xiaomo/website/model/AdminModel.java @@ -21,10 +21,10 @@ * ｜╭－－－╮把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 16/4/2 12:39 diff --git a/website/src/main/java/info/xiaomo/website/model/ChangeLogModel.java b/website/src/main/java/info/xiaomo/website/model/ChangeLogModel.java index bbf7eac4..bfc74198 100644 --- a/website/src/main/java/info/xiaomo/website/model/ChangeLogModel.java +++ b/website/src/main/java/info/xiaomo/website/model/ChangeLogModel.java @@ -13,10 +13,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/517:17 diff --git a/website/src/main/java/info/xiaomo/website/model/LinkModel.java b/website/src/main/java/info/xiaomo/website/model/LinkModel.java index a7d3198d..5907fff0 100644 --- a/website/src/main/java/info/xiaomo/website/model/LinkModel.java +++ b/website/src/main/java/info/xiaomo/website/model/LinkModel.java @@ -13,10 +13,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1119:47 diff --git a/website/src/main/java/info/xiaomo/website/model/TechnologyModel.java b/website/src/main/java/info/xiaomo/website/model/TechnologyModel.java index 8426806c..ad3d9e05 100644 --- a/website/src/main/java/info/xiaomo/website/model/TechnologyModel.java +++ b/website/src/main/java/info/xiaomo/website/model/TechnologyModel.java @@ -12,10 +12,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/3 14:27 diff --git a/website/src/main/java/info/xiaomo/website/model/UserModel.java b/website/src/main/java/info/xiaomo/website/model/UserModel.java index ef37578a..1dfba5b9 100644 --- a/website/src/main/java/info/xiaomo/website/model/UserModel.java +++ b/website/src/main/java/info/xiaomo/website/model/UserModel.java @@ -13,10 +13,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 17:36 diff --git a/website/src/main/java/info/xiaomo/website/model/WorksModel.java b/website/src/main/java/info/xiaomo/website/model/WorksModel.java index 066ffff3..6fef0f0e 100644 --- a/website/src/main/java/info/xiaomo/website/model/WorksModel.java +++ b/website/src/main/java/info/xiaomo/website/model/WorksModel.java @@ -12,10 +12,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/3 14:15 diff --git a/website/src/main/java/info/xiaomo/website/service/AdminUserService.java b/website/src/main/java/info/xiaomo/website/service/AdminUserService.java index d5bdf1b0..18ee9d15 100644 --- a/website/src/main/java/info/xiaomo/website/service/AdminUserService.java +++ b/website/src/main/java/info/xiaomo/website/service/AdminUserService.java @@ -18,10 +18,10 @@ * ｜╭－－－╮把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 16/4/2 13:04 diff --git a/website/src/main/java/info/xiaomo/website/service/ChangeLogService.java b/website/src/main/java/info/xiaomo/website/service/ChangeLogService.java index a06a2e54..5339b40c 100644 --- a/website/src/main/java/info/xiaomo/website/service/ChangeLogService.java +++ b/website/src/main/java/info/xiaomo/website/service/ChangeLogService.java @@ -9,10 +9,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1119:49 diff --git a/website/src/main/java/info/xiaomo/website/service/LinkService.java b/website/src/main/java/info/xiaomo/website/service/LinkService.java index d537e68d..6c97007f 100644 --- a/website/src/main/java/info/xiaomo/website/service/LinkService.java +++ b/website/src/main/java/info/xiaomo/website/service/LinkService.java @@ -10,10 +10,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1119:49 diff --git a/website/src/main/java/info/xiaomo/website/service/TechnologyService.java b/website/src/main/java/info/xiaomo/website/service/TechnologyService.java index 1f5c2215..5165cfb1 100644 --- a/website/src/main/java/info/xiaomo/website/service/TechnologyService.java +++ b/website/src/main/java/info/xiaomo/website/service/TechnologyService.java @@ -10,10 +10,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/3 14:33 diff --git a/website/src/main/java/info/xiaomo/website/service/UserService.java b/website/src/main/java/info/xiaomo/website/service/UserService.java index 3d3e204d..cc244a90 100644 --- a/website/src/main/java/info/xiaomo/website/service/UserService.java +++ b/website/src/main/java/info/xiaomo/website/service/UserService.java @@ -12,10 +12,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 17:45 diff --git a/website/src/main/java/info/xiaomo/website/service/WorksService.java b/website/src/main/java/info/xiaomo/website/service/WorksService.java index fef99e16..ffb93ddc 100644 --- a/website/src/main/java/info/xiaomo/website/service/WorksService.java +++ b/website/src/main/java/info/xiaomo/website/service/WorksService.java @@ -10,10 +10,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/3 14:33 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 index 67a4d27c..eb252a50 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java @@ -26,10 +26,10 @@ * ｜╭－－－╮把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 16/4/2 13:34 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 index 62d5648b..a7526f51 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/ChangeLogServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/ChangeLogServiceImpl.java @@ -17,10 +17,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/11 19:49 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 index cf04ef9a..e592b225 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/LinkServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/LinkServiceImpl.java @@ -17,10 +17,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/11 19:50 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 index debfe08c..42d66e9d 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/TechnologyServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/TechnologyServiceImpl.java @@ -16,10 +16,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/3 14:34 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 index 4265b711..220fb3a1 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/UserServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/UserServiceImpl.java @@ -18,10 +18,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/1 17:46 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 index 6427b09e..50b66c00 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/WorksServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/WorksServiceImpl.java @@ -16,10 +16,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/3 14:34 diff --git a/website/src/main/java/info/xiaomo/website/util/MailUtil.java b/website/src/main/java/info/xiaomo/website/util/MailUtil.java index 1903b12a..d338d6d1 100644 --- a/website/src/main/java/info/xiaomo/website/util/MailUtil.java +++ b/website/src/main/java/info/xiaomo/website/util/MailUtil.java @@ -21,10 +21,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/4/511:00 diff --git a/website/src/main/java/info/xiaomo/website/view/AdminUserView.java b/website/src/main/java/info/xiaomo/website/view/AdminUserView.java index 47ff5be8..63ac1226 100644 --- a/website/src/main/java/info/xiaomo/website/view/AdminUserView.java +++ b/website/src/main/java/info/xiaomo/website/view/AdminUserView.java @@ -4,10 +4,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/21 11:12 diff --git a/website/src/main/java/info/xiaomo/website/view/ChangeLogView.java b/website/src/main/java/info/xiaomo/website/view/ChangeLogView.java index 77570ec4..05900fdd 100644 --- a/website/src/main/java/info/xiaomo/website/view/ChangeLogView.java +++ b/website/src/main/java/info/xiaomo/website/view/ChangeLogView.java @@ -4,10 +4,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/21 11:12 diff --git a/website/src/main/java/info/xiaomo/website/view/LinkView.java b/website/src/main/java/info/xiaomo/website/view/LinkView.java index e2bd5fae..42ccd3c7 100644 --- a/website/src/main/java/info/xiaomo/website/view/LinkView.java +++ b/website/src/main/java/info/xiaomo/website/view/LinkView.java @@ -4,10 +4,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/21 11:12 diff --git a/website/src/main/java/info/xiaomo/website/view/TechnologyView.java b/website/src/main/java/info/xiaomo/website/view/TechnologyView.java index cbbfabca..bdf5121b 100644 --- a/website/src/main/java/info/xiaomo/website/view/TechnologyView.java +++ b/website/src/main/java/info/xiaomo/website/view/TechnologyView.java @@ -4,10 +4,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/21 11:12 diff --git a/website/src/main/java/info/xiaomo/website/view/UserView.java b/website/src/main/java/info/xiaomo/website/view/UserView.java index d2e55dfa..2e6aea81 100644 --- a/website/src/main/java/info/xiaomo/website/view/UserView.java +++ b/website/src/main/java/info/xiaomo/website/view/UserView.java @@ -4,10 +4,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/21 11:12 diff --git a/website/src/main/java/info/xiaomo/website/view/WorksView.java b/website/src/main/java/info/xiaomo/website/view/WorksView.java index 9f93238f..4b4a5f67 100644 --- a/website/src/main/java/info/xiaomo/website/view/WorksView.java +++ b/website/src/main/java/info/xiaomo/website/view/WorksView.java @@ -4,10 +4,10 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * Created by IntelliJ IDEA. + * * @author : xiaomo - * github: https://github.com/xiaomoinfo + * github: https://github.com/houko * email: xiaomo@xiaomo.info *

* Date: 2016/11/21 11:12 From 833a99522de06111d5a0cc94dffd918768f3af3b Mon Sep 17 00:00:00 2001 From: kohou Date: Tue, 6 Aug 2019 17:09:15 +0900 Subject: [PATCH 27/52] add plugins --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 23c2af74..2ee6ac98 100644 --- a/pom.xml +++ b/pom.xml @@ -219,6 +219,19 @@ + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + org.apache.maven.plugins From 77a8f71f7355e747a38e8ba106cd1e0b3318a51c Mon Sep 17 00:00:00 2001 From: kohou Date: Tue, 6 Aug 2019 17:13:37 +0900 Subject: [PATCH 28/52] =?UTF-8?q?=E6=8C=87=E5=AE=9Ajdk=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index dff5f3a5..c4f11b7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,3 @@ language: java +jdk: + - oraclejdk8 \ No newline at end of file From a5236e06ca74a4b377913939e66e6ef84e68e079 Mon Sep 17 00:00:00 2001 From: kohou Date: Tue, 6 Aug 2019 17:16:07 +0900 Subject: [PATCH 29/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Readme.md b/Readme.md index e397156a..29c80a62 100644 --- a/Readme.md +++ b/Readme.md @@ -66,6 +66,7 @@ http://localhost:808/doc.html bootstrap-ui - 2017-11-03 按照阿里巴巴编程规范插件P3C优化代码 - 2017-11-03 合并`api`和`website`模块,访问`localhost:8080`会显示网站主页,访问`localhost:8080/api`会显示api管理界面 - 2018-04-09 将整个项目升级到spring boot2.0 release版本,api有较大变动 +- 2019-08-06 travis-ci指定jdk版本 From b5535c0e3a4f2e2c615dbf3381d06fb59ede2841 Mon Sep 17 00:00:00 2001 From: kohou Date: Tue, 6 Aug 2019 17:20:10 +0900 Subject: [PATCH 30/52] =?UTF-8?q?travis=20ci=20=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c4f11b7c..7851aebe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ language: java jdk: - - oraclejdk8 \ No newline at end of file + - oraclejdk8 +dist: trusty \ No newline at end of file From 92781cff2d41139deb8a59a40ad94a22158712f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E6=9C=8B=EF=BC=88=E5=B0=8F=E8=8E=AB=EF=BC=89?= Date: Mon, 26 Aug 2019 23:20:47 +0900 Subject: [PATCH 31/52] =?UTF-8?q?=E6=90=AD=E5=BB=BAorder=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order/pom.xml | 55 +++++++++++++ .../java/info/xiaomo/order/OrderMain.java | 81 +++++++++++++++++++ .../order/controller/OrderController.java | 43 ++++++++++ .../info/xiaomo/order/model/OrderModel.java | 54 +++++++++++++ .../xiaomo/order/service/OrderService.java | 9 +++ .../order/service/impl/OrderServiceImpl.java | 12 +++ pom.xml | 3 +- 7 files changed, 256 insertions(+), 1 deletion(-) create mode 100644 order/pom.xml create mode 100644 order/src/main/java/info/xiaomo/order/OrderMain.java create mode 100644 order/src/main/java/info/xiaomo/order/controller/OrderController.java create mode 100644 order/src/main/java/info/xiaomo/order/model/OrderModel.java create mode 100644 order/src/main/java/info/xiaomo/order/service/OrderService.java create mode 100644 order/src/main/java/info/xiaomo/order/service/impl/OrderServiceImpl.java diff --git a/order/pom.xml b/order/pom.xml new file mode 100644 index 00000000..76a26383 --- /dev/null +++ b/order/pom.xml @@ -0,0 +1,55 @@ + + + + xiaomo + info.xiaomo + 2017.2 + + 4.0.0 + + order + + + info.xiaomo + core + 2017.2 + + + org.springframework.boot + spring-boot-devtools + true + + + io.springfox + springfox-swagger2 + + + io.springfox + springfox-swagger-ui + + + com.github.xiaoymin + swagger-bootstrap-ui + 1.5 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + diff --git a/order/src/main/java/info/xiaomo/order/OrderMain.java b/order/src/main/java/info/xiaomo/order/OrderMain.java new file mode 100644 index 00000000..6ea75239 --- /dev/null +++ b/order/src/main/java/info/xiaomo/order/OrderMain.java @@ -0,0 +1,81 @@ +package info.xiaomo.order; + +import io.swagger.annotations.ApiOperation; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.EnableTransactionManagement; +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.WebMvcConfigurer; +import springfox.documentation.annotations.ApiIgnore; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + + +/** + * @author xiaomo + */ +@Configuration +@ComponentScan("info.xiaomo") +@EntityScan("info.xiaomo.*.model") +@EnableSwagger2 +@Controller +@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class}) +public class OrderMain implements WebMvcConfigurer { + + public static void main(String[] args) { + SpringApplication.run(OrderMain.class, args); + } + + @RequestMapping(value = "/", method = RequestMethod.GET) + public String index() { + return "swagger-ui.html"; + } + + /** + * 接口 + * + * @return 接口 + */ + @RequestMapping(value = "/api", method = RequestMethod.GET) + @ApiIgnore() + @ApiOperation(value = "重定向到api首页") + public ModelAndView api() { + return new ModelAndView("redirect:/swagger-ui.html"); + } + + + @Bean + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + .apis(RequestHandlerSelectors.basePackage("info.xiaomo.order")) + .paths(PathSelectors.any()) + .build(); + } + + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("Spring Boot中使用Swagger2构建RESTful APIs") + .contact("小莫") + .version("1.0") + .build(); + } + +} diff --git a/order/src/main/java/info/xiaomo/order/controller/OrderController.java b/order/src/main/java/info/xiaomo/order/controller/OrderController.java new file mode 100644 index 00000000..f215d9ff --- /dev/null +++ b/order/src/main/java/info/xiaomo/order/controller/OrderController.java @@ -0,0 +1,43 @@ +package info.xiaomo.order.controller; + +import info.xiaomo.core.base.Result; +import info.xiaomo.order.service.OrderService; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + + +/** + * @author xiaomo + */ +@RestController +@RequestMapping("/order") +@Api(value = "识别订单") +public class OrderController { + + private final OrderService service; + + @Autowired + public OrderController(OrderService orderService) { + this.service = orderService; + } + + + @RequestMapping(value = "forbid/{id}", method = RequestMethod.GET) + @ApiOperation(value = "封号", notes = "根据传入的id对修改对应帐号状态", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "后台用户唯一id", required = true, dataType = "Long", paramType = "path") + }) + @ApiResponses(value = { + @ApiResponse(code = 404, message = "Not Found"), + @ApiResponse(code = 400, message = "No Name Provided"), + }) + public Result forbid(@PathVariable("id") Long id) { + return new Result<>(null); + } +} + diff --git a/order/src/main/java/info/xiaomo/order/model/OrderModel.java b/order/src/main/java/info/xiaomo/order/model/OrderModel.java new file mode 100644 index 00000000..22b8cba9 --- /dev/null +++ b/order/src/main/java/info/xiaomo/order/model/OrderModel.java @@ -0,0 +1,54 @@ +package info.xiaomo.order.model; + + +import info.xiaomo.core.base.BaseModel; +import lombok.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * │＼＿＿╭╭╭╭╭＿＿／│ + * │　　　　　　　　　│ + * │　　　　　　　　　│ + * │　－　　　　　　－│ + * │≡　　　　ｏ　≡ │ + * │　　　　　　　　　│ + * ╰——┬Ｏ◤▽◥Ｏ┬——╯ + * ｜　　ｏ　　｜ + * ｜╭－－－╮把今天最好的表现当作明天最新的起点．．～ + * いま 最高の表現 として 明日最新の始発．．～ + * Today the best performance as tomorrow newest starter! + + * + * @author : xiaomo + * github: https://github.com/houko + * email: xiaomo@xiaomo.info + *

+ * Date: 16/4/2 12:39 + * Copyright(©) 2015 by xiaomo. + */ +@Entity +@Table(name = "adminUser") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = false) +@AllArgsConstructor +@NoArgsConstructor +public class OrderModel extends BaseModel implements Serializable { + + @Column(name = "UserName") + private String userName; + + @Column(name = "Password") + private String password; + + @Column(name = "Status") + private int status = 1; + + @Column(name = "Salt") + private String salt; + +} diff --git a/order/src/main/java/info/xiaomo/order/service/OrderService.java b/order/src/main/java/info/xiaomo/order/service/OrderService.java new file mode 100644 index 00000000..b3543f4d --- /dev/null +++ b/order/src/main/java/info/xiaomo/order/service/OrderService.java @@ -0,0 +1,9 @@ +package info.xiaomo.order.service; + +/** + * @author xiaomo + */ +public interface OrderService { + + +} diff --git a/order/src/main/java/info/xiaomo/order/service/impl/OrderServiceImpl.java b/order/src/main/java/info/xiaomo/order/service/impl/OrderServiceImpl.java new file mode 100644 index 00000000..d7b60d04 --- /dev/null +++ b/order/src/main/java/info/xiaomo/order/service/impl/OrderServiceImpl.java @@ -0,0 +1,12 @@ +package info.xiaomo.order.service.impl; + +import info.xiaomo.order.service.OrderService; +import org.springframework.stereotype.Service; + +/** + * @author xiaomo + */ +@Service +public class OrderServiceImpl implements OrderService { + +} diff --git a/pom.xml b/pom.xml index 2ee6ac98..8dd1ca77 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,7 @@ crawler javase + order pom @@ -260,4 +261,4 @@ - \ No newline at end of file + From d1b3764485560dc515dca1aa1bb3ebdf1bb01437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E6=9C=8B=EF=BC=88=E5=B0=8F=E8=8E=AB=EF=BC=89?= Date: Tue, 27 Aug 2019 00:02:39 +0900 Subject: [PATCH 32/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A0zx=E8=A7=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order/pom.xml | 6 ++++++ order/src/main/java/info/xiaomo/order/OrderMain.java | 10 +--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/order/pom.xml b/order/pom.xml index 76a26383..c8797258 100644 --- a/order/pom.xml +++ b/order/pom.xml @@ -29,6 +29,12 @@ io.springfox springfox-swagger-ui + + com.google.zxing + core + 3.4.0 + + com.github.xiaoymin swagger-bootstrap-ui diff --git a/order/src/main/java/info/xiaomo/order/OrderMain.java b/order/src/main/java/info/xiaomo/order/OrderMain.java index 6ea75239..d6311aba 100644 --- a/order/src/main/java/info/xiaomo/order/OrderMain.java +++ b/order/src/main/java/info/xiaomo/order/OrderMain.java @@ -6,13 +6,10 @@ import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; @@ -42,17 +39,12 @@ public static void main(String[] args) { SpringApplication.run(OrderMain.class, args); } - @RequestMapping(value = "/", method = RequestMethod.GET) - public String index() { - return "swagger-ui.html"; - } - /** * 接口 * * @return 接口 */ - @RequestMapping(value = "/api", method = RequestMethod.GET) + @RequestMapping(value = "/", method = RequestMethod.GET) @ApiIgnore() @ApiOperation(value = "重定向到api首页") public ModelAndView api() { From a5ca2983a742df3757963845f7e642a91a8defae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E6=9C=8B=EF=BC=88=E5=B0=8F=E8=8E=AB=EF=BC=89?= Date: Tue, 27 Aug 2019 00:04:11 +0900 Subject: [PATCH 33/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A0zx=E8=A7=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order/pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/order/pom.xml b/order/pom.xml index c8797258..7c8e3fb7 100644 --- a/order/pom.xml +++ b/order/pom.xml @@ -29,10 +29,15 @@ io.springfox springfox-swagger-ui + + com.google.zxing + javase + 3.2.1 + com.google.zxing core - 3.4.0 + 3.3.3 From 774d8de0ed186966c2dbddd79c578c7e2a870c54 Mon Sep 17 00:00:00 2001 From: Peng Hu Date: Wed, 23 Oct 2019 10:56:05 +0900 Subject: [PATCH 34/52] Update FUNDING.yml --- .github/FUNDING.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index fcb6b4da..5b50b894 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,12 +1,12 @@ # These are supported funding model platforms -github: #houko -patreon: hupeng +github: houko +patreon: #hupeng open_collective: SpringBootUnity -ko_fi: hupeng +ko_fi: #hupeng tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry liberapay: # Replace with a single Liberapay username -issuehunt: houko/SpringBootUnity +issuehunt: #houko/SpringBootUnity otechie: # Replace with a single Otechie username custom: https:blog.xiaomo.info From 88cca658b61337159167a3a57ea4afeebfd3e83a Mon Sep 17 00:00:00 2001 From: xiaomo Date: Sat, 16 Nov 2019 17:56:04 +0900 Subject: [PATCH 35/52] fix core build error --- core/pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/core/pom.xml b/core/pom.xml index 18a51db4..94636319 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -84,4 +84,18 @@ poi + + + + + org.springframework.boot + spring-boot-maven-plugin + + + none + + + + + \ No newline at end of file From 0562eb4dc8fb1c47d9185e3ae9687a1e15543a77 Mon Sep 17 00:00:00 2001 From: Peng Hu Date: Wed, 27 Nov 2019 13:52:42 +0900 Subject: [PATCH 36/52] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 5b50b894..36de67a3 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl liberapay: # Replace with a single Liberapay username issuehunt: #houko/SpringBootUnity otechie: # Replace with a single Otechie username -custom: https:blog.xiaomo.info +custom: #https:blog.xiaomo.info From ed92380850252c781ae75f32339fef8de3b0a87c Mon Sep 17 00:00:00 2001 From: Peng Hu Date: Sun, 8 Dec 2019 20:22:41 +0900 Subject: [PATCH 37/52] Update Readme.md --- Readme.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Readme.md b/Readme.md index 3310d9da..ba5bcf39 100644 --- a/Readme.md +++ b/Readme.md @@ -9,9 +9,8 @@ ### 环境 - `maven` latest - `jdk1.8` -- `spring boot 1.5.8 release`(目前最新版) -- 个人推荐`idea`来代替eclipse（希望不要被说成异教徒必须死） -- mysql5.5+ +- `spring boot 2.x release` +- 个人推荐`idea`来代替eclipse - git: 版本管理 - nginx: 反向代理服务器 From 88019adb2bb8685487b42b3f456a822d3874f645 Mon Sep 17 00:00:00 2001 From: Peng Hu Date: Sun, 8 Dec 2019 20:23:45 +0900 Subject: [PATCH 38/52] Update Readme.md --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index ba5bcf39..0dfd9aa5 100644 --- a/Readme.md +++ b/Readme.md @@ -16,7 +16,7 @@ ### 注意事项 -- 本项目代码托管在[github](https://github.com/houko/SpringBootUnity)和[码云](http://git.oschina.net/hupeng/SpringBootUnity)两个地方,最新代码会先推送在github上,码云上会在github上更新完之后进行同步。 +- 本项目代码托管在[github](https://github.com/houko/SpringBootUnity)和[码云](http://git.oschina.net/hupeng_admin/SpringBootUnity)两个地方,最新代码会先推送在github上,码云上会在github上更新完之后进行同步。 - 本项目多数数据库都用到了`hibernate`，如果没有提供`sql`文件。则启动时会根据代码映射自动生成数据库表，请在启动前修改`application.properties`中的数据库连接信息 From e5865ef596973883f3c799ad0e486a28b740d036 Mon Sep 17 00:00:00 2001 From: Peng Hu Date: Fri, 5 Jun 2020 13:36:15 +0800 Subject: [PATCH 39/52] Update Readme.md --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 0dfd9aa5..c9e6929a 100644 --- a/Readme.md +++ b/Readme.md @@ -121,7 +121,7 @@ http://localhost:808/doc.html bootstrap-ui MIT License - Copyright (c) 2019 Peng Hu + Copyright (c) 2020 Peng Hu Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 31ce2884d5a880248d595009681a8ec07116ced3 Mon Sep 17 00:00:00 2001 From: houko Date: Fri, 9 Oct 2020 19:15:47 +0900 Subject: [PATCH 40/52] upgrade version to 2020.1 --- Readme.md | 2 +- async/pom.xml | 4 +- .../resources/config/application.properties | 2 +- core/pom.xml | 2 +- crawler/pom.xml | 4 +- .../resources/config/application.properties | 3 +- freemarker/pom.xml | 4 +- .../resources/config/application.properties | 2 +- javase/pom.xml | 4 +- .../javase/controller/QuestionController.java | 6 +- .../resources/config/application.properties | 17 ++- mongodb/pom.xml | 4 +- .../controller/MongoUserController.java | 2 +- .../resources/config/application.properties | 2 +- multipleSource/pom.xml | 4 +- .../resources/config/application.properties | 6 +- mybatis/pom.xml | 4 +- .../resources/config/application.properties | 4 +- order/pom.xml | 4 +- .../order/controller/OrderController.java | 2 +- pom.xml | 34 ++---- rabbitmq/pom.xml | 4 +- .../resources/config/application.properties | 2 +- redis/pom.xml | 4 +- .../resources/config/application.properties | 2 +- scheduled/pom.xml | 4 +- .../resources/config/application.properties | 2 +- security/pom.xml | 4 +- .../resources/config/application.properties | 2 +- socket/pom.xml | 4 +- .../resources/config/application.properties | 2 +- thymeleaf/pom.xml | 4 +- .../resources/config/application.properties | 2 +- website/pom.xml | 16 ++- .../controller/AdminUserController.java | 36 +++--- .../controller/ChangeLogController.java | 24 ++-- .../website/controller/LinkController.java | 12 +- .../controller/TechnologyController.java | 27 ++--- .../website/controller/UserController.java | 40 +++--- .../website/controller/WorksController.java | 114 +++--------------- .../website/interceptor/LoginInterceptor.java | 2 +- .../service/impl/AdminUserServiceImpl.java | 2 +- .../service/impl/ChangeLogServiceImpl.java | 2 +- .../website/service/impl/LinkServiceImpl.java | 3 +- .../website/service/impl/UserServiceImpl.java | 2 +- .../resources/config/application.properties | 4 +- .../test/java/info/xiaomo/test/MailTests.java | 71 ----------- .../src/test/resources/application.properties | 33 ----- 48 files changed, 181 insertions(+), 359 deletions(-) delete mode 100644 website/src/test/java/info/xiaomo/test/MailTests.java delete mode 100644 website/src/test/resources/application.properties diff --git a/Readme.md b/Readme.md index c9e6929a..207b7268 100644 --- a/Readme.md +++ b/Readme.md @@ -59,7 +59,7 @@ http://localhost:808/doc.html bootstrap-ui - 2017-09-08 crawler模块(网络爬虫):修复本地文件目录不存在会报错的bug。处理方式为：不存在则自动创建 - 2017-11-02 开源协议从apache更换到MIT - 2017-11-02 添加本地运行方式的说明 -- 2017-11-02 版本更新到2017.2 +- 2017-11-02 版本更新到2020.1 - 2017-11-02 spring boot版本更新到1.5.8 - 2017-11-03 添加kotlin环境配置 - 2017-11-03 按照阿里巴巴编程规范插件P3C优化代码 diff --git a/async/pom.xml b/async/pom.xml index ae7c1344..60d54b74 100644 --- a/async/pom.xml +++ b/async/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -14,7 +14,7 @@ info.xiaomo core - 2017.2 + 2020.1 diff --git a/async/src/main/resources/config/application.properties b/async/src/main/resources/config/application.properties index 464af148..79ef9397 100644 --- a/async/src/main/resources/config/application.properties +++ b/async/src/main/resources/config/application.properties @@ -1,6 +1,6 @@ logging.config=classpath:config/logback-dev.xml server.port=8080 -server.session.timeout=1800 + server.max-http-header-size=20971520 # \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4 diff --git a/core/pom.xml b/core/pom.xml index 94636319..8e3af9eb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ info.xiaomo xiaomo - 2017.2 + 2020.1 4.0.0 diff --git a/crawler/pom.xml b/crawler/pom.xml index d8cde5a4..157ff6a3 100644 --- a/crawler/pom.xml +++ b/crawler/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -15,7 +15,7 @@ info.xiaomo core - 2017.2 + 2020.1 org.springframework.boot diff --git a/crawler/src/main/resources/config/application.properties b/crawler/src/main/resources/config/application.properties index 1a4a1da6..8d5bd3e7 100644 --- a/crawler/src/main/resources/config/application.properties +++ b/crawler/src/main/resources/config/application.properties @@ -1,6 +1,5 @@ logging.config=classpath:config/logback-dev.xml server.port=8080 -server.session.timeout=1800 server.max-http-header-size=20971520 #datasource @@ -8,7 +7,7 @@ spring.datasource.url=jdbc:mysql://ip/db?characterEncoding=utf8&useSSL=true # ?useUnicode=true&characterEncoding=UTF-8 spring.datasource.username=username spring.datasource.password=password -spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver # \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4 #spring.jackson.date-format=yyyy-MM-dd HH:mm:ss #spring.jackson.time-zone=GMT+8 diff --git a/freemarker/pom.xml b/freemarker/pom.xml index 856c083f..d866ff82 100644 --- a/freemarker/pom.xml +++ b/freemarker/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -14,7 +14,7 @@ info.xiaomo core - 2017.2 + 2020.1 org.springframework.boot diff --git a/freemarker/src/main/resources/config/application.properties b/freemarker/src/main/resources/config/application.properties index 8ac071cd..ae76e147 100644 --- a/freemarker/src/main/resources/config/application.properties +++ b/freemarker/src/main/resources/config/application.properties @@ -1,6 +1,6 @@ logging.config=classpath:config/logback-dev.xml server.port=8080 -server.session.timeout=1800 + server.max-http-header-size=20971520 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss diff --git a/javase/pom.xml b/javase/pom.xml index 14560de4..e3a3c480 100644 --- a/javase/pom.xml +++ b/javase/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -15,7 +15,7 @@ info.xiaomo core - 2017.2 + 2020.1 org.springframework.boot diff --git a/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java b/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java index 90bb52c3..d76c4876 100644 --- a/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java +++ b/javase/src/main/java/info/xiaomo/javase/controller/QuestionController.java @@ -44,7 +44,7 @@ public QuestionController(QuestionService service) { * @param id id * @return result */ - @ApiOperation(value = "查找问题", notes = "查找问题", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "查找问题", notes = "查找问题", httpMethod = "GET") @RequestMapping(value = "findById/{id}", method = RequestMethod.GET) @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path"), @@ -52,7 +52,7 @@ public QuestionController(QuestionService service) { public Result findUserById(@PathVariable("id") Long id) { QuestionModel questionModel = service.findById(id); if (questionModel == null) { - return new Result(CodeConst.NOT_FOUNT.getResultCode(), CodeConst.NOT_FOUNT.getMessage()); + return new Result<>(CodeConst.NOT_FOUNT.getResultCode(), CodeConst.NOT_FOUNT.getMessage()); } return new Result<>(questionModel); } @@ -62,7 +62,7 @@ public Result findUserById(@PathVariable("id") Long id) { * * @return result */ - @ApiOperation(value = "添加", notes = "添加", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "添加", notes = "添加", httpMethod = "POST") @RequestMapping(value = "findById/{id}", method = RequestMethod.POST) public Result addQuestion(@RequestBody QuestionModel questionModel) { boolean add = service.add(questionModel); diff --git a/javase/src/main/resources/config/application.properties b/javase/src/main/resources/config/application.properties index d83fc3f2..34b74282 100644 --- a/javase/src/main/resources/config/application.properties +++ b/javase/src/main/resources/config/application.properties @@ -1,13 +1,12 @@ logging.config=classpath:config/logback-dev.xml server.port=8080 -server.session.timeout=1800 server.max-http-header-size=20971520 #datasource spring.datasource.url=jdbc:mysql://ip/db?characterEncoding=utf8&useSSL=true # ?useUnicode=true&characterEncoding=UTF-8 spring.datasource.username=xiaomo spring.datasource.password=password -spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver # \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4 #spring.jackson.date-format=yyyy-MM-dd HH:mm:ss #spring.jackson.time-zone=GMT+8 @@ -23,12 +22,12 @@ spring.redis.host=ip spring.redis.port=6379 spring.redis.password= # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09 -spring.redis.pool.max-active=8 -# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09 -spring.redis.pool.max-wait=-1 -# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5 -spring.redis.pool.max-idle=8 -# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5 -spring.redis.pool.min-idle=0 +#spring.redis.pool.max-active=8 +## \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09 +#spring.redis.pool.max-wait=-1 +## \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5 +#spring.redis.pool.max-idle=8 +## \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5 +#spring.redis.pool.min-idle=0 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09 spring.redis.timeout=0 diff --git a/mongodb/pom.xml b/mongodb/pom.xml index 5a17eca2..f3ade783 100644 --- a/mongodb/pom.xml +++ b/mongodb/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -14,7 +14,7 @@ info.xiaomo core - 2017.2 + 2020.1 org.springframework.boot diff --git a/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java b/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java index 58f1dbdb..a7056409 100644 --- a/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java +++ b/mongodb/src/main/java/info/xiaomo/mongodb/controller/MongoUserController.java @@ -54,7 +54,7 @@ public Result add(@RequestBody MongoUser user) { @RequestMapping(value = "delete/{id}", method = RequestMethod.GET) public Result delete(@PathVariable("id") Long id) { service.delete(id); - return new Result(CodeConst.SUCCESS.getResultCode(), CodeConst.SUCCESS.getMessage()); + return new Result<>(CodeConst.SUCCESS.getResultCode(), CodeConst.SUCCESS.getMessage()); } } diff --git a/mongodb/src/main/resources/config/application.properties b/mongodb/src/main/resources/config/application.properties index 8676bc6c..192ebb13 100644 --- a/mongodb/src/main/resources/config/application.properties +++ b/mongodb/src/main/resources/config/application.properties @@ -1,6 +1,6 @@ logging.config=classpath:config/logback-dev.xml server.port=8080 -server.session.timeout=1800 + server.max-http-header-size=20971520 #mongodb diff --git a/multipleSource/pom.xml b/multipleSource/pom.xml index dced9ad7..52e3b92d 100644 --- a/multipleSource/pom.xml +++ b/multipleSource/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -15,7 +15,7 @@ info.xiaomo core - 2017.2 + 2020.1 org.springframework.boot diff --git a/multipleSource/src/main/resources/config/application.properties b/multipleSource/src/main/resources/config/application.properties index 1f0a93a5..f1910361 100644 --- a/multipleSource/src/main/resources/config/application.properties +++ b/multipleSource/src/main/resources/config/application.properties @@ -1,6 +1,6 @@ logging.config=classpath:config/logback-dev.xml server.port=8080 -server.session.timeout=1800 + server.max-http-header-size=20971520 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss @@ -10,13 +10,13 @@ spring.jackson.time-zone=GMT+8 spring.datasource.primary.url=jdbc:mysql://ip:3306/test1?characterEncoding=utf8&useSSL=true spring.datasource.primary.username=\u4F60\u7684\u5E10\u53F7 spring.datasource.primary.password=\u4F60\u7684\u5BC6\u7801 -spring.datasource.primary.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver #database2 spring.datasource.secondary.url=jdbc:mysql://ip:3306/test2?characterEncoding=utf8&useSSL=true spring.datasource.secondary.username=\u5E10\u53F7 spring.datasource.secondary.password=\u4F60\u7684\u5BC6\u7801 -spring.datasource.secondary.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.secondary.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/mybatis/pom.xml b/mybatis/pom.xml index 1f021924..aca5b38b 100644 --- a/mybatis/pom.xml +++ b/mybatis/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -15,7 +15,7 @@ info.xiaomo core - 2017.2 + 2020.1 org.mybatis.spring.boot diff --git a/mybatis/src/main/resources/config/application.properties b/mybatis/src/main/resources/config/application.properties index c75522bf..b138051d 100644 --- a/mybatis/src/main/resources/config/application.properties +++ b/mybatis/src/main/resources/config/application.properties @@ -1,6 +1,6 @@ logging.config=classpath:config/logback-dev.xml server.port=8080 -server.session.timeout=1800 + server.max-http-header-size=20971520 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss @@ -11,7 +11,7 @@ spring.jackson.time-zone=GMT+8 spring.datasource.url=jdbc:mysql://ip:3306/db?characterEncoding=utf8&useSSL=true spring.datasource.username=username spring.datasource.password=password -spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/order/pom.xml b/order/pom.xml index 7c8e3fb7..fed4e2b0 100644 --- a/order/pom.xml +++ b/order/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -14,7 +14,7 @@ info.xiaomo core - 2017.2 + 2020.1 org.springframework.boot diff --git a/order/src/main/java/info/xiaomo/order/controller/OrderController.java b/order/src/main/java/info/xiaomo/order/controller/OrderController.java index f215d9ff..416d1c4d 100644 --- a/order/src/main/java/info/xiaomo/order/controller/OrderController.java +++ b/order/src/main/java/info/xiaomo/order/controller/OrderController.java @@ -28,7 +28,7 @@ public OrderController(OrderService orderService) { @RequestMapping(value = "forbid/{id}", method = RequestMethod.GET) - @ApiOperation(value = "封号", notes = "根据传入的id对修改对应帐号状态", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "封号", notes = "根据传入的id对修改对应帐号状态", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "后台用户唯一id", required = true, dataType = "Long", paramType = "path") }) diff --git a/pom.xml b/pom.xml index 8dd1ca77..ff5ee3a0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 info.xiaomo xiaomo - 2017.2 + 2020.1 @@ -36,7 +36,9 @@ multipleSource crawler + javase + order pom @@ -48,30 +50,18 @@ - - - - - - - - - - - - UTF-8 - 1.8 + 11 3.5 4.12 - 5.1.38 + 8.0.21 1.7.21 @@ -85,7 +75,7 @@ 1.10.1 - 2.0.3.RELEASE + 2.3.0.RELEASE 3.5.1 @@ -93,7 +83,7 @@ 1.4.7 - 1.16.10 + 1.18.14 2.2.2 @@ -123,6 +113,11 @@ pom import + + dom4j + dom4j + 1.6.1 + junit junit @@ -246,16 +241,13 @@ maven-source-plugin - 2.1 + 3.2.0 true compile - - jar - diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index 5237d5c8..eed80ec6 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -15,7 +15,7 @@ info.xiaomo core - 2017.2 + 2020.1 org.springframework.boot diff --git a/rabbitmq/src/main/resources/config/application.properties b/rabbitmq/src/main/resources/config/application.properties index e2c21445..b3ab7a48 100644 --- a/rabbitmq/src/main/resources/config/application.properties +++ b/rabbitmq/src/main/resources/config/application.properties @@ -1,6 +1,6 @@ logging.config=classpath:config/logback-dev.xml server.port=8080 -server.session.timeout=1800 + server.max-http-header-size=20971520 # \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4 diff --git a/redis/pom.xml b/redis/pom.xml index 348bf85a..3ed31182 100644 --- a/redis/pom.xml +++ b/redis/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -15,7 +15,7 @@ info.xiaomo core - 2017.2 + 2020.1 org.springframework.boot diff --git a/redis/src/main/resources/config/application.properties b/redis/src/main/resources/config/application.properties index b25e5713..7721fe42 100644 --- a/redis/src/main/resources/config/application.properties +++ b/redis/src/main/resources/config/application.properties @@ -1,6 +1,6 @@ logging.config=classpath:config/logback-dev.xml server.port=8080 -server.session.timeout=1800 + server.max-http-header-size=20971520 # redis diff --git a/scheduled/pom.xml b/scheduled/pom.xml index b4bff7da..fa18839a 100644 --- a/scheduled/pom.xml +++ b/scheduled/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -14,7 +14,7 @@ info.xiaomo core - 2017.2 + 2020.1 diff --git a/scheduled/src/main/resources/config/application.properties b/scheduled/src/main/resources/config/application.properties index 2bbf0e38..7d2d7151 100644 --- a/scheduled/src/main/resources/config/application.properties +++ b/scheduled/src/main/resources/config/application.properties @@ -1,6 +1,6 @@ logging.config=classpath:config/logback-dev.xml server.port=8080 -server.session.timeout=1800 + server.max-http-header-size=20971520 # \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4 diff --git a/security/pom.xml b/security/pom.xml index bf01534e..2c3b2bda 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -15,7 +15,7 @@ info.xiaomo core - 2017.2 + 2020.1 org.springframework.boot diff --git a/security/src/main/resources/config/application.properties b/security/src/main/resources/config/application.properties index e32aee62..8d858203 100644 --- a/security/src/main/resources/config/application.properties +++ b/security/src/main/resources/config/application.properties @@ -1,6 +1,6 @@ logging.config=classpath:config/logback-dev.xml server.port=8080 -server.session.timeout=1800 + server.max-http-header-size=20971520 # \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss diff --git a/socket/pom.xml b/socket/pom.xml index c7509645..3739f943 100644 --- a/socket/pom.xml +++ b/socket/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -15,7 +15,7 @@ info.xiaomo core - 2017.2 + 2020.1 org.springframework.boot diff --git a/socket/src/main/resources/config/application.properties b/socket/src/main/resources/config/application.properties index 453a78fb..d1e72d0f 100644 --- a/socket/src/main/resources/config/application.properties +++ b/socket/src/main/resources/config/application.properties @@ -1,6 +1,6 @@ logging.config=classpath:config/logback-dev.xml server.port=8081 -server.session.timeout=1800 + server.max-http-header-size=20971520 diff --git a/thymeleaf/pom.xml b/thymeleaf/pom.xml index 6a7376b3..6d1b1f53 100644 --- a/thymeleaf/pom.xml +++ b/thymeleaf/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -14,7 +14,7 @@ info.xiaomo core - 2017.2 + 2020.1 org.springframework.boot diff --git a/thymeleaf/src/main/resources/config/application.properties b/thymeleaf/src/main/resources/config/application.properties index 9a461544..fec3b903 100644 --- a/thymeleaf/src/main/resources/config/application.properties +++ b/thymeleaf/src/main/resources/config/application.properties @@ -1,6 +1,6 @@ logging.config=classpath:config/logback-dev.xml server.port=8080 -server.session.timeout=1800 + server.max-http-header-size=20971520 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss diff --git a/website/pom.xml b/website/pom.xml index 5e3a88d4..3a00bf4f 100644 --- a/website/pom.xml +++ b/website/pom.xml @@ -5,7 +5,7 @@ xiaomo info.xiaomo - 2017.2 + 2020.1 4.0.0 @@ -15,7 +15,7 @@ info.xiaomo core - 2017.2 + 2020.1 org.springframework.boot @@ -43,6 +43,18 @@ swagger-bootstrap-ui 1.5 + + org.springframework + spring-webmvc + + + org.projectlombok + lombok + + + org.springframework.boot + spring-boot-starter-web + diff --git a/website/src/main/java/info/xiaomo/website/controller/AdminUserController.java b/website/src/main/java/info/xiaomo/website/controller/AdminUserController.java index 0756bbdc..c79e934b 100644 --- a/website/src/main/java/info/xiaomo/website/controller/AdminUserController.java +++ b/website/src/main/java/info/xiaomo/website/controller/AdminUserController.java @@ -56,7 +56,7 @@ public AdminUserController(AdminUserService service) { * @return Result */ @RequestMapping(value = "login/{userName}/{password}", method = RequestMethod.POST) - @ApiOperation(value = "获取用户信息", notes = "根据用户帐号和密码登录后台", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "获取用户信息", notes = "根据用户帐号和密码登录后台", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "userName", value = "用户名", required = true, dataType = "Result", paramType = "path"), @ApiImplicitParam(name = "password", value = "用户名", required = true, dataType = "Result", paramType = "path") @@ -65,13 +65,13 @@ public AdminUserController(AdminUserService service) { @ApiResponse(code = 404, message = "Not Found"), @ApiResponse(code = 400, message = "No Name Provided"), }) - public Result login(@PathVariable("userName") String userName, @PathVariable("password") String password) { + public Result login(@PathVariable("userName") String userName, @PathVariable("password") String password) { AdminModel adminModel = service.findAdminUserByUserName(userName); if (adminModel == null) { - return new Result(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage()); + return new Result<>(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage()); } if (!Md5Util.encode(password, adminModel.getSalt()).equals(adminModel.getPassword())) { - return new Result(CodeConst.AUTH_FAILED.getResultCode(), CodeConst.AUTH_FAILED.getMessage()); + return new Result<>(CodeConst.AUTH_FAILED.getResultCode(), CodeConst.AUTH_FAILED.getMessage()); } return new Result<>(adminModel); } @@ -82,7 +82,7 @@ public Result login(@PathVariable("userName") String userName, @PathVariable("pa * * @return Result */ - @ApiOperation(value = "添加后台用户", notes = "传一个管理员用户模型过来然后保存到数据库", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "添加后台用户", notes = "传一个管理员用户模型过来然后保存到数据库", httpMethod = "POST") @RequestMapping(value = "add", method = RequestMethod.POST) @ApiResponses(value = { @ApiResponse(code = 404, message = "Not Found"), @@ -91,7 +91,7 @@ public Result login(@PathVariable("userName") String userName, @PathVariable("pa public Result add(@RequestBody AdminModel model) { AdminModel adminModel = service.findAdminUserByUserName(model.getUserName()); if (adminModel != null) { - return new Result(CodeConst.ADMIN_USER_REPEAT.getResultCode(), CodeConst.ADMIN_USER_REPEAT.getMessage()); + return new Result<>(CodeConst.ADMIN_USER_REPEAT.getResultCode(), CodeConst.ADMIN_USER_REPEAT.getMessage()); } String salt = RandomUtil.createSalt(); model.setSalt(salt); @@ -106,7 +106,7 @@ public Result add(@RequestBody AdminModel model) { * @param id id * @return Result */ - @ApiOperation(value = "查找用户", notes = "根据传来的id查找用户并返回", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "查找用户", notes = "根据传来的id查找用户并返回", httpMethod = "GET") @RequestMapping(value = "findById/{id}", method = RequestMethod.GET) @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "后台用户唯一id", required = true, dataType = "Long", paramType = "path") @@ -118,7 +118,7 @@ public Result add(@RequestBody AdminModel model) { public Result findUserById(@PathVariable("id") Long id) { AdminModel adminModel = service.findAdminUserById(id); if (adminModel == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } return new Result<>(adminModel); } @@ -163,7 +163,7 @@ public Result findById(@PathVariable Long id) { * @return Result */ @Override - @ApiOperation(value = "查找用户", notes = "根据传来的用户名查找用户并返回", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "查找用户", notes = "根据传来的用户名查找用户并返回", httpMethod = "GET") @RequestMapping(value = "findByName/{userName}", method = RequestMethod.GET) @ApiImplicitParams({ @ApiImplicitParam(name = "userName", value = "用户名", required = true, dataType = "String", paramType = "path") @@ -175,7 +175,7 @@ public Result findById(@PathVariable Long id) { public Result findByName(@PathVariable("userName") String userName) { AdminModel adminModel = service.findAdminUserByUserName(userName); if (adminModel == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } return new Result<>(adminModel); } @@ -242,7 +242,7 @@ public Result delByIds(@PathVariable List ids) { * @throws UserNotFoundException UserNotFoundException */ @RequestMapping(value = "changePassword", method = RequestMethod.POST) - @ApiOperation(value = "修改用户密码", notes = "传来模型验证并修改密码", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "修改用户密码", notes = "传来模型验证并修改密码", httpMethod = "POST") @ApiResponses(value = { @ApiResponse(code = 404, message = "Not Found"), @ApiResponse(code = 400, message = "No Name Provided"), @@ -250,7 +250,7 @@ public Result delByIds(@PathVariable List ids) { public Result changePassword(@RequestBody AdminModel model) throws UserNotFoundException { AdminModel adminModel = service.findAdminUserByUserName(model.getUserName()); if (adminModel == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } String salt = RandomUtil.createSalt(); adminModel.setSalt(salt); @@ -266,7 +266,7 @@ public Result changePassword(@RequestBody AdminModel model) throws UserNotFoundE * @return 不分页 */ @RequestMapping(value = "findAll", method = RequestMethod.GET) - @ApiOperation(value = "返回所有用户信息", notes = "不分页", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "返回所有用户信息", notes = "不分页", httpMethod = "GET") @ApiResponses(value = { @ApiResponse(code = 404, message = "Not Found"), @ApiResponse(code = 400, message = "No Name Provided"), @@ -287,7 +287,7 @@ public Result getAll() { * @throws UserNotFoundException UserNotFoundException */ @RequestMapping(value = "delete/{id}", method = RequestMethod.GET) - @ApiOperation(value = "删除用户", notes = "根据传入的id删除对应的用户", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "删除用户", notes = "根据传入的id删除对应的用户", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "用户唯一id", required = true, dataType = "Long", paramType = "path") }) @@ -298,7 +298,7 @@ public Result getAll() { public Result deleteUserById(@PathVariable("id") Long id) throws UserNotFoundException { AdminModel adminModel = service.findAdminUserById(id); if (adminModel == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } service.deleteAdminUserById(id); return new Result<>(adminModel); @@ -312,7 +312,7 @@ public Result deleteUserById(@PathVariable("id") Long id) throws UserNotFoundExc * @throws UserNotFoundException UserNotFoundException */ @RequestMapping(value = "update/{userName}", method = RequestMethod.POST) - @ApiOperation(value = "更新用户信息", notes = "根据传入的模型更新用户信息", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "更新用户信息", notes = "根据传入的模型更新用户信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "userName", value = "用户名", required = true, dataType = "String", paramType = "path") }) @@ -338,7 +338,7 @@ public Result update(@PathVariable("userName") String userName) throws UserNotFo * @throws UserNotFoundException UserNotFoundException */ @RequestMapping(value = "forbid/{id}", method = RequestMethod.GET) - @ApiOperation(value = "封号", notes = "根据传入的id对修改对应帐号状态", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "封号", notes = "根据传入的id对修改对应帐号状态", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "后台用户唯一id", required = true, dataType = "Long", paramType = "path") }) @@ -349,7 +349,7 @@ public Result update(@PathVariable("userName") String userName) throws UserNotFo public Result forbid(@PathVariable("id") Long id) throws UserNotFoundException { AdminModel model = service.findAdminUserById(id); if (model == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } model = service.forbidAdminUserById(id); return new Result<>(model); diff --git a/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java b/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java index 0d8783cb..86452ba6 100644 --- a/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java +++ b/website/src/main/java/info/xiaomo/website/controller/ChangeLogController.java @@ -50,14 +50,14 @@ public ChangeLogController(ChangeLogService service) { */ @Override @RequestMapping(value = "findById/{id}", method = RequestMethod.GET) - @ApiOperation(value = "通过id查找", notes = "通过id查找", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "通过id查找", notes = "通过id查找", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path") }) public Result findById(@PathVariable("id") Long id) { ChangeLogModel changeLogModel = service.findById(id); if (changeLogModel == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } return new Result<>(changeLogModel); } @@ -69,14 +69,14 @@ public Result findById(@PathVariable("id") Long id) { */ @Override @RequestMapping(value = "findByName/{name}", method = RequestMethod.GET) - @ApiOperation(value = "通过名字查找", notes = "通过名字查找", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "通过名字查找", notes = "通过名字查找", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "name", value = "更新日志内容", required = true, dataType = "String", paramType = "path") }) public Result findByName(@PathVariable("name") String name) { ChangeLogModel model = service.findByName(name); if (model == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } return new Result<>(model); } @@ -143,11 +143,11 @@ public Result delByIds(@PathVariable List ids) { */ @Override @RequestMapping(value = "findAll", method = RequestMethod.GET) - @ApiOperation(value = "分页查询更新日志", notes = "分页查询更新日志", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "分页查询更新日志", notes = "分页查询更新日志", httpMethod = "GET") public Result findAll() { List pages = service.findAll(); if (pages == null || pages.size() <= 0) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } return new Result<>(pages); } @@ -169,12 +169,12 @@ public Result findAll(@PathVariable int start, @PathVariable int pageSize) * * @return result */ - @ApiOperation(value = "增加更新日志", notes = "增加更新日志", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "增加更新日志", notes = "增加更新日志", httpMethod = "POST") @RequestMapping(value = "add", method = RequestMethod.POST) public Result add(@RequestBody ChangeLogModel model) { ChangeLogModel changeLogModel = service.findByName(model.getName()); if (changeLogModel != null) { - return new Result(CodeConst.REPEAT.getResultCode(), CodeConst.REPEAT.getMessage()); + return new Result<>(CodeConst.REPEAT.getResultCode(), CodeConst.REPEAT.getMessage()); } changeLogModel = new ChangeLogModel(); changeLogModel.setName(model.getName()); @@ -189,12 +189,12 @@ public Result add(@RequestBody ChangeLogModel model) { * * @return result */ - @ApiOperation(value = "修改更新日志", notes = "修改更新日志", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "修改更新日志", notes = "修改更新日志", httpMethod = "POST") @RequestMapping(value = "update", method = RequestMethod.POST) public Result update(@RequestBody ChangeLogModel model) { ChangeLogModel changeLogModel = service.findByName(model.getName()); if (changeLogModel == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } changeLogModel.setName(model.getName()); changeLogModel.setOnlineTime(model.getOnlineTime()); @@ -207,14 +207,14 @@ public Result update(@RequestBody ChangeLogModel model) { * 删除更新日志 */ @RequestMapping(value = "delete/{id}", method = RequestMethod.GET) - @ApiOperation(value = "删除更新日志", notes = "删除更新日志", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "删除更新日志", notes = "删除更新日志", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path") }) public Result deleteById(@PathVariable("id") Long id) { ChangeLogModel changeLogModel = service.findById(id); if (changeLogModel == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } ChangeLogModel delModel = service.delete(id); return new Result<>(delModel); diff --git a/website/src/main/java/info/xiaomo/website/controller/LinkController.java b/website/src/main/java/info/xiaomo/website/controller/LinkController.java index 6aa52756..1afd6385 100644 --- a/website/src/main/java/info/xiaomo/website/controller/LinkController.java +++ b/website/src/main/java/info/xiaomo/website/controller/LinkController.java @@ -49,7 +49,7 @@ public LinkController(LinkService service) { * @return model */ @RequestMapping(value = "findById/{id}", method = RequestMethod.GET) - @ApiOperation(value = "通过id查找", notes = "通过id查找", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "通过id查找", notes = "通过id查找", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path") }) @@ -69,7 +69,7 @@ public Result findLinkById(@PathVariable("id") Long id) { */ @Override @RequestMapping(value = "findByName/{name}", method = RequestMethod.GET) - @ApiOperation(value = "根据名字查找", notes = "根据名字查找", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "根据名字查找", notes = "根据名字查找", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "name", value = "友情链接名字", required = true, dataType = "String", paramType = "path") }) @@ -144,7 +144,7 @@ public Result delByIds(@PathVariable List ids) { */ @Override @RequestMapping(value = "findAll", method = RequestMethod.GET) - @ApiOperation(value = "返回所有数据", notes = "返回所有数据", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "返回所有数据", notes = "返回所有数据", httpMethod = "GET") public Result findAll() { List pages = service.findAll(); if (pages == null || pages.size() == 0) { @@ -182,7 +182,7 @@ public Result findById(@PathVariable Long id) { * @return model */ @RequestMapping(value = "add", method = RequestMethod.POST) - @ApiOperation(value = "添加链接", notes = "添加链接", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "添加链接", notes = "添加链接", httpMethod = "POST") public Result add(@RequestBody LinkModel model) { LinkModel linkModel = service.findByName(model.getName()); if (linkModel != null) { @@ -200,7 +200,7 @@ public Result add(@RequestBody LinkModel model) { * * @return model */ - @ApiOperation(value = "更新链接", notes = "更新链接", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "更新链接", notes = "更新链接", httpMethod = "POST") @RequestMapping(value = "update", method = RequestMethod.POST) public Result update(@RequestBody LinkModel model) { LinkModel linkModel = service.findById(model.getId()); @@ -220,7 +220,7 @@ public Result update(@RequestBody LinkModel model) { * @return model */ @RequestMapping(value = "delete/{id}", method = RequestMethod.GET) - @ApiOperation(value = "删除链接", notes = "删除链接", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "删除链接", notes = "删除链接", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path") }) diff --git a/website/src/main/java/info/xiaomo/website/controller/TechnologyController.java b/website/src/main/java/info/xiaomo/website/controller/TechnologyController.java index 409c0337..46601a9a 100644 --- a/website/src/main/java/info/xiaomo/website/controller/TechnologyController.java +++ b/website/src/main/java/info/xiaomo/website/controller/TechnologyController.java @@ -20,7 +20,6 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * * @author : xiaomo * github: https://github.com/houko @@ -45,21 +44,21 @@ public TechnologyController(TechnologyService service) { @Override - @ApiOperation(value = "根据id查找技术", notes = "根据id查找技术", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "根据id查找技术", notes = "根据id查找技术", httpMethod = "GET") @RequestMapping(value = "/findById/{id}", method = RequestMethod.GET) @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "唯一Id", required = true, dataType = "Long", paramType = "path") }) - public Result findById(@PathVariable Long id) { + public Result findById(@PathVariable Long id) { TechnologyModel model = service.findById(id); if (model == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } return new Result<>(model); } @Override - @ApiOperation(value = "根据名字查找技术", notes = "根据名字查找技术", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "根据名字查找技术", notes = "根据名字查找技术", httpMethod = "GET") @RequestMapping(value = "/findByName/{name}", method = RequestMethod.GET) @ApiImplicitParams({ @ApiImplicitParam(name = "name", value = "技术名字", required = true, dataType = "name", paramType = "path") @@ -67,7 +66,7 @@ public Result findById(@PathVariable Long id) { public Result findByName(@PathVariable String name) { TechnologyModel model = service.findByName(name); if (model == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } return new Result<>(model); } @@ -128,12 +127,12 @@ public Result delByIds(@PathVariable List ids) { } @Override - @ApiOperation(value = "查找所有", notes = "查找所有", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "查找所有", notes = "查找所有", httpMethod = "GET") @RequestMapping(value = "/findAll", method = RequestMethod.GET) public Result findAll() { List all = service.findAll(); if (all == null || all.isEmpty()) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } return new Result<>(all); } @@ -151,23 +150,23 @@ public Result findAll(@PathVariable int start, @PathVariable int pageSize) } - @ApiOperation(value = "添加链接", notes = "添加链接", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "添加链接", notes = "添加链接", httpMethod = "POST") @RequestMapping(value = "/add", method = RequestMethod.POST) public Result add(@RequestBody TechnologyModel model) { TechnologyModel addModel = service.findByName(model.getName()); if (addModel != null) { - return new Result(CodeConst.REPEAT.getResultCode(), CodeConst.REPEAT.getMessage()); + return new Result<>(CodeConst.REPEAT.getResultCode(), CodeConst.REPEAT.getMessage()); } addModel = service.add(model); return new Result<>(addModel); } - @ApiOperation(value = "更新链接", notes = "更新链接", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "更新链接", notes = "更新链接", httpMethod = "POST") @RequestMapping(value = "/update", method = RequestMethod.POST) public Result update(@RequestBody TechnologyModel model) { TechnologyModel update = service.findById(model.getId()); if (update == null) { - return new Result(CodeConst.CodeOR.getResultCode(), CodeConst.CodeOR.getMessage()); + return new Result<>(CodeConst.CodeOR.getResultCode(), CodeConst.CodeOR.getMessage()); } update = service.update(model); return new Result<>(update); @@ -175,14 +174,14 @@ public Result update(@RequestBody TechnologyModel model) { @RequestMapping(value = "/delete/{id}", method = RequestMethod.GET) - @ApiOperation(value = "删除链接", notes = "删除链接", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "删除链接", notes = "删除链接", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path") }) public Result delete(@PathVariable Long id) { TechnologyModel model = service.findById(id); if (model == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } service.del(id); return new Result<>(model); diff --git a/website/src/main/java/info/xiaomo/website/controller/UserController.java b/website/src/main/java/info/xiaomo/website/controller/UserController.java index 1ab1b414..5a4ca6d9 100644 --- a/website/src/main/java/info/xiaomo/website/controller/UserController.java +++ b/website/src/main/java/info/xiaomo/website/controller/UserController.java @@ -56,7 +56,7 @@ public UserController(UserService service) { * @param id id * @return result */ - @ApiOperation(value = "查找用户", notes = "查找用户", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "查找用户", notes = "查找用户", httpMethod = "GET") @RequestMapping(value = "findById/{id}", method = RequestMethod.GET) @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path"), @@ -64,18 +64,18 @@ public UserController(UserService service) { @SuppressWarnings("unchecked") public Result findUserById(@PathVariable("id") Long id) { Optional optional = service.findUserById(id); - return optional.map(Result::new).orElseGet(() -> new Result(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage())); + return optional.map(Result::new).orElseGet(() -> new Result<>(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage())); } /** * 添加用户 */ - @ApiOperation(value = "添加用户", notes = "添加用户", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "添加用户", notes = "添加用户", httpMethod = "POST") @RequestMapping(value = "addUser", method = RequestMethod.POST) public Result addUser(@RequestBody UserModel user) { UserModel userModel = service.findUserByEmail(user.getEmail()); if (userModel != null) { - return new Result(CodeConst.USER_REPEAT.getResultCode(), CodeConst.USER_REPEAT.getMessage()); + return new Result<>(CodeConst.USER_REPEAT.getResultCode(), CodeConst.USER_REPEAT.getMessage()); } String salt = RandomUtil.createSalt(); user.setPassword(Md5Util.encode(user.getPassword(), salt)); @@ -90,7 +90,7 @@ public Result addUser(@RequestBody UserModel user) { * * @return result */ - @ApiOperation(value = "注册", notes = "注册用户并发送验证链接到邮箱", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "注册", notes = "注册用户并发送验证链接到邮箱", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "用户名", required = true, dataType = "String", paramType = "path"), @ApiImplicitParam(name = "密码", required = true, dataType = "String", paramType = "path") @@ -100,7 +100,7 @@ public Result register(@PathVariable("email") String email, @PathVariable("passw UserModel userModel = service.findUserByEmail(email); //邮箱被占用 if (userModel != null) { - return new Result(CodeConst.USER_REPEAT.getResultCode(), CodeConst.USER_REPEAT.getMessage()); + return new Result<>(CodeConst.USER_REPEAT.getResultCode(), CodeConst.USER_REPEAT.getMessage()); } String redirectValidateUrl = MailUtil.redirectValidateUrl(email, password); MailUtil.send(email, "帐号激活邮件", redirectValidateUrl); @@ -113,7 +113,7 @@ public Result register(@PathVariable("email") String email, @PathVariable("passw * * @return result */ - @ApiOperation(value = "登录", notes = "登录", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "登录", notes = "登录", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "email", value = "邮箱", required = true, dataType = "String", paramType = "path"), @ApiImplicitParam(name = "password", value = "密码", required = true, dataType = "String", paramType = "path") @@ -123,11 +123,11 @@ public Result login(@PathVariable("email") String email, @PathVariable("password UserModel userModel = service.findUserByEmail(email); //找不到用户 if (userModel == null) { - return new Result(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage()); + return new Result<>(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage()); } //密码不正确 if (!Md5Util.encode(password, userModel.getSalt()).equals(userModel.getPassword())) { - return new Result(CodeConst.AUTH_FAILED.getResultCode(), CodeConst.AUTH_FAILED.getMessage()); + return new Result<>(CodeConst.AUTH_FAILED.getResultCode(), CodeConst.AUTH_FAILED.getMessage()); } return new Result<>(userModel); } @@ -139,12 +139,12 @@ public Result login(@PathVariable("email") String email, @PathVariable("password * @return model * @throws UserNotFoundException UserNotFoundException */ - @ApiOperation(value = "修改密码", notes = "修改密码", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "修改密码", notes = "修改密码", httpMethod = "POST") @RequestMapping(value = "changePassword", method = RequestMethod.POST) public Result changePassword(@RequestBody UserModel user) throws UserNotFoundException { UserModel userByEmail = service.findUserByEmail(user.getEmail()); if (userByEmail == null) { - return new Result(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage()); + return new Result<>(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage()); } String salt = RandomUtil.createSalt(); userByEmail.setPassword(Md5Util.encode(user.getPassword(), salt)); @@ -160,12 +160,12 @@ public Result changePassword(@RequestBody UserModel user) throws UserNotFoundExc * @return model * @throws UserNotFoundException UserNotFoundException */ - @ApiOperation(value = "更新用户信息", notes = "更新用户信息", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "更新用户信息", notes = "更新用户信息", httpMethod = "POST") @RequestMapping(value = "update", method = RequestMethod.POST) public Result update(@RequestBody UserModel user) throws UserNotFoundException { UserModel userModel = service.findUserByEmail(user.getEmail()); if (userModel == null) { - return new Result(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage()); + return new Result<>(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage()); } userModel = new UserModel(); userModel.setEmail(user.getEmail()); @@ -183,12 +183,12 @@ public Result update(@RequestBody UserModel user) throws UserNotFoundException { * * @return result */ - @ApiOperation(value = "返回所有用户数据", notes = "返回所有用户数据", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "返回所有用户数据", notes = "返回所有用户数据", httpMethod = "GET") @RequestMapping(value = "findAll", method = RequestMethod.GET) public Result getAll() { List pages = service.findAll(); if (pages == null || pages.size() <= 0) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } return new Result<>(pages); } @@ -201,14 +201,14 @@ public Result getAll() { * @return result */ @RequestMapping(value = "delete/{id}", method = RequestMethod.GET) - @ApiOperation(value = "根据id删除用户", notes = "根据id删除用户", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "根据id删除用户", notes = "根据id删除用户", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path"), }) public Result deleteUserById(@PathVariable("id") Long id) throws UserNotFoundException { UserModel userModel = service.deleteUserById(id); if (userModel == null) { - return new Result(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage()); + return new Result<>(CodeConst.USER_NOT_FOUND.getResultCode(), CodeConst.USER_NOT_FOUND.getMessage()); } return new Result<>(userModel); } @@ -216,19 +216,19 @@ public Result deleteUserById(@PathVariable("id") Long id) throws UserNotFoundExc /** * 处理激活 */ - @ApiOperation(value = "处理激活", notes = "处理激活", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "处理激活", notes = "处理激活", httpMethod = "POST") @RequestMapping(value = "validateEmail", method = RequestMethod.POST) public Result validateEmail(@RequestBody UserModel user ) throws ServiceException { //数据访问层，通过email获取用户信息 UserModel userModel = service.findUserByEmail(user.getEmail()); if (userModel != null) { - return new Result(CodeConst.USER_REPEAT.getResultCode(), CodeConst.USER_REPEAT.getMessage()); + return new Result<>(CodeConst.USER_REPEAT.getResultCode(), CodeConst.USER_REPEAT.getMessage()); } //验证码是否过期 if (user.getRegisterTime() + TimeUtil.ONE_DAY_IN_MILLISECONDS < TimeUtil.getNowOfMills()) { LOGGER.info("用户{}使用己过期的激活码{}激活邮箱失败！", user.getEmail(), user.getEmail()); - return new Result(CodeConst.TIME_PASSED.getResultCode(), CodeConst.TIME_PASSED.getMessage()); + return new Result<>(CodeConst.TIME_PASSED.getResultCode(), CodeConst.TIME_PASSED.getMessage()); } //激活 String salt = RandomUtil.createSalt(); diff --git a/website/src/main/java/info/xiaomo/website/controller/WorksController.java b/website/src/main/java/info/xiaomo/website/controller/WorksController.java index 6ce9f784..9817f244 100644 --- a/website/src/main/java/info/xiaomo/website/controller/WorksController.java +++ b/website/src/main/java/info/xiaomo/website/controller/WorksController.java @@ -1,6 +1,5 @@ package info.xiaomo.website.controller; -import info.xiaomo.core.base.BaseController; import info.xiaomo.core.base.Result; import info.xiaomo.core.constant.CodeConst; import info.xiaomo.website.model.WorksModel; @@ -10,8 +9,6 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; 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 java.util.List; @@ -20,7 +17,6 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * * @author : xiaomo * github: https://github.com/houko @@ -34,8 +30,8 @@ @RequestMapping("/works") @RestController -@Api(value = "作品相关api", description = "作品相关api") -public class WorksController extends BaseController { +@Api(value = "作品相关api") +public class WorksController { private final WorksService service; @@ -45,145 +41,75 @@ public WorksController(WorksService service) { } - @Override @RequestMapping(value = "/findById/{id}", method = RequestMethod.GET) - @ApiOperation(value = "根据id查找作品", notes = "根据id查找作品", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "根据id查找作品", notes = "根据id查找作品", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path"), }) - public Result findById(@PathVariable Long id) { + public Result findById(@PathVariable Long id) { WorksModel model = service.findById(id); if (model == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } return new Result<>(model); } - @Override @RequestMapping(value = "/findAll", method = RequestMethod.GET) - @ApiOperation(value = "查找所有", notes = "查找所有", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) - public Result findAll() { + @ApiOperation(value = "查找所有", notes = "查找所有", httpMethod = "GET") + public Result> findAll() { List all = service.findAll(); if (all == null || all.isEmpty()) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } return new Result<>(all); } - /** - * 带分页 - * - * @param start 起始页 - * @param pageSize 页码数 - * @return result - */ - @Override - public Result findAll(@PathVariable int start, @PathVariable int pageSize) { - return null; - } - - @Override @RequestMapping(value = "/findByName/{name}", method = RequestMethod.GET) - @ApiOperation(value = "根据名字查找作品", notes = "根据名字查找作品", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "根据名字查找作品", notes = "根据名字查找作品", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "name", value = "作品名字", required = true, dataType = "String", paramType = "path"), }) - public Result findByName(@PathVariable String name) { + public Result findByName(@PathVariable String name) { WorksModel model = service.findByName(name); if (model == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } return new Result<>(model); } - /** - * 根据名字删除模型 - * - * @param name name - * @return result - */ - @Override - public Result delByName(@PathVariable String name) { - return null; - } - - /** - * 根据id删除模型 - * - * @param id id - * @return result - */ - @Override - public Result delById(@PathVariable Long id) { - return null; - } - - /** - * 添加模型 - * - * @param model model - * @return result - */ - @Override - public Result add(@RequestBody Object model) { - return null; - } - - /** - * 更新 - * - * @param model model - * @return result - */ - @Override - public Result update(@RequestBody Object model) { - return null; - } - - /** - * 批量删除 - * - * @param ids ids - * @return result - */ - @Override - public Result delByIds(@PathVariable List ids) { - return null; - } - - @ApiOperation(value = "添加作品", notes = "添加作品", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "添加作品", notes = "添加作品", httpMethod = "POST") @RequestMapping(value = "/add", method = RequestMethod.POST) - public Result add(@RequestBody WorksModel model) { + public Result add(@RequestBody WorksModel model) { WorksModel addModel = service.findByName(model.getName()); if (addModel != null) { - return new Result(CodeConst.REPEAT.getResultCode(), CodeConst.REPEAT.getMessage()); + return new Result<>(CodeConst.REPEAT.getResultCode(), CodeConst.REPEAT.getMessage()); } addModel = service.add(model); return new Result<>(addModel); } - @ApiOperation(value = "更新作品", notes = "更新作品", httpMethod = "POST", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "更新作品", notes = "更新作品", httpMethod = "POST") @RequestMapping(value = "/update", method = RequestMethod.POST) - public Result update(@RequestBody WorksModel model) { + public Result update(@RequestBody WorksModel model) { WorksModel worksModel = service.findById(model.getId()); if (worksModel == null) { - return new Result(CodeConst.CodeOR.getResultCode(), CodeConst.CodeOR.getMessage()); + return new Result<>(CodeConst.CodeOR.getResultCode(), CodeConst.CodeOR.getMessage()); } worksModel = service.update(worksModel); return new Result<>(worksModel); } - @ApiOperation(value = "根据id删除作品", notes = "根据id删除作品", httpMethod = "GET", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "根据id删除作品", notes = "根据id删除作品", httpMethod = "GET") @RequestMapping(value = "/delete/{id}", method = RequestMethod.GET) @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "唯一id", required = true, dataType = "Long", paramType = "path"), }) - public Result delete(@PathVariable Long id) { + public Result delete(@PathVariable Long id) { WorksModel model = service.findById(id); if (model == null) { - return new Result(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); + return new Result<>(CodeConst.NULL_DATA.getResultCode(), CodeConst.NULL_DATA.getMessage()); } service.del(id); return new Result<>(model); diff --git a/website/src/main/java/info/xiaomo/website/interceptor/LoginInterceptor.java b/website/src/main/java/info/xiaomo/website/interceptor/LoginInterceptor.java index f3eff131..a981ef75 100644 --- a/website/src/main/java/info/xiaomo/website/interceptor/LoginInterceptor.java +++ b/website/src/main/java/info/xiaomo/website/interceptor/LoginInterceptor.java @@ -7,11 +7,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + /** * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * * @author : xiaomo * github: https://github.com/houko 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 index eb252a50..dcebc65b 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/AdminUserServiceImpl.java @@ -84,7 +84,7 @@ public AdminModel updateAdminUser(AdminModel model) throws UserNotFoundException @Override public Page getAdminUsers(int start, int pageSize) { - Sort sort = new Sort(Sort.Direction.DESC, "createTime"); + Sort sort = Sort.by(Sort.Direction.DESC, "createTime"); return dao.findAll(PageRequest.of(start - 1, pageSize, sort)); } 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 index a7526f51..aa603bd1 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/ChangeLogServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/ChangeLogServiceImpl.java @@ -49,7 +49,7 @@ public ChangeLogModel findByName(String name) { @Override public Page findAll(int start, int pageSize) { - Sort sort = new Sort(Sort.Direction.DESC, "createTime"); + Sort sort = Sort.by(Sort.Direction.DESC, "createTime"); return dao.findAll(PageRequest.of(start - 1, pageSize, sort)); } 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 index e592b225..1742a9e7 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/LinkServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/LinkServiceImpl.java @@ -17,7 +17,6 @@ * 把今天最好的表现当作明天最新的起点．．～ * いま 最高の表現 として 明日最新の始発．．～ * Today the best performance as tomorrow newest starter! - * * @author : xiaomo * github: https://github.com/houko @@ -49,7 +48,7 @@ public LinkModel findByName(String name) { @Override public Page findAll(int start, int pageSize) { - Sort sort = new Sort(Sort.Direction.DESC, "order"); + Sort sort = Sort.by(Sort.Direction.DESC, "order"); return dao.findAll(PageRequest.of(start - 1, pageSize, sort)); } 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 index 220fb3a1..f971ce79 100644 --- a/website/src/main/java/info/xiaomo/website/service/impl/UserServiceImpl.java +++ b/website/src/main/java/info/xiaomo/website/service/impl/UserServiceImpl.java @@ -86,7 +86,7 @@ public UserModel updateUser(UserModel model) throws UserNotFoundException { @Override public Page findAll(int start, int pageSize) { - Sort sort = new Sort(Sort.Direction.DESC, "createTime"); + Sort sort = Sort.by(Sort.Direction.DESC, "createTime"); return dao.findAll(PageRequest.of(start - 1, pageSize, sort)); } diff --git a/website/src/main/resources/config/application.properties b/website/src/main/resources/config/application.properties index 71bb2fbe..f830f53d 100644 --- a/website/src/main/resources/config/application.properties +++ b/website/src/main/resources/config/application.properties @@ -1,6 +1,6 @@ logging.config=classpath:config/logback-dev.xml server.port=8080 -server.session.timeout=1800 + server.max-http-header-size=20971520 #datasource @@ -8,7 +8,7 @@ spring.datasource.url=jdbc:mysql://ip/db?characterEncoding=utf8&useSSL=true # ?useUnicode=true&characterEncoding=UTF-8 spring.datasource.username=username spring.datasource.password=password -spring.datasource.driver-class-name=com.mysql.jdbc.Driver +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver # \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4 #spring.jackson.date-format=yyyy-MM-dd HH:mm:ss #spring.jackson.time-zone=GMT+8 diff --git a/website/src/test/java/info/xiaomo/test/MailTests.java b/website/src/test/java/info/xiaomo/test/MailTests.java deleted file mode 100644 index 3bff1dd0..00000000 --- a/website/src/test/java/info/xiaomo/test/MailTests.java +++ /dev/null @@ -1,71 +0,0 @@ -package info.xiaomo.test; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.io.FileSystemResource; -import org.springframework.mail.SimpleMailMessage; -import org.springframework.mail.javamail.JavaMailSender; -import org.springframework.mail.javamail.MimeMessageHelper; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import javax.mail.internet.MimeMessage; -import java.io.File; - - -@RunWith(SpringJUnit4ClassRunner.class) -public class MailTests { - - @Autowired - private JavaMailSender mailSender; - - - @Test - public void sendSimpleMail() throws Exception { - - SimpleMailMessage message = new SimpleMailMessage(); - message.setFrom("dyc87112@qq.com"); - message.setTo("dyc87112@qq.com"); - message.setSubject("主题：简单邮件"); - message.setText("测试邮件内容"); - - mailSender.send(message); - } - - @Test - public void sendAttachmentsMail() throws Exception { - - MimeMessage mimeMessage = mailSender.createMimeMessage(); - - MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true); - helper.setFrom("dyc87112@qq.com"); - helper.setTo("dyc87112@qq.com"); - helper.setSubject("主题：有附件"); - helper.setText("有附件的邮件"); - - FileSystemResource file = new FileSystemResource(new File("weixin.jpg")); - helper.addAttachment("附件-1.jpg", file); - helper.addAttachment("附件-2.jpg", file); - - mailSender.send(mimeMessage); - } - - @Test - public void sendInlineMail() throws Exception { - - MimeMessage mimeMessage = mailSender.createMimeMessage(); - - MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true); - helper.setFrom("dyc87112@qq.com"); - helper.setTo("dyc87112@qq.com"); - helper.setSubject("主题：嵌入静态资源"); - helper.setText("", true); - - FileSystemResource file = new FileSystemResource(new File("weixin.jpg")); - helper.addInline("weixin", file); - - mailSender.send(mimeMessage); - } - - -} diff --git a/website/src/test/resources/application.properties b/website/src/test/resources/application.properties deleted file mode 100644 index 41c59d16..00000000 --- a/website/src/test/resources/application.properties +++ /dev/null @@ -1,33 +0,0 @@ -logging.config=classpath:config/logback-dev.xml -server.port=8080 -server.session.timeout=1800 -server.max-http-header-size=20971520 - -#datasource -spring.datasource.url=jdbc:mysql://ip/\u6570\u636E\u5E93?characterEncoding=utf8&useSSL=true -# ?useUnicode=true&characterEncoding=UTF-8 -spring.datasource.username=\u4F60\u7684\u5E10\u53F7 -spring.datasource.password=\u4F60\u7684\u5BC6\u7801 -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -# \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4 -#spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -#spring.jackson.time-zone=GMT+8 - -#jpa -spring.jpa.database-platform=org.hibernate.dialect.MySQL5Dialect -spring.jpa.hibernate.ddl-auto=update -spring.jpa.show-sql=true -spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl - - -#\u90AE\u4EF6 -spring.mail.host=smtp.qq.com -spring.mail.username=83387856@qq.com -spring.mail.password=, -spring.mail.properties.mail.smtp.auth=true -spring.mail.properties.mail.smtp.starttls.enable=true -spring.mail.properties.mail.smtp.starttls.required=true - -#spring.data.mongodb.uri=mongodb://name:pass@localhost:27017/test - - From abb8e9b8a0cac101c4eee0c89b360cfb0a38947c Mon Sep 17 00:00:00 2001 From: houko Date: Fri, 9 Oct 2020 19:23:57 +0900 Subject: [PATCH 41/52] jdk 11 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7851aebe..34d145f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: java jdk: - - oraclejdk8 + - oraclejdk11 dist: trusty \ No newline at end of file From 6738a539b13d4b27b66bc3ae92922f2afc7a3018 Mon Sep 17 00:00:00 2001 From: houko Date: Fri, 9 Oct 2020 19:27:02 +0900 Subject: [PATCH 42/52] jdk 11 --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 207b7268..8c676685 100644 --- a/Readme.md +++ b/Readme.md @@ -8,7 +8,7 @@ ### 环境 - `maven` latest -- `jdk1.8` +- `jdk11` - `spring boot 2.x release` - 个人推荐`idea`来代替eclipse - git: 版本管理 From 8002dfbdfe7055e7de1ab376a89b39d1443da607 Mon Sep 17 00:00:00 2001 From: houko Date: Fri, 9 Oct 2020 19:32:37 +0900 Subject: [PATCH 43/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A02020.2=20=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Readme.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Readme.md b/Readme.md index 8c676685..0692e4dd 100644 --- a/Readme.md +++ b/Readme.md @@ -66,6 +66,12 @@ http://localhost:808/doc.html bootstrap-ui - 2017-11-03 合并`api`和`website`模块,访问`localhost:8080`会显示网站主页,访问`localhost:8080/api`会显示api管理界面 - 2018-04-09 将整个项目升级到spring boot2.0 release版本,api有较大变动 - 2019-08-06 travis-ci指定jdk版本 +- 2020-10-09 升级版本到2020.2 +- 2020-10-09 升级jdk版本到11 +- 2020-10-09 升级mysql connector到8 +- 2020-10-09 升级spring boot到2.3.0 +- 2020-10-09 修复了升级后API的破坏性变动，修复了一些了编辑器警告 + From 073cb8ef5e32ad195c60bb52f54b94ec31e5410d Mon Sep 17 00:00:00 2001 From: houko Date: Tue, 13 Oct 2020 14:23:44 +0900 Subject: [PATCH 44/52] upgrade junit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff5ee3a0..b17e93b6 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 3.5 - 4.12 + 4.13.1 8.0.21 From 2ab460a6192ff39aaf1af5380250a845fef8b6af Mon Sep 17 00:00:00 2001 From: Evan Date: Wed, 22 Jun 2022 17:59:46 +0900 Subject: [PATCH 45/52] Update Readme.md --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 0692e4dd..6f137c59 100644 --- a/Readme.md +++ b/Readme.md @@ -127,7 +127,7 @@ http://localhost:808/doc.html bootstrap-ui MIT License - Copyright (c) 2020 Peng Hu + Copyright (c) 2022 Peng Hu Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 59a23ad0d7c5e55ddc6a16baaa377238250eeb56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 09:00:16 +0000 Subject: [PATCH 46/52] Bump mysql-connector-java from 8.0.21 to 8.0.28 Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.21 to 8.0.28. - [Release notes](https://github.com/mysql/mysql-connector-j/releases) - [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES) - [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.21...8.0.28) --- updated-dependencies: - dependency-name: mysql:mysql-connector-java dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b17e93b6..23674d2a 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 4.13.1 - 8.0.21 + 8.0.28 1.7.21 From a670542f40b8ebd4500418f49494b316ba5267bc Mon Sep 17 00:00:00 2001 From: Evan Date: Wed, 22 Jun 2022 18:00:28 +0900 Subject: [PATCH 47/52] Create codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 72 +++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 00000000..1620e2e5 --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,72 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ "master" ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "master" ] + schedule: + - cron: '24 7 * * 0' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'java' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + # ℹ️ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 From e8da169f8e11955e62e3ef94833387275d0fb145 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 09:00:34 +0000 Subject: [PATCH 48/52] Bump spring-boot-starter-web from 2.3.0.RELEASE to 2.5.12 Bumps [spring-boot-starter-web](https://github.com/spring-projects/spring-boot) from 2.3.0.RELEASE to 2.5.12. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.3.0.RELEASE...v2.5.12) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b17e93b6..49c58294 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 1.10.1 - 2.3.0.RELEASE + 2.5.12 3.5.1 From 3acc7cd514e6caed4afa1708f56241f20781413e Mon Sep 17 00:00:00 2001 From: Evan Date: Wed, 22 Jun 2022 18:00:54 +0900 Subject: [PATCH 49/52] Create SECURITY.md --- SECURITY.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..034e8480 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,21 @@ +# Security Policy + +## Supported Versions + +Use this section to tell people about which versions of your project are +currently being supported with security updates. + +| Version | Supported | +| ------- | ------------------ | +| 5.1.x | :white_check_mark: | +| 5.0.x | :x: | +| 4.0.x | :white_check_mark: | +| < 4.0 | :x: | + +## Reporting a Vulnerability + +Use this section to tell people how to report a vulnerability. + +Tell them where to go, how often they can expect to get an update on a +reported vulnerability, what to expect if the vulnerability is accepted or +declined, etc. From 31888c7068f20d7e5972cc89ac3bea7fd5325edb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 09:01:05 +0000 Subject: [PATCH 50/52] Bump poi from 3.10-beta2 to 3.17 Bumps poi from 3.10-beta2 to 3.17. --- updated-dependencies: - dependency-name: org.apache.poi:poi dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b17e93b6..14815c7a 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ 2.6.12 - 3.10-beta2 + 3.17 From b783f976e19d418149ddf59fc736b709abf0f1aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 09:02:18 +0000 Subject: [PATCH 51/52] Bump jsoup from 1.10.1 to 1.14.2 Bumps [jsoup](https://github.com/jhy/jsoup) from 1.10.1 to 1.14.2. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES) - [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.10.1...jsoup-1.14.2) --- updated-dependencies: - dependency-name: org.jsoup:jsoup dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5f61043c..4b280e7e 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ [1.2.31,) - 1.10.1 + 1.14.2 2.5.12 From fbbceec7f7fdd907884b6ae43f67dc0258d38b27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 09:05:19 +0000 Subject: [PATCH 52/52] Bump commons-io from 2.5 to 2.7 Bumps commons-io from 2.5 to 2.7. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b280e7e..5b1f7919 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 1.1.7 - 2.5 + 2.7 [1.3.3,)