From 6ec65d0fdb83d65feb11daa2cec7b771c6cfa8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=B4=A5?= Date: Thu, 20 Dec 2018 22:02:22 +0800 Subject: [PATCH 1/3] Update README.zh.md Former-commit-id: c20663b9b8577f4cfc5cfe0a32f59f2bf59d874c [formerly c20663b9b8577f4cfc5cfe0a32f59f2bf59d874c [formerly c20663b9b8577f4cfc5cfe0a32f59f2bf59d874c [formerly c20663b9b8577f4cfc5cfe0a32f59f2bf59d874c [formerly 4729b37be38a2688590043de9db44bc21b649c13 [formerly 3f68b4c5628cdbcdcdea5cbb19ae80abbe484b34]]]]] Former-commit-id: 870ac55cd6e8bd572ef696ee9b4aacb00ce5d1ca Former-commit-id: 399f4233809effcf377efb24c98e00490c73dd2d Former-commit-id: 2775992776a18da3ae6c10bac9dde55917b6acfb [formerly 16b512a0ec0a6ce9a5291c60fb8eacebebd3b30f] Former-commit-id: 30c041de2bab0f849ba94a58cf6131b4f9767c7e Former-commit-id: 4863bd7d74775ecbf367749af86f95cf1764e2f1 Former-commit-id: dc77910125be64827f7da27c53375a3526f1c465 Former-commit-id: d051ae5cf81eb69260b84440db1d8a821f616d29 Former-commit-id: 59fedab47c615e432950be0a7fd8e6169c38e7c8 --- doc/README.zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.zh.md b/doc/README.zh.md index cd95a2e6..aa42c8c3 100644 --- a/doc/README.zh.md +++ b/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 开发的在线问答系统 | From e34bb80007a2cdfa292b0ed4a005c0045df3e164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=B4=A5?= Date: Thu, 20 Dec 2018 22:04:40 +0800 Subject: [PATCH 2/3] Update README.md Former-commit-id: 89b2d1e0373d5255d9734bdb019bb303ce2f6c3d [formerly a10d91b9ebd7f449c1a7516e25baf7ada0352b4e] [formerly 89b2d1e0373d5255d9734bdb019bb303ce2f6c3d [formerly a10d91b9ebd7f449c1a7516e25baf7ada0352b4e] [formerly 89b2d1e0373d5255d9734bdb019bb303ce2f6c3d [formerly a10d91b9ebd7f449c1a7516e25baf7ada0352b4e] [formerly a10d91b9ebd7f449c1a7516e25baf7ada0352b4e [formerly d7367dc7cdc0e213e34b8cbc4df94ffd74e0723b [formerly 615d9f9db1dcc740564327dcaad0bac51fdc9bc8]]]]] Former-commit-id: 8cd4f04c5127b10bded7e7080ad3d594eb138040 Former-commit-id: b8cb447289a27df238794b3b61d2d8117e6ddbd4 Former-commit-id: 8c050df893b29a33211733d3feddc2b16e5427b9 [formerly b24e290708149fd02a0c53400ddea98b7edc2fa8] Former-commit-id: ee6e436e1c156e022988f2b23ce0770abf3da8ec Former-commit-id: 2dbf28ffab5665b12af177d66a777540677a0c5f Former-commit-id: e765f682daf21e557f2fd2ee7998793c917524da Former-commit-id: d9580fa539b77ffa54ee24cf6af718175a242296 Former-commit-id: 387d2b85c3d46d4415fcda5793002e690d559e49 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6eca468c..b69cb06a 100644 --- a/README.md +++ b/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 | From da04de73309a474e068c7f3742a3e20d9e398569 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 26 Dec 2018 13:34:38 +0800 Subject: [PATCH 3/3] fixed Former-commit-id: 7754c3f7b3e600c0d074f0a8d8b6c0194e8584a1 [formerly 7754c3f7b3e600c0d074f0a8d8b6c0194e8584a1 [formerly 7754c3f7b3e600c0d074f0a8d8b6c0194e8584a1 [formerly 7754c3f7b3e600c0d074f0a8d8b6c0194e8584a1 [formerly 47e661f1094c7cb44373c483b4408336242458bc [formerly 3d9a52e14d48a7501bf8aa1b2e21212a2948bacc]]]]] Former-commit-id: a466d8b039f6d196b07272df8eaa48a31a8108ae Former-commit-id: 97c04527803d3a00627d10ed96da91277dc4d6df Former-commit-id: ff49cc08c6c2136337f7f661427a8f43099f2970 [formerly 19fa5c08d7598b4c946c69db3b418c26d1d38618] Former-commit-id: 34604bbcc937be22b9524107cc34634c4ec204de Former-commit-id: 065d76b2967d9a34917328cc3309b774fea7ecdb Former-commit-id: 530356a64f92f759c2ea7a5288082e2259e536e6 Former-commit-id: f4595e8ea65a5a5138e7eaf00634a07018797841 Former-commit-id: 9a0e3e2b1f7fd64dba9b86892c3078d6300e41e4 --- package-lock.json.REMOVED.git-id | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id index 97098837..71aa5775 100644 --- a/package-lock.json.REMOVED.git-id +++ b/package-lock.json.REMOVED.git-id @@ -1 +1 @@ -2b614609fc8311fc059d290422304b490e9a3abc \ No newline at end of file +71f178dfd5db284dc9ddb4e31c02b334cd4e920c \ No newline at end of file diff --git a/package.json b/package.json index c9dd3eb0..692e83b2 100644 --- a/package.json +++ b/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",