Young 2 years ago
parent
commit
382c011d32
100 changed files with 666 additions and 597 deletions
  1. 0 3
      .gitattributes
  2. 0 201
      LICENSE
  3. 0 109
      README.md
  4. 0 9
      deploy.cmd
  5. 11 6
      pom.xml
  6. 6 5
      src/main/java/com/sumbytes/HelloBlogApplication.java
  7. 1 1
      src/main/java/com/sumbytes/common/annotation/Explain.java
  8. 2 2
      src/main/java/com/sumbytes/common/annotation/LoginRequired.java
  9. 2 2
      src/main/java/com/sumbytes/common/annotation/OperateLog.java
  10. 1 1
      src/main/java/com/sumbytes/common/base/dao/BaseDao.java
  11. 33 0
      src/main/java/com/nosum/common/base/domain/PageInfo.java
  12. 3 3
      src/main/java/com/sumbytes/common/base/domain/Result.java
  13. 6 6
      src/main/java/com/sumbytes/common/base/domain/vo/BaseVO.java
  14. 1 1
      src/main/java/com/sumbytes/common/base/domain/vo/UserSessionVO.java
  15. 1 1
      src/main/java/com/sumbytes/common/base/service/BaseService.java
  16. 1 1
      src/main/java/com/sumbytes/common/base/service/impl/BaseServiceImpl.java
  17. 1 1
      src/main/java/com/sumbytes/common/cache/ConfigCache.java
  18. 1 1
      src/main/java/com/sumbytes/common/config/AsyncTaskConfig.java
  19. 2 2
      src/main/java/com/sumbytes/common/config/GlobalExceptionConfig.java
  20. 14 4
      src/main/java/com/sumbytes/common/config/JacksonConfig.java
  21. 2 2
      src/main/java/com/sumbytes/common/config/MybatisPlusConfig.java
  22. 2 2
      src/main/java/com/sumbytes/common/config/TransactionConfig.java
  23. 2 2
      src/main/java/com/sumbytes/common/config/TransactionManager.java
  24. 26 0
      src/main/java/com/nosum/common/config/WebConfigurer.java
  25. 2 2
      src/main/java/com/sumbytes/common/config/WebConverterConfigurer.java
  26. 1 1
      src/main/java/com/sumbytes/common/constant/Constants.java
  27. 4 4
      src/main/java/com/sumbytes/common/constant/GithubOauth.java
  28. 1 1
      src/main/java/com/sumbytes/common/constant/ResultConstants.java
  29. 1 1
      src/main/java/com/sumbytes/common/context/BeanTool.java
  30. 1 1
      src/main/java/com/sumbytes/common/enums/DateTypeEnum.java
  31. 2 2
      src/main/java/com/sumbytes/common/enums/ErrorEnum.java
  32. 1 1
      src/main/java/com/sumbytes/common/enums/OperateEnum.java
  33. 1 1
      src/main/java/com/sumbytes/common/enums/SystemLanguageEnum.java
  34. 1 1
      src/main/java/com/sumbytes/common/exception/ApiInvalidParamException.java
  35. 2 2
      src/main/java/com/sumbytes/common/exception/BusinessException.java
  36. 6 6
      src/main/java/com/sumbytes/common/handler/HandlerExceptionResolver.java
  37. 3 3
      src/main/java/com/sumbytes/common/handler/RestExceptionHandler.java
  38. 1 1
      src/main/java/com/sumbytes/common/util/DateUtil.java
  39. 3 3
      src/main/java/com/sumbytes/common/util/ErrorMessageUtil.java
  40. 5 5
      src/main/java/com/sumbytes/common/util/ExceptionUtil.java
  41. 1 1
      src/main/java/com/sumbytes/common/util/FileUtil.java
  42. 1 1
      src/main/java/com/sumbytes/common/util/HttpClientDownloader.java
  43. 1 1
      src/main/java/com/sumbytes/common/util/HttpClientGenerator.java
  44. 1 1
      src/main/java/com/sumbytes/common/util/HttpClientUtils.java
  45. 1 1
      src/main/java/com/sumbytes/common/util/HttpContextUtils.java
  46. 3 3
      src/main/java/com/sumbytes/common/util/JsonUtil.java
  47. 3 3
      src/main/java/com/sumbytes/common/util/JwtUtil.java
  48. 1 1
      src/main/java/com/sumbytes/common/util/Markdown2HtmlUtil.java
  49. 4 4
      src/main/java/com/sumbytes/common/util/PageUtil.java
  50. 1 1
      src/main/java/com/sumbytes/common/util/PreviewTextUtils.java
  51. 9 9
      src/main/java/com/sumbytes/common/util/SessionUtil.java
  52. 3 3
      src/main/java/com/sumbytes/common/util/ThrowableUtils.java
  53. 1 1
      src/main/java/com/sumbytes/common/util/ToolUtil.java
  54. 1 1
      src/main/java/com/sumbytes/common/validator/Messages.java
  55. 3 3
      src/main/java/com/sumbytes/common/validator/annotion/IntegerNotNull.java
  56. 3 3
      src/main/java/com/sumbytes/common/validator/annotion/NotBlank.java
  57. 2 2
      src/main/java/com/sumbytes/common/validator/annotion/NotNull.java
  58. 3 3
      src/main/java/com/sumbytes/common/validator/annotion/Numeric.java
  59. 3 3
      src/main/java/com/sumbytes/common/validator/annotion/Range.java
  60. 3 3
      src/main/java/com/sumbytes/common/validator/constraint/IdValidator.java
  61. 2 2
      src/main/java/com/sumbytes/common/validator/constraint/IntegerValidator.java
  62. 2 2
      src/main/java/com/sumbytes/common/validator/constraint/NumericValidator.java
  63. 3 3
      src/main/java/com/sumbytes/common/validator/constraint/RangValidator.java
  64. 2 2
      src/main/java/com/sumbytes/common/validator/constraint/StringValidator.java
  65. 1 1
      src/main/java/com/sumbytes/common/validator/group/Insert.java
  66. 1 1
      src/main/java/com/sumbytes/common/validator/group/Page.java
  67. 1 1
      src/main/java/com/sumbytes/common/validator/group/Update.java
  68. 9 9
      src/main/java/com/sumbytes/helloblog/auth/controller/AuthSocialController.java
  69. 12 12
      src/main/java/com/sumbytes/helloblog/auth/controller/AuthUserController.java
  70. 12 0
      src/main/java/com/nosum/deliver/auth/dao/AuthTokenDao.java
  71. 3 3
      src/main/java/com/sumbytes/helloblog/auth/dao/AuthUserDao.java
  72. 4 4
      src/main/java/com/sumbytes/helloblog/auth/dao/AuthUserSocialDao.java
  73. 2 2
      src/main/java/com/sumbytes/helloblog/auth/domain/po/AuthToken.java
  74. 2 2
      src/main/java/com/sumbytes/helloblog/auth/domain/po/AuthUser.java
  75. 2 2
      src/main/java/com/sumbytes/helloblog/auth/domain/po/AuthUserSocial.java
  76. 2 2
      src/main/java/com/sumbytes/helloblog/auth/domain/validator/InsertSocial.java
  77. 2 2
      src/main/java/com/sumbytes/helloblog/auth/domain/validator/UpdateSocial.java
  78. 2 2
      src/main/java/com/sumbytes/helloblog/auth/domain/validator/UpdateUsers.java
  79. 6 6
      src/main/java/com/sumbytes/helloblog/auth/domain/vo/AuthUserSocialVO.java
  80. 4 4
      src/main/java/com/sumbytes/helloblog/auth/domain/vo/AuthUserVO.java
  81. 1 1
      src/main/java/com/sumbytes/helloblog/auth/domain/vo/GithubVO.java
  82. 5 5
      src/main/java/com/sumbytes/helloblog/auth/service/AuthUserService.java
  83. 5 5
      src/main/java/com/sumbytes/helloblog/auth/service/AuthUserSocialService.java
  84. 3 3
      src/main/java/com/sumbytes/helloblog/auth/service/OauthService.java
  85. 15 15
      src/main/java/com/sumbytes/helloblog/auth/service/impl/AuthUserServiceImpl.java
  86. 9 9
      src/main/java/com/sumbytes/helloblog/auth/service/impl/AuthUserSocialServiceImpl.java
  87. 17 17
      src/main/java/com/sumbytes/helloblog/auth/service/impl/OauthServiceImpl.java
  88. 65 0
      src/main/java/com/nosum/deliver/author/controller/AuthorAdminController.java
  89. 101 0
      src/main/java/com/nosum/deliver/author/domain/po/Author.java
  90. 60 0
      src/main/java/com/nosum/deliver/author/service/AuthorService.java
  91. 78 0
      src/main/java/com/nosum/deliver/author/service/impl/AuthorServiceImpl.java
  92. 8 8
      src/main/java/com/sumbytes/helloblog/category/controller/CategoryController.java
  93. 8 8
      src/main/java/com/sumbytes/helloblog/category/controller/TagsController.java
  94. 4 4
      src/main/java/com/sumbytes/helloblog/category/dao/CategoryDao.java
  95. 3 3
      src/main/java/com/sumbytes/helloblog/category/dao/CategoryTagsDao.java
  96. 3 3
      src/main/java/com/sumbytes/helloblog/category/dao/TagsDao.java
  97. 2 2
      src/main/java/com/sumbytes/helloblog/category/domain/po/Category.java
  98. 2 2
      src/main/java/com/sumbytes/helloblog/category/domain/po/CategoryTags.java
  99. 2 2
      src/main/java/com/sumbytes/helloblog/category/domain/po/Tags.java
  100. 0 0
      src/main/java/com/sumbytes/helloblog/category/domain/vo/CategoryVO.java

