1
0
mirror of https://gitee.com/incloudcode/yexuejc-springboot.git synced 2025-08-07 19:19:31 +08:00

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
This commit is contained in:
maxf 2018-12-03 10:56:11 +08:00
commit 09f2138327
2 changed files with 4 additions and 4 deletions

View File

@ -13,9 +13,9 @@ parent版本封装<br/>
base:功能封装 base:功能封装
#### 最新版本 #### 最新版本
* 1.x yexuejc.springboot.version=1.1.5 <br> * 1.x yexuejc.springboot.version=1.2.0 <br>
* 2.x yexuejc.springboot.version=2.0.4 <br> * 2.x yexuejc.springboot.version=2.0.5 <br>
* yexuejc.base.version=1.2.2 * yexuejc.base.version=1.2.4
pom.xml pom.xml
``` ```

View File

@ -9,7 +9,7 @@
### 内部集成 ### 内部集成
# #
* [1.1.4新增 集成security登录](SECURITY.md) * [1.2.0/2.0.5 集成security登录第一个稳定版](SECURITY.md)
* [1.0.6新增 针对API请求安全解决方案](PARAMS_RSA_DECRYPT_ENCRYPT.md)<br/> * [1.0.6新增 针对API请求安全解决方案](PARAMS_RSA_DECRYPT_ENCRYPT.md)<br/>
* [1.0.6新增 加密功能](PARAMS_RSA_DECRYPT_ENCRYPT.md) * [1.0.6新增 加密功能](PARAMS_RSA_DECRYPT_ENCRYPT.md)