mirror of
https://gitee.com/lab1024/smart-admin.git
synced 2025-09-26 15:26:40 +08:00
v1.1.0
This commit is contained in:
zhuoda
parent
478b39d61a
commit
8394525697
54
README.md
54
README.md
@ -5,7 +5,7 @@ SmartAdmin由河南·洛阳 [1024创新实验室](https://www.1024lab.net/)团
|
|||||||
github: [https://github.com/1024-lab/smart-admin](https://github.com/1024-lab/smart-admin)
|
github: [https://github.com/1024-lab/smart-admin](https://github.com/1024-lab/smart-admin)
|
||||||
gitee: [https://gitee.com/lab1024/smart-admin](https://gitee.com/lab1024/smart-admin)
|
gitee: [https://gitee.com/lab1024/smart-admin](https://gitee.com/lab1024/smart-admin)
|
||||||
在线预览： [http://preview.smartadmin.1024lab.net](http://preview.smartadmin.1024lab.net)
|
在线预览： [http://preview.smartadmin.1024lab.net](http://preview.smartadmin.1024lab.net)
|
||||||
部署文档：[http://smartadmin.1024lab.net/doc/1/68](http://smartadmin.1024lab.net/doc/1/68)
|
部署文档：[http://smartadmin.1024lab.net/doc/2/168](http://smartadmin.1024lab.net/doc/2/168)
|
||||||
|
|
||||||
#### 疑惑
|
#### 疑惑
|
||||||
有人问：又是个“轮子”？ 轮子靠谱吗？为什么要选择你这个轮子？
|
有人问：又是个“轮子”？ 轮子靠谱吗？为什么要选择你这个轮子？
|
||||||
@ -24,38 +24,38 @@ gitee: [https://gitee.com/lab1024/smart-admin](https://gitee.com/lab1024/smart-
|
|||||||
#### 演示图
|
#### 演示图
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/11.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/11.png"/></td>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/12.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/12.png"/></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/21.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/11.png"/></td>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/22.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/21.png"/></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/31.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/31.png"/></td>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/32.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/32.png"/></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/41.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/41.png"/></td>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/42.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/42.png"/></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/51.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/51.png"/></td>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/52.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/52.png"/></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/61.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/61.png"/></td>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/62.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/62.png"/></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/71.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/71.png"/></td>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/cut/72.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/cut/1.1.0/72.png"/></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
||||||
#### 技术体系
|
#### 技术体系
|
||||||
- 前端：Vue + Vue-Router + Vuex + ViewUI(iview) + vue-enum
|
- 前端：Vue + Vue-Router + Vuex + ViewUI + vue-enum
|
||||||
- 后端：SpringBoot2 + Mybatis-plus + jwt + druid + mysql
|
- 后端：SpringBoot2 + Mybatis-plus + jwt + druid + mysql
|
||||||
- 前端代码规范smart-front-standard -guide（大力推荐）
|
- 前端代码规范smart-front-standard -guide（大力推荐）
|
||||||
- 基于阿里规范之上的后端规范smart-backend-standard-guide（大力推荐）
|
- 基于阿里规范之上的后端规范smart-backend-standard-guide（大力推荐）
|
||||||
@ -67,7 +67,7 @@ gitee: [https://gitee.com/lab1024/smart-admin](https://gitee.com/lab1024/smart-
|
|||||||
- 前端常量维护: vue-enum，拒绝出现魔法数字，代码不可维护的现象
|
- 前端常量维护: vue-enum，拒绝出现魔法数字，代码不可维护的现象
|
||||||
- 全新的基于前端的权限设计（忘掉传统的权限设计吧，已经不适合这个前端时代）
|
- 全新的基于前端的权限设计（忘掉传统的权限设计吧，已经不适合这个前端时代）
|
||||||
- 基于websocket的在线人数
|
- 基于websocket的在线人数
|
||||||
- 支持一级、二级、三级菜单，单搜索功能
|
- 支持一级、二级、三级菜单，四级菜单以及搜索功能
|
||||||
- 其他功能：邮件、富文本、消息、系统配置等等
|
- 其他功能：邮件、富文本、消息、系统配置等等
|
||||||
- 写不完了，太多好的细节需要你的发现......
|
- 写不完了，太多好的细节需要你的发现......
|
||||||
|
|
||||||
@ -103,20 +103,28 @@ gitee: [https://gitee.com/lab1024/smart-admin](https://gitee.com/lab1024/smart-
|
|||||||
ps：以上规范基础都是以团队出发，让团队开心快乐的写代码，而不是为了代码规范而规范，不喜勿喷！谢谢。
|
ps：以上规范基础都是以团队出发，让团队开心快乐的写代码，而不是为了代码规范而规范，不喜勿喷！谢谢。
|
||||||
|
|
||||||
#### 联系我们
|
#### 联系我们
|
||||||
|
|
||||||
[1024创新实验室](https://www.1024lab.net/)
|
[1024创新实验室](https://www.1024lab.net/)
|
||||||
|
|
||||||
官方QQ群：914442584
|
SmartAdmin微信群（**加我微信拉你入群！**）
|
||||||
|
|
||||||
SmartAdmin微信群（**加我拉你入群！**）：
|
|
||||||
|
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/zhuoda-wechat.jpg"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/wechat/zhuoda-wechat.jpg"/></td>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/smart-admin-qq-group.png"/></td>
|
<td><img src="http://q8expnedf.bkt.clouddn.com/qq/smart-admin-qq-group.png"/></td>
|
||||||
<td><img src="http://cdn.1024lab.net/img/smart-admin/zhuoda-wechat-money-v1.jpg"/></td>
|
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
#### 捐赠
|
||||||
|
开源不易，感谢捐赠
|
||||||
|
>*佛祖保佑捐赠这些人写程序永无bug，工资翻倍，迎娶白富美，走上人生巅峰！*
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<td><img src="http://q8expnedf.bkt.clouddn.com/wechat/zhuoda-wechat-money-v1.jpg"/></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
|
||||||
---
|
---
|
||||||
作者简介:
|
作者简介:
|
||||||
[卓大](https://zhuoluodada.cn)， 1024创新实验室主任，混迹于各个技术圈，研究过计算机，熟悉点java，略懂点前端。
|
[卓大](https://zhuoluodada.cn)， 1024创新实验室主任，混迹于各个技术圈，研究过计算机，熟悉点java，略懂点前端。
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>com.gangquan360</groupId>
|
<groupId>net.1024lab</groupId>
|
||||||
<artifactId>smart-admin-service-parent</artifactId>
|
<artifactId>smart-admin-service-parent</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
@ -13,72 +13,38 @@
|
|||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
<java.version>1.8</java.version>
|
<java.version>1.8</java.version>
|
||||||
<hibernate.annotations.version>3.3.0.ga</hibernate.annotations.version>
|
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
|
||||||
<log4j.web.version>2.10.0</log4j.web.version>
|
<log4j.web.version>2.10.0</log4j.web.version>
|
||||||
<smartadmin.springboot.version>2.1.9.RELEASE</smartadmin.springboot.version>
|
<smartadmin.springboot.version>2.2.5.RELEASE</smartadmin.springboot.version>
|
||||||
<smartadmin.springcloud.version>Finchley.SR1</smartadmin.springcloud.version>
|
|
||||||
<spring-framework-bom.version>5.1.10.RELEASE</spring-framework-bom.version>
|
|
||||||
<actuator.version>2.0.5.RELEASE</actuator.version>
|
|
||||||
<jolokia.version>1.5.0</jolokia.version>
|
|
||||||
<micrometer.version>1.0.6</micrometer.version>
|
|
||||||
<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
|
|
||||||
<thymeleaf-extras-java8time.version>3.0.1.RELEASE</thymeleaf-extras-java8time.version>
|
|
||||||
<thymeleaf-extras-springsecurity4.version>3.0.2.RELEASE</thymeleaf-extras-springsecurity4.version>
|
|
||||||
<thymeleaf-layout-dialect.version>2.3.0</thymeleaf-layout-dialect.version>
|
|
||||||
<thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
|
|
||||||
<velocity.version>1.7</velocity.version>
|
<velocity.version>1.7</velocity.version>
|
||||||
<swagger.version>2.7.0</swagger.version>
|
|
||||||
<mybatis-spring-boot.version>1.3.0</mybatis-spring-boot.version>
|
|
||||||
<sql-server.version>6.3.2.jre8-preview</sql-server.version>
|
|
||||||
<fastjson.version>1.2.9</fastjson.version>
|
|
||||||
<feign-gson-version>8.18.0</feign-gson-version>
|
|
||||||
<guava-version>23.1-jre</guava-version>
|
|
||||||
<pagehelper-version>1.2.3</pagehelper-version>
|
|
||||||
<oss.version>2.7.0</oss.version>
|
|
||||||
<qiniu.version>[7.2.0, 7.2.99]</qiniu.version>
|
|
||||||
<fileupload.version>1.3.1</fileupload.version>
|
|
||||||
<jjwt.version>0.9.0</jjwt.version>
|
|
||||||
<openhtml.version>0.0.1-RC11</openhtml.version>
|
|
||||||
<hibernate-validator-version>6.0.2.Final</hibernate-validator-version>
|
|
||||||
<javax.validation-version>2.0.0.Final</javax.validation-version>
|
|
||||||
<javax.el-version>3.0.1-b08</javax.el-version>
|
|
||||||
<druid.version>1.0.29</druid.version>
|
|
||||||
<commons-lang3.version>3.3.2</commons-lang3.version>
|
|
||||||
<mybatisplus.version>2.1.6</mybatisplus.version>
|
|
||||||
<mybatisplus-spring-boot-starter.version>1.0.4</mybatisplus-spring-boot-starter.version>
|
|
||||||
<concurrentlinkedhashmap-version>1.4.2</concurrentlinkedhashmap-version>
|
|
||||||
<velocity-engine-core.version>2.0</velocity-engine-core.version>
|
<velocity-engine-core.version>2.0</velocity-engine-core.version>
|
||||||
<client.version>1.0.0-SNAPSHOT</client.version>
|
<swagger.version>2.7.0</swagger.version>
|
||||||
<springboot.redis.version>2.0.2.RELEASE</springboot.redis.version>
|
<mybatis-plus-boot.version>3.3.1</mybatis-plus-boot.version>
|
||||||
<apache-poi-version>3.15</apache-poi-version>
|
<fastjson.version>1.2.66</fastjson.version>
|
||||||
<easypoi-version>3.3.0</easypoi-version>
|
<guava.version>28.2-jre</guava.version>
|
||||||
<jpush-api-version>3.3.4</jpush-api-version>
|
<aliyun-oss.version>2.7.0</aliyun-oss.version>
|
||||||
|
<qiniu-oss.version>[7.2.0, 7.2.99]</qiniu-oss.version>
|
||||||
|
<jjwt.version>0.9.1</jjwt.version>
|
||||||
|
<druid.version>1.1.21</druid.version>
|
||||||
|
<concurrentlinkedhashmap.version>1.4.2</concurrentlinkedhashmap.version>
|
||||||
|
<easypoi.version>4.1.2</easypoi.version>
|
||||||
|
<commons-fileupload.version>1.3.1</commons-fileupload.version>
|
||||||
|
<commons-lang3.version>3.3.2</commons-lang3.version>
|
||||||
<commons-beanutils.version>1.9.3</commons-beanutils.version>
|
<commons-beanutils.version>1.9.3</commons-beanutils.version>
|
||||||
<weixin-sdk.version>3.1.0</weixin-sdk.version>
|
<commons-pool2.version>2.8.0</commons-pool2.version>
|
||||||
<kafka.version>2.1.11.RELEASE</kafka.version>
|
|
||||||
<kafka-test.version>2.1.11.RELEASE</kafka-test.version>
|
|
||||||
<sigar.version>1.6.4</sigar.version>
|
|
||||||
<userAgent.version>1.21</userAgent.version>
|
|
||||||
<kaptcha.version>2.3.2</kaptcha.version>
|
<kaptcha.version>2.3.2</kaptcha.version>
|
||||||
<lombok.version>1.18.8</lombok.version>
|
|
||||||
<okhttp.version>4.2.2</okhttp.version>
|
<okhttp.version>4.2.2</okhttp.version>
|
||||||
|
<mysql.version>8.0.19</mysql.version>
|
||||||
|
<user-agent-util.version>1.21</user-agent-util.version>
|
||||||
|
<lombok.version>1.18.8</lombok.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<!--BOM begin-->
|
||||||
<artifactId>velocity</artifactId>
|
|
||||||
<groupId>org.apache.velocity</groupId>
|
|
||||||
<version>${velocity.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework</groupId>
|
|
||||||
<artifactId>spring-framework-bom</artifactId>
|
|
||||||
<version>${spring-framework-bom.version}</version>
|
|
||||||
<type>pom</type>
|
|
||||||
<scope>import</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-dependencies</artifactId>
|
<artifactId>spring-boot-dependencies</artifactId>
|
||||||
@ -86,26 +52,65 @@
|
|||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!--BOM end-->
|
||||||
|
|
||||||
|
<!--springboot starter dependency begin -->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-log4j2</artifactId>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-quartz</artifactId>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-validation</artifactId>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-data-redis</artifactId>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-web</artifactId>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-websocket</artifactId>-->
|
||||||
|
<!-- <version>${smartadmin.springboot.version}</version>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!-- <dependency>-->
|
||||||
|
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||||
|
<!-- <artifactId>spring-boot-starter-test</artifactId>-->
|
||||||
|
<!-- <scope>test</scope>-->
|
||||||
|
<!-- </dependency>-->
|
||||||
|
<!--springboot starter dependency end -->
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>com.baomidou</groupId>
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
<artifactId>mybatis-plus-boot-starter</artifactId>
|
||||||
<version>${actuator.version}</version>
|
<version>${mybatis-plus-boot.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!--velocity begin-->
|
||||||
|
<dependency>
|
||||||
|
<artifactId>velocity</artifactId>
|
||||||
|
<groupId>org.apache.velocity</groupId>
|
||||||
|
<version>${velocity.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.apache.velocity</groupId>
|
||||||
<artifactId>spring-boot-starter-quartz</artifactId>
|
<artifactId>velocity-engine-core</artifactId>
|
||||||
<version>2.0.5.RELEASE</version>
|
<version>${velocity-engine-core.version}</version>
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.jolokia</groupId>
|
|
||||||
<artifactId>jolokia-core</artifactId>
|
|
||||||
<version>${jolokia.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.micrometer</groupId>
|
|
||||||
<artifactId>micrometer-registry-influx</artifactId>
|
|
||||||
<version>${micrometer.version}</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!--velocity end-->
|
||||||
|
|
||||||
|
<!--fastjson -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba</groupId>
|
<groupId>com.alibaba</groupId>
|
||||||
<artifactId>fastjson</artifactId>
|
<artifactId>fastjson</artifactId>
|
||||||
@ -119,195 +124,44 @@
|
|||||||
<version>${druid.version}</version>
|
<version>${druid.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!--微信sdk依赖-->
|
<!-- swagger begin -->
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.binarywang</groupId>
|
|
||||||
<artifactId>weixin-java-mp</artifactId>
|
|
||||||
<version>${weixin-sdk.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.kafka</groupId>
|
|
||||||
<artifactId>spring-kafka</artifactId>
|
|
||||||
<version>${kafka.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.kafka</groupId>
|
|
||||||
<artifactId>spring-kafka-test</artifactId>
|
|
||||||
<version>${kafka.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- spring cloud -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-dependencies</artifactId>
|
|
||||||
<version>${smartadmin.springcloud.version}</version>
|
|
||||||
<type>pom</type>
|
|
||||||
<scope>import</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- hibernate-validator 验证框架 start -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.hibernate</groupId>
|
|
||||||
<artifactId>hibernate-validator</artifactId>
|
|
||||||
<version>${hibernate-validator-version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.validation</groupId>
|
|
||||||
<artifactId>validation-api</artifactId>
|
|
||||||
<version>${javax.validation-version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.glassfish</groupId>
|
|
||||||
<artifactId>javax.el</artifactId>
|
|
||||||
<version>${javax.el-version}</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- hibernate-validator 验证框架 end -->
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.logging.log4j</groupId>
|
|
||||||
<artifactId>log4j-web</artifactId>
|
|
||||||
<version>${log4j.web.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--thymeleaf3 begin -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.mxab.thymeleaf.extras</groupId>
|
|
||||||
<artifactId>thymeleaf-extras-data-attribute</artifactId>
|
|
||||||
<version>${thymeleaf-extras-data-attribute.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.thymeleaf.extras</groupId>
|
|
||||||
<artifactId>thymeleaf-extras-java8time</artifactId>
|
|
||||||
<version>${thymeleaf-extras-java8time.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.thymeleaf.extras</groupId>
|
|
||||||
<artifactId>thymeleaf-extras-springsecurity4</artifactId>
|
|
||||||
<version>${thymeleaf-extras-springsecurity4.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>nz.net.ultraq.thymeleaf</groupId>
|
|
||||||
<artifactId>thymeleaf-layout-dialect</artifactId>
|
|
||||||
<version>${thymeleaf-layout-dialect.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.thymeleaf</groupId>
|
|
||||||
<artifactId>thymeleaf</artifactId>
|
|
||||||
<version>${thymeleaf.version}</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>javassist</artifactId>
|
|
||||||
<groupId>org.javassist</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.thymeleaf</groupId>
|
|
||||||
<artifactId>thymeleaf-spring5</artifactId>
|
|
||||||
<version>${thymeleaf.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<!--thymeleaf3 end -->
|
|
||||||
|
|
||||||
<!--redis-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-data-redis</artifactId>
|
|
||||||
<version>${smartadmin.springboot.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
|
||||||
<version>${smartadmin.springboot.version}</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- swagger -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.springfox</groupId>
|
<groupId>io.springfox</groupId>
|
||||||
<artifactId>springfox-swagger2</artifactId>
|
<artifactId>springfox-swagger2</artifactId>
|
||||||
<version>${swagger.version}</version>
|
<version>${swagger.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.springfox</groupId>
|
<groupId>io.springfox</groupId>
|
||||||
<artifactId>springfox-swagger-ui</artifactId>
|
<artifactId>springfox-swagger-ui</artifactId>
|
||||||
<version>${swagger.version}</version>
|
<version>${swagger.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!-- swagger end -->
|
||||||
<!--mybatis 匹配spring Boot1.5 or higher-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mybatis.spring.boot</groupId>
|
|
||||||
<artifactId>mybatis-spring-boot-starter</artifactId>
|
|
||||||
<version>${mybatis-spring-boot.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- sql server -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.microsoft.sqlserver</groupId>
|
|
||||||
<artifactId>mssql-jdbc</artifactId>
|
|
||||||
<version>${sql-server.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- fastjson -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
<artifactId>fastjson</artifactId>
|
|
||||||
<version>${fastjson.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- feign-gson -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.netflix.feign</groupId>
|
|
||||||
<artifactId>feign-gson</artifactId>
|
|
||||||
<version>${feign-gson-version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.code.gson</groupId>
|
|
||||||
<artifactId>gson</artifactId>
|
|
||||||
<version>2.8.5</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- spring-boot cache -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-cache</artifactId>
|
|
||||||
<version>${smartadmin.springboot.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- guava -->
|
<!-- guava -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.guava</groupId>
|
<groupId>com.google.guava</groupId>
|
||||||
<artifactId>guava</artifactId>
|
<artifactId>guava</artifactId>
|
||||||
<version>${guava-version}</version>
|
<version>${guava.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!--page helper-->
|
<!-- oss begin -->
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.pagehelper</groupId>
|
|
||||||
<artifactId>pagehelper-spring-boot-starter</artifactId>
|
|
||||||
<version>${pagehelper-version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 阿里云oss -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.aliyun.oss</groupId>
|
<groupId>com.aliyun.oss</groupId>
|
||||||
<artifactId>aliyun-sdk-oss</artifactId>
|
<artifactId>aliyun-sdk-oss</artifactId>
|
||||||
<version>${oss.version}</version>
|
<version>${aliyun-oss.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.qiniu</groupId>
|
<groupId>com.qiniu</groupId>
|
||||||
<artifactId>qiniu-java-sdk</artifactId>
|
<artifactId>qiniu-java-sdk</artifactId>
|
||||||
<version>${qiniu.version}</version>
|
<version>${qiniu-oss.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-fileupload</groupId>
|
<groupId>commons-fileupload</groupId>
|
||||||
<artifactId>commons-fileupload</artifactId>
|
<artifactId>commons-fileupload</artifactId>
|
||||||
<version>${fileupload.version}</version>
|
<version>${commons-fileupload.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!-- oss end -->
|
||||||
|
|
||||||
<!--jjwt-->
|
<!--jjwt-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.jsonwebtoken</groupId>
|
<groupId>io.jsonwebtoken</groupId>
|
||||||
@ -315,86 +169,33 @@
|
|||||||
<version>${jjwt.version}</version>
|
<version>${jjwt.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<!-- easy poi begin -->
|
||||||
<!-- ALWAYS required. -->
|
|
||||||
<groupId>com.openhtmltopdf</groupId>
|
|
||||||
<artifactId>openhtmltopdf-core</artifactId>
|
|
||||||
<version>${openhtml.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<!-- Required for PDF output. -->
|
|
||||||
<groupId>com.openhtmltopdf</groupId>
|
|
||||||
<artifactId>openhtmltopdf-pdfbox</artifactId>
|
|
||||||
<version>${openhtml.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<!-- Required for image output only. -->
|
|
||||||
<groupId>com.openhtmltopdf</groupId>
|
|
||||||
<artifactId>openhtmltopdf-java2d</artifactId>
|
|
||||||
<version>${openhtml.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- easy poi -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.afterturn</groupId>
|
<groupId>cn.afterturn</groupId>
|
||||||
<artifactId>easypoi-base</artifactId>
|
<artifactId>easypoi-spring-boot-starter</artifactId>
|
||||||
<version>${easypoi-version}</version>
|
<version>${easypoi.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!-- easy poi end -->
|
||||||
|
|
||||||
|
<!--mysql-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.afterturn</groupId>
|
<groupId>mysql</groupId>
|
||||||
<artifactId>easypoi-web</artifactId>
|
<artifactId>mysql-connector-java</artifactId>
|
||||||
<version>${easypoi-version}</version>
|
<version>${mysql.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.afterturn</groupId>
|
|
||||||
<artifactId>easypoi-annotation</artifactId>
|
|
||||||
<version>${easypoi-version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.poi</groupId>
|
|
||||||
<artifactId>poi</artifactId>
|
|
||||||
<version>${apache-poi-version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.poi</groupId>
|
|
||||||
<artifactId>poi-ooxml-schemas</artifactId>
|
|
||||||
<version>${apache-poi-version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.poi</groupId>
|
|
||||||
<artifactId>poi-ooxml</artifactId>
|
|
||||||
<version>${apache-poi-version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 极光推送 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.jpush.api</groupId>
|
|
||||||
<artifactId>jpush-client</artifactId>
|
|
||||||
<version>${jpush-api-version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-beanutils</groupId>
|
<groupId>commons-beanutils</groupId>
|
||||||
<artifactId>commons-beanutils</artifactId>
|
<artifactId>commons-beanutils</artifactId>
|
||||||
<version>${commons-beanutils.version}</version>
|
<version>${commons-beanutils.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.fusesource</groupId>
|
<groupId>org.apache.commons</groupId>
|
||||||
<artifactId>sigar</artifactId>
|
<artifactId>commons-pool2</artifactId>
|
||||||
<version>${sigar.version}</version>
|
<version>${commons-pool2.version}</version>
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>eu.bitwalker</groupId>
|
|
||||||
<artifactId>UserAgentUtils</artifactId>
|
|
||||||
<version>${userAgent.version}</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.penggle</groupId>
|
<groupId>com.github.penggle</groupId>
|
||||||
<artifactId>kaptcha</artifactId>
|
<artifactId>kaptcha</artifactId>
|
||||||
@ -404,20 +205,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
|
<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
|
||||||
<artifactId>concurrentlinkedhashmap-lru</artifactId>
|
<artifactId>concurrentlinkedhashmap-lru</artifactId>
|
||||||
<version>${concurrentlinkedhashmap-version}</version>
|
<version>${concurrentlinkedhashmap.version}</version>
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.velocity</groupId>
|
|
||||||
<artifactId>velocity-engine-core</artifactId>
|
|
||||||
<version>${velocity-engine-core.version}</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>mybatis-plus</artifactId>
|
|
||||||
<version>${mybatisplus.version}</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -426,17 +214,10 @@
|
|||||||
<version>${okhttp.version}</version>
|
<version>${okhttp.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.baomidou</groupId>
|
<groupId>eu.bitwalker</groupId>
|
||||||
<artifactId>mybatisplus-spring-boot-starter</artifactId>
|
<artifactId>UserAgentUtils</artifactId>
|
||||||
<exclusions>
|
<version>${user-agent-util.version}</version>
|
||||||
<exclusion>
|
|
||||||
<artifactId>spring-boot-starter-logging</artifactId>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
<version>${mybatisplus-spring-boot-starter.version}</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -523,6 +304,12 @@
|
|||||||
<activeByDefault>true</activeByDefault>
|
<activeByDefault>true</activeByDefault>
|
||||||
</activation>
|
</activation>
|
||||||
</profile>
|
</profile>
|
||||||
|
<profile>
|
||||||
|
<id>telework</id>
|
||||||
|
<properties>
|
||||||
|
<profiles.active>telework</profiles.active>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
<profile>
|
<profile>
|
||||||
<id>sit</id>
|
<id>sit</id>
|
||||||
<properties>
|
<properties>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
1 更新密码
|
1 更新密码
|
||||||
com.gangquan360.smartadmin.module.employee.EmployeeController.updatePwd
|
EmployeeController.updatePwd
|
||||||
|
|
||||||
2 更新功能点
|
2 更新功能点
|
||||||
PrivilegeController functionSaveOrUpdate和menuBatchSave
|
PrivilegeController functionSaveOrUpdate和menuBatchSave
|
||||||
@ -14,4 +14,9 @@ sa/123456
|
|||||||
5 除dev之外文件
|
5 除dev之外文件
|
||||||
|
|
||||||
6 刷新页面，获取权限是否走缓存
|
6 刷新页面，获取权限是否走缓存
|
||||||
com.gangquan360.smartadmin.module.login.LoginService.getSession
|
LoginService.getSession
|
||||||
|
|
||||||
|
7 test类中去掉代码生成run
|
||||||
|
|
||||||
|
8 RoleController 更新角色
|
||||||
|
updateRole
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.gangquan360</groupId>
|
<groupId>net.1024lab</groupId>
|
||||||
<artifactId>smart-admin-service-parent</artifactId>
|
<artifactId>smart-admin-service-parent</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
@ -16,32 +16,55 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
|
<java.version>1.8</java.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<dependency>
|
<!--springboot starter dependency begin -->
|
||||||
<artifactId>velocity</artifactId>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>commons-collections</artifactId>
|
|
||||||
<groupId>commons-collections</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
<groupId>org.apache.velocity</groupId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-log4j2</artifactId>
|
<artifactId>spring-boot-starter-log4j2</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.logging.log4j</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>log4j-web</artifactId>
|
<artifactId>spring-boot-starter-aop</artifactId>
|
||||||
<version>2.10.0</version>
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<artifactId>spring-boot-starter-logging</artifactId>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-quartz</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-validation</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-data-redis</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-web</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-websocket</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-mail</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||||
@ -56,33 +79,34 @@
|
|||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!--springboot starter dependency end -->
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>com.baomidou</groupId>
|
||||||
<artifactId>spring-boot-starter-websocket</artifactId>
|
<artifactId>mybatis-plus-boot-starter</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!--velocity begin-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<artifactId>velocity</artifactId>
|
||||||
<artifactId>lombok</artifactId>
|
<groupId>org.apache.velocity</groupId>
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--redis-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-data-redis</artifactId>
|
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<artifactId>commons-collections</artifactId>
|
||||||
<artifactId>spring-boot-starter</artifactId>
|
<groupId>commons-collections</groupId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.microsoft.sqlserver</groupId>
|
<groupId>org.apache.velocity</groupId>
|
||||||
<artifactId>mssql-jdbc</artifactId>
|
<artifactId>velocity-engine-core</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<!--velocity end-->
|
||||||
|
|
||||||
|
<!--fastjson -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.alibaba</groupId>
|
||||||
|
<artifactId>fastjson</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!--druid -->
|
<!--druid -->
|
||||||
@ -91,24 +115,71 @@
|
|||||||
<artifactId>druid</artifactId>
|
<artifactId>druid</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- swagger begin -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba</groupId>
|
<groupId>io.springfox</groupId>
|
||||||
<artifactId>fastjson</artifactId>
|
<artifactId>springfox-swagger2</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.springfox</groupId>
|
||||||
|
<artifactId>springfox-swagger-ui</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<!-- swagger end -->
|
||||||
|
|
||||||
|
<!-- guava -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.google.guava</groupId>
|
||||||
|
<artifactId>guava</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- oss begin -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.aliyun.oss</groupId>
|
||||||
|
<artifactId>aliyun-sdk-oss</artifactId>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<artifactId>commons-logging</artifactId>
|
||||||
|
<groupId>commons-logging</groupId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.qiniu</groupId>
|
||||||
|
<artifactId>qiniu-java-sdk</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-fileupload</groupId>
|
||||||
|
<artifactId>commons-fileupload</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<!-- oss end -->
|
||||||
|
|
||||||
|
<!--jjwt-->
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.jsonwebtoken</groupId>
|
||||||
|
<artifactId>jjwt</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- easy poi begin -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>cn.afterturn</groupId>
|
||||||
|
<artifactId>easypoi-spring-boot-starter</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<!-- easy poi end -->
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-beanutils</groupId>
|
||||||
|
<artifactId>commons-beanutils</artifactId>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<artifactId>commons-logging</artifactId>
|
||||||
|
<groupId>commons-logging</groupId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.apache.commons</groupId>
|
||||||
<artifactId>spring-boot-starter-jdbc</artifactId>
|
<artifactId>commons-pool2</artifactId>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>logback-classic</artifactId>
|
|
||||||
<groupId>ch.qos.logback</groupId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>spring-boot-starter</artifactId>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -117,79 +188,8 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.baomidou</groupId>
|
<groupId>com.github.penggle</groupId>
|
||||||
<artifactId>mybatisplus-spring-boot-starter</artifactId>
|
<artifactId>kaptcha</artifactId>
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>spring-boot-starter-logging</artifactId>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-logging</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-devtools</artifactId>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.jsonwebtoken</groupId>
|
|
||||||
<artifactId>jjwt</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-mail</artifactId>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>spring-boot-starter</artifactId>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-quartz</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.quartz-scheduler</groupId>
|
|
||||||
<artifactId>quartz</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.quartz-scheduler</groupId>
|
|
||||||
<artifactId>quartz-jobs</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.commons</groupId>
|
|
||||||
<artifactId>commons-lang3</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- swagger -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.springfox</groupId>
|
|
||||||
<artifactId>springfox-swagger2</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.springfox</groupId>
|
|
||||||
<artifactId>springfox-swagger-ui</artifactId>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -198,103 +198,8 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>com.squareup.okhttp3</groupId>
|
||||||
<artifactId>spring-boot-starter-aop</artifactId>
|
<artifactId>okhttp</artifactId>
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.velocity</groupId>
|
|
||||||
<artifactId>velocity-engine-core</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!--redis-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>redis.clients</groupId>
|
|
||||||
<artifactId>jedis</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.afterturn</groupId>
|
|
||||||
<artifactId>easypoi-base</artifactId>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>javassist</artifactId>
|
|
||||||
<groupId>org.javassist</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.afterturn</groupId>
|
|
||||||
<artifactId>easypoi-web</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.afterturn</groupId>
|
|
||||||
<artifactId>easypoi-annotation</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.poi</groupId>
|
|
||||||
<artifactId>poi</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.poi</groupId>
|
|
||||||
<artifactId>poi-ooxml-schemas</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.poi</groupId>
|
|
||||||
<artifactId>poi-ooxml</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>commons-beanutils</groupId>
|
|
||||||
<artifactId>commons-beanutils</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.thoughtworks.xstream</groupId>
|
|
||||||
<artifactId>xstream</artifactId>
|
|
||||||
<version>1.4.10</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-test</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 七牛云 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.qiniu</groupId>
|
|
||||||
<artifactId>qiniu-java-sdk</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 阿里云oss -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.aliyun.oss</groupId>
|
|
||||||
<artifactId>aliyun-sdk-oss</artifactId>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>commons-lang</artifactId>
|
|
||||||
<groupId>commons-lang</groupId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>commons-logging</artifactId>
|
|
||||||
<groupId>commons-logging</groupId>
|
|
||||||
</exclusion>
|
|
||||||
<exclusion>
|
|
||||||
<artifactId>commons-collections</artifactId>
|
|
||||||
<groupId>commons-collections</groupId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.baomidou</groupId>
|
|
||||||
<artifactId>mybatis-plus</artifactId>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -303,13 +208,9 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.penggle</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
<artifactId>kaptcha</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
</dependency>
|
<scope>provided</scope>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.squareup.okhttp3</groupId>
|
|
||||||
<artifactId>okhttp</artifactId>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|||||||
@ -1,39 +0,0 @@
|
|||||||
package com.gangquan360.smartadmin.config;
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
|
|
||||||
import com.baomidou.mybatisplus.plugins.PerformanceInterceptor;
|
|
||||||
import org.mybatis.spring.annotation.MapperScan;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Conditional;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* description
|
|
||||||
*
|
|
||||||
* @author listen
|
|
||||||
* @date 2017/12/19 13:54
|
|
||||||
*/
|
|
||||||
@EnableTransactionManagement
|
|
||||||
@Configuration
|
|
||||||
@MapperScan(basePackages = {"com.gangquan360.smartadmin.module.*"})
|
|
||||||
public class SmartMybatisPlusConfig {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 分页插件
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public PaginationInterceptor paginationInterceptor() {
|
|
||||||
return new PaginationInterceptor();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* mybatis-plus SQL执行效率插件【生产环境可以关闭】
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
@Conditional(SystemEnvironmentCondition.class)
|
|
||||||
public PerformanceInterceptor performanceInterceptor() {
|
|
||||||
return new PerformanceInterceptor();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,74 +0,0 @@
|
|||||||
package com.gangquan360.smartadmin.module.codegenerator.service;
|
|
||||||
|
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [ ]
|
|
||||||
*
|
|
||||||
* @author yandanyang
|
|
||||||
* @version 1.0
|
|
||||||
* @company 1024lab.net
|
|
||||||
* @copyright (c) 2018 1024lab.netInc. All rights reserved.
|
|
||||||
* @date 2019/5/11 0011 上午 8:33
|
|
||||||
* @since JDK1.8
|
|
||||||
*/
|
|
||||||
@Component
|
|
||||||
public class CodeGeneratorComponent {
|
|
||||||
|
|
||||||
private static Map<String,String> dataMap = new HashMap<>(16);
|
|
||||||
|
|
||||||
static {
|
|
||||||
dataMap();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void dataMap(){
|
|
||||||
dataMap.put("int","Integer");
|
|
||||||
dataMap.put("tinyint","Integer");
|
|
||||||
dataMap.put("smallint","Integer");
|
|
||||||
dataMap.put("integer","Integer");
|
|
||||||
dataMap.put("bigint","Long");
|
|
||||||
dataMap.put("float","Float");
|
|
||||||
dataMap.put("double","Double");
|
|
||||||
dataMap.put("decimal","BigDecimal");
|
|
||||||
|
|
||||||
dataMap.put("char","String");
|
|
||||||
dataMap.put("varchar","String");
|
|
||||||
dataMap.put("tinytext","String");
|
|
||||||
dataMap.put("text","String");
|
|
||||||
dataMap.put("longtext","String");
|
|
||||||
|
|
||||||
dataMap.put("date","Date");
|
|
||||||
dataMap.put("datetime","Date");
|
|
||||||
dataMap.put("timestamp","Date");
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public Map<String,String> codeTemplates(String moduleClass, String basePackage, String modulePackage){
|
|
||||||
String javaPackagePath = "src"+File.separator+"main" + File.separator + "java" + File.separator;
|
|
||||||
javaPackagePath = javaPackagePath + basePackage.replace(".", File.separator) + File.separator+"module"+File.separator + modulePackage + File.separator;
|
|
||||||
String xmlPackagePath = "src"+File.separator+"main" + File.separator + "resources" + File.separator +"mapper"+File.separator+ modulePackage + File.separator;
|
|
||||||
Map<String,String> templateMap = new HashMap<>(7);
|
|
||||||
templateMap.put("templates/codegenerator/Controller.java.vm",javaPackagePath+"controller"+File.separator+moduleClass+"Controller.java");
|
|
||||||
templateMap.put("templates/codegenerator/Dao.java.vm",javaPackagePath+"dao"+File.separator+moduleClass+"Dao.java");
|
|
||||||
templateMap.put("templates/codegenerator/Dao.xml.vm",xmlPackagePath+moduleClass+"Mapper.xml");
|
|
||||||
templateMap.put("templates/codegenerator/DTO.java.vm",javaPackagePath+"domain"+File.separator+"dto"+File.separator+moduleClass+"DTO.java");
|
|
||||||
templateMap.put("templates/codegenerator/Entity.java.vm",javaPackagePath+"domain"+File.separator+"entity"+File.separator+moduleClass+"Entity.java");
|
|
||||||
templateMap.put("templates/codegenerator/QueryDTO.java.vm",javaPackagePath+"domain"+File.separator+"dto"+File.separator+moduleClass+"QueryDTO.java");
|
|
||||||
templateMap.put("templates/codegenerator/Service.java.vm",javaPackagePath+"service"+File.separator+moduleClass+"Service.java");
|
|
||||||
return templateMap;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getJavaType(String mysqlType ){
|
|
||||||
String javaType = dataMap.get(mysqlType);
|
|
||||||
return javaType;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin;
|
package net.lab1024.smartadmin;
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
@ -15,8 +15,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
|
|||||||
* @copyright (c) 2019 1024lab.netInc. All rights reserved.
|
* @copyright (c) 2019 1024lab.netInc. All rights reserved.
|
||||||
* @date
|
* @date
|
||||||
* @since JDK1.8
|
* @since JDK1.8
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
@SpringBootApplication(scanBasePackages = {"com.gangquan360.smartadmin", "cn.afterturn.easypoi"})
|
@SpringBootApplication(scanBasePackages = {"net.lab1024.smartadmin", "cn.afterturn.easypoi"})
|
||||||
@EnableCaching
|
@EnableCaching
|
||||||
@EnableScheduling
|
@EnableScheduling
|
||||||
@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
|
@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.gangquan360.smartadmin.common.anno;
|
package net.lab1024.smartadmin.common.anno;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.domain.BaseEnum;
|
import net.lab1024.smartadmin.common.domain.BaseEnum;
|
||||||
|
|
||||||
import java.lang.annotation.ElementType;
|
import java.lang.annotation.ElementType;
|
||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.gangquan360.smartadmin.common.anno;
|
package net.lab1024.smartadmin.common.anno;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.module.datascope.constant.DataScopeTypeEnum;
|
import net.lab1024.smartadmin.module.system.datascope.constant.DataScopeTypeEnum;
|
||||||
|
|
||||||
import java.lang.annotation.ElementType;
|
import java.lang.annotation.ElementType;
|
||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.anno;
|
package net.lab1024.smartadmin.common.anno;
|
||||||
|
|
||||||
import java.lang.annotation.ElementType;
|
import java.lang.annotation.ElementType;
|
||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.anno;
|
package net.lab1024.smartadmin.common.anno;
|
||||||
|
|
||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
||||||
import java.lang.annotation.RetentionPolicy;
|
import java.lang.annotation.RetentionPolicy;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.anno;
|
package net.lab1024.smartadmin.common.anno;
|
||||||
|
|
||||||
import java.lang.annotation.*;
|
import java.lang.annotation.*;
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
package com.gangquan360.smartadmin.common.constant;
|
package net.lab1024.smartadmin.common.constant;
|
||||||
|
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.domain.BaseEnum;
|
import net.lab1024.smartadmin.common.domain.BaseEnum;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 全局排序枚举类
|
* 全局排序枚举类
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.gangquan360.smartadmin.common.constant;
|
package net.lab1024.smartadmin.common.constant;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.domain.BaseEnum;
|
import net.lab1024.smartadmin.common.domain.BaseEnum;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
@ -1,14 +1,14 @@
|
|||||||
package com.gangquan360.smartadmin.common.constant;
|
package net.lab1024.smartadmin.common.constant;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.module.department.DepartmentResponseCodeConst;
|
import net.lab1024.smartadmin.module.system.department.DepartmentResponseCodeConst;
|
||||||
import com.gangquan360.smartadmin.module.employee.constant.EmployeeResponseCodeConst;
|
import net.lab1024.smartadmin.module.system.employee.constant.EmployeeResponseCodeConst;
|
||||||
import com.gangquan360.smartadmin.module.file.constant.FileResponseCodeConst;
|
import net.lab1024.smartadmin.module.support.file.constant.FileResponseCodeConst;
|
||||||
import com.gangquan360.smartadmin.module.log.orderoperatelog.constant.OrderOperateLogOperateTypeConst;
|
import net.lab1024.smartadmin.module.business.log.orderoperatelog.constant.OrderOperateLogOperateTypeConst;
|
||||||
import com.gangquan360.smartadmin.module.login.LoginResponseCodeConst;
|
import net.lab1024.smartadmin.module.business.login.LoginResponseCodeConst;
|
||||||
import com.gangquan360.smartadmin.module.position.PositionResponseCodeConst;
|
import net.lab1024.smartadmin.module.system.position.PositionResponseCodeConst;
|
||||||
import com.gangquan360.smartadmin.module.privilege.constant.PrivilegeResponseCodeConst;
|
import net.lab1024.smartadmin.module.system.privilege.constant.PrivilegeResponseCodeConst;
|
||||||
import com.gangquan360.smartadmin.module.role.basic.RoleResponseCodeConst;
|
import net.lab1024.smartadmin.module.system.role.basic.RoleResponseCodeConst;
|
||||||
import com.gangquan360.smartadmin.module.systemconfig.constant.SystemConfigResponseCodeConst;
|
import net.lab1024.smartadmin.module.system.systemconfig.constant.SystemConfigResponseCodeConst;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
@ -37,9 +37,7 @@ public class ResponseCodeConst {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final ResponseCodeConst SUCCESS = new ResponseCodeConst(1, "success", true);
|
public static final ResponseCodeConst SUCCESS = new ResponseCodeConst(1, "操作成功!", true);
|
||||||
|
|
||||||
public static final ResponseCodeConst COMMON_ERROR = new ResponseCodeConst(2, "我错了....");
|
|
||||||
|
|
||||||
public static final ResponseCodeConst ERROR_PARAM = new ResponseCodeConst(101, "参数异常！");
|
public static final ResponseCodeConst ERROR_PARAM = new ResponseCodeConst(101, "参数异常！");
|
||||||
|
|
||||||
@ -0,0 +1,42 @@
|
|||||||
|
package net.lab1024.smartadmin.common.controller;
|
||||||
|
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.poi.ss.usermodel.Workbook;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
|
import java.net.URLEncoder;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author: zhuoda
|
||||||
|
* @create: 2020-03-31 08:54 PM from win10
|
||||||
|
*/
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
public class BaseController {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 下载 Excel 消息头
|
||||||
|
* @param fileName
|
||||||
|
* @param workbook
|
||||||
|
* @param response
|
||||||
|
*/
|
||||||
|
public void downloadExcel(String fileName, Workbook workbook, HttpServletResponse response) {
|
||||||
|
try {
|
||||||
|
fileName = URLEncoder.encode(fileName, "UTF-8");
|
||||||
|
} catch (UnsupportedEncodingException e) {
|
||||||
|
log.error("", e);
|
||||||
|
}
|
||||||
|
response.setCharacterEncoding("utf-8");
|
||||||
|
response.setHeader("Content-Type", "application/vnd.ms-excel");
|
||||||
|
response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xls");
|
||||||
|
try {
|
||||||
|
workbook.write(response.getOutputStream());
|
||||||
|
workbook.close();
|
||||||
|
} catch (IOException e) {
|
||||||
|
log.error("", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,7 +1,7 @@
|
|||||||
package com.gangquan360.smartadmin.common.domain;
|
package net.lab1024.smartadmin.common.domain;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotations.TableId;
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
import com.baomidou.mybatisplus.enums.IdType;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.domain;
|
package net.lab1024.smartadmin.common.domain;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.alibaba.fastjson.JSONAware;
|
import com.alibaba.fastjson.JSONAware;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.module.quartz.task;
|
package net.lab1024.smartadmin.common.domain;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [ ]
|
* [ ]
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
package net.lab1024.smartadmin.common.domain;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author: zhuoda
|
||||||
|
* @create: 2020-03-20 09:07 PM from win10
|
||||||
|
*/
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Data
|
||||||
|
public class OrderItemDTO {
|
||||||
|
private String column;
|
||||||
|
private boolean asc = true;
|
||||||
|
}
|
||||||
@ -1,10 +1,11 @@
|
|||||||
package com.gangquan360.smartadmin.common.domain;
|
package net.lab1024.smartadmin.common.domain;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.validation.constraints.Max;
|
import javax.validation.constraints.Max;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页基础参数
|
* 分页基础参数
|
||||||
@ -24,12 +25,9 @@ public class PageParamDTO {
|
|||||||
@Max(value = 200, message = "每页最大为200")
|
@Max(value = 200, message = "每页最大为200")
|
||||||
protected Integer pageSize;
|
protected Integer pageSize;
|
||||||
|
|
||||||
@ApiModelProperty("排序规则：true正序 | false 倒序")
|
|
||||||
protected Boolean sort;
|
|
||||||
|
|
||||||
@ApiModelProperty("排序字段")
|
|
||||||
protected String orderByField;
|
|
||||||
|
|
||||||
@ApiModelProperty("是否查询总条数")
|
@ApiModelProperty("是否查询总条数")
|
||||||
protected Boolean searchCount;
|
protected Boolean searchCount;
|
||||||
|
|
||||||
|
@ApiModelProperty("排序")
|
||||||
|
protected List<OrderItemDTO> orders;
|
||||||
}
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.domain;
|
package net.lab1024.smartadmin.common.domain;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -18,13 +18,13 @@ public class PageResultDTO<T> {
|
|||||||
* 当前页
|
* 当前页
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "当前页")
|
@ApiModelProperty(value = "当前页")
|
||||||
private Integer pageNum;
|
private Long pageNum;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 每页的数量
|
* 每页的数量
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "每页的数量")
|
@ApiModelProperty(value = "每页的数量")
|
||||||
private Integer pageSize;
|
private Long pageSize;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 总记录数
|
* 总记录数
|
||||||
@ -36,7 +36,7 @@ public class PageResultDTO<T> {
|
|||||||
* 总页数
|
* 总页数
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "总页数")
|
@ApiModelProperty(value = "总页数")
|
||||||
private Integer pages;
|
private Long pages;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 结果集
|
* 结果集
|
||||||
@ -1,13 +1,13 @@
|
|||||||
package com.gangquan360.smartadmin.common.domain;
|
package net.lab1024.smartadmin.common.domain;
|
||||||
|
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.constant.ResponseCodeConst;
|
import net.lab1024.smartadmin.common.constant.ResponseCodeConst;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 返回类
|
* 返回类
|
||||||
*
|
*
|
||||||
* @param <T>
|
* @param <T>
|
||||||
* @author gangquan
|
* @author zhuoda
|
||||||
*/
|
*/
|
||||||
public class ResponseDTO<T> {
|
public class ResponseDTO<T> {
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.domain;
|
package net.lab1024.smartadmin.common.domain;
|
||||||
|
|
||||||
import javax.validation.Valid;
|
import javax.validation.Valid;
|
||||||
import javax.validation.constraints.NotEmpty;
|
import javax.validation.constraints.NotEmpty;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.exception;
|
package net.lab1024.smartadmin.common.exception;
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* [ 业务逻辑异常,全局异常拦截后统一返回ResponseCodeConst.SYSTEM_ERROR ]
|
* [ 业务逻辑异常,全局异常拦截后统一返回ResponseCodeConst.SYSTEM_ERROR ]
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.exception;
|
package net.lab1024.smartadmin.common.exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [ 全局异常拦截后保留ResponseCode码的异常]
|
* [ 全局异常拦截后保留ResponseCode码的异常]
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.heartbeat;
|
package net.lab1024.smartadmin.common.heartbeat;
|
||||||
|
|
||||||
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.heartbeat;
|
package net.lab1024.smartadmin.common.heartbeat;
|
||||||
|
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.heartbeat;
|
package net.lab1024.smartadmin.common.heartbeat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [ ]
|
* [ ]
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.heartbeat;
|
package net.lab1024.smartadmin.common.heartbeat;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.heartbeat;
|
package net.lab1024.smartadmin.common.heartbeat;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.heartbeat;
|
package net.lab1024.smartadmin.common.heartbeat;
|
||||||
|
|
||||||
|
|
||||||
import java.lang.management.ManagementFactory;
|
import java.lang.management.ManagementFactory;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.heartbeat;
|
package net.lab1024.smartadmin.common.heartbeat;
|
||||||
|
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
import java.net.NetworkInterface;
|
import java.net.NetworkInterface;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.heartbeat;
|
package net.lab1024.smartadmin.common.heartbeat;
|
||||||
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.json;
|
package net.lab1024.smartadmin.common.json;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonParser;
|
import com.fasterxml.jackson.core.JsonParser;
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.json;
|
package net.lab1024.smartadmin.common.json;
|
||||||
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonGenerator;
|
import com.fasterxml.jackson.core.JsonGenerator;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.kaptcha;
|
package net.lab1024.smartadmin.common.kaptcha;
|
||||||
|
|
||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.kaptcha;
|
package net.lab1024.smartadmin.common.kaptcha;
|
||||||
|
|
||||||
import com.google.code.kaptcha.NoiseProducer;
|
import com.google.code.kaptcha.NoiseProducer;
|
||||||
import com.google.code.kaptcha.util.Configurable;
|
import com.google.code.kaptcha.util.Configurable;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.kaptcha;
|
package net.lab1024.smartadmin.common.kaptcha;
|
||||||
|
|
||||||
import com.google.code.kaptcha.util.Configurable;
|
import com.google.code.kaptcha.util.Configurable;
|
||||||
|
|
||||||
@ -0,0 +1,46 @@
|
|||||||
|
package net.lab1024.smartadmin.common.mybatis;
|
||||||
|
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.ibatis.mapping.BoundSql;
|
||||||
|
import org.apache.ibatis.mapping.MappedStatement;
|
||||||
|
import org.apache.ibatis.plugin.*;
|
||||||
|
import org.apache.ibatis.session.ResultHandler;
|
||||||
|
import org.apache.ibatis.session.RowBounds;
|
||||||
|
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [ mybaits sql 拦截 ]
|
||||||
|
*
|
||||||
|
* @author zhuoda
|
||||||
|
* @version 1.0
|
||||||
|
* @company 1024lab.net
|
||||||
|
* @copyright (c) 2019 1024lab.netInc. All rights reserved.
|
||||||
|
* @date
|
||||||
|
* @since JDK1.8
|
||||||
|
*/
|
||||||
|
@Intercepts({@Signature(type = org.apache.ibatis.executor.Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class})})
|
||||||
|
@Slf4j
|
||||||
|
public class MyBatisSqlQuerySqlDebugPlugin implements Interceptor {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object intercept(Invocation invocation) throws Throwable {
|
||||||
|
MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
|
||||||
|
Object parameter = invocation.getArgs()[1];
|
||||||
|
BoundSql boundSql = mappedStatement.getBoundSql(parameter);
|
||||||
|
log.info(boundSql.getSql()+"\r\n"+boundSql.getParameterMappings().toString());
|
||||||
|
Object obj = invocation.proceed();
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object plugin(Object arg0) {
|
||||||
|
return Plugin.wrap(arg0,this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setProperties(Properties arg0) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,44 @@
|
|||||||
|
package net.lab1024.smartadmin.common.mybatis;
|
||||||
|
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.apache.ibatis.mapping.BoundSql;
|
||||||
|
import org.apache.ibatis.mapping.MappedStatement;
|
||||||
|
import org.apache.ibatis.plugin.*;
|
||||||
|
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [ mybaits sql 拦截 ]
|
||||||
|
*
|
||||||
|
* @author zhuoda
|
||||||
|
* @version 1.0
|
||||||
|
* @company 1024lab.net
|
||||||
|
* @copyright (c) 2019 1024lab.netInc. All rights reserved.
|
||||||
|
* @date
|
||||||
|
* @since JDK1.8
|
||||||
|
*/
|
||||||
|
@Intercepts({@Signature(type = org.apache.ibatis.executor.Executor.class, method = "update", args = {MappedStatement.class, Object.class})})
|
||||||
|
@Slf4j
|
||||||
|
public class MyBatisSqlUpdateSqlDebugPlugin implements Interceptor {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object intercept(Invocation invocation) throws Throwable {
|
||||||
|
MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
|
||||||
|
Object parameter = invocation.getArgs()[1];
|
||||||
|
BoundSql boundSql = mappedStatement.getBoundSql(parameter);
|
||||||
|
log.info(boundSql.getSql()+"\r\n"+boundSql.getParameterMappings().toString());
|
||||||
|
Object obj = invocation.proceed();
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object plugin(Object arg0) {
|
||||||
|
return Plugin.wrap(arg0,this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setProperties(Properties arg0) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,14 +1,14 @@
|
|||||||
package com.gangquan360.smartadmin.common.reload;
|
package net.lab1024.smartadmin.common.reload;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.reload.annotation.SmartReload;
|
import net.lab1024.smartadmin.common.reload.annotation.SmartReload;
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.AbstractSmartReloadObject;
|
import net.lab1024.smartadmin.common.reload.domain.AbstractSmartReloadObject;
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.AnnotationReloadObject;
|
import net.lab1024.smartadmin.common.reload.domain.AnnotationReloadObject;
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.InterfaceReloadObject;
|
import net.lab1024.smartadmin.common.reload.domain.InterfaceReloadObject;
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem;
|
import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem;
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.entity.SmartReloadResult;
|
import net.lab1024.smartadmin.common.reload.domain.entity.SmartReloadResult;
|
||||||
import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadCommandInterface;
|
import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadCommandInterface;
|
||||||
import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadThreadLogger;
|
import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadThreadLogger;
|
||||||
import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadable;
|
import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadable;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@ -1,7 +1,7 @@
|
|||||||
package com.gangquan360.smartadmin.common.reload;
|
package net.lab1024.smartadmin.common.reload;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadCommandInterface;
|
import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadCommandInterface;
|
||||||
import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadThreadLogger;
|
import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadThreadLogger;
|
||||||
|
|
||||||
import java.util.concurrent.ScheduledThreadPoolExecutor;
|
import java.util.concurrent.ScheduledThreadPoolExecutor;
|
||||||
import java.util.concurrent.ThreadFactory;
|
import java.util.concurrent.ThreadFactory;
|
||||||
@ -1,8 +1,8 @@
|
|||||||
package com.gangquan360.smartadmin.common.reload.abstracts;
|
package net.lab1024.smartadmin.common.reload.abstracts;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.reload.SmartReloadManager;
|
import net.lab1024.smartadmin.common.reload.SmartReloadManager;
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem;
|
import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem;
|
||||||
import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadCommandInterface;
|
import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadCommandInterface;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
@ -1,11 +1,10 @@
|
|||||||
package com.gangquan360.smartadmin.common.reload.abstracts;
|
package net.lab1024.smartadmin.common.reload.abstracts;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.reload.SmartReloadManager;
|
import net.lab1024.smartadmin.common.reload.SmartReloadManager;
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem;
|
import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem;
|
||||||
import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadCommandInterface;
|
import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadCommandInterface;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
||||||
import javax.annotation.PostConstruct;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.reload.annotation;
|
package net.lab1024.smartadmin.common.reload.annotation;
|
||||||
|
|
||||||
import java.lang.annotation.ElementType;
|
import java.lang.annotation.ElementType;
|
||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
||||||
@ -1,7 +1,7 @@
|
|||||||
package com.gangquan360.smartadmin.common.reload.domain;
|
package net.lab1024.smartadmin.common.reload.domain;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem;
|
import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem;
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.entity.SmartReloadResult;
|
import net.lab1024.smartadmin.common.reload.domain.entity.SmartReloadResult;
|
||||||
|
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.io.StringWriter;
|
import java.io.StringWriter;
|
||||||
@ -1,8 +1,8 @@
|
|||||||
package com.gangquan360.smartadmin.common.reload.domain;
|
package net.lab1024.smartadmin.common.reload.domain;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.reload.annotation.SmartReload;
|
import net.lab1024.smartadmin.common.reload.annotation.SmartReload;
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem;
|
import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem;
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.entity.SmartReloadResult;
|
import net.lab1024.smartadmin.common.reload.domain.entity.SmartReloadResult;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
|
||||||
@ -1,8 +1,8 @@
|
|||||||
package com.gangquan360.smartadmin.common.reload.domain;
|
package net.lab1024.smartadmin.common.reload.domain;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem;
|
import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem;
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.entity.SmartReloadResult;
|
import net.lab1024.smartadmin.common.reload.domain.entity.SmartReloadResult;
|
||||||
import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadable;
|
import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reload 处理程序的实现类
|
* Reload 处理程序的实现类
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.reload.domain.entity;
|
package net.lab1024.smartadmin.common.reload.domain.entity;
|
||||||
/**
|
/**
|
||||||
* ReloadItem 类
|
* ReloadItem 类
|
||||||
*
|
*
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.reload.domain.entity;
|
package net.lab1024.smartadmin.common.reload.domain.entity;
|
||||||
/**
|
/**
|
||||||
* t_reload_result 表 实体类
|
* t_reload_result 表 实体类
|
||||||
*
|
*
|
||||||
@ -1,7 +1,7 @@
|
|||||||
package com.gangquan360.smartadmin.common.reload.interfaces;
|
package net.lab1024.smartadmin.common.reload.interfaces;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem;
|
import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem;
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.entity.SmartReloadResult;
|
import net.lab1024.smartadmin.common.reload.domain.entity.SmartReloadResult;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.reload.interfaces;
|
package net.lab1024.smartadmin.common.reload.interfaces;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SmartReloadThreadLogger 日志类
|
* SmartReloadThreadLogger 日志类
|
||||||
@ -1,6 +1,7 @@
|
|||||||
package com.gangquan360.smartadmin.common.reload.interfaces;
|
package net.lab1024.smartadmin.common.reload.interfaces;
|
||||||
|
|
||||||
|
import net.lab1024.smartadmin.common.reload.domain.entity.ReloadItem;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.reload.domain.entity.ReloadItem;
|
|
||||||
/**
|
/**
|
||||||
* reload 接口<br>
|
* reload 接口<br>
|
||||||
* 需要reload的业务实现类
|
* 需要reload的业务实现类
|
||||||
@ -17,16 +17,14 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.gangquan360.smartadmin.common.swagger;
|
package net.lab1024.smartadmin.common.swagger;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.anno.ApiModelPropertyEnum;
|
import net.lab1024.smartadmin.common.anno.ApiModelPropertyEnum;
|
||||||
import com.gangquan360.smartadmin.common.domain.BaseEnum;
|
import net.lab1024.smartadmin.common.domain.BaseEnum;
|
||||||
import com.google.common.base.Function;
|
import com.google.common.base.Function;
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.core.annotation.AnnotationUtils;
|
import org.springframework.core.annotation.AnnotationUtils;
|
||||||
import org.springframework.core.annotation.Order;
|
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
import springfox.documentation.spi.DocumentationType;
|
import springfox.documentation.spi.DocumentationType;
|
||||||
import springfox.documentation.spi.schema.ModelPropertyBuilderPlugin;
|
import springfox.documentation.spi.schema.ModelPropertyBuilderPlugin;
|
||||||
import springfox.documentation.spi.schema.contexts.ModelPropertyContext;
|
import springfox.documentation.spi.schema.contexts.ModelPropertyContext;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.gangquan360.smartadmin.common.validator.bigdecimal;
|
package net.lab1024.smartadmin.common.validator.bigdecimal;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.util.SmartBigDecimalUtil;
|
import net.lab1024.smartadmin.util.SmartBigDecimalUtil;
|
||||||
|
|
||||||
import javax.validation.ConstraintValidator;
|
import javax.validation.ConstraintValidator;
|
||||||
import javax.validation.ConstraintValidatorContext;
|
import javax.validation.ConstraintValidatorContext;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.validator.bigdecimal;
|
package net.lab1024.smartadmin.common.validator.bigdecimal;
|
||||||
|
|
||||||
import javax.validation.Constraint;
|
import javax.validation.Constraint;
|
||||||
import javax.validation.Payload;
|
import javax.validation.Payload;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.common.validator.bigdecimal;
|
package net.lab1024.smartadmin.common.validator.bigdecimal;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 比较符枚举类
|
* 比较符枚举类
|
||||||
@ -1,8 +1,7 @@
|
|||||||
package com.gangquan360.smartadmin.common.validator.en;
|
package net.lab1024.smartadmin.common.validator.en;
|
||||||
|
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.domain.BaseEnum;
|
import net.lab1024.smartadmin.common.domain.BaseEnum;
|
||||||
import com.gangquan360.smartadmin.common.validator.en.EnumValidator;
|
|
||||||
|
|
||||||
import javax.validation.Constraint;
|
import javax.validation.Constraint;
|
||||||
import javax.validation.Payload;
|
import javax.validation.Payload;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.gangquan360.smartadmin.common.validator.en;
|
package net.lab1024.smartadmin.common.validator.en;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.domain.BaseEnum;
|
import net.lab1024.smartadmin.common.domain.BaseEnum;
|
||||||
|
|
||||||
import javax.validation.ConstraintValidator;
|
import javax.validation.ConstraintValidator;
|
||||||
import javax.validation.ConstraintValidatorContext;
|
import javax.validation.ConstraintValidatorContext;
|
||||||
@ -1,17 +1,13 @@
|
|||||||
package com.gangquan360.smartadmin.config;
|
package net.lab1024.smartadmin.config;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.interceptor.SmartAuthenticationInterceptor;
|
import net.lab1024.smartadmin.interceptor.SmartAuthenticationInterceptor;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.web.servlet.config.annotation.*;
|
import org.springframework.web.servlet.config.annotation.*;
|
||||||
|
|
||||||
/**
|
|
||||||
* @Description
|
|
||||||
* @Author lihaifan
|
|
||||||
* @Date Created in 2017/10/24 13:48
|
|
||||||
*/
|
|
||||||
@Configuration
|
@Configuration
|
||||||
public class SmartAdminWebAppConfig implements WebMvcConfigurer {
|
public class SmartAdminWebAppConfig implements WebMvcConfigurer {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private SmartAuthenticationInterceptor smartAuthenticationInterceptor;
|
private SmartAuthenticationInterceptor smartAuthenticationInterceptor;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.config;
|
package net.lab1024.smartadmin.config;
|
||||||
|
|
||||||
import com.alibaba.druid.filter.Filter;
|
import com.alibaba.druid.filter.Filter;
|
||||||
import com.alibaba.druid.filter.stat.StatFilter;
|
import com.alibaba.druid.filter.stat.StatFilter;
|
||||||
@ -6,6 +6,7 @@ import com.alibaba.druid.pool.DruidDataSource;
|
|||||||
import com.alibaba.druid.support.http.StatViewServlet;
|
import com.alibaba.druid.support.http.StatViewServlet;
|
||||||
import com.alibaba.druid.support.http.WebStatFilter;
|
import com.alibaba.druid.support.http.WebStatFilter;
|
||||||
import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
|
import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
|
||||||
|
import com.alibaba.druid.util.JdbcConstants;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.aop.support.DefaultPointcutAdvisor;
|
import org.springframework.aop.support.DefaultPointcutAdvisor;
|
||||||
import org.springframework.aop.support.JdkRegexpMethodPointcut;
|
import org.springframework.aop.support.JdkRegexpMethodPointcut;
|
||||||
@ -89,6 +90,7 @@ public class SmartDruidDataSourceConfig {
|
|||||||
@Primary
|
@Primary
|
||||||
public DataSource druidDataSource() {
|
public DataSource druidDataSource() {
|
||||||
DruidDataSource druidDataSource = new DruidDataSource();
|
DruidDataSource druidDataSource = new DruidDataSource();
|
||||||
|
druidDataSource.setDbType(JdbcConstants.MYSQL);
|
||||||
druidDataSource.setDriverClassName(driver);
|
druidDataSource.setDriverClassName(driver);
|
||||||
druidDataSource.setUrl(url);
|
druidDataSource.setUrl(url);
|
||||||
druidDataSource.setUsername(username);
|
druidDataSource.setUsername(username);
|
||||||
@ -155,7 +157,7 @@ public class SmartDruidDataSourceConfig {
|
|||||||
@Bean
|
@Bean
|
||||||
public JdkRegexpMethodPointcut jdkRegexpMethodPointcut() {
|
public JdkRegexpMethodPointcut jdkRegexpMethodPointcut() {
|
||||||
JdkRegexpMethodPointcut jdkRegexpMethodPointcut = new JdkRegexpMethodPointcut();
|
JdkRegexpMethodPointcut jdkRegexpMethodPointcut = new JdkRegexpMethodPointcut();
|
||||||
jdkRegexpMethodPointcut.setPatterns("com.gangquan360.smartadmin.module..*Service.*");
|
jdkRegexpMethodPointcut.setPatterns("net.lab1024.smartadmin.module..*Service.*");
|
||||||
return jdkRegexpMethodPointcut;
|
return jdkRegexpMethodPointcut;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.config;
|
package net.lab1024.smartadmin.config;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
@ -1,7 +1,7 @@
|
|||||||
package com.gangquan360.smartadmin.config;
|
package net.lab1024.smartadmin.config;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.kaptcha.KaptchaNoise;
|
import net.lab1024.smartadmin.common.kaptcha.KaptchaNoise;
|
||||||
import com.gangquan360.smartadmin.common.kaptcha.KaptchaWordRenderer;
|
import net.lab1024.smartadmin.common.kaptcha.KaptchaWordRenderer;
|
||||||
import com.google.code.kaptcha.impl.DefaultKaptcha;
|
import com.google.code.kaptcha.impl.DefaultKaptcha;
|
||||||
import com.google.code.kaptcha.util.Config;
|
import com.google.code.kaptcha.util.Config;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
@ -0,0 +1,44 @@
|
|||||||
|
package net.lab1024.smartadmin.config;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
|
||||||
|
import net.lab1024.smartadmin.common.mybatis.MyBatisSqlQuerySqlDebugPlugin;
|
||||||
|
import net.lab1024.smartadmin.common.mybatis.MyBatisSqlUpdateSqlDebugPlugin;
|
||||||
|
import net.lab1024.smartadmin.constant.SystemEnvironmentEnum;
|
||||||
|
import org.mybatis.spring.annotation.MapperScan;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.context.annotation.Profile;
|
||||||
|
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author zhuoda
|
||||||
|
*/
|
||||||
|
@EnableTransactionManagement
|
||||||
|
@Configuration
|
||||||
|
@MapperScan(basePackages = {"net.lab1024.smartadmin.module.*"})
|
||||||
|
public class SmartMybatisPlusConfig {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页插件
|
||||||
|
*/
|
||||||
|
@Bean
|
||||||
|
public PaginationInterceptor paginationInterceptor() {
|
||||||
|
// 开启 count 的 join 优化,只针对 left join !!!
|
||||||
|
return new PaginationInterceptor().setCountSqlParser(new JsqlParserCountOptimize(true));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打印sql log
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Bean
|
||||||
|
@Profile(SystemEnvironmentEnum.DEV_ENV)
|
||||||
|
ConfigurationCustomizer mybatisConfigurationCustomizer() {
|
||||||
|
return configuration -> {
|
||||||
|
configuration.addInterceptor(new MyBatisSqlUpdateSqlDebugPlugin());
|
||||||
|
configuration.addInterceptor(new MyBatisSqlQuerySqlDebugPlugin());
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.config;
|
package net.lab1024.smartadmin.config;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
import com.fasterxml.jackson.annotation.PropertyAccessor;
|
import com.fasterxml.jackson.annotation.PropertyAccessor;
|
||||||
@ -1,7 +1,7 @@
|
|||||||
package com.gangquan360.smartadmin.config;
|
package net.lab1024.smartadmin.config;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.reload.SmartReloadManager;
|
import net.lab1024.smartadmin.common.reload.SmartReloadManager;
|
||||||
import com.gangquan360.smartadmin.common.reload.interfaces.SmartReloadThreadLogger;
|
import net.lab1024.smartadmin.common.reload.interfaces.SmartReloadThreadLogger;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.config;
|
package net.lab1024.smartadmin.config;
|
||||||
|
|
||||||
import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
|
import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
|
||||||
import org.apache.http.client.HttpClient;
|
import org.apache.http.client.HttpClient;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.gangquan360.smartadmin.config;
|
package net.lab1024.smartadmin.config;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.swagger.SmartSwaggerApiModelEnumPlugin;
|
import net.lab1024.smartadmin.common.swagger.SmartSwaggerApiModelEnumPlugin;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.annotation.Profile;
|
import org.springframework.context.annotation.Profile;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.gangquan360.smartadmin.config;
|
package net.lab1024.smartadmin.config;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.constant.SwaggerTagConst;
|
import net.lab1024.smartadmin.constant.SwaggerTagConst;
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
import com.google.common.base.Predicate;
|
import com.google.common.base.Predicate;
|
||||||
import com.google.common.base.Predicates;
|
import com.google.common.base.Predicates;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.config;
|
package net.lab1024.smartadmin.config;
|
||||||
|
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
@ -1,5 +1,5 @@
|
|||||||
package com.gangquan360.smartadmin.config;
|
package net.lab1024.smartadmin.config;
|
||||||
import com.gangquan360.smartadmin.constant.SystemEnvironmentEnum;
|
import net.lab1024.smartadmin.constant.SystemEnvironmentEnum;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.context.annotation.Condition;
|
import org.springframework.context.annotation.Condition;
|
||||||
import org.springframework.context.annotation.ConditionContext;
|
import org.springframework.context.annotation.ConditionContext;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.constant;
|
package net.lab1024.smartadmin.constant;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableSet;
|
import com.google.common.collect.ImmutableSet;
|
||||||
import org.apache.commons.collections4.CollectionUtils;
|
import org.apache.commons.collections4.CollectionUtils;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.constant;
|
package net.lab1024.smartadmin.constant;
|
||||||
/**
|
/**
|
||||||
* smart initDefines 项 常量
|
* smart initDefines 项 常量
|
||||||
*
|
*
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.constant;
|
package net.lab1024.smartadmin.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* []
|
* []
|
||||||
@ -1,6 +1,7 @@
|
|||||||
package com.gangquan360.smartadmin.constant;
|
package net.lab1024.smartadmin.constant;
|
||||||
|
|
||||||
|
import net.lab1024.smartadmin.common.domain.BaseEnum;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.domain.BaseEnum;
|
|
||||||
/**
|
/**
|
||||||
* 系统环境枚举类
|
* 系统环境枚举类
|
||||||
*
|
*
|
||||||
@ -9,6 +10,7 @@ import com.gangquan360.smartadmin.common.domain.BaseEnum;
|
|||||||
*/
|
*/
|
||||||
public enum SystemEnvironmentEnum implements BaseEnum {
|
public enum SystemEnvironmentEnum implements BaseEnum {
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* dev
|
* dev
|
||||||
*/
|
*/
|
||||||
@ -29,6 +31,10 @@ public enum SystemEnvironmentEnum implements BaseEnum {
|
|||||||
*/
|
*/
|
||||||
PROD("prod", "生产环境");
|
PROD("prod", "生产环境");
|
||||||
|
|
||||||
|
|
||||||
|
public static final String DEV_ENV = "dev";
|
||||||
|
|
||||||
|
|
||||||
private String value;
|
private String value;
|
||||||
|
|
||||||
private String desc;
|
private String desc;
|
||||||
@ -37,6 +43,7 @@ public enum SystemEnvironmentEnum implements BaseEnum {
|
|||||||
this.value = value;
|
this.value = value;
|
||||||
this.desc = desc;
|
this.desc = desc;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取定义枚举value值
|
* 获取定义枚举value值
|
||||||
*
|
*
|
||||||
@ -1,8 +1,8 @@
|
|||||||
package com.gangquan360.smartadmin.handler;
|
package net.lab1024.smartadmin.handler;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.constant.ResponseCodeConst;
|
import net.lab1024.smartadmin.common.constant.ResponseCodeConst;
|
||||||
import com.gangquan360.smartadmin.common.domain.ResponseDTO;
|
import net.lab1024.smartadmin.common.domain.ResponseDTO;
|
||||||
import com.gangquan360.smartadmin.common.exception.SmartBusinessException;
|
import net.lab1024.smartadmin.common.exception.SmartBusinessException;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.TypeMismatchException;
|
import org.springframework.beans.TypeMismatchException;
|
||||||
import org.springframework.http.converter.HttpMessageNotReadableException;
|
import org.springframework.http.converter.HttpMessageNotReadableException;
|
||||||
@ -40,6 +40,8 @@ public class SmartGlobalExceptionHandler {
|
|||||||
@ResponseBody
|
@ResponseBody
|
||||||
@ExceptionHandler(Exception.class)
|
@ExceptionHandler(Exception.class)
|
||||||
public ResponseDTO exceptionHandler(Exception e) {
|
public ResponseDTO exceptionHandler(Exception e) {
|
||||||
|
log.error("error:", e);
|
||||||
|
|
||||||
// http 请求方式错误
|
// http 请求方式错误
|
||||||
if (e instanceof HttpRequestMethodNotSupportedException) {
|
if (e instanceof HttpRequestMethodNotSupportedException) {
|
||||||
return ResponseDTO.wrap(ResponseCodeConst.REQUEST_METHOD_ERROR);
|
return ResponseDTO.wrap(ResponseCodeConst.REQUEST_METHOD_ERROR);
|
||||||
@ -66,8 +68,6 @@ public class SmartGlobalExceptionHandler {
|
|||||||
return ResponseDTO.wrap(ResponseCodeConst.SYSTEM_ERROR);
|
return ResponseDTO.wrap(ResponseCodeConst.SYSTEM_ERROR);
|
||||||
}
|
}
|
||||||
|
|
||||||
log.error("error:", e);
|
|
||||||
|
|
||||||
return ResponseDTO.wrap(ResponseCodeConst.SYSTEM_ERROR);
|
return ResponseDTO.wrap(ResponseCodeConst.SYSTEM_ERROR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,13 +1,13 @@
|
|||||||
package com.gangquan360.smartadmin.handler;
|
package net.lab1024.smartadmin.handler;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.gangquan360.smartadmin.common.anno.OperateLog;
|
import net.lab1024.smartadmin.common.anno.OperateLog;
|
||||||
import com.gangquan360.smartadmin.common.constant.JudgeEnum;
|
import net.lab1024.smartadmin.common.constant.JudgeEnum;
|
||||||
import com.gangquan360.smartadmin.module.log.LogService;
|
import net.lab1024.smartadmin.module.business.log.LogService;
|
||||||
import com.gangquan360.smartadmin.module.log.useroperatelog.domain.UserOperateLogEntity;
|
import net.lab1024.smartadmin.module.business.log.useroperatelog.domain.UserOperateLogEntity;
|
||||||
import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO;
|
import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO;
|
||||||
import com.gangquan360.smartadmin.util.SmartRequestTokenUtil;
|
import net.lab1024.smartadmin.util.SmartRequestTokenUtil;
|
||||||
import com.gangquan360.smartadmin.util.SmartStringUtil;
|
import net.lab1024.smartadmin.util.SmartStringUtil;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@ -46,7 +46,7 @@ public class SmartOperateLogAspect {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private LogService logService;
|
private LogService logService;
|
||||||
|
|
||||||
@Pointcut("execution(* com.gangquan360.smartadmin.module..*Controller.*(..)))")
|
@Pointcut("execution(* net.lab1024.smartadmin.module..*Controller.*(..)))")
|
||||||
public void logPointCut() {
|
public void logPointCut() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1,16 +1,16 @@
|
|||||||
package com.gangquan360.smartadmin.interceptor;
|
package net.lab1024.smartadmin.interceptor;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.gangquan360.smartadmin.common.anno.NoNeedLogin;
|
import net.lab1024.smartadmin.common.anno.NoNeedLogin;
|
||||||
import com.gangquan360.smartadmin.common.anno.NoValidPrivilege;
|
import net.lab1024.smartadmin.common.anno.NoValidPrivilege;
|
||||||
import com.gangquan360.smartadmin.common.domain.ResponseDTO;
|
import net.lab1024.smartadmin.common.domain.ResponseDTO;
|
||||||
import com.gangquan360.smartadmin.constant.CommonConst;
|
import net.lab1024.smartadmin.constant.CommonConst;
|
||||||
import com.gangquan360.smartadmin.module.login.LoginResponseCodeConst;
|
import net.lab1024.smartadmin.module.business.login.LoginResponseCodeConst;
|
||||||
import com.gangquan360.smartadmin.module.login.LoginTokenService;
|
import net.lab1024.smartadmin.module.business.login.LoginTokenService;
|
||||||
import com.gangquan360.smartadmin.module.login.domain.RequestTokenBO;
|
import net.lab1024.smartadmin.module.business.login.domain.RequestTokenBO;
|
||||||
import com.gangquan360.smartadmin.module.privilege.service.PrivilegeEmployeeService;
|
import net.lab1024.smartadmin.module.system.privilege.service.PrivilegeEmployeeService;
|
||||||
import com.gangquan360.smartadmin.util.SmartRequestTokenUtil;
|
import net.lab1024.smartadmin.util.SmartRequestTokenUtil;
|
||||||
import com.gangquan360.smartadmin.util.SmartStringUtil;
|
import net.lab1024.smartadmin.util.SmartStringUtil;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.gangquan360.smartadmin.listener;
|
package net.lab1024.smartadmin.listener;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.constant.ResponseCodeConst;
|
import net.lab1024.smartadmin.common.constant.ResponseCodeConst;
|
||||||
import org.springframework.boot.CommandLineRunner;
|
import org.springframework.boot.CommandLineRunner;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
@ -1,16 +1,17 @@
|
|||||||
package com.gangquan360.smartadmin.module.email;
|
package net.lab1024.smartadmin.module.business.email;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.anno.NoValidPrivilege;
|
import net.lab1024.smartadmin.common.anno.NoValidPrivilege;
|
||||||
import com.gangquan360.smartadmin.common.anno.OperateLog;
|
import net.lab1024.smartadmin.common.anno.OperateLog;
|
||||||
import com.gangquan360.smartadmin.common.domain.PageResultDTO;
|
import net.lab1024.smartadmin.common.domain.PageResultDTO;
|
||||||
import com.gangquan360.smartadmin.constant.SwaggerTagConst;
|
import net.lab1024.smartadmin.constant.SwaggerTagConst;
|
||||||
import com.gangquan360.smartadmin.common.domain.ResponseDTO;
|
import net.lab1024.smartadmin.common.domain.ResponseDTO;
|
||||||
import com.gangquan360.smartadmin.module.email.domain.dto.EmailDTO;
|
import net.lab1024.smartadmin.module.business.email.domain.dto.EmailDTO;
|
||||||
import com.gangquan360.smartadmin.module.email.domain.dto.EmailQueryDTO;
|
import net.lab1024.smartadmin.module.business.email.domain.dto.EmailQueryDTO;
|
||||||
import com.gangquan360.smartadmin.module.email.domain.dto.EmailVO;
|
import net.lab1024.smartadmin.module.business.email.domain.dto.EmailVO;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.validation.Valid;
|
import javax.validation.Valid;
|
||||||
@ -36,7 +37,7 @@ public class EmailController {
|
|||||||
@ApiOperation(value = "分页查询",notes = "@author yandanyang")
|
@ApiOperation(value = "分页查询",notes = "@author yandanyang")
|
||||||
@PostMapping("/email/page/query")
|
@PostMapping("/email/page/query")
|
||||||
@NoValidPrivilege
|
@NoValidPrivilege
|
||||||
public ResponseDTO<PageResultDTO<EmailVO>> queryByPage(@RequestBody EmailQueryDTO queryDTO) {
|
public ResponseDTO<PageResultDTO<EmailVO>> queryByPage(@RequestBody @Validated EmailQueryDTO queryDTO) {
|
||||||
return emailService.queryByPage(queryDTO);
|
return emailService.queryByPage(queryDTO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1,9 +1,9 @@
|
|||||||
package com.gangquan360.smartadmin.module.email;
|
package net.lab1024.smartadmin.module.business.email;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.baomidou.mybatisplus.plugins.pagination.Pagination;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.gangquan360.smartadmin.module.email.domain.dto.EmailQueryDTO;
|
import net.lab1024.smartadmin.module.business.email.domain.dto.EmailQueryDTO;
|
||||||
import com.gangquan360.smartadmin.module.email.domain.entity.EmailEntity;
|
import net.lab1024.smartadmin.module.business.email.domain.entity.EmailEntity;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
@ -29,7 +29,7 @@ public interface EmailDao extends BaseMapper<EmailEntity> {
|
|||||||
* @param queryDTO
|
* @param queryDTO
|
||||||
* @return EmailEntity
|
* @return EmailEntity
|
||||||
*/
|
*/
|
||||||
List<EmailEntity> queryByPage(Pagination page, @Param("queryDTO") EmailQueryDTO queryDTO);
|
List<EmailEntity> queryByPage(Page page, @Param("queryDTO") EmailQueryDTO queryDTO);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据id删除
|
* 根据id删除
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.module.email;
|
package net.lab1024.smartadmin.module.business.email;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1,19 +1,19 @@
|
|||||||
package com.gangquan360.smartadmin.module.email;
|
package net.lab1024.smartadmin.module.business.email;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.plugins.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.gangquan360.smartadmin.common.constant.ResponseCodeConst;
|
import net.lab1024.smartadmin.common.constant.ResponseCodeConst;
|
||||||
import com.gangquan360.smartadmin.common.domain.PageResultDTO;
|
import net.lab1024.smartadmin.common.domain.PageResultDTO;
|
||||||
import com.gangquan360.smartadmin.common.domain.ResponseDTO;
|
import net.lab1024.smartadmin.common.domain.ResponseDTO;
|
||||||
import com.gangquan360.smartadmin.module.email.domain.dto.EmailConfigDTO;
|
import net.lab1024.smartadmin.module.business.email.domain.dto.EmailConfigDTO;
|
||||||
import com.gangquan360.smartadmin.module.email.domain.dto.EmailDTO;
|
import net.lab1024.smartadmin.module.business.email.domain.dto.EmailDTO;
|
||||||
import com.gangquan360.smartadmin.module.email.domain.dto.EmailQueryDTO;
|
import net.lab1024.smartadmin.module.business.email.domain.dto.EmailQueryDTO;
|
||||||
import com.gangquan360.smartadmin.module.email.domain.dto.EmailVO;
|
import net.lab1024.smartadmin.module.business.email.domain.dto.EmailVO;
|
||||||
import com.gangquan360.smartadmin.module.email.domain.entity.EmailEntity;
|
import net.lab1024.smartadmin.module.business.email.domain.entity.EmailEntity;
|
||||||
import com.gangquan360.smartadmin.module.systemconfig.SystemConfigService;
|
import net.lab1024.smartadmin.module.system.systemconfig.SystemConfigService;
|
||||||
import com.gangquan360.smartadmin.module.systemconfig.constant.SystemConfigEnum;
|
import net.lab1024.smartadmin.module.system.systemconfig.constant.SystemConfigEnum;
|
||||||
import com.gangquan360.smartadmin.util.SmartBeanUtil;
|
import net.lab1024.smartadmin.util.SmartBeanUtil;
|
||||||
import com.gangquan360.smartadmin.util.SmartPaginationUtil;
|
import net.lab1024.smartadmin.util.SmartPageUtil;
|
||||||
import com.gangquan360.smartadmin.util.SmartSendMailUtil;
|
import net.lab1024.smartadmin.util.SmartSendMailUtil;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -46,11 +46,11 @@ public class EmailService {
|
|||||||
* @date 2019-05-13 17:10:16
|
* @date 2019-05-13 17:10:16
|
||||||
*/
|
*/
|
||||||
public ResponseDTO<PageResultDTO<EmailVO>> queryByPage(EmailQueryDTO queryDTO) {
|
public ResponseDTO<PageResultDTO<EmailVO>> queryByPage(EmailQueryDTO queryDTO) {
|
||||||
Page page = SmartPaginationUtil.convert2PageQueryInfo(queryDTO);
|
Page page = SmartPageUtil.convert2QueryPage(queryDTO);
|
||||||
List<EmailEntity> entities = emailDao.queryByPage(page, queryDTO);
|
List<EmailEntity> entities = emailDao.queryByPage(page, queryDTO);
|
||||||
List<EmailVO> dtoList = SmartBeanUtil.copyList(entities, EmailVO.class);
|
List<EmailVO> dtoList = SmartBeanUtil.copyList(entities, EmailVO.class);
|
||||||
page.setRecords(dtoList);
|
page.setRecords(dtoList);
|
||||||
PageResultDTO<EmailVO> pageResultDTO = SmartPaginationUtil.convert2PageResultDTO(page);
|
PageResultDTO<EmailVO> pageResultDTO = SmartPageUtil.convert2PageResult(page);
|
||||||
return ResponseDTO.succData(pageResultDTO);
|
return ResponseDTO.succData(pageResultDTO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.module.email.domain.dto;
|
package net.lab1024.smartadmin.module.business.email.domain.dto;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.module.email.domain.dto;
|
package net.lab1024.smartadmin.module.business.email.domain.dto;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.gangquan360.smartadmin.module.email.domain.dto;
|
package net.lab1024.smartadmin.module.business.email.domain.dto;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.domain.PageParamDTO;
|
import net.lab1024.smartadmin.common.domain.PageParamDTO;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.module.email.domain.dto;
|
package net.lab1024.smartadmin.module.business.email.domain.dto;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.gangquan360.smartadmin.module.email.domain.entity;
|
package net.lab1024.smartadmin.module.business.email.domain.entity;
|
||||||
import com.baomidou.mybatisplus.annotations.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.gangquan360.smartadmin.common.domain.BaseEntity;
|
import net.lab1024.smartadmin.common.domain.BaseEntity;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1,12 +1,12 @@
|
|||||||
package com.gangquan360.smartadmin.module.log;
|
package net.lab1024.smartadmin.module.business.log;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.module.log.orderoperatelog.OrderOperateLogDao;
|
import net.lab1024.smartadmin.module.business.log.orderoperatelog.OrderOperateLogDao;
|
||||||
import com.gangquan360.smartadmin.module.log.orderoperatelog.domain.entity.OrderOperateLogEntity;
|
import net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.entity.OrderOperateLogEntity;
|
||||||
import com.gangquan360.smartadmin.module.log.userloginlog.UserLoginLogDao;
|
import net.lab1024.smartadmin.module.business.log.userloginlog.UserLoginLogDao;
|
||||||
import com.gangquan360.smartadmin.module.log.userloginlog.domain.UserLoginLogEntity;
|
import net.lab1024.smartadmin.module.business.log.userloginlog.domain.UserLoginLogEntity;
|
||||||
import com.gangquan360.smartadmin.module.log.useroperatelog.UserOperateLogDao;
|
import net.lab1024.smartadmin.module.business.log.useroperatelog.UserOperateLogDao;
|
||||||
import com.gangquan360.smartadmin.module.log.useroperatelog.domain.UserOperateLogEntity;
|
import net.lab1024.smartadmin.module.business.log.useroperatelog.domain.UserOperateLogEntity;
|
||||||
import com.gangquan360.smartadmin.util.SmartThreadFactory;
|
import net.lab1024.smartadmin.util.SmartThreadFactory;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -1,11 +1,11 @@
|
|||||||
package com.gangquan360.smartadmin.module.log.orderoperatelog;
|
package net.lab1024.smartadmin.module.business.log.orderoperatelog;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.anno.OperateLog;
|
import net.lab1024.smartadmin.common.anno.OperateLog;
|
||||||
import com.gangquan360.smartadmin.common.domain.ResponseDTO;
|
import net.lab1024.smartadmin.common.domain.ResponseDTO;
|
||||||
import com.gangquan360.smartadmin.constant.SwaggerTagConst;
|
import net.lab1024.smartadmin.constant.SwaggerTagConst;
|
||||||
import com.gangquan360.smartadmin.module.log.orderoperatelog.constant.OrderOperateLogOrderTypeEnum;
|
import net.lab1024.smartadmin.module.business.log.orderoperatelog.constant.OrderOperateLogOrderTypeEnum;
|
||||||
import com.gangquan360.smartadmin.module.log.orderoperatelog.domain.vo.OrderOperateLogVO;
|
import net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.vo.OrderOperateLogVO;
|
||||||
import com.gangquan360.smartadmin.util.SmartStringUtil;
|
import net.lab1024.smartadmin.util.SmartStringUtil;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
import io.swagger.annotations.ApiImplicitParams;
|
import io.swagger.annotations.ApiImplicitParams;
|
||||||
@ -1,7 +1,7 @@
|
|||||||
package com.gangquan360.smartadmin.module.log.orderoperatelog;
|
package net.lab1024.smartadmin.module.business.log.orderoperatelog;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.gangquan360.smartadmin.module.log.orderoperatelog.domain.entity.OrderOperateLogEntity;
|
import net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.entity.OrderOperateLogEntity;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
@ -1,11 +1,11 @@
|
|||||||
package com.gangquan360.smartadmin.module.log.orderoperatelog;
|
package net.lab1024.smartadmin.module.business.log.orderoperatelog;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.domain.ResponseDTO;
|
import net.lab1024.smartadmin.common.domain.ResponseDTO;
|
||||||
import com.gangquan360.smartadmin.module.log.orderoperatelog.domain.dto.OrderOperateLogSaveDTO;
|
import net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.dto.OrderOperateLogSaveDTO;
|
||||||
import com.gangquan360.smartadmin.module.log.orderoperatelog.domain.entity.OrderOperateLogEntity;
|
import net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.entity.OrderOperateLogEntity;
|
||||||
import com.gangquan360.smartadmin.module.log.orderoperatelog.domain.vo.OrderOperateLogVO;
|
import net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.vo.OrderOperateLogVO;
|
||||||
import com.gangquan360.smartadmin.util.SmartBeanUtil;
|
import net.lab1024.smartadmin.util.SmartBeanUtil;
|
||||||
import com.gangquan360.smartadmin.util.SmartStringUtil;
|
import net.lab1024.smartadmin.util.SmartStringUtil;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.module.log.orderoperatelog.constant;
|
package net.lab1024.smartadmin.module.business.log.orderoperatelog.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
@ -1,6 +1,6 @@
|
|||||||
package com.gangquan360.smartadmin.module.log.orderoperatelog.constant;
|
package net.lab1024.smartadmin.module.business.log.orderoperatelog.constant;
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.common.constant.ResponseCodeConst;
|
import net.lab1024.smartadmin.common.constant.ResponseCodeConst;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [ 8001 -8999 ]
|
* [ 8001 -8999 ]
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.module.log.orderoperatelog.constant;
|
package net.lab1024.smartadmin.module.business.log.orderoperatelog.constant;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
@ -1,9 +1,10 @@
|
|||||||
package com.gangquan360.smartadmin.module.log.orderoperatelog.domain.dto;
|
package net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.dto;
|
||||||
|
|
||||||
|
|
||||||
import com.gangquan360.smartadmin.module.log.orderoperatelog.constant.OrderOperateLogOperateTypeConst;
|
import net.lab1024.smartadmin.module.business.log.orderoperatelog.constant.OrderOperateLogOperateTypeConst;
|
||||||
import com.gangquan360.smartadmin.module.log.orderoperatelog.constant.OrderOperateLogOrderTypeEnum;
|
import net.lab1024.smartadmin.module.business.log.orderoperatelog.constant.OrderOperateLogOrderTypeEnum;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author yandanyang
|
* @author yandanyang
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.module.log.orderoperatelog.domain.dto;
|
package net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.dto;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -1,12 +1,10 @@
|
|||||||
package com.gangquan360.smartadmin.module.log.orderoperatelog.domain.entity;
|
package net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.entity;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotations.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.gangquan360.smartadmin.common.domain.BaseEntity;
|
import net.lab1024.smartadmin.common.domain.BaseEntity;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* 各种单据操作记录
|
* 各种单据操作记录
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.gangquan360.smartadmin.module.log.orderoperatelog.domain.vo;
|
package net.lab1024.smartadmin.module.business.log.orderoperatelog.domain.vo;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user