+ 0 - 3
.gitattributes

@@ -1,3 +0,0 @@
-*.js linguist-language=java
-*.css linguist-language=java
-*.html linguist-language=java

+ 0 - 201
LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

+ 0 - 109
README.md

@@ -1,109 +0,0 @@
-<h1 align="center"><a href="https://github.com/sumbytes168/hello-blog" target="_blank">helloblog</a></h1>
-
-> [Hello Blog](http://helloblog.sumbytes.com/) 是一个前后端分离的博客系统,为了解除开发人员对后端的束缚,真正做到的一个面向接口开发的博客系统。
-
-<p align="center">
-<a href="#"><img alt="JDK" src="https://img.shields.io/badge/JDK-1.8-yellow.svg?style=flat-square"/></a>
-<a href="#"><img alt="GitHub release" src="https://img.shields.io/github/release/halo-dev/halo.svg?style=flat-square"/></a>
-<a href="#"><img alt="GitHub All Releases" src="https://img.shields.io/github/downloads/halo-dev/halo/total.svg?style=flat-square"></a>
-<a href="#"><img alt="Docker pulls" src="https://img.shields.io/docker/pulls/ruibaby/halo?style=flat-square"></a>
-</p>
-
-------------------------------
-
-## 简介
-
-**hello** [hello],意为你好(强行科普)。。
-
-> 基于[SpringBoot](https://spring.io/projects/spring-boot/)实现零配置让系统的配置更简单,使用了[Mybatis-Plus](https://mp.baomidou.com/)快速开发框架,在不是复杂的查询操作下,无需写sql就可以快速完成接口编写。
-> 后台管理系统使用了vue中流行的[ant](https://panjiachen.github.io/vue-element-admin-site/#/),另外前后交互使用了[JWT](https://jwt.io/)作为令牌,进行权限、登录校验。。
-
-
-> [官网](http://helloblog.sumbytes.com/) | [社区](https://sumbytes.com) | [QQ 交流群](https://shang.qq.com/wpa/qunwpa?idkey=4f8653da80e632ef86ca1d57ccf8751602940d1036c79b04a3a5bc668adf8864) | 
-
-## 声明
-
-> 本项目,主要宗旨在于,简单、易用、不烧脑的博客,并且基于helloblog,搭建一个属于博主们的博客圈
-
-## 使用须知
-
->  由于项目是前后端完全分离,所以此项目为单独的后端项目,后台管理系统、博客主题可以进行自由搭配
->
->> 后端API <https://github.com/sumbytes168/hello-blog><br>
->> 后端管理系统 <https://github.com/sumbytes168/hello-blog-admin><br>
->> 前端主题地址:<https://github.com/sumbytes168/theme-react-sakura/><br>
-
-## 快速开始
-
-### 下载最新的 helloblog 安装包
-
-window
-
-```bash
-https://github.com/sumbytes168/hello-blog/releases/download/v1.1.0/helloblog-v1.1.0.jar
-```
-
-linux
-
-```bash
-wget https://github.com/sumbytes168/hello-blog/releases/download/v1.1.0/helloblog-v1.1.0.jar
-```
-
-### 启动 helloblog 
-
-```bash
-java -jar helloblog-v1.1.0.jar --MYSQL_USERNAME=root  --MYSQL_PASSWORD=password  --MYSQL_DATABASE=jdbc:mysql://127.0.0.1:3306/helloblog?useSSL=false&characterEncoding=utf8 
-```
-
-详细文档请移步:<http://helloblog.sumbytes.com/docs/>
-
-## 博客示例
-- 前端: <https://preview.sumbytes.com/>。
-- 管理系统: <https://preview.sumbytes.com/admin>。
-
-## 生态圈
-- 后端代码(hello-blog):<https://github.com/sumbytes168/hello-blog>
-- 后端代码(helloblog-admin):<https://github.com/sumbytes168/hello-blog-admin>
-- 主题仓库:<https://github.com/sumbytes168/theme-react-sakura/>
-
-## 使用helloblog的优秀博主
-
-- 青涩知夏:<https://www.nosum.cn/>
-- 踏歌长行:<https://www.bygit.cn/>
-
-## 捐赠
-
-> 如果 helloblog 对你有帮助,可以请作者喝杯☕️。
-
-| 支付宝  | 微信 |
-| :------------: |  :------------: |
-| <img src="http://image.sumbytes.com/FvM2HsxIesxN41bPJCtRpUi8LQgA" width="200"/>  |  <img src="http://image.sumbytes.com/Fn33krSt1uIm4sgqBE67fkZL2-__" width="200"/>
-
-## 预览图
-
-<img src="https://cos.nosum.cn/preview/helloblog-theme/helloblog-theme3-perview%20%281%29.jpg" width="600"/>
-
-<img src="https://cos.nosum.cn/preview/helloblog-theme/helloblog-theme3-perview%20%282%29.jpg" width="600"/>
-
-<img src="https://cos.nosum.cn/preview/helloblog-theme/helloblog-theme3-perview%20%283%29.jpg" width="600"/>
-
-<img src="https://cos.nosum.cn/preview/helloblog-theme/helloblog-theme3-perview%20%284%29.jpg" width="600"/>
-
-<img src="https://cos.nosum.cn/preview/helloblog-theme/helloblog-theme3-perview%20%285%29.jpg" width="600"/>
-
-<img src="https://cos.nosum.cn/preview/helloblog-theme/helloblog-theme3-perview%20%286%29.jpg" width="600"/>
-
-<img src="https://cos.nosum.cn/preview/helloblog-theme/helloblog-theme3-perview%20%287%29.jpg" width="600"/>
-
-<img src="https://cos.nosum.cn/preview/helloblog-admin/helloblog-admin-preview%20%282%29.png" width="600"/>
-
-
-<img src="https://cos.nosum.cn/preview/helloblog-admin/helloblog-admin-preview%20%283%29.png" width="600"/>
-
-<img src="https://cos.nosum.cn/preview/helloblog-admin/helloblog-admin-preview%20%284%29.png" width="600"/>
-
-<img src="https://cos.nosum.cn/preview/helloblog-admin/helloblog-admin-preview%20%285%29.png" width="600"/>
-
-<img src="https://cos.nosum.cn/preview/helloblog-admin/helloblog-admin-preview%20%286%29.png" width="600"/>
-
-<img src="https://cos.nosum.cn/preview/helloblog-admin/helloblog-admin-preview%20%287%29.png" width="600"/>

+ 0 - 9
deploy.cmd

@@ -1,9 +0,0 @@
-@echo off
-call mvn clean
-call mvn package -Dmaven.test.skip=true
-
-md .\jar
-copy /y .\target\helloblog-v1.0.1-Alpha.jar .\jar\helloblog-v1.0.1-Alpha.jar
-
-call mvn clean
-pause

+ 11 - 6
pom.xml

@@ -6,13 +6,13 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.1.8.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath/>
     </parent>
-    <groupId>com.sumbytes</groupId>
-    <artifactId>helloblog</artifactId>
+    <groupId>com.nosum</groupId>
+    <artifactId>deliver</artifactId>
     <version>v1.1.0</version>
-    <name>hello-blog</name>
-    <description>helloblog - 一个简单通用的前后分离的博客系统</description>
+    <name>deliver</name>
+    <description>deliver - 短视频流量推送平台</description>
 
     <properties>
         <java.version>1.8</java.version>
@@ -25,10 +25,15 @@
         </dependency>
 
         <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-mongodb</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.46</version>
         </dependency>
+
         <dependency>
             <groupId>eu.bitwalker</groupId>
             <artifactId>UserAgentUtils</artifactId>

+ 6 - 5
src/main/java/com/sumbytes/HelloBlogApplication.java

@@ -1,6 +1,7 @@
-package com.sumbytes;
+package com.nosum;
 
-import com.sumbytes.system.init.ConfigApplicationContextInitializer;
+import com.nosum.system.init.ConfigApplicationContextInitializer;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -9,11 +10,11 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @Author:sumbytes
  * @Date:2018/09/27 12:52
  */
-@SpringBootApplication
 @EnableScheduling
-public class HelloBlogApplication {
+@SpringBootApplication
+public class DeliverApplication {
     public static void main(String[] args) {
-        SpringApplication springApplication = new SpringApplication(HelloBlogApplication.class);
+        SpringApplication springApplication = new SpringApplication(DeliverApplication.class);
         springApplication.addInitializers(new ConfigApplicationContextInitializer());
         springApplication.run(args);
     }

+ 1 - 1
src/main/java/com/sumbytes/common/annotation/Explain.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.annotation;
+package com.nosum.common.annotation;
 
 
 import java.lang.annotation.ElementType;

+ 2 - 2
src/main/java/com/sumbytes/common/annotation/LoginRequired.java

@@ -1,6 +1,6 @@
-package com.sumbytes.common.annotation;
+package com.nosum.common.annotation;
 
-import com.sumbytes.system.enums.RoleEnum;
+import com.nosum.system.enums.RoleEnum;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

+ 2 - 2
src/main/java/com/sumbytes/common/annotation/OperateLog.java

@@ -1,6 +1,6 @@
-package com.sumbytes.common.annotation;
+package com.nosum.common.annotation;
 
-import com.sumbytes.common.enums.OperateEnum;
+import com.nosum.common.enums.OperateEnum;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

+ 1 - 1
src/main/java/com/sumbytes/common/base/dao/BaseDao.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.base.dao;
+package com.nosum.common.base.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 

+ 33 - 0
src/main/java/com/nosum/common/base/domain/PageInfo.java

@@ -0,0 +1,33 @@
+package com.nosum.common.base.domain;
+
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
+import com.nosum.common.constant.Constants;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class PageInfo<T> {
+
+    private long page = Constants.DEFAULT_PAGE_INDEX;
+    private long size = Constants.DEFAULT_PAGE_SIZE;
+    private Long total;
+
+    private List<T> record;
+
+    public static <T> PageInfo<T> withRequest() {
+        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+        String page = request.getParameter("page");
+        String size = request.getParameter("size");
+        if (StrUtil.isNotBlank(page) && StrUtil.isNotBlank(size)) {
+            return new PageInfo().setPage(NumberUtil.parseInt(page)).setSize(NumberUtil.parseInt(size));
+        }
+        return new PageInfo();
+    }
+}

+ 3 - 3
src/main/java/com/sumbytes/common/base/domain/Result.java

@@ -1,7 +1,7 @@
-package com.sumbytes.common.base.domain;
+package com.nosum.common.base.domain;
 
-import com.sumbytes.common.constant.ResultConstants;
-import com.sumbytes.common.enums.ErrorEnum;
+import com.nosum.common.constant.ResultConstants;
+import com.nosum.common.enums.ErrorEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.apache.commons.lang3.StringUtils;

+ 6 - 6
src/main/java/com/sumbytes/common/base/domain/vo/BaseVO.java

@@ -1,10 +1,10 @@
-package com.sumbytes.common.base.domain.vo;
+package com.nosum.common.base.domain.vo;
 
-import com.sumbytes.common.validator.Messages;
-import com.sumbytes.common.validator.annotion.IntegerNotNull;
-import com.sumbytes.common.validator.annotion.NotNull;
-import com.sumbytes.common.validator.group.Page;
-import com.sumbytes.common.validator.group.Update;
+import com.nosum.common.validator.Messages;
+import com.nosum.common.validator.annotion.IntegerNotNull;
+import com.nosum.common.validator.annotion.NotNull;
+import com.nosum.common.validator.group.Page;
+import com.nosum.common.validator.group.Update;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

+ 1 - 1
src/main/java/com/sumbytes/common/base/domain/vo/UserSessionVO.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.base.domain.vo;
+package com.nosum.common.base.domain.vo;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

+ 1 - 1
src/main/java/com/sumbytes/common/base/service/BaseService.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.base.service;
+package com.nosum.common.base.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 

+ 1 - 1
src/main/java/com/sumbytes/common/base/service/impl/BaseServiceImpl.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.base.service.impl;
+package com.nosum.common.base.service.impl;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 1 - 1
src/main/java/com/sumbytes/common/cache/ConfigCache.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.cache;
+package com.nosum.common.cache;
 
 import org.apache.commons.lang3.StringUtils;
 

+ 1 - 1
src/main/java/com/sumbytes/common/config/AsyncTaskConfig.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.config;
+package com.nosum.common.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

+ 2 - 2
src/main/java/com/sumbytes/common/config/GlobalExceptionConfig.java

@@ -1,6 +1,6 @@
-package com.sumbytes.common.config;
+package com.nosum.common.config;
 
-import com.sumbytes.common.handler.HandlerExceptionResolver;
+import com.nosum.common.handler.HandlerExceptionResolver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

+ 14 - 4
src/main/java/com/sumbytes/common/config/JacksonConfig.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.config;
+package com.nosum.common.config;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -10,8 +10,11 @@ import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.apache.commons.lang3.StringUtils;
+import org.bson.types.ObjectId;
 
 import java.io.IOException;
 import java.sql.Timestamp;
@@ -57,19 +60,26 @@ public class JacksonConfig {
             @Override
             public LocalDate deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
                 String value = jsonParser.getValueAsString();
-                return StringUtils.isBlank(value) ? null : new Timestamp(Long.valueOf(value.trim())).toLocalDateTime().toLocalDate();
+                return StringUtils.isBlank(value) ? null : new Timestamp(Long.parseLong(value.trim())).toLocalDateTime().toLocalDate();
             }
         });
         javaTimeModule.addDeserializer(LocalDateTime.class, new JsonDeserializer<LocalDateTime>() {
             @Override
             public LocalDateTime deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
                 String value = jsonParser.getValueAsString();
-                return StringUtils.isBlank(value) ? null : new Timestamp(Long.valueOf(value.trim())).toLocalDateTime();
+                return StringUtils.isBlank(value) ? null : new Timestamp(Long.parseLong(value.trim())).toLocalDateTime();
             }
         });
 
         // 注册JAVA 时间序列化器
         objectMapper.registerModule(javaTimeModule);
+
+        SimpleModule simpleModule = new SimpleModule();
+        //指定mongodb ObjectId 序列化方式
+        simpleModule.addSerializer(ObjectId.class, ToStringSerializer.instance);
+        objectMapper.registerModule(simpleModule);
+
+
         return objectMapper;
     }
-}
+}

