diff --git a/bootdo/.gitignore b/.gitignore
similarity index 100%
rename from bootdo/.gitignore
rename to .gitignore
diff --git "a/bootdo/bootdo(\345\246\202\346\236\234\346\212\245\351\224\231\350\257\267\346\211\247\350\241\214\350\277\231\344\270\252\345\205\274\345\256\271\347\211\210\346\234\254).sql" "b/bootdo(\345\246\202\346\236\234\346\212\245\351\224\231\350\257\267\346\211\247\350\241\214\350\277\231\344\270\252\345\205\274\345\256\271\347\211\210\346\234\254).sql"
similarity index 100%
rename from "bootdo/bootdo(\345\246\202\346\236\234\346\212\245\351\224\231\350\257\267\346\211\247\350\241\214\350\277\231\344\270\252\345\205\274\345\256\271\347\211\210\346\234\254).sql"
rename to "bootdo(\345\246\202\346\236\234\346\212\245\351\224\231\350\257\267\346\211\247\350\241\214\350\277\231\344\270\252\345\205\274\345\256\271\347\211\210\346\234\254).sql"
diff --git a/bootdo/bootdo.sql b/bootdo.sql
similarity index 100%
rename from bootdo/bootdo.sql
rename to bootdo.sql
diff --git a/bootdo/src/main/resources/static/css/.DS_Store b/bootdo/src/main/resources/static/css/.DS_Store
deleted file mode 100644
index cfec20c7460366091f0a1ca38cbcd2898edc493d..0000000000000000000000000000000000000000
Binary files a/bootdo/src/main/resources/static/css/.DS_Store and /dev/null differ
diff --git a/bootdo/src/main/resources/static/docs/.DS_Store b/bootdo/src/main/resources/static/docs/.DS_Store
deleted file mode 100644
index 8226a56a70482430d45f369f4480db8945d5c9f1..0000000000000000000000000000000000000000
Binary files a/bootdo/src/main/resources/static/docs/.DS_Store and /dev/null differ
diff --git a/bootdo/src/main/resources/static/img/.DS_Store b/bootdo/src/main/resources/static/img/.DS_Store
deleted file mode 100644
index 9a92c7eefe3f1ff8c89b9a0bee6f0edd5c7d4463..0000000000000000000000000000000000000000
Binary files a/bootdo/src/main/resources/static/img/.DS_Store and /dev/null differ
diff --git a/bootdo/src/main/resources/static/js/.DS_Store b/bootdo/src/main/resources/static/js/.DS_Store
deleted file mode 100644
index b34c7460ba31ec4ffb2d4d81264d44a86d9455fc..0000000000000000000000000000000000000000
Binary files a/bootdo/src/main/resources/static/js/.DS_Store and /dev/null differ
diff --git a/bootdo/src/main/resources/static/js/plugins/bootstrap-table/.DS_Store b/bootdo/src/main/resources/static/js/plugins/bootstrap-table/.DS_Store
deleted file mode 100644
index 3b4f88d240af9be4e017f58dbf6d0c7ce93612f9..0000000000000000000000000000000000000000
Binary files a/bootdo/src/main/resources/static/js/plugins/bootstrap-table/.DS_Store and /dev/null differ
diff --git a/bootdo/src/main/resources/static/js/plugins/echarts/.DS_Store b/bootdo/src/main/resources/static/js/plugins/echarts/.DS_Store
deleted file mode 100644
index 303a88eb384a6e273ecea24131629f95586801f1..0000000000000000000000000000000000000000
Binary files a/bootdo/src/main/resources/static/js/plugins/echarts/.DS_Store and /dev/null differ
diff --git a/bootdo/src/main/resources/static/js/plugins/layer/.DS_Store b/bootdo/src/main/resources/static/js/plugins/layer/.DS_Store
deleted file mode 100644
index e516f0111d8c6586e26a18066e31e9e5d193b421..0000000000000000000000000000000000000000
Binary files a/bootdo/src/main/resources/static/js/plugins/layer/.DS_Store and /dev/null differ
diff --git a/bootdo/src/main/resources/static/js/plugins/suggest/.DS_Store b/bootdo/src/main/resources/static/js/plugins/suggest/.DS_Store
deleted file mode 100644
index dbbaa7226c8401c68e08d3349211cb097cc8d08e..0000000000000000000000000000000000000000
Binary files a/bootdo/src/main/resources/static/js/plugins/suggest/.DS_Store and /dev/null differ
diff --git a/bootdo/src/main/resources/static/js/plugins/webuploader/.DS_Store b/bootdo/src/main/resources/static/js/plugins/webuploader/.DS_Store
deleted file mode 100644
index e94517ab2bbb9252bb5b1b86b92eca39d3568d1a..0000000000000000000000000000000000000000
Binary files a/bootdo/src/main/resources/static/js/plugins/webuploader/.DS_Store and /dev/null differ
diff --git a/bootdo/src/main/resources/templates/login.html b/bootdo/src/main/resources/templates/login.html
deleted file mode 100644
index 64db799d4becd36bc775190ad53634fb8735ad9d..0000000000000000000000000000000000000000
--- a/bootdo/src/main/resources/templates/login.html
+++ /dev/null
@@ -1,193 +0,0 @@
-
-
-
-
-
-
- BootDo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
BootDo
-
-
-
- 欢迎使用 BootDo管理系统
-
-
- -
- springBoot
-
- - mybatis
- - shiro
- -
- thymeleaf
-
- -
- bootstrap
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/bootdo/src/test/java/com/bootdo/testDemo/TestDemo.java b/bootdo/src/test/java/com/bootdo/testDemo/TestDemo.java
deleted file mode 100644
index 4ff04b7b9d0b7b872581206509a23a26bf9e14ce..0000000000000000000000000000000000000000
--- a/bootdo/src/test/java/com/bootdo/testDemo/TestDemo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.bootdo.testDemo;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController()
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class TestDemo {
- @Autowired
- RedisTemplate redisTemplate;
-
- @Test
- public void test() {
- redisTemplate.opsForValue().set("a", "b");
- System.out.println(redisTemplate.opsForValue().get("a"));
- }
-
- ;
-}
diff --git a/bootdo/pom.xml b/pom.xml
similarity index 88%
rename from bootdo/pom.xml
rename to pom.xml
index b9befe526d120fe36977356301e50363bb4cc28d..a3c0e4af60dfb044a5995305527e1e838d0b4d8d 100644
--- a/bootdo/pom.xml
+++ b/pom.xml
@@ -71,6 +71,12 @@
mybatis-spring-boot-starter
1.1.1
+
+
+ com.baomidou
+ mybatis-plus
+ 2.1.8
+
com.alibaba
@@ -256,12 +262,50 @@
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+ org.apache.httpcomponents
+ httpclient
+
+
+
+ redis.clients
+ jedis
+
+
+
+ cn.hutool
+ hutool-all
+ 4.6.8
+
+
+
+
+
+
org.springframework.boot
spring-boot-maven-plugin
+ 2.0.5.RELEASE
+
+
+
+ repackage
+
+
+
true
diff --git a/bootdo/src/main/java/com/bootdo/BootdoApplication.java b/src/main/java/com/bootdo/BootdoApplication.java
similarity index 99%
rename from bootdo/src/main/java/com/bootdo/BootdoApplication.java
rename to src/main/java/com/bootdo/BootdoApplication.java
index 4555095b70c9081de72fbd80cfc0c747f89da2e4..40ceec96b650c22b1382fd9584e2c5f25e89ed5f 100644
--- a/bootdo/src/main/java/com/bootdo/BootdoApplication.java
+++ b/src/main/java/com/bootdo/BootdoApplication.java
@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@SpringBootApplication
@EnableCaching
public class BootdoApplication {
+
public static void main(String[] args) {
SpringApplication.run(BootdoApplication.class, args);
System.out.println("ヾ(◍°∇°◍)ノ゙ bootdo启动成功 ヾ(◍°∇°◍)ノ゙\n" +
diff --git a/bootdo/src/main/java/com/bootdo/activiti/config/ActivitiConfig.java b/src/main/java/com/bootdo/activiti/config/ActivitiConfig.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/config/ActivitiConfig.java
rename to src/main/java/com/bootdo/activiti/config/ActivitiConfig.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/config/ActivitiConstant.java b/src/main/java/com/bootdo/activiti/config/ActivitiConstant.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/config/ActivitiConstant.java
rename to src/main/java/com/bootdo/activiti/config/ActivitiConstant.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/controller/ModelController.java b/src/main/java/com/bootdo/activiti/controller/ModelController.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/controller/ModelController.java
rename to src/main/java/com/bootdo/activiti/controller/ModelController.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/controller/ProcessController.java b/src/main/java/com/bootdo/activiti/controller/ProcessController.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/controller/ProcessController.java
rename to src/main/java/com/bootdo/activiti/controller/ProcessController.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/controller/SalaryController.java b/src/main/java/com/bootdo/activiti/controller/SalaryController.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/controller/SalaryController.java
rename to src/main/java/com/bootdo/activiti/controller/SalaryController.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/controller/TaskController.java b/src/main/java/com/bootdo/activiti/controller/TaskController.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/controller/TaskController.java
rename to src/main/java/com/bootdo/activiti/controller/TaskController.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/dao/SalaryDao.java b/src/main/java/com/bootdo/activiti/dao/SalaryDao.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/dao/SalaryDao.java
rename to src/main/java/com/bootdo/activiti/dao/SalaryDao.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/domain/ActivitiDO.java b/src/main/java/com/bootdo/activiti/domain/ActivitiDO.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/domain/ActivitiDO.java
rename to src/main/java/com/bootdo/activiti/domain/ActivitiDO.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/domain/SalaryDO.java b/src/main/java/com/bootdo/activiti/domain/SalaryDO.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/domain/SalaryDO.java
rename to src/main/java/com/bootdo/activiti/domain/SalaryDO.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/domain/TaskDO.java b/src/main/java/com/bootdo/activiti/domain/TaskDO.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/domain/TaskDO.java
rename to src/main/java/com/bootdo/activiti/domain/TaskDO.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/domain/Variable.java b/src/main/java/com/bootdo/activiti/domain/Variable.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/domain/Variable.java
rename to src/main/java/com/bootdo/activiti/domain/Variable.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/service/ActTaskService.java b/src/main/java/com/bootdo/activiti/service/ActTaskService.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/service/ActTaskService.java
rename to src/main/java/com/bootdo/activiti/service/ActTaskService.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/service/ProcessService.java b/src/main/java/com/bootdo/activiti/service/ProcessService.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/service/ProcessService.java
rename to src/main/java/com/bootdo/activiti/service/ProcessService.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/service/SalaryService.java b/src/main/java/com/bootdo/activiti/service/SalaryService.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/service/SalaryService.java
rename to src/main/java/com/bootdo/activiti/service/SalaryService.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/service/impl/ActTaskServiceImpl.java b/src/main/java/com/bootdo/activiti/service/impl/ActTaskServiceImpl.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/service/impl/ActTaskServiceImpl.java
rename to src/main/java/com/bootdo/activiti/service/impl/ActTaskServiceImpl.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/service/impl/ProcessServiceImpl.java b/src/main/java/com/bootdo/activiti/service/impl/ProcessServiceImpl.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/service/impl/ProcessServiceImpl.java
rename to src/main/java/com/bootdo/activiti/service/impl/ProcessServiceImpl.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/service/impl/SalaryServiceImpl.java b/src/main/java/com/bootdo/activiti/service/impl/SalaryServiceImpl.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/service/impl/SalaryServiceImpl.java
rename to src/main/java/com/bootdo/activiti/service/impl/SalaryServiceImpl.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/utils/ActivitiUtils.java b/src/main/java/com/bootdo/activiti/utils/ActivitiUtils.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/utils/ActivitiUtils.java
rename to src/main/java/com/bootdo/activiti/utils/ActivitiUtils.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/vo/DeploymentResponse.java b/src/main/java/com/bootdo/activiti/vo/DeploymentResponse.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/vo/DeploymentResponse.java
rename to src/main/java/com/bootdo/activiti/vo/DeploymentResponse.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/vo/ProcessVO.java b/src/main/java/com/bootdo/activiti/vo/ProcessVO.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/vo/ProcessVO.java
rename to src/main/java/com/bootdo/activiti/vo/ProcessVO.java
diff --git a/bootdo/src/main/java/com/bootdo/activiti/vo/TaskVO.java b/src/main/java/com/bootdo/activiti/vo/TaskVO.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/activiti/vo/TaskVO.java
rename to src/main/java/com/bootdo/activiti/vo/TaskVO.java
diff --git a/bootdo/src/main/java/com/bootdo/blog/controller/BlogController.java b/src/main/java/com/bootdo/blog/controller/BlogController.java
similarity index 96%
rename from bootdo/src/main/java/com/bootdo/blog/controller/BlogController.java
rename to src/main/java/com/bootdo/blog/controller/BlogController.java
index 91839318ca972260735c6ef4c90542aeac037468..d3aa2cb909bddbc1157b61727a4afd88e4b5b036 100644
--- a/bootdo/src/main/java/com/bootdo/blog/controller/BlogController.java
+++ b/src/main/java/com/bootdo/blog/controller/BlogController.java
@@ -1,59 +1,59 @@
-package com.bootdo.blog.controller;
-
-import com.bootdo.blog.domain.ContentDO;
-import com.bootdo.blog.service.ContentService;
-import com.bootdo.common.utils.DateUtils;
-import com.bootdo.common.utils.PageUtils;
-import com.bootdo.common.utils.Query;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author bootdo 1992lcg@163.com
- */
-@RequestMapping("/blog")
-@Controller
-public class BlogController {
- @Autowired
- ContentService bContentService;
-
- @GetMapping()
- String blog() {
- return "blog/index/main";
- }
-
- @ResponseBody
- @GetMapping("/open/list")
- public PageUtils opentList(@RequestParam Map params) {
- Query query = new Query(params);
- List bContentList = bContentService.list(query);
- int total = bContentService.count(query);
- PageUtils pageUtils = new PageUtils(bContentList, total);
- return pageUtils;
- }
-
- @GetMapping("/open/post/{cid}")
- String post(@PathVariable("cid") Long cid, Model model) {
- ContentDO bContentDO = bContentService.get(cid);
- model.addAttribute("bContent", bContentDO);
- model.addAttribute("gtmModified", DateUtils.format(bContentDO.getGtmModified()));
- return "blog/index/post";
- }
- @GetMapping("/open/page/{categories}")
- String about(@PathVariable("categories") String categories, Model model) {
- Map map = new HashMap<>(16);
- map.put("categories", categories);
- ContentDO bContentDO =null;
- if(bContentService.list(map).size()>0){
- bContentDO = bContentService.list(map).get(0);
- }
- model.addAttribute("bContent", bContentDO);
- return "blog/index/post";
- }
-}
+package com.bootdo.blog.controller;
+
+import com.bootdo.blog.domain.ContentDO;
+import com.bootdo.blog.service.ContentService;
+import com.bootdo.common.utils.DateUtils;
+import com.bootdo.common.utils.PageUtils;
+import com.bootdo.common.utils.Query;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author bootdo 1992lcg@163.com
+ */
+@RequestMapping("/blog")
+@Controller
+public class BlogController {
+ @Autowired
+ ContentService bContentService;
+
+ @GetMapping()
+ String blog() {
+ return "blog/index/main";
+ }
+
+ @ResponseBody
+ @GetMapping("/open/list")
+ public PageUtils opentList(@RequestParam Map params) {
+ Query query = new Query(params);
+ List bContentList = bContentService.list(query);
+ int total = bContentService.count(query);
+ PageUtils pageUtils = new PageUtils(bContentList, total);
+ return pageUtils;
+ }
+
+ @GetMapping("/open/post/{cid}")
+ String post(@PathVariable("cid") Long cid, Model model) {
+ ContentDO bContentDO = bContentService.get(cid);
+ model.addAttribute("bContent", bContentDO);
+ model.addAttribute("gtmModified", DateUtils.format(bContentDO.getGtmModified()));
+ return "blog/index/post";
+ }
+ @GetMapping("/open/page/{categories}")
+ String about(@PathVariable("categories") String categories, Model model) {
+ Map map = new HashMap<>(16);
+ map.put("categories", categories);
+ ContentDO bContentDO =null;
+ if(bContentService.list(map).size()>0){
+ bContentDO = bContentService.list(map).get(0);
+ }
+ model.addAttribute("bContent", bContentDO);
+ return "blog/index/post";
+ }
+}
diff --git a/bootdo/src/main/java/com/bootdo/blog/controller/ContentController.java b/src/main/java/com/bootdo/blog/controller/ContentController.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/blog/controller/ContentController.java
rename to src/main/java/com/bootdo/blog/controller/ContentController.java
diff --git a/bootdo/src/main/java/com/bootdo/blog/dao/ContentDao.java b/src/main/java/com/bootdo/blog/dao/ContentDao.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/blog/dao/ContentDao.java
rename to src/main/java/com/bootdo/blog/dao/ContentDao.java
diff --git a/bootdo/src/main/java/com/bootdo/blog/domain/ContentDO.java b/src/main/java/com/bootdo/blog/domain/ContentDO.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/blog/domain/ContentDO.java
rename to src/main/java/com/bootdo/blog/domain/ContentDO.java
diff --git a/bootdo/src/main/java/com/bootdo/blog/service/ContentService.java b/src/main/java/com/bootdo/blog/service/ContentService.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/blog/service/ContentService.java
rename to src/main/java/com/bootdo/blog/service/ContentService.java
diff --git a/bootdo/src/main/java/com/bootdo/blog/service/impl/ContentServiceImpl.java b/src/main/java/com/bootdo/blog/service/impl/ContentServiceImpl.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/blog/service/impl/ContentServiceImpl.java
rename to src/main/java/com/bootdo/blog/service/impl/ContentServiceImpl.java
diff --git a/bootdo/src/main/java/com/bootdo/common/annotation/Log.java b/src/main/java/com/bootdo/common/annotation/Log.java
similarity index 96%
rename from bootdo/src/main/java/com/bootdo/common/annotation/Log.java
rename to src/main/java/com/bootdo/common/annotation/Log.java
index fa6827d8be04a70ca54949d64fdfc06c6ba31a95..32d97cab975a15738da4d29a81aac6a87ab6469e 100644
--- a/bootdo/src/main/java/com/bootdo/common/annotation/Log.java
+++ b/src/main/java/com/bootdo/common/annotation/Log.java
@@ -1,12 +1,12 @@
-package com.bootdo.common.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.lang.annotation.RetentionPolicy;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Log {
- String value() default "";
-}
+package com.bootdo.common.annotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.lang.annotation.RetentionPolicy;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Log {
+ String value() default "";
+}
diff --git a/bootdo/src/main/java/com/bootdo/common/aspect/LogAspect.java b/src/main/java/com/bootdo/common/aspect/LogAspect.java
similarity index 97%
rename from bootdo/src/main/java/com/bootdo/common/aspect/LogAspect.java
rename to src/main/java/com/bootdo/common/aspect/LogAspect.java
index 85b2152859a26012dd219113253b65a2a63eacc2..9091220cbe802fa5ed513276490a190002020000 100644
--- a/bootdo/src/main/java/com/bootdo/common/aspect/LogAspect.java
+++ b/src/main/java/com/bootdo/common/aspect/LogAspect.java
@@ -1,104 +1,104 @@
-package com.bootdo.common.aspect;
-
-import java.lang.reflect.Method;
-import java.util.Date;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.bootdo.common.service.LogService;
-import com.bootdo.system.domain.UserToken;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-
-import com.bootdo.common.annotation.Log;
-import com.bootdo.common.dao.LogDao;
-import com.bootdo.common.domain.LogDO;
-import com.bootdo.common.utils.HttpContextUtils;
-import com.bootdo.common.utils.IPUtils;
-import com.bootdo.common.utils.JSONUtils;
-import com.bootdo.common.utils.ShiroUtils;
-import com.bootdo.system.domain.UserDO;
-
-@Aspect
-@Component
-public class LogAspect {
- private static final Logger logger = LoggerFactory.getLogger(LogAspect.class);
-
- @Autowired
- LogService logService;
-
-
- @Pointcut("@annotation(com.bootdo.common.annotation.Log)")
- public void logPointCut() {
- }
-
- @Around("logPointCut()")
- public Object around(ProceedingJoinPoint point) throws Throwable {
- long beginTime = System.currentTimeMillis();
- // 执行方法
- Object result = point.proceed();
- // 执行时长(毫秒)
- long time = System.currentTimeMillis() - beginTime;
- //异步保存日志
- saveLog(point, time);
- return result;
- }
-
- void saveLog(ProceedingJoinPoint joinPoint, long time) throws InterruptedException {
- MethodSignature signature = (MethodSignature) joinPoint.getSignature();
- Method method = signature.getMethod();
- LogDO sysLog = new LogDO();
- Log syslog = method.getAnnotation(Log.class);
- if (syslog != null) {
- // 注解上的描述
- sysLog.setOperation(syslog.value());
- }
- // 请求的方法名
- String className = joinPoint.getTarget().getClass().getName();
- String methodName = signature.getName();
- sysLog.setMethod(className + "." + methodName + "()");
- // 请求的参数
- Object[] args = joinPoint.getArgs();
- try {
- String params = JSONUtils.beanToJson(args[0]).substring(0, 4999);
- sysLog.setParams(params);
- } catch (Exception e) {
-
- }
- // 获取request
- HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
- // 设置IP地址
- sysLog.setIp(IPUtils.getIpAddr(request));
- // 用户名
- UserDO currUser = ShiroUtils.getUser();
- if (null == currUser) {
- if (null != sysLog.getParams()) {
- sysLog.setUserId(-1L);
- sysLog.setUsername(sysLog.getParams());
- } else {
- sysLog.setUserId(-1L);
- sysLog.setUsername("获取用户信息为空");
- }
- } else {
- sysLog.setUserId(ShiroUtils.getUserId());
- sysLog.setUsername(ShiroUtils.getUser().getUsername());
- }
- sysLog.setTime((int) time);
- // 系统当前时间
- Date date = new Date();
- sysLog.setGmtCreate(date);
- // 保存系统日志
- logService.save(sysLog);
- }
-}
+package com.bootdo.common.aspect;
+
+import java.lang.reflect.Method;
+import java.util.Date;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.bootdo.common.service.LogService;
+import com.bootdo.system.domain.UserToken;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import com.bootdo.common.annotation.Log;
+import com.bootdo.common.dao.LogDao;
+import com.bootdo.common.domain.LogDO;
+import com.bootdo.common.utils.HttpContextUtils;
+import com.bootdo.common.utils.IPUtils;
+import com.bootdo.common.utils.JSONUtils;
+import com.bootdo.common.utils.ShiroUtils;
+import com.bootdo.system.domain.UserDO;
+
+@Aspect
+@Component
+public class LogAspect {
+ private static final Logger logger = LoggerFactory.getLogger(LogAspect.class);
+
+ @Autowired
+ LogService logService;
+
+
+ @Pointcut("@annotation(com.bootdo.common.annotation.Log)")
+ public void logPointCut() {
+ }
+
+ @Around("logPointCut()")
+ public Object around(ProceedingJoinPoint point) throws Throwable {
+ long beginTime = System.currentTimeMillis();
+ // 执行方法
+ Object result = point.proceed();
+ // 执行时长(毫秒)
+ long time = System.currentTimeMillis() - beginTime;
+ //异步保存日志
+ saveLog(point, time);
+ return result;
+ }
+
+ void saveLog(ProceedingJoinPoint joinPoint, long time) throws InterruptedException {
+ MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+ Method method = signature.getMethod();
+ LogDO sysLog = new LogDO();
+ Log syslog = method.getAnnotation(Log.class);
+ if (syslog != null) {
+ // 注解上的描述
+ sysLog.setOperation(syslog.value());
+ }
+ // 请求的方法名
+ String className = joinPoint.getTarget().getClass().getName();
+ String methodName = signature.getName();
+ sysLog.setMethod(className + "." + methodName + "()");
+ // 请求的参数
+ Object[] args = joinPoint.getArgs();
+ try {
+ String params = JSONUtils.beanToJson(args[0]).substring(0, 4999);
+ sysLog.setParams(params);
+ } catch (Exception e) {
+
+ }
+ // 获取request
+ HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
+ // 设置IP地址
+ sysLog.setIp(IPUtils.getIpAddr(request));
+ // 用户名
+ UserDO currUser = ShiroUtils.getUser();
+ if (null == currUser) {
+ if (null != sysLog.getParams()) {
+ sysLog.setUserId(-1L);
+ sysLog.setUsername(sysLog.getParams());
+ } else {
+ sysLog.setUserId(-1L);
+ sysLog.setUsername("获取用户信息为空");
+ }
+ } else {
+ sysLog.setUserId(ShiroUtils.getUserId());
+ sysLog.setUsername(ShiroUtils.getUser().getUsername());
+ }
+ sysLog.setTime((int) time);
+ // 系统当前时间
+ Date date = new Date();
+ sysLog.setGmtCreate(date);
+ // 保存系统日志
+ logService.save(sysLog);
+ }
+}
diff --git a/bootdo/src/main/java/com/bootdo/common/aspect/WebLogAspect.java b/src/main/java/com/bootdo/common/aspect/WebLogAspect.java
similarity index 92%
rename from bootdo/src/main/java/com/bootdo/common/aspect/WebLogAspect.java
rename to src/main/java/com/bootdo/common/aspect/WebLogAspect.java
index fda51d128f4ed9a15240595eb802374c6325cdf0..6cc50c7c9e58927f01e5fc14b50c3da38d9d8825 100644
--- a/bootdo/src/main/java/com/bootdo/common/aspect/WebLogAspect.java
+++ b/src/main/java/com/bootdo/common/aspect/WebLogAspect.java
@@ -34,6 +34,7 @@ public class WebLogAspect {
HttpServletRequest request = attributes.getRequest();
// 记录下请求内容
+ logger.info(startLine);
logger.info("请求地址 : " + request.getRequestURL().toString());
logger.info("HTTP METHOD : " + request.getMethod());
// 获取真实的ip地址
@@ -49,6 +50,7 @@ public class WebLogAspect {
public void doAfterReturning(Object ret) throws Throwable {
// 处理完请求,返回内容(返回值太复杂时,打印的是物理存储空间的地址)
logger.debug("返回值 : " + ret);
+ logger.info(endLine);
}
@Around("logPointCut()")
@@ -58,4 +60,8 @@ public class WebLogAspect {
logger.info("耗时 : " + (System.currentTimeMillis() - startTime));
return ob;
}
+
+ private final String startLine = "----------------------------";
+
+ private final String endLine = "\\_ _ _ _ _ _ _ _ _ _ _ _ _ _ _";
}
diff --git a/bootdo/src/main/java/com/bootdo/common/config/ApplicationContextRegister.java b/src/main/java/com/bootdo/common/config/ApplicationContextRegister.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/common/config/ApplicationContextRegister.java
rename to src/main/java/com/bootdo/common/config/ApplicationContextRegister.java
diff --git a/bootdo/src/main/java/com/bootdo/common/config/BootdoConfig.java b/src/main/java/com/bootdo/common/config/BootdoConfig.java
similarity index 95%
rename from bootdo/src/main/java/com/bootdo/common/config/BootdoConfig.java
rename to src/main/java/com/bootdo/common/config/BootdoConfig.java
index ce25ea483f203b66208a454ed32701c0e1bb50b0..1981a335b74947a0c003fb4913b4227af12b00a7 100644
--- a/bootdo/src/main/java/com/bootdo/common/config/BootdoConfig.java
+++ b/src/main/java/com/bootdo/common/config/BootdoConfig.java
@@ -1,39 +1,39 @@
-package com.bootdo.common.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Component
-@ConfigurationProperties(prefix="bootdo")
-public class BootdoConfig {
- //上传路径
- private String uploadPath;
-
- private String username;
-
- private String password;
-
- public String getUploadPath() {
- return uploadPath;
- }
-
- public void setUploadPath(String uploadPath) {
- this.uploadPath = uploadPath;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-}
+package com.bootdo.common.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix="bootdo")
+public class BootdoConfig {
+ //上传路径
+ private String uploadPath;
+
+ private String username;
+
+ private String password;
+
+ public String getUploadPath() {
+ return uploadPath;
+ }
+
+ public void setUploadPath(String uploadPath) {
+ this.uploadPath = uploadPath;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+}
diff --git a/bootdo/src/main/java/com/bootdo/common/config/Constant.java b/src/main/java/com/bootdo/common/config/Constant.java
similarity index 76%
rename from bootdo/src/main/java/com/bootdo/common/config/Constant.java
rename to src/main/java/com/bootdo/common/config/Constant.java
index 4b0054dac4ba93f31222499bf6a5ae7d14b5024c..c902e625b454252173447d5fbf411b5aee03eb4b 100644
--- a/bootdo/src/main/java/com/bootdo/common/config/Constant.java
+++ b/src/main/java/com/bootdo/common/config/Constant.java
@@ -20,5 +20,10 @@ public class Constant {
public static String LOG_ERROR = "error";
-
+ //行分割线
+ public static String lineSplit = "\n|\t\t\t";
+ //起始线
+ public static String startLine = "\n+---------------";
+ //结束线
+ public static String endLine = "\n\\______________";
}
diff --git a/bootdo/src/main/java/com/bootdo/common/config/DateConverConfig.java b/src/main/java/com/bootdo/common/config/DateConverConfig.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/common/config/DateConverConfig.java
rename to src/main/java/com/bootdo/common/config/DateConverConfig.java
diff --git a/bootdo/src/main/java/com/bootdo/common/config/DruidDBConfig.java b/src/main/java/com/bootdo/common/config/DruidDBConfig.java
similarity index 97%
rename from bootdo/src/main/java/com/bootdo/common/config/DruidDBConfig.java
rename to src/main/java/com/bootdo/common/config/DruidDBConfig.java
index 28332d7fc5bb232f97d78f1fd0c039c1de59df5f..cad37e091d09c26b3332352cf3511e60684f33d4 100644
--- a/bootdo/src/main/java/com/bootdo/common/config/DruidDBConfig.java
+++ b/src/main/java/com/bootdo/common/config/DruidDBConfig.java
@@ -1,132 +1,132 @@
-package com.bootdo.common.config;
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.support.http.StatViewServlet;
-import com.alibaba.druid.support.http.WebStatFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-import javax.sql.DataSource;
-import java.sql.SQLException;
-
-/**
- * Created by PrimaryKey on 17/2/4.
- */
-@SuppressWarnings("AlibabaRemoveCommentedCode")
-@Configuration
-public class DruidDBConfig {
- private Logger logger = LoggerFactory.getLogger(DruidDBConfig.class);
- @Value("${spring.datasource.url}")
- private String dbUrl;
-
- @Value("${spring.datasource.username}")
- private String username;
-
- @Value("${spring.datasource.password}")
- private String password;
-
- @Value("${spring.datasource.driverClassName}")
- private String driverClassName;
-
- @Value("${spring.datasource.initialSize}")
- private int initialSize;
-
- @Value("${spring.datasource.minIdle}")
- private int minIdle;
-
- @Value("${spring.datasource.maxActive}")
- private int maxActive;
-
- @Value("${spring.datasource.maxWait}")
- private int maxWait;
-
- @Value("${spring.datasource.timeBetweenEvictionRunsMillis}")
- private int timeBetweenEvictionRunsMillis;
-
- @Value("${spring.datasource.minEvictableIdleTimeMillis}")
- private int minEvictableIdleTimeMillis;
-
- @Value("${spring.datasource.validationQuery}")
- private String validationQuery;
-
- @Value("${spring.datasource.testWhileIdle}")
- private boolean testWhileIdle;
-
- @Value("${spring.datasource.testOnBorrow}")
- private boolean testOnBorrow;
-
- @Value("${spring.datasource.testOnReturn}")
- private boolean testOnReturn;
-
- @Value("${spring.datasource.poolPreparedStatements}")
- private boolean poolPreparedStatements;
-
- @Value("${spring.datasource.maxPoolPreparedStatementPerConnectionSize}")
- private int maxPoolPreparedStatementPerConnectionSize;
-
- @Value("${spring.datasource.filters}")
- private String filters;
-
- @Value("{spring.datasource.connectionProperties}")
- private String connectionProperties;
-
- @Bean(initMethod = "init", destroyMethod = "close") //声明其为Bean实例
- @Primary //在同样的DataSource中,首先使用被标注的DataSource
- public DataSource dataSource() {
- DruidDataSource datasource = new DruidDataSource();
-
- datasource.setUrl(this.dbUrl);
- datasource.setUsername(username);
- datasource.setPassword(password);
- datasource.setDriverClassName(driverClassName);
-
- //configuration
- datasource.setInitialSize(initialSize);
- datasource.setMinIdle(minIdle);
- datasource.setMaxActive(maxActive);
- datasource.setMaxWait(maxWait);
- datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
- datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
- datasource.setValidationQuery(validationQuery);
- datasource.setTestWhileIdle(testWhileIdle);
- datasource.setTestOnBorrow(testOnBorrow);
- datasource.setTestOnReturn(testOnReturn);
- datasource.setPoolPreparedStatements(poolPreparedStatements);
- datasource.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize);
- try {
- datasource.setFilters(filters);
- } catch (SQLException e) {
- logger.error("druid configuration initialization filter", e);
- }
- datasource.setConnectionProperties(connectionProperties);
-
- return datasource;
- }
-
- @Bean
- public ServletRegistrationBean druidServlet() {
- ServletRegistrationBean reg = new ServletRegistrationBean();
- reg.setServlet(new StatViewServlet());
- reg.addUrlMappings("/druid/*");
- reg.addInitParameter("allow", ""); //白名单
- return reg;
- }
-
- @Bean public FilterRegistrationBean filterRegistrationBean() {
- FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
- filterRegistrationBean.setFilter(new WebStatFilter());
- filterRegistrationBean.addUrlPatterns("/*");
- filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*");
- filterRegistrationBean.addInitParameter("profileEnable", "true");
- filterRegistrationBean.addInitParameter("principalCookieName","USER_COOKIE");
- filterRegistrationBean.addInitParameter("principalSessionName","USER_SESSION");
- filterRegistrationBean.addInitParameter("DruidWebStatFilter","/*");
- return filterRegistrationBean;
- }
-}
-
+package com.bootdo.common.config;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.http.StatViewServlet;
+import com.alibaba.druid.support.http.WebStatFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+
+/**
+ * Created by PrimaryKey on 17/2/4.
+ */
+@SuppressWarnings("AlibabaRemoveCommentedCode")
+@Configuration
+public class DruidDBConfig {
+ private Logger logger = LoggerFactory.getLogger(DruidDBConfig.class);
+ @Value("${spring.datasource.url}")
+ private String dbUrl;
+
+ @Value("${spring.datasource.username}")
+ private String username;
+
+ @Value("${spring.datasource.password}")
+ private String password;
+
+ @Value("${spring.datasource.driverClassName}")
+ private String driverClassName;
+
+ @Value("${spring.datasource.initialSize}")
+ private int initialSize;
+
+ @Value("${spring.datasource.minIdle}")
+ private int minIdle;
+
+ @Value("${spring.datasource.maxActive}")
+ private int maxActive;
+
+ @Value("${spring.datasource.maxWait}")
+ private int maxWait;
+
+ @Value("${spring.datasource.timeBetweenEvictionRunsMillis}")
+ private int timeBetweenEvictionRunsMillis;
+
+ @Value("${spring.datasource.minEvictableIdleTimeMillis}")
+ private int minEvictableIdleTimeMillis;
+
+ @Value("${spring.datasource.validationQuery}")
+ private String validationQuery;
+
+ @Value("${spring.datasource.testWhileIdle}")
+ private boolean testWhileIdle;
+
+ @Value("${spring.datasource.testOnBorrow}")
+ private boolean testOnBorrow;
+
+ @Value("${spring.datasource.testOnReturn}")
+ private boolean testOnReturn;
+
+ @Value("${spring.datasource.poolPreparedStatements}")
+ private boolean poolPreparedStatements;
+
+ @Value("${spring.datasource.maxPoolPreparedStatementPerConnectionSize}")
+ private int maxPoolPreparedStatementPerConnectionSize;
+
+ @Value("${spring.datasource.filters}")
+ private String filters;
+
+ @Value("{spring.datasource.connectionProperties}")
+ private String connectionProperties;
+
+ @Bean(initMethod = "init", destroyMethod = "close") //声明其为Bean实例
+ @Primary //在同样的DataSource中,首先使用被标注的DataSource
+ public DataSource dataSource() {
+ DruidDataSource datasource = new DruidDataSource();
+
+ datasource.setUrl(this.dbUrl);
+ datasource.setUsername(username);
+ datasource.setPassword(password);
+ datasource.setDriverClassName(driverClassName);
+
+ //configuration
+ datasource.setInitialSize(initialSize);
+ datasource.setMinIdle(minIdle);
+ datasource.setMaxActive(maxActive);
+ datasource.setMaxWait(maxWait);
+ datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
+ datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
+ datasource.setValidationQuery(validationQuery);
+ datasource.setTestWhileIdle(testWhileIdle);
+ datasource.setTestOnBorrow(testOnBorrow);
+ datasource.setTestOnReturn(testOnReturn);
+ datasource.setPoolPreparedStatements(poolPreparedStatements);
+ datasource.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize);
+ try {
+ datasource.setFilters(filters);
+ } catch (SQLException e) {
+ logger.error("druid configuration initialization filter", e);
+ }
+ datasource.setConnectionProperties(connectionProperties);
+
+ return datasource;
+ }
+
+ @Bean
+ public ServletRegistrationBean druidServlet() {
+ ServletRegistrationBean reg = new ServletRegistrationBean();
+ reg.setServlet(new StatViewServlet());
+ reg.addUrlMappings("/druid/*");
+ reg.addInitParameter("allow", ""); //白名单
+ return reg;
+ }
+
+ @Bean public FilterRegistrationBean filterRegistrationBean() {
+ FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
+ filterRegistrationBean.setFilter(new WebStatFilter());
+ filterRegistrationBean.addUrlPatterns("/*");
+ filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*");
+ filterRegistrationBean.addInitParameter("profileEnable", "true");
+ filterRegistrationBean.addInitParameter("principalCookieName","USER_COOKIE");
+ filterRegistrationBean.addInitParameter("principalSessionName","USER_SESSION");
+ filterRegistrationBean.addInitParameter("DruidWebStatFilter","/*");
+ return filterRegistrationBean;
+ }
+}
+
diff --git a/src/main/java/com/bootdo/common/config/HttpclientSpringConfig.java b/src/main/java/com/bootdo/common/config/HttpclientSpringConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..cc2f983e858548258db54cf098ba3cc6ae2ec8da
--- /dev/null
+++ b/src/main/java/com/bootdo/common/config/HttpclientSpringConfig.java
@@ -0,0 +1,16 @@
+package com.bootdo.common.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+/**
+ * @Author: PENGXIAOLIANG
+ * @Date: 2018/10/2 23:32
+ * @Desc:
+ **/
+
+@Configuration
+@PropertySource(value = "classpath:httpclient.properties")
+public class HttpclientSpringConfig {
+
+}
diff --git a/bootdo/src/main/java/com/bootdo/common/config/QuartzConfigration.java b/src/main/java/com/bootdo/common/config/QuartzConfigration.java
similarity index 96%
rename from bootdo/src/main/java/com/bootdo/common/config/QuartzConfigration.java
rename to src/main/java/com/bootdo/common/config/QuartzConfigration.java
index 744419dbf078a654404336510e2b6b904187ab70..0cb4307cf269b1c7708e33d710478d65a451f252 100644
--- a/bootdo/src/main/java/com/bootdo/common/config/QuartzConfigration.java
+++ b/src/main/java/com/bootdo/common/config/QuartzConfigration.java
@@ -1,50 +1,50 @@
-package com.bootdo.common.config;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import org.quartz.Scheduler;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.PropertiesFactoryBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.scheduling.quartz.SchedulerFactoryBean;
-
-import com.bootdo.common.quartz.factory.JobFactory;
-
-@Configuration
-public class QuartzConfigration {
-
- @Autowired
- JobFactory jobFactory;
-
-
- @Bean
- public SchedulerFactoryBean schedulerFactoryBean() {
- SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean();
- try {
- schedulerFactoryBean.setOverwriteExistingJobs(true);
- schedulerFactoryBean.setQuartzProperties(quartzProperties());
- schedulerFactoryBean.setJobFactory(jobFactory);
- } catch (IOException e) {
- e.printStackTrace();
- }
- return schedulerFactoryBean;
- }
-
- // 指定quartz.properties
- @Bean
- public Properties quartzProperties() throws IOException {
- PropertiesFactoryBean propertiesFactoryBean = new PropertiesFactoryBean();
- propertiesFactoryBean.setLocation(new ClassPathResource("/config/quartz.properties"));
- propertiesFactoryBean.afterPropertiesSet();
- return propertiesFactoryBean.getObject();
- }
-
- // 创建schedule
- @Bean(name = "scheduler")
- public Scheduler scheduler() {
- return schedulerFactoryBean().getScheduler();
- }
-}
+package com.bootdo.common.config;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import org.quartz.Scheduler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.PropertiesFactoryBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.scheduling.quartz.SchedulerFactoryBean;
+
+import com.bootdo.common.quartz.factory.JobFactory;
+
+@Configuration
+public class QuartzConfigration {
+
+ @Autowired
+ JobFactory jobFactory;
+
+
+ @Bean
+ public SchedulerFactoryBean schedulerFactoryBean() {
+ SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean();
+ try {
+ schedulerFactoryBean.setOverwriteExistingJobs(true);
+ schedulerFactoryBean.setQuartzProperties(quartzProperties());
+ schedulerFactoryBean.setJobFactory(jobFactory);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return schedulerFactoryBean;
+ }
+
+ // 指定quartz.properties
+ @Bean
+ public Properties quartzProperties() throws IOException {
+ PropertiesFactoryBean propertiesFactoryBean = new PropertiesFactoryBean();
+ propertiesFactoryBean.setLocation(new ClassPathResource("/config/quartz.properties"));
+ propertiesFactoryBean.afterPropertiesSet();
+ return propertiesFactoryBean.getObject();
+ }
+
+ // 创建schedule
+ @Bean(name = "scheduler")
+ public Scheduler scheduler() {
+ return schedulerFactoryBean().getScheduler();
+ }
+}
diff --git a/src/main/java/com/bootdo/common/config/RedisSpringConfig.java b/src/main/java/com/bootdo/common/config/RedisSpringConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..ad6fc2954b9a8b1d3d7755a0858a8ead1b1e9a26
--- /dev/null
+++ b/src/main/java/com/bootdo/common/config/RedisSpringConfig.java
@@ -0,0 +1,9 @@
+package com.bootdo.common.config;
+
+/**
+ * @Author: PENGXIAOLIANG
+ * @Date: 2018/10/2 23:31
+ * @Desc:
+ **/
+public class RedisSpringConfig {
+}
diff --git a/bootdo/src/main/java/com/bootdo/common/config/SecuityConfig.java b/src/main/java/com/bootdo/common/config/SecuityConfig.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/common/config/SecuityConfig.java
rename to src/main/java/com/bootdo/common/config/SecuityConfig.java
diff --git a/bootdo/src/main/java/com/bootdo/common/config/SpringAsyncConfig.java b/src/main/java/com/bootdo/common/config/SpringAsyncConfig.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/common/config/SpringAsyncConfig.java
rename to src/main/java/com/bootdo/common/config/SpringAsyncConfig.java
diff --git a/bootdo/src/main/java/com/bootdo/common/config/SpringBootSampleApplication.java b/src/main/java/com/bootdo/common/config/SpringBootSampleApplication.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/common/config/SpringBootSampleApplication.java
rename to src/main/java/com/bootdo/common/config/SpringBootSampleApplication.java
diff --git a/bootdo/src/main/java/com/bootdo/common/config/WebConfigurer.java b/src/main/java/com/bootdo/common/config/WebConfigurer.java
similarity index 97%
rename from bootdo/src/main/java/com/bootdo/common/config/WebConfigurer.java
rename to src/main/java/com/bootdo/common/config/WebConfigurer.java
index 8606642c8e7beab6fc098256f83be236c62a01cf..284661abdcb519bb5cdc35f1d02fb1da9418fb81 100644
--- a/bootdo/src/main/java/com/bootdo/common/config/WebConfigurer.java
+++ b/src/main/java/com/bootdo/common/config/WebConfigurer.java
@@ -1,17 +1,17 @@
-package com.bootdo.common.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-@Component
-class WebConfigurer extends WebMvcConfigurerAdapter {
- @Autowired
- BootdoConfig bootdoConfig;
- @Override
- public void addResourceHandlers(ResourceHandlerRegistry registry) {
- registry.addResourceHandler("/files/**").addResourceLocations("file:///"+bootdoConfig.getUploadPath());
- }
-
+package com.bootdo.common.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Component
+class WebConfigurer extends WebMvcConfigurerAdapter {
+ @Autowired
+ BootdoConfig bootdoConfig;
+ @Override
+ public void addResourceHandlers(ResourceHandlerRegistry registry) {
+ registry.addResourceHandler("/files/**").addResourceLocations("file:///"+bootdoConfig.getUploadPath());
+ }
+
}
\ No newline at end of file
diff --git a/bootdo/src/main/java/com/bootdo/common/controller/BaseController.java b/src/main/java/com/bootdo/common/controller/BaseController.java
similarity index 95%
rename from bootdo/src/main/java/com/bootdo/common/controller/BaseController.java
rename to src/main/java/com/bootdo/common/controller/BaseController.java
index 8394c75cf2665ac4d6f6de4c144c476bcae4a915..15c9f9a58381e80874f5ef9183bb1e46e9b4e95c 100644
--- a/bootdo/src/main/java/com/bootdo/common/controller/BaseController.java
+++ b/src/main/java/com/bootdo/common/controller/BaseController.java
@@ -1,21 +1,21 @@
-package com.bootdo.common.controller;
-
-import com.bootdo.system.domain.UserToken;
-import org.springframework.stereotype.Controller;
-import com.bootdo.common.utils.ShiroUtils;
-import com.bootdo.system.domain.UserDO;
-
-@Controller
-public class BaseController {
- public UserDO getUser() {
- return ShiroUtils.getUser();
- }
-
- public Long getUserId() {
- return getUser().getUserId();
- }
-
- public String getUsername() {
- return getUser().getUsername();
- }
+package com.bootdo.common.controller;
+
+import com.bootdo.system.domain.UserToken;
+import org.springframework.stereotype.Controller;
+import com.bootdo.common.utils.ShiroUtils;
+import com.bootdo.system.domain.UserDO;
+
+@Controller
+public class BaseController {
+ public UserDO getUser() {
+ return ShiroUtils.getUser();
+ }
+
+ public Long getUserId() {
+ return getUser().getUserId();
+ }
+
+ public String getUsername() {
+ return getUser().getUsername();
+ }
}
\ No newline at end of file
diff --git a/bootdo/src/main/java/com/bootdo/common/controller/DictController.java b/src/main/java/com/bootdo/common/controller/DictController.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/common/controller/DictController.java
rename to src/main/java/com/bootdo/common/controller/DictController.java
diff --git a/bootdo/src/main/java/com/bootdo/common/controller/FileController.java b/src/main/java/com/bootdo/common/controller/FileController.java
similarity index 100%
rename from bootdo/src/main/java/com/bootdo/common/controller/FileController.java
rename to src/main/java/com/bootdo/common/controller/FileController.java
diff --git a/bootdo/src/main/java/com/bootdo/common/controller/GeneratorController.java b/src/main/java/com/bootdo/common/controller/GeneratorController.java
similarity index 97%
rename from bootdo/src/main/java/com/bootdo/common/controller/GeneratorController.java
rename to src/main/java/com/bootdo/common/controller/GeneratorController.java
index 67261ec51b10a04531c6e4073fce1cd06981022b..8cb0288997251412ac41a13c3ab3cd3f303b9fd7 100644
--- a/bootdo/src/main/java/com/bootdo/common/controller/GeneratorController.java
+++ b/src/main/java/com/bootdo/common/controller/GeneratorController.java
@@ -1,97 +1,97 @@
-package com.bootdo.common.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.bootdo.common.service.GeneratorService;
-import com.bootdo.common.utils.GenUtils;
-import com.bootdo.common.utils.R;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RequestMapping("/common/generator")
-@Controller
-public class GeneratorController {
- String prefix = "common/generator";
- @Autowired
- GeneratorService generatorService;
-
- @GetMapping()
- String generator() {
- return prefix + "/list";
- }
-
- @ResponseBody
- @GetMapping("/list")
- List