Merge branch 'hotfix/issues/149' into develop

Former-commit-id: 920830f2b6593b44422e6660e0381c30772fa12f [formerly 920830f2b6593b44422e6660e0381c30772fa12f [formerly 920830f2b6593b44422e6660e0381c30772fa12f [formerly 920830f2b6593b44422e6660e0381c30772fa12f [formerly 9e4348cc7b1d8c148416dd7aed46161d35e3d2a7 [formerly df4e28229b5ee1894b33fe07c8ed267accba45db]]]]]
Former-commit-id: f1b03d0dec9d120b2e2a776503006914208150bc
Former-commit-id: 190beb85ec0de9ea0a57134784e4e158ad94fb19
Former-commit-id: 90bf4316f202cc7f32af040c0fb812a4ae3dfc7f [formerly bc38bdc11379f171d70bd76c47fbf3b4dd72fcc1]
Former-commit-id: e6f5ced67f14b79f852b27a3e90ff0c10229d98f
Former-commit-id: ea836f8a724c4e58fb48c32e66cda17e12258aa1
Former-commit-id: 85091fbb2ed958198132fd5db2f4c47238114d4c
Former-commit-id: b2097d72054d7f112226127c000f6eb770d3fc72
Former-commit-id: a46653f6af77e55f041e1f4cfea1dc8ce8642ecf

README.md

@@ -106,7 +106,7 @@ D2Admin is a fully open source and free enterprise back-end product front-end in
 
 | Name | technology | HomePage | Preview | Introduction |
 | --- | --- | --- | --- | --- |
-| **jiiiiiin-security** | MyBatis | [Github](https://github.com/Jiiiiiin/jiiiiiin-security) | [Preview](https://github.com/Jiiiiiin/jiiiiiin-security) | Separate front-end and back-end content management infrastructure projects, focusing on user rights management functions |
+| **jiiiiiin-security** | Spring Boot + Spring Security | [Github](https://github.com/Jiiiiiin/jiiiiiin-security) | [Preview](https://github.com/Jiiiiiin/jiiiiiin-security) | Separate front-end and back-end content management infrastructure projects, focusing on user rights management functions |
 | **Taroco** | Spring Cloud | [Github](https://github.com/liuht777/Taroco) | [Preview](http://111.231.192.110/) | Complete microservice enterprise solution |
 | **Aooms** | Spring Cloud | [Gitee](https://gitee.com/cyb-javaer/Aooms) | [Preview](https://www.yuboon.com/Aooms) | Extremely fast microservice development, not just as simple as JFinal |
 | **GOA** | Beego | [Github](https://github.com/Qsnh/goa) | [Preview](http://goaio.vip/) | Online question answering system based on Beego + Vue |

doc/README.zh.md

@@ -110,7 +110,7 @@
 
 | 名称 | 技术 | Github / 主页 | 预览 | 介绍 |
 | --- | --- | --- | --- | --- |
-| jiiiiiin-security | MyBatis | [Github](https://github.com/Jiiiiiin/jiiiiiin-security) | [预览](https://github.com/Jiiiiiin/jiiiiiin-security) | 前后端分离的内容管理基础项目，注重用户权限管理功能 |
+| jiiiiiin-security | Spring Boot + Spring Security | [Github](https://github.com/Jiiiiiin/jiiiiiin-security) | [预览](https://github.com/Jiiiiiin/jiiiiiin-security) | 前后端分离的内容管理基础项目，注重用户权限管理功能 |
 | Taroco | Spring Cloud | [Github](https://github.com/liuht777/Taroco) | [预览](http://111.231.192.110/) | 整套微服务企业级解决方案 |
 | Aooms | Spring Cloud | [码云](https://gitee.com/cyb-javaer/Aooms) | [预览](https://www.yuboon.com/Aooms) | 极速微服务开发，不止像JFinal一样简单 |
 | GOA | Beego | [Github](https://github.com/Qsnh/goa) | [预览](http://goaio.vip/) | 基于 Beego + Vue 开发的在线问答系统 |

package-lock.json.REMOVED.git-id

@@ -1 +1 @@
-2b614609fc8311fc059d290422304b490e9a3abc
+71f178dfd5db284dc9ddb4e31c02b334cd4e920c

package.json

@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "qs": "^6.6.0",
     "quill": "^1.3.4",
-    "screenfull": "^3.3.2",
+    "screenfull": "^4.0.0",
     "simplemde": "^1.11.2",
     "ua-parser-js": "^0.7.18",
     "v-charts": "^1.17.6",