+ 2 - 2
src/main/java/com/sumbytes/common/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.config;
+package com.nosum.common.config;
 
 import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
  * @Date:2018/09/27 12:52
  */
 @Configuration
-@MapperScan("com.sumbytes.helloblog.*.dao")
+@MapperScan("com.nosum.deliver.*.dao")
 public class MybatisPlusConfig {
 
     @Bean

+ 2 - 2
src/main/java/com/sumbytes/common/config/TransactionConfig.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.config;
+package com.nosum.common.config;
 
 import org.springframework.aop.Advisor;
 import org.springframework.aop.aspectj.AspectJExpressionPointcut;
@@ -28,7 +28,7 @@ public class TransactionConfig {
     @Bean
     public Advisor txAdviceAdvisor() {
         AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
-        pointcut.setExpression("execution(* com.sumbytes.helloblog.*.service.impl.*.*(..))");
+        pointcut.setExpression("execution(* com.nosum.deliver.*.service.impl.*.*(..))");
         return new DefaultPointcutAdvisor(pointcut, txAdvice());
     }
 }

+ 2 - 2
src/main/java/com/sumbytes/common/config/TransactionManager.java

@@ -1,6 +1,6 @@
-package com.sumbytes.common.config;
+package com.nosum.common.config;
 
-import com.sumbytes.common.constant.Constants;
+import com.nosum.common.constant.Constants;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.interceptor.NameMatchTransactionAttributeSource;

+ 26 - 0
src/main/java/com/nosum/common/config/WebConfigurer.java

@@ -0,0 +1,26 @@
+package com.nosum.common.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfigurer implements WebMvcConfigurer {
+
+//    @Autowired
+//    private ConfigDao configDao;
+
+    @Override
+    public void addResourceHandlers(final ResourceHandlerRegistry registry) {
+
+//        String defaultPath;
+//        try {
+//            Config config = configDao.selectOne(new LambdaQueryWrapper<Config>().eq(Config::getConfigKey, Constants.DEFAULT_PATH));
+//            defaultPath = config.getConfigValue();
+//        } catch (Exception e) {
+//            defaultPath = ConstantsModels.getDefaultPath(ConfigCache.getConfig(Constants.DEFAULT_PATH));
+//        }
+//        registry.addResourceHandler("/files/**").addResourceLocations("file:///" + defaultPath);
+    }
+}

+ 2 - 2
src/main/java/com/sumbytes/common/config/WebConverterConfigurer.java

@@ -1,6 +1,6 @@
-package com.sumbytes.common.config;
+package com.nosum.common.config;
 
-import com.sumbytes.system.interceptor.AuthenticationInterceptor;
+import com.nosum.system.interceptor.AuthenticationInterceptor;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
src/main/java/com/sumbytes/common/constant/Constants.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.constant;
+package com.nosum.common.constant;
 
 /**
  * @Author:sumbytes

+ 4 - 4
src/main/java/com/sumbytes/common/constant/GithubOauth.java

@@ -1,10 +1,10 @@
-package com.sumbytes.common.constant;
+package com.nosum.common.constant;
 
 import cn.hutool.http.Header;
 import cn.hutool.http.HttpRequest;
-import com.sumbytes.common.util.HttpClientUtils;
-import com.sumbytes.common.util.JsonUtil;
-import com.sumbytes.helloblog.auth.domain.vo.AuthUserVO;
+import com.nosum.common.util.HttpClientUtils;
+import com.nosum.common.util.JsonUtil;
+import com.nosum.deliver.auth.domain.vo.AuthUserVO;
 
 import java.util.HashMap;
 import java.util.Map;

+ 1 - 1
src/main/java/com/sumbytes/common/constant/ResultConstants.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.constant;
+package com.nosum.common.constant;
 
 /**
  * @Author: sumbytes

+ 1 - 1
src/main/java/com/sumbytes/common/context/BeanTool.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.context;
+package com.nosum.common.context;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

+ 1 - 1
src/main/java/com/sumbytes/common/enums/DateTypeEnum.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.enums;
+package com.nosum.common.enums;
 
 /**
  * @author: sumbytes

+ 2 - 2
src/main/java/com/sumbytes/common/enums/ErrorEnum.java

@@ -1,6 +1,6 @@
-package com.sumbytes.common.enums;
+package com.nosum.common.enums;
 
-import com.sumbytes.common.constant.ResultConstants;
+import com.nosum.common.constant.ResultConstants;
 
 import javax.validation.constraints.NotBlank;
 import java.util.HashMap;

+ 1 - 1
src/main/java/com/sumbytes/common/enums/OperateEnum.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.enums;
+package com.nosum.common.enums;
 
 
 import javax.validation.constraints.NotBlank;

+ 1 - 1
src/main/java/com/sumbytes/common/enums/SystemLanguageEnum.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.enums;
+package com.nosum.common.enums;
 
 /**
  * @Author:sumbytes

+ 1 - 1
src/main/java/com/sumbytes/common/exception/ApiInvalidParamException.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.exception;
+package com.nosum.common.exception;
 
 /**
  * 自定义异常类型是方便全局异常拦截器将参数异常拦截,做统一的Response响应编码.如(20,"Parameter Error")

+ 2 - 2
src/main/java/com/sumbytes/common/exception/BusinessException.java

@@ -1,6 +1,6 @@
-package com.sumbytes.common.exception;
+package com.nosum.common.exception;
 
-import com.sumbytes.common.enums.ErrorEnum;
+import com.nosum.common.enums.ErrorEnum;
 
 /**
  * @Author:sumbytes

+ 6 - 6
src/main/java/com/sumbytes/common/handler/HandlerExceptionResolver.java

@@ -1,10 +1,10 @@
-package com.sumbytes.common.handler;
+package com.nosum.common.handler;
 
-import com.sumbytes.common.base.domain.Result;
-import com.sumbytes.common.enums.ErrorEnum;
-import com.sumbytes.common.exception.ApiInvalidParamException;
-import com.sumbytes.common.exception.BusinessException;
-import com.sumbytes.common.util.JsonUtil;
+import com.nosum.common.base.domain.Result;
+import com.nosum.common.enums.ErrorEnum;
+import com.nosum.common.exception.ApiInvalidParamException;
+import com.nosum.common.exception.BusinessException;
+import com.nosum.common.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
 import org.springframework.web.servlet.ModelAndView;

+ 3 - 3
src/main/java/com/sumbytes/common/handler/RestExceptionHandler.java

@@ -1,7 +1,7 @@
-package com.sumbytes.common.handler;
+package com.nosum.common.handler;
 
-import com.sumbytes.common.base.domain.Result;
-import com.sumbytes.common.enums.ErrorEnum;
+import com.nosum.common.base.domain.Result;
+import com.nosum.common.enums.ErrorEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.http.converter.HttpMessageNotReadableException;

+ 1 - 1
src/main/java/com/sumbytes/common/util/DateUtil.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
 import java.time.Instant;
 import java.time.LocalDateTime;

+ 3 - 3
src/main/java/com/sumbytes/common/util/ErrorMessageUtil.java

@@ -1,7 +1,7 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
-import com.sumbytes.common.constant.Constants;
-import com.sumbytes.common.enums.SystemLanguageEnum;
+import com.nosum.common.constant.Constants;
+import com.nosum.common.enums.SystemLanguageEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
 import org.springframework.util.CollectionUtils;

+ 5 - 5
src/main/java/com/sumbytes/common/util/ExceptionUtil.java

@@ -1,9 +1,9 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
-import com.sumbytes.common.base.domain.Result;
-import com.sumbytes.common.constant.ResultConstants;
-import com.sumbytes.common.enums.ErrorEnum;
-import com.sumbytes.common.exception.BusinessException;
+import com.nosum.common.base.domain.Result;
+import com.nosum.common.constant.ResultConstants;
+import com.nosum.common.enums.ErrorEnum;
+import com.nosum.common.exception.BusinessException;
 import org.apache.commons.lang3.StringUtils;
 
 /**

+ 1 - 1
src/main/java/com/sumbytes/common/util/FileUtil.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
 import java.io.*;
 import java.net.HttpURLConnection;

+ 1 - 1
src/main/java/com/sumbytes/common/util/HttpClientDownloader.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;

+ 1 - 1
src/main/java/com/sumbytes/common/util/HttpClientGenerator.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
 import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;

+ 1 - 1
src/main/java/com/sumbytes/common/util/HttpClientUtils.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.HttpEntity;

+ 1 - 1
src/main/java/com/sumbytes/common/util/HttpContextUtils.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
 import eu.bitwalker.useragentutils.Browser;
 import eu.bitwalker.useragentutils.OperatingSystem;

+ 3 - 3
src/main/java/com/sumbytes/common/util/JsonUtil.java

@@ -1,7 +1,7 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
-import com.sumbytes.common.config.JacksonConfig;
-import com.sumbytes.common.exception.BusinessException;
+import com.nosum.common.config.JacksonConfig;
+import com.nosum.common.exception.BusinessException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;

+ 3 - 3
src/main/java/com/sumbytes/common/util/JwtUtil.java

@@ -1,9 +1,9 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.algorithms.Algorithm;
-import com.sumbytes.common.constant.Constants;
-import com.sumbytes.helloblog.auth.domain.vo.AuthUserVO;
+import com.nosum.common.constant.Constants;
+import com.nosum.deliver.auth.domain.vo.AuthUserVO;
 
 import java.util.Date;
 

+ 1 - 1
src/main/java/com/sumbytes/common/util/Markdown2HtmlUtil.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
 import com.vladsch.flexmark.Extension;
 import com.vladsch.flexmark.ast.Node;

+ 4 - 4
src/main/java/com/sumbytes/common/util/PageUtil.java

@@ -1,9 +1,9 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sumbytes.common.base.domain.PageInfo;
-import com.sumbytes.common.base.domain.vo.BaseVO;
-import com.sumbytes.common.constant.Constants;
+import com.nosum.common.base.domain.PageInfo;
+import com.nosum.common.base.domain.vo.BaseVO;
+import com.nosum.common.constant.Constants;
 
 /**
  * @author: sumbytes

+ 1 - 1
src/main/java/com/sumbytes/common/util/PreviewTextUtils.java

@@ -6,7 +6,7 @@
 |   http://www.mtons.com
 +---------------------------------------------------------------------------
 */
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;

+ 9 - 9
src/main/java/com/sumbytes/common/util/SessionUtil.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
@@ -6,14 +6,14 @@ import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.exceptions.JWTVerificationException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.sumbytes.common.base.domain.vo.UserSessionVO;
-import com.sumbytes.common.constant.Constants;
-import com.sumbytes.common.context.BeanTool;
-import com.sumbytes.common.enums.ErrorEnum;
-import com.sumbytes.helloblog.auth.dao.AuthTokenDao;
-import com.sumbytes.helloblog.auth.dao.AuthUserDao;
-import com.sumbytes.helloblog.auth.domain.po.AuthToken;
-import com.sumbytes.helloblog.auth.domain.po.AuthUser;
+import com.nosum.common.base.domain.vo.UserSessionVO;
+import com.nosum.common.constant.Constants;
+import com.nosum.common.context.BeanTool;
+import com.nosum.common.enums.ErrorEnum;
+import com.nosum.deliver.auth.dao.AuthTokenDao;
+import com.nosum.deliver.auth.dao.AuthUserDao;
+import com.nosum.deliver.auth.domain.po.AuthToken;
+import com.nosum.deliver.auth.domain.po.AuthUser;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;

+ 3 - 3
src/main/java/com/sumbytes/common/util/ThrowableUtils.java

@@ -1,8 +1,8 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.sumbytes.common.constant.Constants;
-import com.sumbytes.common.exception.ApiInvalidParamException;
+import com.nosum.common.constant.Constants;
+import com.nosum.common.exception.ApiInvalidParamException;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 

+ 1 - 1
src/main/java/com/sumbytes/common/util/ToolUtil.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.util;
+package com.nosum.common.util;
 
 public class ToolUtil {
     public static Integer getInteger(Object obj){

+ 1 - 1
src/main/java/com/sumbytes/common/validator/Messages.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.validator;
+package com.nosum.common.validator;
 
 /**
  * @author Andy Chen

+ 3 - 3
src/main/java/com/sumbytes/common/validator/annotion/IntegerNotNull.java

@@ -1,7 +1,7 @@
-package com.sumbytes.common.validator.annotion;
+package com.nosum.common.validator.annotion;
 
-import com.sumbytes.common.validator.Messages;
-import com.sumbytes.common.validator.constraint.IntegerValidator;
+import com.nosum.common.validator.Messages;
+import com.nosum.common.validator.constraint.IntegerValidator;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

+ 3 - 3
src/main/java/com/sumbytes/common/validator/annotion/NotBlank.java

@@ -1,7 +1,7 @@
-package com.sumbytes.common.validator.annotion;
+package com.nosum.common.validator.annotion;
 
-import com.sumbytes.common.validator.Messages;
-import com.sumbytes.common.validator.constraint.StringValidator;
+import com.nosum.common.validator.Messages;
+import com.nosum.common.validator.constraint.StringValidator;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

+ 2 - 2
src/main/java/com/sumbytes/common/validator/annotion/NotNull.java

@@ -1,6 +1,6 @@
-package com.sumbytes.common.validator.annotion;
+package com.nosum.common.validator.annotion;
 
-import com.sumbytes.common.validator.constraint.IdValidator;
+import com.nosum.common.validator.constraint.IdValidator;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

+ 3 - 3
src/main/java/com/sumbytes/common/validator/annotion/Numeric.java

@@ -1,7 +1,7 @@
-package com.sumbytes.common.validator.annotion;
+package com.nosum.common.validator.annotion;
 
-import com.sumbytes.common.validator.Messages;
-import com.sumbytes.common.validator.constraint.NumericValidator;
+import com.nosum.common.validator.Messages;
+import com.nosum.common.validator.constraint.NumericValidator;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

+ 3 - 3
src/main/java/com/sumbytes/common/validator/annotion/Range.java

@@ -1,7 +1,7 @@
-package com.sumbytes.common.validator.annotion;
+package com.nosum.common.validator.annotion;
 
-import com.sumbytes.common.validator.Messages;
-import com.sumbytes.common.validator.constraint.RangValidator;
+import com.nosum.common.validator.Messages;
+import com.nosum.common.validator.constraint.RangValidator;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

+ 3 - 3
src/main/java/com/sumbytes/common/validator/constraint/IdValidator.java

@@ -1,13 +1,13 @@
-package com.sumbytes.common.validator.constraint;
+package com.nosum.common.validator.constraint;
 
-import com.sumbytes.common.validator.annotion.NotNull;
+import com.nosum.common.validator.annotion.NotNull;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
 /**
  * 这里有些冗余了,其实面对控制器的VO对象,应该全为String类型。
- * 作为后端程序员,不应该相信前端传递的任何参数,所以字符串类型也应该被识别。然后使用{@link com.sumbytes.common.validator.annotion.Numeric}注解
+ * 作为后端程序员,不应该相信前端传递的任何参数,所以字符串类型也应该被识别。然后使用{@link com.nosum.common.validator.annotion.Numeric}注解
  *
  * @author Andy Chen
  * @date 9/30/19 1:24 PM

+ 2 - 2
src/main/java/com/sumbytes/common/validator/constraint/IntegerValidator.java

@@ -1,6 +1,6 @@
-package com.sumbytes.common.validator.constraint;
+package com.nosum.common.validator.constraint;
 
-import com.sumbytes.common.validator.annotion.IntegerNotNull;
+import com.nosum.common.validator.annotion.IntegerNotNull;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;

+ 2 - 2
src/main/java/com/sumbytes/common/validator/constraint/NumericValidator.java

@@ -1,6 +1,6 @@
-package com.sumbytes.common.validator.constraint;
+package com.nosum.common.validator.constraint;
 
-import com.sumbytes.common.validator.annotion.Numeric;
+import com.nosum.common.validator.annotion.Numeric;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.ConstraintValidator;

+ 3 - 3
src/main/java/com/sumbytes/common/validator/constraint/RangValidator.java

@@ -1,7 +1,7 @@
-package com.sumbytes.common.validator.constraint;
+package com.nosum.common.validator.constraint;
 
-import com.sumbytes.common.validator.Messages;
-import com.sumbytes.common.validator.annotion.Range;
+import com.nosum.common.validator.Messages;
+import com.nosum.common.validator.annotion.Range;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.ConstraintValidator;

+ 2 - 2
src/main/java/com/sumbytes/common/validator/constraint/StringValidator.java

@@ -1,6 +1,6 @@
-package com.sumbytes.common.validator.constraint;
+package com.nosum.common.validator.constraint;
 
-import com.sumbytes.common.validator.annotion.NotBlank;
+import com.nosum.common.validator.annotion.NotBlank;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.ConstraintValidator;

+ 1 - 1
src/main/java/com/sumbytes/common/validator/group/Insert.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.validator.group;
+package com.nosum.common.validator.group;
 
 /**
  * @author: sumbytes

+ 1 - 1
src/main/java/com/sumbytes/common/validator/group/Page.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.validator.group;
+package com.nosum.common.validator.group;
 
 /**
  * @author: sumbytes

+ 1 - 1
src/main/java/com/sumbytes/common/validator/group/Update.java

@@ -1,4 +1,4 @@
-package com.sumbytes.common.validator.group;
+package com.nosum.common.validator.group;
 
 /**
  * @author: sumbytes

+ 9 - 9
src/main/java/com/sumbytes/helloblog/auth/controller/AuthSocialController.java

@@ -1,12 +1,12 @@
-package com.sumbytes.helloblog.auth.controller;
-
-import com.sumbytes.common.annotation.LoginRequired;
-import com.sumbytes.common.base.domain.Result;
-import com.sumbytes.common.enums.ErrorEnum;
-import com.sumbytes.common.util.ExceptionUtil;
-import com.sumbytes.helloblog.auth.domain.vo.AuthUserSocialVO;
-import com.sumbytes.helloblog.auth.service.AuthUserSocialService;
-import com.sumbytes.system.enums.RoleEnum;
+package com.nosum.deliver.auth.controller;
+
+import com.nosum.common.annotation.LoginRequired;
+import com.nosum.common.base.domain.Result;
+import com.nosum.common.enums.ErrorEnum;
+import com.nosum.common.util.ExceptionUtil;
+import com.nosum.deliver.auth.domain.vo.AuthUserSocialVO;
+import com.nosum.deliver.auth.service.AuthUserSocialService;
+import com.nosum.system.enums.RoleEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

+ 12 - 12
src/main/java/com/sumbytes/helloblog/auth/controller/AuthUserController.java

@@ -1,15 +1,15 @@
-package com.sumbytes.helloblog.auth.controller;
-
-import com.sumbytes.common.annotation.Explain;
-import com.sumbytes.common.annotation.LoginRequired;
-import com.sumbytes.common.base.domain.Result;
-import com.sumbytes.common.util.FileUtil;
-import com.sumbytes.helloblog.auth.domain.vo.AuthUserSocialVO;
-import com.sumbytes.helloblog.auth.domain.vo.AuthUserVO;
-import com.sumbytes.helloblog.auth.service.AuthUserService;
-import com.sumbytes.helloblog.auth.service.AuthUserSocialService;
-import com.sumbytes.helloblog.auth.service.OauthService;
-import com.sumbytes.system.enums.RoleEnum;
+package com.nosum.deliver.auth.controller;
+
+import com.nosum.common.annotation.Explain;
+import com.nosum.common.annotation.LoginRequired;
+import com.nosum.common.base.domain.Result;
+import com.nosum.common.util.FileUtil;
+import com.nosum.deliver.auth.domain.vo.AuthUserSocialVO;
+import com.nosum.deliver.auth.domain.vo.AuthUserVO;
+import com.nosum.deliver.auth.service.AuthUserService;
+import com.nosum.deliver.auth.service.AuthUserSocialService;
+import com.nosum.deliver.auth.service.OauthService;
+import com.nosum.system.enums.RoleEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;

+ 12 - 0
src/main/java/com/nosum/deliver/auth/dao/AuthTokenDao.java

@@ -0,0 +1,12 @@
+package com.nosum.deliver.auth.dao;
+
+import com.nosum.deliver.auth.domain.po.AuthToken;
+import com.nosum.common.base.dao.BaseDao;
+
+/**
+ * @author sumbytes
+ * @since 2019-09-18
+ */
+public interface AuthTokenDao extends BaseDao<AuthToken> {
+
+}

+ 3 - 3
src/main/java/com/sumbytes/helloblog/auth/dao/AuthUserDao.java

@@ -1,7 +1,7 @@
-package com.sumbytes.helloblog.auth.dao;
+package com.nosum.deliver.auth.dao;
 
-import com.sumbytes.common.base.dao.BaseDao;
-import com.sumbytes.helloblog.auth.domain.po.AuthUser;
+import com.nosum.deliver.auth.domain.po.AuthUser;
+import com.nosum.common.base.dao.BaseDao;
 
 /**
  * <p>

+ 4 - 4
src/main/java/com/sumbytes/helloblog/auth/dao/AuthUserSocialDao.java

@@ -1,9 +1,9 @@
-package com.sumbytes.helloblog.auth.dao;
+package com.nosum.deliver.auth.dao;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sumbytes.common.base.dao.BaseDao;
-import com.sumbytes.helloblog.auth.domain.po.AuthUserSocial;
-import com.sumbytes.helloblog.auth.domain.vo.AuthUserSocialVO;
+import com.nosum.deliver.auth.domain.po.AuthUserSocial;
+import com.nosum.deliver.auth.domain.vo.AuthUserSocialVO;
+import com.nosum.common.base.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

+ 2 - 2
src/main/java/com/sumbytes/helloblog/auth/domain/po/AuthToken.java

@@ -1,4 +1,4 @@
-package com.sumbytes.helloblog.auth.domain.po;
+package com.nosum.deliver.auth.domain.po;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("hello_blog_auth_token")
+@TableName("auth_token")
 public class AuthToken extends Model<AuthToken> {
 
     private static final long serialVersionUID = 1L;

+ 2 - 2
src/main/java/com/sumbytes/helloblog/auth/domain/po/AuthUser.java

@@ -1,4 +1,4 @@
-package com.sumbytes.helloblog.auth.domain.po;
+package com.nosum.deliver.auth.domain.po;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("hello_blog_auth_user")
+@TableName("auth_user")
 public class AuthUser extends Model<AuthUser> {
 
     private static final long serialVersionUID = 1L;

+ 2 - 2
src/main/java/com/sumbytes/helloblog/auth/domain/po/AuthUserSocial.java

@@ -1,4 +1,4 @@
-package com.sumbytes.helloblog.auth.domain.po;
+package com.nosum.deliver.auth.domain.po;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName(value = "hello_blog_auth_user_social")
+@TableName(value = "auth_user_social")
 public class AuthUserSocial extends Model<AuthUserSocial> {
 
 	private static final long serialVersionUID = 1L;

+ 2 - 2
src/main/java/com/sumbytes/helloblog/auth/domain/validator/InsertSocial.java

@@ -1,6 +1,6 @@
-package com.sumbytes.helloblog.auth.domain.validator;
+package com.nosum.deliver.auth.domain.validator;
 
-import com.sumbytes.common.validator.group.Insert;
+import com.nosum.common.validator.group.Insert;
 
 import javax.validation.GroupSequence;
 

+ 2 - 2
src/main/java/com/sumbytes/helloblog/auth/domain/validator/UpdateSocial.java

@@ -1,6 +1,6 @@
-package com.sumbytes.helloblog.auth.domain.validator;
+package com.nosum.deliver.auth.domain.validator;
 
-import com.sumbytes.common.validator.group.Update;
+import com.nosum.common.validator.group.Update;
 
 import javax.validation.GroupSequence;
 

+ 2 - 2
src/main/java/com/sumbytes/helloblog/auth/domain/validator/UpdateUsers.java

@@ -1,6 +1,6 @@
-package com.sumbytes.helloblog.auth.domain.validator;
+package com.nosum.deliver.auth.domain.validator;
 
-import com.sumbytes.common.validator.group.Update;
+import com.nosum.common.validator.group.Update;
 
 import javax.validation.GroupSequence;
 

+ 6 - 6
src/main/java/com/sumbytes/helloblog/auth/domain/vo/AuthUserSocialVO.java

@@ -1,11 +1,11 @@
-package com.sumbytes.helloblog.auth.domain.vo;
+package com.nosum.deliver.auth.domain.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.sumbytes.common.base.domain.vo.BaseVO;
-import com.sumbytes.common.validator.annotion.IntegerNotNull;
-import com.sumbytes.common.validator.annotion.NotBlank;
-import com.sumbytes.helloblog.auth.domain.validator.InsertSocial;
-import com.sumbytes.helloblog.auth.domain.validator.UpdateSocial;
+import com.nosum.deliver.auth.domain.validator.InsertSocial;
+import com.nosum.deliver.auth.domain.validator.UpdateSocial;
+import com.nosum.common.base.domain.vo.BaseVO;
+import com.nosum.common.validator.annotion.IntegerNotNull;
+import com.nosum.common.validator.annotion.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

+ 4 - 4
src/main/java/com/sumbytes/helloblog/auth/domain/vo/AuthUserVO.java

@@ -1,8 +1,8 @@
-package com.sumbytes.helloblog.auth.domain.vo;
+package com.nosum.deliver.auth.domain.vo;
 
-import com.sumbytes.common.base.domain.vo.BaseVO;
-import com.sumbytes.common.validator.annotion.IntegerNotNull;
-import com.sumbytes.helloblog.auth.domain.validator.UpdateUsers;
+import com.nosum.common.base.domain.vo.BaseVO;
+import com.nosum.common.validator.annotion.IntegerNotNull;
+import com.nosum.deliver.auth.domain.validator.UpdateUsers;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

+ 1 - 1
src/main/java/com/sumbytes/helloblog/auth/domain/vo/GithubVO.java

@@ -1,4 +1,4 @@
-package com.sumbytes.helloblog.auth.domain.vo;
+package com.nosum.deliver.auth.domain.vo;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

+ 5 - 5
src/main/java/com/sumbytes/helloblog/auth/service/AuthUserService.java

@@ -1,9 +1,9 @@
-package com.sumbytes.helloblog.auth.service;
+package com.nosum.deliver.auth.service;
 
-import com.sumbytes.common.base.domain.Result;
-import com.sumbytes.common.base.service.BaseService;
-import com.sumbytes.helloblog.auth.domain.po.AuthUser;
-import com.sumbytes.helloblog.auth.domain.vo.AuthUserVO;
+import com.nosum.common.base.domain.Result;
+import com.nosum.common.base.service.BaseService;
+import com.nosum.deliver.auth.domain.po.AuthUser;
+import com.nosum.deliver.auth.domain.vo.AuthUserVO;
 
 public interface AuthUserService extends BaseService<AuthUser> {
 

+ 5 - 5
src/main/java/com/sumbytes/helloblog/auth/service/AuthUserSocialService.java

@@ -1,10 +1,10 @@
-package com.sumbytes.helloblog.auth.service;
+package com.nosum.deliver.auth.service;
 
 
-import com.sumbytes.common.base.domain.Result;
-import com.sumbytes.common.base.service.BaseService;
-import com.sumbytes.helloblog.auth.domain.po.AuthUserSocial;
-import com.sumbytes.helloblog.auth.domain.vo.AuthUserSocialVO;
+import com.nosum.common.base.domain.Result;
+import com.nosum.common.base.service.BaseService;
+import com.nosum.deliver.auth.domain.po.AuthUserSocial;
+import com.nosum.deliver.auth.domain.vo.AuthUserSocialVO;
 
 /**
  * 用户表社交信息表:业务接口类

+ 3 - 3
src/main/java/com/sumbytes/helloblog/auth/service/OauthService.java

@@ -1,7 +1,7 @@
-package com.sumbytes.helloblog.auth.service;
+package com.nosum.deliver.auth.service;
 
-import com.sumbytes.common.base.domain.Result;
-import com.sumbytes.helloblog.auth.domain.vo.AuthUserVO;
+import com.nosum.common.base.domain.Result;
+import com.nosum.deliver.auth.domain.vo.AuthUserVO;
 
 /**
  * @description:

+ 15 - 15
src/main/java/com/sumbytes/helloblog/auth/service/impl/AuthUserServiceImpl.java

@@ -1,23 +1,23 @@
-package com.sumbytes.helloblog.auth.service.impl;
+package com.nosum.deliver.auth.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.sumbytes.common.base.domain.Result;
-import com.sumbytes.common.base.domain.vo.UserSessionVO;
-import com.sumbytes.common.constant.Constants;
-import com.sumbytes.common.enums.ErrorEnum;
-import com.sumbytes.common.util.ExceptionUtil;
-import com.sumbytes.common.util.PageUtil;
-import com.sumbytes.common.util.SessionUtil;
-import com.sumbytes.helloblog.auth.dao.AuthTokenDao;
-import com.sumbytes.helloblog.auth.dao.AuthUserDao;
-import com.sumbytes.helloblog.auth.domain.po.AuthToken;
-import com.sumbytes.helloblog.auth.domain.po.AuthUser;
-import com.sumbytes.helloblog.auth.domain.vo.AuthUserVO;
-import com.sumbytes.helloblog.auth.service.AuthUserService;
-import com.sumbytes.system.enums.RoleEnum;
+import com.nosum.common.base.domain.Result;
+import com.nosum.common.base.domain.vo.UserSessionVO;
+import com.nosum.common.constant.Constants;
+import com.nosum.common.enums.ErrorEnum;
+import com.nosum.common.util.ExceptionUtil;
+import com.nosum.common.util.PageUtil;
+import com.nosum.common.util.SessionUtil;
+import com.nosum.deliver.auth.dao.AuthTokenDao;
+import com.nosum.deliver.auth.dao.AuthUserDao;
+import com.nosum.deliver.auth.domain.po.AuthToken;
+import com.nosum.deliver.auth.domain.po.AuthUser;
+import com.nosum.deliver.auth.domain.vo.AuthUserVO;
+import com.nosum.deliver.auth.service.AuthUserService;
+import com.nosum.system.enums.RoleEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 9 - 9
src/main/java/com/sumbytes/helloblog/auth/service/impl/AuthUserSocialServiceImpl.java

@@ -1,16 +1,16 @@
-package com.sumbytes.helloblog.auth.service.impl;
+package com.nosum.deliver.auth.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.sumbytes.common.base.domain.Result;
-import com.sumbytes.common.enums.ErrorEnum;
-import com.sumbytes.common.util.ExceptionUtil;
-import com.sumbytes.common.util.PageUtil;
-import com.sumbytes.helloblog.auth.dao.AuthUserSocialDao;
-import com.sumbytes.helloblog.auth.domain.po.AuthUserSocial;
-import com.sumbytes.helloblog.auth.domain.vo.AuthUserSocialVO;
-import com.sumbytes.helloblog.auth.service.AuthUserSocialService;
+import com.nosum.common.base.domain.Result;
+import com.nosum.common.enums.ErrorEnum;
+import com.nosum.common.util.ExceptionUtil;
+import com.nosum.common.util.PageUtil;
+import com.nosum.deliver.auth.dao.AuthUserSocialDao;
+import com.nosum.deliver.auth.domain.po.AuthUserSocial;
+import com.nosum.deliver.auth.domain.vo.AuthUserSocialVO;
+import com.nosum.deliver.auth.service.AuthUserSocialService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

+ 17 - 17
src/main/java/com/sumbytes/helloblog/auth/service/impl/OauthServiceImpl.java

@@ -1,23 +1,23 @@
-package com.sumbytes.helloblog.auth.service.impl;
+package com.nosum.deliver.auth.service.impl;
 
 import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.sumbytes.common.base.domain.Result;
-import com.sumbytes.common.base.domain.vo.UserSessionVO;
-import com.sumbytes.common.constant.Constants;
-import com.sumbytes.common.constant.GithubOauth;
-import com.sumbytes.common.enums.ErrorEnum;
-import com.sumbytes.common.util.ExceptionUtil;
-import com.sumbytes.common.util.JwtUtil;
-import com.sumbytes.common.util.SessionUtil;
-import com.sumbytes.common.util.ToolUtil;
-import com.sumbytes.helloblog.auth.dao.AuthTokenDao;
-import com.sumbytes.helloblog.auth.dao.AuthUserDao;
-import com.sumbytes.helloblog.auth.domain.po.AuthToken;
-import com.sumbytes.helloblog.auth.domain.po.AuthUser;
-import com.sumbytes.helloblog.auth.domain.vo.AuthUserVO;
-import com.sumbytes.helloblog.auth.service.OauthService;
-import com.sumbytes.system.enums.RoleEnum;
+import com.nosum.common.base.domain.Result;
+import com.nosum.common.base.domain.vo.UserSessionVO;
+import com.nosum.common.constant.Constants;
+import com.nosum.common.constant.GithubOauth;
+import com.nosum.common.enums.ErrorEnum;
+import com.nosum.common.util.ExceptionUtil;
+import com.nosum.common.util.JwtUtil;
+import com.nosum.common.util.SessionUtil;
+import com.nosum.common.util.ToolUtil;
+import com.nosum.deliver.auth.dao.AuthTokenDao;
+import com.nosum.deliver.auth.dao.AuthUserDao;
+import com.nosum.deliver.auth.domain.po.AuthToken;
+import com.nosum.deliver.auth.domain.po.AuthUser;
+import com.nosum.deliver.auth.domain.vo.AuthUserVO;
+import com.nosum.deliver.auth.service.OauthService;
+import com.nosum.system.enums.RoleEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;

+ 65 - 0
src/main/java/com/nosum/deliver/author/controller/AuthorAdminController.java

@@ -0,0 +1,65 @@
+package com.nosum.deliver.author.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.nosum.common.base.domain.PageInfo;
+import com.nosum.common.base.domain.Result;
+import com.nosum.deliver.author.domain.po.Author;
+import com.nosum.deliver.author.service.AuthorService;
+import org.bson.types.ObjectId;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 作者信息接口层.
+ *
+ * @author Young
+ */
+@RestController
+@RequestMapping("/admin/author")
+public class AuthorAdminController {
+
+    @Autowired
+    private AuthorService authorService;
+
+    @PostMapping("/save")
+    public Result<Void> save(@RequestBody Author author) {
+        authorService.save(author);
+        return Result.createWithSuccessMessage();
+    }
+
+    @GetMapping("/saveBatch")
+    public Result<Void> saveBatch() {
+        Result<Author> page = page(new Author());
+        List<Author> models = page.getModels();
+        Author author1 = models.get(0);
+        for (int i = 0; i < 1000; i++) {
+            author1.setId(ObjectId.get());
+            author1.setFinderUin(i + IdWorker.get32UUID());
+            save(author1);
+        }
+
+        return Result.createWithSuccessMessage();
+    }
+
+    @GetMapping("/{id}")
+    public Result<Author> get(@PathVariable("id") ObjectId id) {
+        return Result.createWithModel(authorService.getById(id));
+    }
+
+
+    @GetMapping("/page")
+    public Result<Author> page(Author author) {
+        PageInfo<Author> pageInfo = authorService.getPage(PageInfo.withRequest(), author);
+        return Result.createWithPaging(pageInfo.getRecord(), pageInfo);
+    }
+
+
+    @DeleteMapping("/{id}")
+    public Result<Void> remove(@PathVariable("id") ObjectId id) {
+        authorService.remove(id);
+        return Result.createWithSuccessMessage();
+    }
+
+}

+ 101 - 0
src/main/java/com/nosum/deliver/author/domain/po/Author.java

@@ -0,0 +1,101 @@
+package com.nosum.deliver.author.domain.po;
+
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.bson.types.ObjectId;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.time.LocalDateTime;
+
+/**
+ * 作者信息.
+ *
+ * @author Young
+ */
+@Data
+@Accessors(chain = true)
+@Document(value = "author")
+public class Author {
+
+    /**
+     * ID
+     */
+    @Id
+    private ObjectId id;
+
+    /**
+     * 账户
+     */
+    private String finderUin;
+
+    /**
+     * 来源渠道
+     */
+    private String fromChannelName;
+
+    /**
+     * 是否有账外账号
+     */
+    private Integer outSideAccountFlag;
+
+    /**
+     * 等级
+     */
+    private String level;
+
+    /**
+     * 微信号
+     */
+    private String weChatAccount;
+
+    /**
+     * 视频账号
+     */
+    private String videoAccount;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 拟定认证信息
+     */
+    private String authInfo;
+
+    /**
+     * 是否本地作者
+     */
+    private Integer isLocal;
+
+    /**
+     * 影响力描述
+     */
+    private String prove;
+
+    /**
+     * 是否下发流量
+     */
+    private Integer isSend;
+
+    /**
+     * 下发流量发送原因
+     * 1 新入驻作者
+     * 0 作者首条发文
+     */
+    private Integer sendReason;
+
+    /**
+     * 下发流量数量
+     */
+    private Integer sendCount;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+}

+ 60 - 0
src/main/java/com/nosum/deliver/author/service/AuthorService.java

@@ -0,0 +1,60 @@
+package com.nosum.deliver.author.service;
+
+import com.nosum.common.base.domain.PageInfo;
+import com.nosum.deliver.author.domain.po.Author;
+import org.bson.types.ObjectId;
+
+/**
+ * 作者信息服务层.
+ *
+ * @author Young
+ */
+public interface AuthorService {
+
+    /**
+     * 保存作者信息.
+     *
+     * @param author 作者信息
+     */
+    void save(Author author);
+
+
+    /**
+     * 分页查询作者信息.
+     *
+     * @param pageInfo 分页查询条件
+     * @param author   作者信息
+     * @return 作者信息列表
+     */
+    PageInfo<Author> getPage(PageInfo<Author> pageInfo, Author author);
+
+    /**
+     * 根据ID删除作者信息
+     *
+     * @param id id
+     */
+    void remove(ObjectId id);
+
+
+    /**
+     * 统计当天创建的作者数量.
+     *
+     * @return 作者数量
+     */
+    Long countCreatedByToDay();
+
+    /**
+     * 统计全部的作者数量.
+     *
+     * @return 作者数量
+     */
+    Long count();
+
+    /**
+     * 根据 ID 查询作者信息.
+     *
+     * @param id ID
+     * @return 作者信息
+     */
+    Author getById(ObjectId id);
+}

+ 78 - 0
src/main/java/com/nosum/deliver/author/service/impl/AuthorServiceImpl.java

@@ -0,0 +1,78 @@
+package com.nosum.deliver.author.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.nosum.common.base.domain.PageInfo;
+import com.nosum.deliver.author.domain.po.Author;
+import com.nosum.deliver.author.service.AuthorService;
+import org.apache.commons.lang3.LocaleUtils;
+import org.bson.types.ObjectId;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Objects;
+
+/**
+ * 作者信息服务层实现类.
+ *
+ * @author Young
+ */
+@Service
+public class AuthorServiceImpl implements AuthorService {
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    @Override
+    public void save(Author author) {
+        Query query = Query.query(Criteria.where("finderUin").is(author.getFinderUin()));
+        Author oldAuthor = mongoTemplate.findOne(query, Author.class);
+        if (Objects.nonNull(oldAuthor)) {
+            author.setId(oldAuthor.getId());
+        } else {
+            author.setId(ObjectId.get());
+            author.setCreateTime(LocalDateTime.now());
+        }
+        mongoTemplate.save(author);
+    }
+
+    @Override
+    public PageInfo<Author> getPage(PageInfo<Author> pageInfo, Author author) {
+        Query query = new Query();
+        query.skip((pageInfo.getPage() - 1) * pageInfo.getSize());
+        query.limit((int) pageInfo.getSize());
+
+        long total = mongoTemplate.count(query, Author.class);
+        if (total == 0) {
+            return pageInfo;
+        }
+        return pageInfo.setRecord(mongoTemplate.find(query, Author.class)).setTotal(total);
+    }
+
+    @Override
+    public void remove(ObjectId id) {
+        mongoTemplate.remove(Query.query(Criteria.where("id").is(id)), Author.class);
+    }
+
+    @Override
+    public Long count() {
+        return mongoTemplate.count(new Query(), Author.class);
+    }
+
+    @Override
+    public Long countCreatedByToDay() {
+        LocalDateTime startTime = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
+        LocalDateTime endTime = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
+        return mongoTemplate.count(Query.query(Criteria.where("createTime").gte(startTime).lte(endTime)), Author.class);
+    }
+
+    @Override
+    public Author getById(ObjectId id) {
+        return mongoTemplate.findById(id, Author.class);
+    }
+}

+ 8 - 8
src/main/java/com/sumbytes/helloblog/category/controller/CategoryController.java

@@ -1,7 +1,7 @@
-package com.sumbytes.helloblog.category.controller;
+package com.nosum.deliver.category.controller;
 
-import com.sumbytes.common.validator.group.Insert;
-import com.sumbytes.common.validator.group.Update;
+import com.nosum.common.validator.group.Insert;
+import com.nosum.common.validator.group.Update;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
@@ -14,11 +14,11 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.sumbytes.common.annotation.LoginRequired;
-import com.sumbytes.common.base.domain.Result;
-import com.sumbytes.common.util.ThrowableUtils;
-import com.sumbytes.helloblog.category.domain.vo.CategoryVO;
-import com.sumbytes.helloblog.category.service.CategoryService;
+import com.nosum.common.annotation.LoginRequired;
+import com.nosum.common.base.domain.Result;
+import com.nosum.common.util.ThrowableUtils;
+import com.nosum.deliver.category.domain.vo.CategoryVO;
+import com.nosum.deliver.category.service.CategoryService;
 
 /**
  * @author sumbytes

+ 8 - 8
src/main/java/com/sumbytes/helloblog/category/controller/TagsController.java

@@ -1,12 +1,12 @@
-package com.sumbytes.helloblog.category.controller;
+package com.nosum.deliver.category.controller;
 
-import com.sumbytes.common.annotation.LoginRequired;
-import com.sumbytes.common.base.domain.Result;
-import com.sumbytes.common.util.ThrowableUtils;
-import com.sumbytes.common.validator.group.Insert;
-import com.sumbytes.common.validator.group.Update;
-import com.sumbytes.helloblog.category.domain.vo.TagsVO;
-import com.sumbytes.helloblog.category.service.TagsService;
+import com.nosum.common.annotation.LoginRequired;
+import com.nosum.common.base.domain.Result;
+import com.nosum.common.util.ThrowableUtils;
+import com.nosum.common.validator.group.Insert;
+import com.nosum.common.validator.group.Update;
+import com.nosum.deliver.category.domain.vo.TagsVO;
+import com.nosum.deliver.category.service.TagsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;

+ 4 - 4
src/main/java/com/sumbytes/helloblog/category/dao/CategoryDao.java

@@ -1,12 +1,12 @@
-package com.sumbytes.helloblog.category.dao;
+package com.nosum.deliver.category.dao;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sumbytes.common.base.dao.BaseDao;
-import com.sumbytes.helloblog.category.domain.po.Category;
-import com.sumbytes.helloblog.category.domain.vo.CategoryVO;
+import com.nosum.deliver.category.domain.po.Category;
+import com.nosum.deliver.category.domain.vo.CategoryVO;
+import com.nosum.common.base.dao.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

+ 3 - 3
src/main/java/com/sumbytes/helloblog/category/dao/CategoryTagsDao.java

@@ -1,7 +1,7 @@
-package com.sumbytes.helloblog.category.dao;
+package com.nosum.deliver.category.dao;
 
-import com.sumbytes.common.base.dao.BaseDao;
-import com.sumbytes.helloblog.category.domain.po.CategoryTags;
+import com.nosum.deliver.category.domain.po.CategoryTags;
+import com.nosum.common.base.dao.BaseDao;
 
 /**
  * <p>

+ 3 - 3
src/main/java/com/sumbytes/helloblog/category/dao/TagsDao.java

@@ -1,7 +1,7 @@
-package com.sumbytes.helloblog.category.dao;
+package com.nosum.deliver.category.dao;
 
-import com.sumbytes.common.base.dao.BaseDao;
-import com.sumbytes.helloblog.category.domain.po.Tags;
+import com.nosum.deliver.category.domain.po.Tags;
+import com.nosum.common.base.dao.BaseDao;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/sumbytes/helloblog/category/domain/po/Category.java

@@ -1,4 +1,4 @@
-package com.sumbytes.helloblog.category.domain.po;
+package com.nosum.deliver.category.domain.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -18,7 +18,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("hello_blog_category")
+@TableName("category")
 public class Category extends Model<Category> {
 
     private static final long serialVersionUID = 1L;

+ 2 - 2
src/main/java/com/sumbytes/helloblog/category/domain/po/CategoryTags.java

@@ -1,4 +1,4 @@
-package com.sumbytes.helloblog.category.domain.po;
+package com.nosum.deliver.category.domain.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("hello_blog_category_tags")
+@TableName("category_tags")
 public class CategoryTags extends Model<CategoryTags> {
 
     private static final long serialVersionUID = 1L;

+ 2 - 2
src/main/java/com/sumbytes/helloblog/category/domain/po/Tags.java

@@ -1,4 +1,4 @@
-package com.sumbytes.helloblog.category.domain.po;
+package com.nosum.deliver.category.domain.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("hello_blog_tags")
+@TableName("tags")
 public class Tags extends Model<Tags> {
 
     private static final long serialVersionUID = 1L;

+ 0 - 0
src/main/java/com/sumbytes/helloblog/category/domain/vo/CategoryVO.java


Some files were not shown because too many files changed in this diff