From 5069209093303091a8342659124da71a904f9c8a Mon Sep 17 00:00:00 2001 From: zhangdaihao Date: Sat, 24 Aug 2019 00:15:45 +0800 Subject: [PATCH] =?UTF-8?q?Jeecg-Boot=202.1.0=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=8COnline=E8=A1=A8=E5=8D=95=E5=BC=80?= =?UTF-8?q?=E5=8F=91&=E5=9C=A8=E7=BA=BF=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8=EF=BC=88=E8=BF=9F=E5=88=B0=E7=9A=84=E7=89=88?= =?UTF-8?q?=E6=9C=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- ant-design-vue-jeecg/README.md | 2 +- ant-design-vue-jeecg/package.json | 14 +- ant-design-vue-jeecg/public/index.html | 16 +- ant-design-vue-jeecg/src/api/api.js | 10 +- .../src/assets/logo-white.png | Bin 0 -> 20703 bytes ant-design-vue-jeecg/src/cas/sso.js | 73 + ant-design-vue-jeecg/src/components/README.md | 2 + .../src/components/chart/DashChartDemo.vue | 6 +- .../src/components/jeecg/JCron.vue | 68 + .../src/components/jeecg/JEditableTable.vue | 582 +- .../src/components/jeecg/JEditor.vue | 2 +- .../components/jeecg/README_JEditableTable.md | 59 +- .../src/components/jeecg/modal/JCronModal.vue | 928 ++ .../jeecgbiz/modal/JSelectDepartModal.vue | 10 + .../src/components/menu/SideMenu.vue | 19 +- .../src/components/setting/SettingDrawer.vue | 7 +- .../src/components/tools/DepartSelect.vue | 12 +- .../src/components/tools/HeaderNotice.vue | 99 +- .../src/components/tools/Logo.vue | 10 +- .../src/components/tools/ShowAnnouncement.vue | 102 +- .../src/components/tools/UserMenu.vue | 16 +- .../src/config/router.config.js | 24 - ant-design-vue-jeecg/src/main.js | 3 + .../src/store/modules/user.js | 28 + ant-design-vue-jeecg/src/utils/request.js | 8 +- ant-design-vue-jeecg/src/utils/util.js | 19 + .../src/views/dashboard/Analysis.vue | 8 +- .../views/jeecg/JeecgEditableTableExample.vue | 308 +- .../src/views/jeecg/SelectDemo.vue | 29 +- .../src/views/jeecg/TableTotal.vue | 91 + .../modules/JEditableTable/DefaultTable.vue | 250 + .../modules/JEditableTable/ReadOnlyTable.vue | 70 + .../modules/JEditableTable/ThreeLinkage.vue | 129 + .../src/views/jeecg/modules/VueCronModal.vue | 2 +- .../online/cgform/OnlCgformHeadList.vue | 435 + .../online/cgform/auto/OnlCgformAutoList.vue | 619 + .../online/cgform/auto/OnlCgformTreeList.vue | 638 + .../modules/online/cgform/util/TableUtils.js | 268 + .../src/views/system/DepartList.vue | 12 +- .../src/views/system/DepartList2.vue | 6 +- .../src/views/system/LogList.vue | 47 +- .../src/views/system/PermissionList.vue | 2 +- .../src/views/system/SysAnnouncementList.vue | 6 +- .../src/views/system/UserAnnouncementList.vue | 6 +- .../src/views/system/UserList.vue | 28 +- .../src/views/system/modules/DepartModal.vue | 2 +- .../views/system/modules/PermissionModal.vue | 2 +- .../views/system/modules/QuartzJobModal.vue | 63 +- .../system/modules/SelectUserListModal.vue | 6 +- .../system/modules/SysUserAgentModal.vue | 6 +- .../src/views/system/modules/UserModal.vue | 3 +- .../src/views/user/Alteration.vue | 2 +- ant-design-vue-jeecg/src/views/user/Login.vue | 14 +- ant-design-vue-jeecg/src/views/user/Step1.vue | 27 +- ant-design-vue-jeecg/src/views/user/Step2.vue | 10 +- ant-design-vue-jeecg/vue.config.js | 8 +- ant-design-vue-jeecg/yarn.lock | 37 + jeecg-boot/README.md | 2 +- jeecg-boot/db/jeecg-boot-mysql-20190705.sql | 2501 ---- jeecg-boot/db/jeecg-boot-mysql-20190823.sql | 3129 +++++ jeecg-boot/db/jeecg-boot-oracle_11g.sql | 3679 ------ jeecg-boot/db/jeecg-boot-sqlserver_2008.sql | 10414 ---------------- jeecg-boot/db/schema_mysql.sql | 2 + .../jeecgboot2.0.1到2.0.2增量升级SQL | 61 - .../jeecgboot2.0.2到2.1增量升级.sql | 717 ++ jeecg-boot/jeecg-boot-base-common/pom.xml | 4 +- .../common/aspect/annotation/AutoLog.java | 7 + .../jeecg/common/constant/CacheConstant.java | 10 + .../jeecg/common/constant/CommonConstant.java | 32 +- .../common/constant/DataBaseConstant.java | 9 +- .../exception/JeecgBootExceptionHandler.java | 10 + .../common/system/query/QueryGenerator.java | 2 +- .../org/jeecg/common/system/util/JwtUtil.java | 17 +- .../org/jeecg/common/system/vo/DictModel.java | 3 + .../org/jeecg/common/system/vo/LoginUser.java | 5 + .../java/org/jeecg/common/util/DySmsEnum.java | 66 + .../org/jeecg/common/util/DySmsHelper.java | 69 +- .../org/jeecg/common/util/PasswordUtil.java | 5 +- .../jeecg/common/util/SqlInjectionUtil.java | 25 +- .../common/util/security/SecurityTools.java | 77 + .../util/security/entity/MyKeyPair.java | 9 + .../util/security/entity/SecurityReq.java | 11 + .../util/security/entity/SecurityResp.java | 10 + .../util/security/entity/SecuritySignReq.java | 9 + .../security/entity/SecuritySignResp.java | 10 + .../jeecg-boot-module-system/.gitattributes | 4 + jeecg-boot/jeecg-boot-module-system/pom.xml | 22 +- .../main/java/org/jeecg/JeecgApplication.java | 41 +- .../java/org/jeecg/config/RedisConfig.java | 13 +- .../java/org/jeecg/config/ShiroConfig.java | 23 + .../java/org/jeecg/config/StaticConfig.java | 25 + .../org/jeecg/config/WebSocketConfig.java | 18 + .../config/mybatis/MybatisInterceptor.java | 2 + .../cas/controller/CasClientController.java | 110 + .../modules/cas/util/CASServiceUtil.java | 103 + .../org/jeecg/modules/cas/util/XmlUtils.java | 292 + .../modules/demo/mock/json/area_mini.json | 1 + .../test/controller/JeecgDemoController.java | 4 +- .../modules/message/entity/SysMessage.java | 2 +- .../message/websocket/TestController.java | 47 + .../modules/message/websocket/WebSocket.java | 97 + .../ngalain/mapper/xml/NgAlainMapper.xml | 2 +- .../modules/quartz/entity/QuartzJob.java | 2 + .../service/impl/QuartzJobServiceImpl.java | 4 +- .../jeecg/modules/shiro/authc/ShiroRealm.java | 5 +- .../modules/system/aspect/AutoLogAspect.java | 35 + .../system/controller/LoginController.java | 62 +- .../controller/SysAnnouncementController.java | 26 +- .../SysAnnouncementSendController.java | 2 +- .../controller/SysCategoryController.java | 8 +- .../controller/SysDepartController.java | 72 +- .../controller/SysPermissionController.java | 2 +- .../controller/SysUserAgentController.java | 2 +- .../system/controller/SysUserController.java | 3 +- .../jeecg/modules/system/entity/SysLog.java | 3 +- .../mapper/xml/SysAnnouncementMapper.xml | 12 +- .../system/mapper/xml/SysCategoryMapper.xml | 6 +- .../system/mapper/xml/SysDepartMapper.xml | 4 +- .../system/mapper/xml/SysDictMapper.xml | 20 +- .../system/service/ISysDepartService.java | 15 + .../impl/SysAnnouncementServiceImpl.java | 5 +- .../system/service/impl/SysBaseApiImpl.java | 11 + .../service/impl/SysDepartServiceImpl.java | 32 +- .../impl/SysPermissionDataRuleImpl.java | 6 +- .../impl/SysRolePermissionServiceImpl.java | 2 +- .../system/util/FindsDepartsChildrenUtil.java | 40 +- .../src/main/resources/application-dev.yml | 10 + .../src/main/resources/application-prod.yml | 12 +- .../src/main/resources/application-test.yml | 10 + .../src/main/resources/banner.txt | 2 +- .../controller/${entityName}Controller.javai | 226 + .../entity/${entityName}.javai | 54 + .../mapper/${entityName}Mapper.javai | 17 + .../mapper/xml/${entityName}Mapper.xml | 5 + .../service/I${entityName}Service.javai | 14 + .../impl/${entityName}ServiceImpl.javai | 19 + .../vue/${entityName}List.vuei | 297 + .../vue/modules/${entityName}Modal.vuei | 219 + .../${entityName}Modal__Style#Drawer.vuei | 229 + .../controller/${entityName}Controller.javai | 273 + .../entity/${entityName}.javai | 41 + .../${entityPackage}/entity/[1-n]Entity.javai | 48 + .../mapper/${entityName}Mapper.javai | 17 + .../${entityPackage}/mapper/[1-n]Mapper.javai | 22 + .../mapper/xml/${entityName}Mapper.xml | 5 + .../mapper/xml/[1-n]Mapper.xml | 26 + .../service/I${entityName}Service.javai | 42 + .../service/[1-n]Service.javai | 19 + .../impl/${entityName}ServiceImpl.javai | 105 + .../service/impl/[1-n]ServiceImpl.javai | 30 + .../vo/${entityName}Page.javai | 51 + .../vue/${entityName}List.vuei | 297 + .../vue/modules/${entityName}Modal.vuei | 297 + .../vue/modules/[1-n]Form.vuei | 213 + .../controller/${entityName}Controller.javai | 242 + .../entity/${entityName}.javai | 54 + .../mapper/${entityName}Mapper.javai | 22 + .../mapper/xml/${entityName}Mapper.xml | 15 + .../service/I${entityName}Service.javai | 33 + .../impl/${entityName}ServiceImpl.javai | 92 + .../vue/${entityName}List.vuei | 355 + .../vue/modules/${entityName}Modal.vuei | 266 + .../java/org/jeecg/SecurityToolsTest.java | 49 + jeecg-boot/pom.xml | 51 +- 165 files changed, 13536 insertions(+), 17580 deletions(-) create mode 100644 ant-design-vue-jeecg/src/assets/logo-white.png create mode 100644 ant-design-vue-jeecg/src/cas/sso.js create mode 100644 ant-design-vue-jeecg/src/components/jeecg/JCron.vue create mode 100644 ant-design-vue-jeecg/src/components/jeecg/modal/JCronModal.vue create mode 100644 ant-design-vue-jeecg/src/views/jeecg/TableTotal.vue create mode 100644 ant-design-vue-jeecg/src/views/jeecg/modules/JEditableTable/DefaultTable.vue create mode 100644 ant-design-vue-jeecg/src/views/jeecg/modules/JEditableTable/ReadOnlyTable.vue create mode 100644 ant-design-vue-jeecg/src/views/jeecg/modules/JEditableTable/ThreeLinkage.vue create mode 100644 ant-design-vue-jeecg/src/views/modules/online/cgform/OnlCgformHeadList.vue create mode 100644 ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformAutoList.vue create mode 100644 ant-design-vue-jeecg/src/views/modules/online/cgform/auto/OnlCgformTreeList.vue create mode 100644 ant-design-vue-jeecg/src/views/modules/online/cgform/util/TableUtils.js delete mode 100644 jeecg-boot/db/jeecg-boot-mysql-20190705.sql create mode 100644 jeecg-boot/db/jeecg-boot-mysql-20190823.sql delete mode 100644 jeecg-boot/db/jeecg-boot-oracle_11g.sql delete mode 100644 jeecg-boot/db/jeecg-boot-sqlserver_2008.sql create mode 100644 jeecg-boot/db/schema_mysql.sql delete mode 100644 jeecg-boot/db/增量升级SQL——mysql/jeecgboot2.0.1到2.0.2增量升级SQL create mode 100644 jeecg-boot/db/增量升级SQL——mysql/jeecgboot2.0.2到2.1增量升级.sql create mode 100644 jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DySmsEnum.java create mode 100644 jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/security/SecurityTools.java create mode 100644 jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java create mode 100644 jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java create mode 100644 jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java create mode 100644 jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.java create mode 100644 jeecg-boot/jeecg-boot-base-common/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.java create mode 100644 jeecg-boot/jeecg-boot-module-system/.gitattributes create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/StaticConfig.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/config/WebSocketConfig.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/util/CASServiceUtil.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/util/XmlUtils.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/mock/json/area_mini.json create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/websocket/TestController.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei create mode 100644 jeecg-boot/jeecg-boot-module-system/src/test/java/org/jeecg/SecurityToolsTest.java diff --git a/README.md b/README.md index 10e55edec..d64a726d1 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Jeecg-Boot 快速开发平台（前后端分离版本） =============== -当前最新版本： 2.0.2（发布日期：20190708） +当前最新版本： 2.1.0（发布日期：20190826） [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE) [![](https://img.shields.io/badge/Author-JEECG团队-orange.svg)](http://www.jeecg.com) @@ -239,7 +239,7 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤 │ └─异常页面 │ └─个人页面 ├─Online在线开发(暂未开源) -│ ├─Online在线表单 +│ ├─Online在线表单 - 已开放功能 │ ├─Online在线图表 │ ├─Online图表模板配置 │ ├─Online在线报表 diff --git a/ant-design-vue-jeecg/README.md b/ant-design-vue-jeecg/README.md index d53272a72..cf0ae032f 100644 --- a/ant-design-vue-jeecg/README.md +++ b/ant-design-vue-jeecg/README.md @@ -1,7 +1,7 @@ Ant Design Jeecg Vue ==== -当前最新版本： 2.0.2（发布日期：20190708） +当前最新版本： 2.1.0（发布日期：20190826） Overview ---- diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index 901957f99..9e0452247 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -1,16 +1,16 @@ { - "name": "ant-design-vue-jeecg", - "version": "2.0.2", - "private": true, + "name": "vue-antd-jeecg", + "version": "2.1.0", + "private": false, "scripts": { - "serve": "vue-cli-service serve --open", + "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ", + "serve": "vue-cli-service serve", "build": "vue-cli-service build", - "lint": "vue-cli-service lint", - "test:unit": "vue-cli-service test:unit", - "test:e2e": "vue-cli-service test:e2e" + "lint": "vue-cli-service lint" }, "dependencies": { "@antv/data-set": "^0.10.2", + "@jeecg/antd-onine": "^1.0.1", "@tinymce/tinymce-vue": "^2.0.0", "ant-design-vue": "^1.3.9", "apexcharts": "^3.6.5", diff --git a/ant-design-vue-jeecg/public/index.html b/ant-design-vue-jeecg/public/index.html index 09d73f4dc..d38c0220e 100644 --- a/ant-design-vue-jeecg/public/index.html +++ b/ant-design-vue-jeecg/public/index.html @@ -242,9 +242,10 @@ @@ -261,15 +262,6 @@ - - - - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/api/api.js b/ant-design-vue-jeecg/src/api/api.js index fa457410c..d2956a79e 100644 --- a/ant-design-vue-jeecg/src/api/api.js +++ b/ant-design-vue-jeecg/src/api/api.js @@ -45,11 +45,11 @@ const getPermissionRuleList = (params)=>getAction("/sys/permission/getPermRuleLi const queryPermissionRule = (params)=>getAction("/sys/permission/queryPermissionRule",params); // 部门管理 -const queryDepartTreeList = (params)=>getAction("/sysdepart/sysDepart/queryTreeList",params); -const queryIdTree = (params)=>getAction("/sysdepart/sysDepart/queryIdTree",params); -const queryParentName = (params)=>getAction("/sysdepart/sysDepart/queryParentName",params); -const searchByKeywords = (params)=>getAction("/sysdepart/sysDepart/searchBy",params); -const deleteByDepartId = (params)=>deleteAction("/sysdepart/sysDepart/delete",params); +const queryDepartTreeList = (params)=>getAction("/sys/sysDepart/queryTreeList",params); +const queryIdTree = (params)=>getAction("/sys/sysDepart/queryIdTree",params); +const queryParentName = (params)=>getAction("/sys/sysDepart/queryParentName",params); +const searchByKeywords = (params)=>getAction("/sys/sysDepart/searchBy",params); +const deleteByDepartId = (params)=>deleteAction("/sys/sysDepart/delete",params); //日志管理 //const getLogList = (params)=>getAction("/sys/log/list",params); diff --git a/ant-design-vue-jeecg/src/assets/logo-white.png b/ant-design-vue-jeecg/src/assets/logo-white.png new file mode 100644 index 0000000000000000000000000000000000000000..6d5f2e84716e0a3a90b5e4d1b06044c39ab84b28 GIT binary patch literal 20703 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 { + console.log("-------单点登录开始-------"); + let token = Vue.ls.get(ACCESS_TOKEN); + let st = getUrlParam("ticket"); + var sevice = "http://"+window.location.host+"/"; + if(token){ + loginSuccess(callback); + }else{ + if(st){ + validateSt(st,sevice,callback); + }else{ + var serviceUrl = encodeURIComponent(sevice); + window.location.href = window._CONFIG['casPrefixUrl']+"/login?service="+serviceUrl; + } + } + console.log("-------单点登录结束-------"); +}; +const SSO = { + init: init +}; + +function getUrlParam(paraName) { + var url = document.location.toString(); + var arrObj = url.split("?"); + + if (arrObj.length > 1) { + var arrPara = arrObj[1].split("&"); + var arr; + + for (var i = 0; i < arrPara.length; i++) { + arr = arrPara[i].split("="); + + if (arr != null && arr[0] == paraName) { + return arr[1]; + } + } + return ""; + } + else { + return ""; + } +} + +function validateSt(ticket,service,callback){ + let params = { + ticket: ticket, + service:service + }; + store.dispatch('ValidateLogin',params).then(res => { + //this.departConfirm(res) + if(res.success){ + loginSuccess(callback); + }else{ + var sevice = "http://"+window.location.host+"/"; + var serviceUrl = encodeURIComponent(sevice); + window.location.href = window._CONFIG['casPrefixUrl']+"/login?service="+serviceUrl; + } + }).catch((err) => { + console.log(err); + //that.requestFailed(err); + }); +} + +function loginSuccess (callback) { + callback(); +} +export default SSO; \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/README.md b/ant-design-vue-jeecg/src/components/README.md index 4adb10739..1742c7052 100644 --- a/ant-design-vue-jeecg/src/components/README.md +++ b/ant-design-vue-jeecg/src/components/README.md @@ -39,3 +39,5 @@ UserMenu.vue:首页右上侧的内容 ![输入图片说明](https://static.oschina.net/uploads/img/201904/12201226_laQK.png "在这里输入图片标题") ####16.trend包 趋势显示组件（如下图） ![输入图片说明](https://static.oschina.net/uploads/img/201904/12201600_Wo8K.png "在这里输入图片标题") +![corn表达式](https://oscimg.oschina.net/oscnet/661f9ac09016395f9f49286143af3241623.jpg) +![corn控件添加清除按钮](https://oscimg.oschina.net/oscnet/15096e49f2e29bd829e304d56770025d03c.jpg) \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/chart/DashChartDemo.vue b/ant-design-vue-jeecg/src/components/chart/DashChartDemo.vue index 07d9b8ce0..9f00127be 100644 --- a/ant-design-vue-jeecg/src/components/chart/DashChartDemo.vue +++ b/ant-design-vue-jeecg/src/components/chart/DashChartDemo.vue @@ -32,7 +32,7 @@ type="arc" :zIndex="1" :start="arcGuide2Start" - :end="getArcGuide2End" + :end="getArcGuide2End()" :vStyle="arcGuide2Style" > +
+ + + + + +
+ + + diff --git a/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue b/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue index f2a5d1ad4..0a9c94148 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue @@ -1,5 +1,5 @@ - +