tag 2.10.0

README.md

@@ -1,89 +1,104 @@
-
-[中文](https://github.com/pigxcloud/pig/blob/master/README.zh.md) | **English**
-
-
 <p align="center">
- <img src="https://img.shields.io/badge/Pig-2.9-success.svg" alt="Build Status">
- <img src="https://img.shields.io/badge/Avue-2.6-green.svg" alt="Build Status">
+ <img src="https://img.shields.io/badge/Pig-2.10-success.svg" alt="Build Status">
  <img src="https://img.shields.io/badge/Spring%20Cloud-Hoxto.SR8-blue.svg" alt="Coverage Status">
  <img src="https://img.shields.io/badge/Spring%20Boot-2.3.RELEASE-blue.svg" alt="Downloads">
+ <img src="https://img.shields.io/badge/Spring%20Boot-2.3.RELEASE-blue.svg" alt="Downloads">
+ <img src="https://img.shields.io/github/license/pig-mesh/pig"/>
 </p>
 
-- based on Spring Cloud Hoxton 、Spring Boot 2.3、 OAuth2  RBAC web framework
-- Idea based on data-driven view,  if you don't use vue, you can get started quickly 
-- provide support for common containers like Docker、Kubernetes、Rancher2 
-- provide lambda 、stream api 、webflux production practice   
+
+## 系统说明
 
+- 基于 Spring Cloud Hoxton 、Spring Boot 2.3、 OAuth2 的 RBAC **权限管理系统**
+- 基于数据驱动视图的理念封装 element-ui，即使没有 vue 的使用经验也能快速上手
+- 提供对常见容器化支持 Docker、Kubernetes、Rancher2 支持
+- 提供 lambda 、stream api 、webflux 的生产实践
 
-<a href="https://wiki.pig4cloud.com" target="_blank">Documentation</a> | <a target="_blank" href="http://pigx.pig4cloud.com"> PigX Online</a> | <a target="_blank" href="https://paper.pig4cloud.com/"> PigX Paper</a> | <a target="_blank" href="https://start.pig4cloud.com"> pig4cloud initializr</a>
-
+### 核心依赖
 
-#### Quickly structure microservice applications  
+| 依赖                   | 版本          |
+| ---------------------- | ------------- |
+| Spring Boot            | 2.3.4.RELEASE |
+| Spring Cloud           | Hoxton.SR8    |
+| Spring Cloud Alibaba   | 2.2.3.RELEASE |
+| Spring Security OAuth2 | 2.3.6         |
+| Mybatis Plus           | 3.4.0         |
+| hutool                 | 5.4.4         |
+| Avue                   | 2.6.16        |
 
-```xml
-<!-- pig-gen archetype -->
-<dependency>
-    <groupId>com.pig4cloud.archetype</groupId>
-    <artifactId>pig-gen</artifactId>
-    <version>last.version</version>
-</dependency>
+### 模块说明
+
+```lua
+pig-ui  -- https://gitee.com/log4j/pig-ui
+
+pig
+├── pig-auth -- 授权服务提供[3000]
+└── pig-common -- 系统公共模块
+     ├── pig-common-core -- 公共工具类核心包
+     ├── pig-common-datasource -- 动态数据源包
+     ├── pig-common-job -- xxl-job 封装
+     ├── pig-common-log -- 日志服务
+     ├── pig-common-mybatis -- mybatis 扩展封装
+     ├── pig-common-security -- 安全工具类
+     ├── pig-common-swagger -- 接口文档
+     ├── pig-common-sentinel -- sentinel 扩展封装
+     └── pig-common-test -- oauth2.0 单元测试扩展封装
+├── pig-register -- Nacos Server[8848]
+├── pig-gateway -- Spring Cloud Gateway网关[9999]
+└── pig-upms -- 通用用户权限管理模块
+     └── pig-upms-api -- 通用用户权限管理系统公共api模块
+     └── pig-upms-biz -- 通用用户权限管理系统业务处理模块[4000]
+└── pig-visual
+     └── pig-monitor -- 服务监控 [5001]
+     ├── pig-codegen -- 图形化代码生成 [5002]
+     ├── pig-sentinel-dashboard -- 流量高可用 [5003]
+     └── pig-xxl-job-admin -- 分布式定时任务管理台 [5004]
 ```
 
-<img src="https://images.gitee.com/uploads/images/2019/1026/004238_9a73e1e7_393021.gif"/>  
-
-#### Core dependencies 
-
-
-dependencies | version
----|---
-Spring Boot |  2.3.3.RELEASE  
-Spring Cloud | Hoxton.SR8  
-Spring Cloud Alibaba | 2.2.2.RELEASE
-Spring Security OAuth2 | 2.3.6
-Mybatis Plus | 3.4.0
-hutool | 5.4.2
-Avue | 2.6.15
-
+## 文档视频
 
+[文档视频 wiki.pig4cloud.com](https://wiki.pig4cloud.com)
 
-#### Module description
+[PIGX 在线体验 pigx.pig4cloud.com](http://pigx.pig4cloud.com)
 
-```lua
-pig-ui  -- https://github.com/pigxcloud/pig-ui
+[产品白皮书 paper.pig4cloud.com](https://paper.pig4cloud.com)
+
+## 快速开始
+
+### 本地开发 运行
+
+pig 提供了详细的[部署文档 wiki.pig4cloud.com](https://www.yuque.com/pig4cloud/pig/vsdox9)，包括开发环境安装、服务端代码运行、前端代码运行等。
+
+请务必**完全按照**文档部署运行章节 进行操作，减少踩坑弯路！！
+
+### Docker 运行
 
-pig
-├── pig-auth -- oauth-server[3000]
-└── pig-common 
-     ├── pig-common-core -- tool core package
-     ├── pig-common-datasource -- dynamic data source package
-     ├── pig-common-log -- Log service package
-     ├── pig-common-mybatis -- mybatis expand
-     ├── pig-common-security -- security tools
-     ├── pig-common-swagger -- api documentation
-     └── pig-common-sentinel -- sentinel auto fallbak
-├── pig-register -- nacos server[8848]
-├── pig-gateway -- spring cloud gateway[9999]
-└── pig-upms
-     └── pig-upms-api -- user management system api
-     └── pig-upms-biz -- user management system biz[4000]
-└── pig-visual
-     └── pig-monitor -- spring boot admin[5001]
-     ├── pig-codegen -- graphical code generation[5002]
-     └── pig-sentinel-dashboard -- sentinel dashboard [5003]	 
 ```
-#### Open source co-construction
+# 下载并运行服务端代码
+git clone https://gitee.com/log4j/pig.git
 
-1. Welcome to submit [pull request](https://dwz.cn/2KURd5Vf)，note correspondence `dev` branch
+cd pig && mvn clean install && docker-compose up -d
 
-2. Welcome to submit [issue](https://gitee.com/log4j/pig/issues)，Please clearly write down the cause of the problem, the development environment, and the steps to reproduce.
+# 下载并运行前端UI
+git clone https://gitee.com/log4j/pig-ui.git
 
-3. mail: <a href="mailto:pig4cloud@qq.com">pig4cloud@qq.com</a>     
+cd pig-ui && npm install -g cnpm --registry=https://registry.npm.taobao.org
 
-#### License
+npm run build:docker && docker-compose up -d
+```
+
+### 快速构架微服务
 
-pig is Open Source software released under the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0.html).
+```xml
+<!-- pig-gen archetype -->
+<dependency>
+    <groupId>com.pig4cloud.archetype</groupId>
+    <artifactId>pig-gen</artifactId>
+    <version>2.10.0</version>
+</dependency>
+```
 
-#### Free Class
+## 免费公开课
 
 <table>
   <tr>
@@ -96,10 +111,23 @@ pig is Open Source software released under the [Apache 2.0 license](https://www.
   </tr>
 </table>
 
-#### Chat Group
+## 微信群 [禁广告]
 
 ![](https://gitee.com/pig4cloud/oss/raw/master/2020-9/20200901133142.png)
 
-#### Star history
+## 开源共建
+
+### 开源协议
+
+pig 开源软件遵循 [Apache 2.0 协议](https://www.apache.org/licenses/LICENSE-2.0.html)。
+允许商业使用，但务必保留类作者、Copyright 信息。
+
+![](https://gitee.com/pig4cloud/oss/raw/master/2020-10-9/1602229452602-image.png)
+
+### 其他说明
+
+1. 欢迎提交 [PR](https://dwz.cn/2KURd5Vf)，注意对应提交对应 `dev` 分支
+
+2. 欢迎提交 [issue](https://gitee.com/log4j/pig/issues)，请写清楚遇到问题的原因、开发环境、复显步骤。
 
-[![Stargazers over time](https://starchart.cc/pigxcloud/pig.svg)](https://starchart.cc/pigxcloud/pig.svg)
+3. 联系作者 <a href="mailto:pig4cloud@qq.com">pig4cloud@qq.com</a>

src/const/crud/admin/log.js

@@ -61,7 +61,9 @@ export const tableOption = {
     prop: 'createTime',
     type: 'datetime',
     format: 'yyyy-MM-dd HH:mm',
-    valueFormat: 'yyyy-MM-dd HH:mm:ss'
+    valueFormat: 'yyyy-MM-dd HH:mm:ss',
+    search: true,
+    searchRange: true
   }, {
     width: 180,
     label: '异常日志',

src/router/axios.js

@@ -5,6 +5,7 @@ import errorCode from '@/const/errorCode'
 import router from "@/router/router"
 import {Message} from 'element-ui'
 import 'nprogress/nprogress.css'
+import qs from 'qs'
 import store from "@/store"; // progress bar style
 axios.defaults.timeout = 30000
 // 返回其他状态吗
@@ -31,6 +32,14 @@ axios.interceptors.request.use(config => {
     config.data = serialize(config.data)
     delete config.data.serialize
   }
+
+  // 处理get 请求的数组 springmvc 可以处理
+  if (config.method === 'get') {
+    config.paramsSerializer = function (params) {
+      return qs.stringify(params, { arrayFormat: 'repeat' })
+    }
+  }
+
   return config
 }, error => {
   return Promise.reject(error)