zhouweidong@lab.ibiz5.com 发布系统代码

README.md

+# 系统概览 iBiz4j Spring R7 dev

app_web/CHANGELOG.md

+## v7.0.0-alpha.18 [2020-8-23]
+
+### Bug修复
+
+修复后续界面行为异常问题
+
+修复表格合计行去掉N/A字样
+
+修复树表跳转页面逻辑
+
+修复嵌入表格保存提示信息重复问题
+
+修复表格表格值清空保存问题
+
+### 功能新增及优化
+
+#### 模板
+
+新增向导面板支持状态属性
+
+新增应用全屏功能和应用锁屏功能
+
+新增搜索表单新建默认值逻辑
+
+新增实体表格值规则
+
+新增动态工作流导航视图计数器
+
+新增工作流审批意见控件时光轴样式组件和cron表达式组件
+
+新增支持日历部件项布局面板
+
+优化视图标题问题
+
+优化表单属性值规则,无值的时候不校验
+
+优化表单按钮、表单分组界面行为、表格操作列、工具栏、操作列权限控制
+
+优化实体数据多项选择视图选中效果
+
+优化动态代码表本地缓存逻辑
+
+优化合入应用级上下文时机
+
+优化实体数据重定向视图逻辑
+
+优化表单开始流程和提交流程逻辑
+
+#### 基础文件
+
+修复表格滑动条表头与内容不齐
+
+修复数据选择（嵌入视图）抛值异常问题
+
+优化权限服务基类菜单权限和统一资源权限
+
+优化动态工作流导航视图引擎
+
+优化表单按钮、表单分组界面行为、表格操作列、工具栏、操作列权限控制
+
+优化表单项增加padding
+
+新增应用全屏组件和应用锁屏组件
+
+新增工作流审批意见控件时光轴样式组件和cron表达式组件
+
+## v7.0.0-alpha.17 [2020-8-9]
+
+### Bug修复
+
+修复系统级的操作标识异常问题
+
+修复表格新增插件异常问题
+
+修复表格单击行绑定数据异常bug
+
+修复表格合计行样式问题
+
+### 功能新增及优化
+
+#### 模板
+
+新增支持前后端分离部署
+
+新增动态代码表预定义代码表支持
+
+新增数据选择（调用接口）组件
+
+新增部件样式表支持
+
+优化数据服务逻辑
+
+优化代码表服务基类、动态代码表
+
+优化导航参数处理逻辑
+
+优化数据拷贝逻辑
+
+优化组织、部门、人员控件只绑定id逻辑
+
+优化部件关联外键值
+
+#### 基础文件
+
+新增前后端分离部署
+
+新增下拉列表控件支持树状代码表
+
+新增数据选择（调用接口）组件
+
+优化数据拷贝逻辑
+
+优化组织、部门、人员控件只绑定id逻辑
+
+## v7.0.0-alpha.16 [2020-8-2]
+
+### Bug修复
+
+修复表格聚合异常
+
+修复文本框精度问题
+
+修复属性值规则常规规则异常
+
+修复应用菜单标题重复问题
+
+修复界面行为异常问题
+
+修复下拉选组件代码表类型和属性进行不匹配问题
+
+### 功能新增及优化
+
+#### 模板
+
+新增应用数据看板视图（卡片样式）、实体数据看板视图（卡片样式）
+
+优化拷贝功能
+
+优化临时模式新建置空父键
+
+优化实体行为执行后逻辑
+
+优化操作栏触发界面行为逻辑
+
+优化实体主状态
+
+#### 基础文件
+
+优化数值框数值位置
+
+优化应用语言选择组件和应用组织部门信息呈现组件
+
+优化无数据主键界面行为逻辑
+
+## v7.0.0-alpha.15 [2020-7-23]
+
+### Bug修复
+
+修复修复数值框错误问题
+
+修复表单通知关系界面上下文、表单数据先后顺序
+
+修复实体行为执行前、后逻辑增加行为逻辑者判断
+
+修复表单loadDraft清空表单临时主键
+
+修复数据图表月份显示问题
+
+修复首页横向菜单呈现
+
+修复树视图部件国际化问题
+
+### 功能新增及优化
+
+#### 模板
+
+新增表单属性值规则（正则式规则、数值范围规则、字符长度规则、常规规则、系统值规则、规则组）支持
+
+新增数据选择、自动填充编辑器自填模式排序
+
+新增表单传入关系界面临时模式
+
+新增数据选择编辑器自填模式界面行为组（662）
+
+新增向导添加数据
+
+优化向导面板成功提示、忽略版本检查
+
+优化导航类部件选中事件
+
+优化表格操作列分隔符问题
+
+优化表单准备工作流数据,填充未存库数据
+
+#### 基础文件
+
+修复数值框firstElementChild异常问题
+
+修复图表视图无搜索表单加载数据问题
+
+修复表格视图标题问题
+
+更新view-design组件库的版本，修复面板分割组件
+
+优化关系界面内嵌表格视图先行通知，再保存表单逻辑
+
+优化部门选择、组织选择编辑器的样式
+
+优化导入文件逻辑
+
+新增关系界面增加无临时数据模式判断
+
+新增数据选择、自动填充编辑器自填模式排序
+
+新增数据选择编辑器自填模式界面行为组（662）
+
+## v7.0.0-alpha.14 [2020-7-18]
+
+### Bug修复
+
+修复表格列千分位格式化
+
+修复标签值格式化
+
+修复表格转化数据错误问题
+
+修复嵌套关系无数据时设置数据为空数组
+
+### 功能新增及优化
+
+#### 模板
+
+新增编辑器插件
+
+新增数据服务增加临时模式判断
+
+新增支持实体行为定义检查方法
+
+新增实体行为执行前、后逻辑 
+
+新增操作栏主状态无权限模式
+
+优化开发环境错误提示友好性
+
+优化应用菜单多层嵌套问题
+
+#### 基础文件
+
+优化popover组件
+
+实体数据服务基类增加saveBatch方法
+
+优化应用菜单多层嵌套问题
+
+## v7.0.0-alpha.13 [2020-7-12]
+
+### Bug修复
+
+修复表格设置更新默认值不生效
+
+修复行编辑中文本字段修改数据保存无法生效
+
+修复行编辑时的错误提示
+
+修复表格开关部件保存异常问题
+
+修复表单可以修改数据主键问题
+
+修复表格操作列问题
+
+#### 基础文件
+
+优化关系界面逻辑
+
+## v7.0.0-alpha.12 [2020-7-2]
+
+### Bug修复
+
+修复mpicker解析调整
+
+修复表格列class逻辑调整
+
+修复面板标签，隐藏表单项
+
+修复嵌入视图导航服务逻辑调整
+
+修复选择多数据视图选择数据异常
+
+修复多行输入十行 高度问题
+
+修复调整实体处理逻辑（参数name转化为codeName）
+
+修复表单项更新值规则校验
+
+修复单位部门选择器禁用功能
+
+修复修复去掉某个子菜单后，主菜单不显示
+
+### 功能新增及优化
+
+#### 模板
+
+新增表单显示更多模式（658）
+
+新增首页应用切换器（658）
+
+新增状态向导面板（658）
+
+新增门户操作栏图标（654）
+
+新增首页空白模式支持
+
+新增表格支持列拖动
+
+新增主状态操作标识权限逻辑
+
+新增工具栏、表格操作列、表单分组主状态操作标识判断
+
+优化应用级数据状态同步功能（654）
+
+优化应用国际化部分
+
+#### 基础文件
+
+新增修改密码功能（654）
+
+优化无权限错误信息友好提示
+
+优化应用国际化部分
+
+## v7.0.0-alpha.11 [2020-6-21]
+
+### Bug修复
+
+修复标题工具栏样式遮挡bug
+
+修复表格行编辑字段格式对齐
+
+修复日历部件初始化压缩成一行问题
+
+修复下拉多选组件最后一项数据无法删除
+
+### 功能新增及优化
+
+#### 模板
+
+新增支持表单、表格新建默认值（当前时间）
+
+新增行编辑浮点数精度格式化
+
+新增首页面包屑导航模式
+
+新增编辑视图第一条记录、上一条记录、下一条记录、最后一条记录界面行为
+
+优化面板和多数据部件数据流向
+
+优化表单在模态打开模式中padding样式
+
+优化嵌入视图中工具栏消息数量提示样式
+
+优化动态导航视图树样式
+
+#### 基础文件
+
+新增行编辑浮点数精度格式化
+
+## v7.0.0-alpha.10 [2020-6-18]
+
+### Bug修复
+
+分页导航视图页面刷新bug
+
+表单项更新，实体行为调用不到bug
+
+关系界面子界面保存不触发父界面保存
+
+表单样式调整
+
+### 功能新增及优化
+
+#### 模板
+
+表格操作列只显示图标时显示tooltip
+
+门户部件高度为0时自适应
+
+面板和多数据部件数据流向
+
+列表，数据视图保存功能
+
+门户部件标题界面行为tooltip
+
+新增面包屑、应用切换器组件
+
+#### 基础文件
+
+formitem样式调整，label适配位置
+
+表格行编辑切换，app-picker不显示
+
+文件上传下载参数格式处理
+
+## v7.0.0-alpha.9 [2020-6-11]
+
+### Bug修复
+
+数值代码表多语言
+
+树右键菜单滚动条样式bug
+
+列表面板界面行为bug
+
+多选视图界面逻辑修复
+
+图表刷新bug修复
+
+日历部件选中抛出数据逻辑调整
+
+编辑视图，app-span显示0时不显示
+
+树视图右键界面行为刷新bug
+
+快捷菜单控制台报错bug
+
+门户加载自定义模型错误时，正常显示默认看板
+
+修复雷达图显示异常问题
+
+修复编辑类、分页导航视图带数据标题问题
+
+修复饼图、漏斗图 获取序列参数错误问题
+
+### 功能新增及优化
+
+#### 模板
+
+看板和门户布局模板调整，支持门户部件标题栏界面行为组
+
+支持数据选择、地址框、自动完成、下拉列表、标签、选项框列表、单选列表等编辑器导航参数调整
+
+支持树导航栏、表格导航栏、列表导航栏、卡片导航栏、日历导航栏、表单关系界面、数据选择面板、分页导航面板、数据关系栏、界面行为、新建逻辑、编辑逻辑导航参数调整
+
+支持图表无数据时显示暂无数据
+
+支持表格新建默认值
+
+支持日历部件右键菜单
+
+支持表格列触发界面行为
+
+面板布局调整
+
+#### 基础文件
+
+门户部件视图的样式
+
+数据选择，地址框，自动完成，下拉列表，标签，选项框列表，单选列表等编辑器导航参数调整
+
+表单项label位置
+
+调整登录页面
+
+穿梭框编辑器支持
+
+## v7.0.0-alpha.8 [2020-6-4]
+
+### Bug修复
+
+修复树右键菜单事件传值bug
+
+修复树节点图标样式
+
+修复viewdata和viewparams解析不同步
+
+修复界面行为多主键分隔符由";"改为","
+
+修复多层导航失效
+
+数据选择，自动填充编辑器参数处理，动态代码表编辑器参数
+
+修复富文本国际化bug
+
+修复坐标轴的自定义参数
+
+修复分页面板配置导航参数
+
+修复实体处理逻辑
+
+修复应用级context对象特性丢失的问题
+
+修复新建逻辑
+
+修复动态代码表传递上下文、参数逻辑
+
+### 功能新增及优化
+
+#### 模板
+
+树选择双击
+
+列表快速分组和快速搜索表单
+
+数据视图快速分组和快速搜索表单
+
+日历图例、日历快速分组和批处理工具栏
+
+实体国际化路径调整
+
+面板界面行为支持
+
+列表，数据视图下拉加载
+
+增加图表名称代码表识别、雷达图支持
+
+uaa菜单权限
+
+增加数据看板动态模型数据存库
+
+应用样式调整
+
+#### 基础文件
+
+人员选择标准控件样式调整
+
+应用样式调整
+
+## v7.0.0-alpha.7 [2020-5-28]
+
+### Bug修复
+
+修复门户部件flex布局
+
+修复表格选择框列样式出现省略号
+
+修复批删除传递参数调整
+
+修复表单上界面行为参数传递bug
+
+修复分页导航、编辑类视图标题
+
+修复界面行为多主键分隔符由";"改为","
+
+修复导航类视图宽度格式
+
+修复图表排序
+
+修复关系界面逻辑
+
+修复401跳登录页清除user和token
+
+### 功能新增及优化
+
+#### 模板
+
+列表，数据视图默认排序
+
+面板项支持偏移
+
+应用支持自定义默认端口
+
+门户部件图标和容器样式
+
+表格列头图片和头部样式
+
+表格操作列图标
+
+表格编辑项值规则
+
+增加树选择双击事件
+
+增加图表分组属性计数统计（srfcount）
+
+增加雷达图支持
+
+#### 基础文件
+
+修复分页导航、编辑类视图标题
+
+修复界面行为多主键分隔符由";"改为","
+
+修复关系界面逻辑
+
+修复401跳登录页清除user和token
+
+## v7.0.0-alpha.6 [2020-5-23]
+
+### Bug修复
+
+修复处理快速分组模型动态数据部分
+
+修复列表，数据视图默认排序
+
+
+### 功能新增及优化
+
+#### 模板
+
+补充单位选择器、部门选择器、人员选择器
+
+#### 基础文件
+
+补充单位选择器、部门选择器、人员选择器
+
+## v7.0.0-alpha.5 [2020-5-21]
+
+### Bug修复
+
+修复表格视图搜索placeholder显示为搜索字段
+
+修复表单嵌表单分页异常
+
+修复门户视图操作栏标题
+
+修复看板部件高度自动撑
+
+修复表单分组，界面行为组不显示
+
+修复表格操作列数据异常
+
+
+### 功能新增及优化
+
+#### 模板
+
+支持拷贝功能
+
+支持实体甘特图视图
+
+支持面板项隐藏表单项
+
+支持表格列最小宽度和操作列样式支持
+
+支持列表项、面板代码表转化
+
+#### 基础文件
+
+支持列表项、面板代码表转化
+
+修复表单分组，界面行为组不显示
+
+## v7.0.0-alpha.4 [2020-5-14]
+
+### Bug修复
+
+修复代码表代码项图标和数据
+
+修复数据多项选择视图UI逻辑不匹配
+
+修复列表高度异常
+
+修复树节点上下文
+
+修复表格（视图）高度，滚动条问题
+
+修复表单loaddraft服务仿真主键丢失修复
+
+修复user显示名称逻辑
+
+修复issue地址为正式环境地址
+
+
+### 功能新增及优化
+
+#### 模板
+
+模态时视图样式调整
+
+增加菜单权限
+
+增加快速分组搜索或快速搜索表单功能
+
+增加表格内置工具栏
+
+代码表多选控件分割符从分号转化为逗号
+
+
+#### 基础文件
+
+增加数据选择类插件表格呈现插件
+
+
+## v7.0.0-alpha.3 [2020-5-10]
+
+### Bug修复
+
+分页导航栏传递srfparentdename和srfparentkey问题
+
+提交流程、启动流程刷新表格数据问题
+
+修复视图自定义导航参数大小写问题
+
+修复批添加功能
+
+修复树部件查询数据集合异常处理
+
+修复图表排序问题
+
+修复富文本国际化切换失效
+
+### 功能新增及优化
+
+#### 模板
+
+搜索面板布局优化
+
+表格checkbox宽度优化
+
+选择类视图不显示标题
+
+补充树节点关系导航上下文，导航参数上下文
+
+#### 基础文件
+
+登录页面调整
+
+## v7.0.0-alpha.2 [2020-5-7]
+
+### Bug修复
+
+分页导航栏添加图标配置
+
+### 功能新增及优化
+
+#### 模板
+
+表格文件上传信息显示
+
+批添加、批删除
+
+实体工作流动态视图
+
+实体工作流动态导航表格视图
+
+富文本信息模式
+
+更新默认值
+
+#### 基础文件
+
+表格文件上传信息显示
+
+实体工作流动态视图
+
+实体工作流动态导航表格视图
+
+## v7.0.0-alpha.1 [2020-4-29]
+
+初始化文件
\ No newline at end of file

app_web/README.md

+## 前言
+
+### 1. 简介
+
+该web应用是基于iBiz平台提供的一套PC端前端解决方案Vue_R7【**一套基于Vue全家桶（Vue + Vue-router + Vuex）的前端框架**】生产而成，Vue_R7不仅适用于管理后台或管理系统开发，且广泛适用于B/S架构的项目开发。本文档主要介绍项目如何快速上手，成果物代码结构做一阐述，旨在能够为开发人员提供一定开发指导支持。而今框架开源，希望能有更多志同道合的伙伴参与Vue_R7的迭代 ^_^
+
+### 2. 开发环境要求
+
+- Node.js
+
+- Yarn
+
+- Vue Cli
+
+### 3. 开发技术要求
+
+掌握`Vue`、`TypeScript`、`less`、`html`等技术。
+
+### 4. 技术栈
+
+- 前端MVVM框架：vue.js 2.6.10
+
+- 路由：vue-router 3.1.3
+
+- 状态管理：vue-router 3.1.3
+
+- 国际化：vue-i18n 8.15.3
+
+- 数据交互：axios 0.19.1
+
+- UI框架：element-ui 2.13.0, view-design 4.1.0
+
+- 工具库：qs, path-to-regexp, rxjs
+
+- 图标库：font-awesome 4.7.0
+
+- 引入组件： tinymce 4.8.5
+
+- 代码风格检测：eslint
+
+
+## 快速上手
+
+### 1. 开发环境
+
+> 在安装使用 `Yarn` 和 `Vue Cli (3.0)` 前，务必确认 [Node.js](https://nodejs.org) 已经升级到 v4.8.0 或以上，强烈建议升级至最新版本。
+> 如果你想了解更多 `Yarn` 工具链的功能和命令，建议访问 [Yarn](https://yarnpkg.com) 了解更多。
+> 如果你想了解更多 `Vue Cli (3.0)` 工具链的功能和命令，建议访问 [Vue Cli (3.0)](https://cli.vuejs.org/) 了解更多。
+
+- 访问 [Node.js](https://nodejs.org) ，根据文档安装 `Node.js`。
+- 访问 [Yarn](https://yarnpkg.com) ，根据文档安装 `Yarn`。
+- 访问 [Vue Cli (3.0)](https://cli.vuejs.org/) ，根据文档安装 `Vue Cli (3.0)`。
+
+<blockquote style="border-color: red;"><p>在安装 Vue Cli (3.0) ,请使用 Yarn 模式全局安装。</p></blockquote>
+
+```bash
+$ yarn global add @vue/cli
+```
+
+以下为 Windows 环境开发正常配置 
+<br>
+<br>
+![开发环境信息](./imgs/getting-started/development.png)
+
+### 2. 安装依赖
+
+打开前端项目，进入工作空间下，执行安装依赖命令
+
+```bash
+$ yarn install
+```
+
+### 3. 启动
+
+在工作空间下，执行启动命令
+
+```bash
+$ yarn dev-serve
+```
+
+启动后，通过 vue.config.js 开发服务 devServer 下配置的本地启动端口号访问开发项目。<br>
+示例: 
+
+```bash
+$ http://localhost:8111
+```
+这儿需要注意一点，此时启动的项目访问的数据是我们前端的mock数据，如需与后台直接交互，请看第4点。
+
+### 4. 远程代理
+
+在工作空间下，执行启动命令
+
+```bash
+$ yarn serve
+```
+
+修改远程代理文件 vue.config.js 代理地址
+
+![远程代理地址](./imgs/getting-started/proxy.png)
+
+### 5. 打包
+
+在工作空间下，执行打包命令
+
+```bash
+$ yarn build
+```
+
+打包完成，生成最终交付产物。
+
+## 成果物结构
+
+```
+|─ ─ app_web
+​    |─ ─ public                                 public文件夹
+​        |─ ─ assets                             静态文件夹
+        |─ ─ favicon.ico                        图标
+​    |─ ─ src                                    工程文件夹
+        |─ ─ assets                             静态资源
+        |─ ─ codelist                           动态代码表服务
+        |─ ─ components                         基础组件，主要包含编辑器组件和其他全局使用的组件
+        |─ ─ counter                            计数器服务
+        |─ ─ engine                             引擎文件，主要封装了内置视图的内置逻辑
+        |─ ─ environments                       环境文件
+​        |─ ─ interface                          接口文件
+​        |─ ─ locale                             多语言文件
+        |─ ─ mock                               模拟数据
+        |─ ─ pages                              视图文件夹
+            |─ ─ module                         模块名称
+​                |─ ─  XXX-view                  视图文件夹
+                    |─ ─  XXX-view-base.vue     视图基类
+                    |─ ─  XXX-view.vue          自定义视图文件
+                    |─ ─  XXX-view.less         自定义视图样式文件
+        ​            |─ ─  main.ts               应用主函数入口
+        ​            |─ ─ page-register.ts       全局视图注册
+        ​            |─ ─ router.ts              路由配置文件
+        |─ ─ service                            应用实体数据服务文件夹
+            |─ ─ XXX                            应用实体名称
+                |─ ─ XXX-service-base.ts        应用实体数据服务文件
+                |─ ─ XXX-service.ts             自定义应用实体数据服务文件
+                |─ ─ YYY-logic-base.ts          应用实体数据处理逻辑文件
+                |─ ─ YYY-logic.ts               自定义应用实体数据处理逻辑文件
+        |─ ─ store                              全局状态管理
+        |─ ─ styles                             样式文件夹
+            |─ ─ default.less                   默认样式
+            |─ ─ user.less                      用户自定义样式
+        |─ ─ theme                              主题文件夹
+        |─ ─ uiservice                          界面服务文件
+            |─ ─ XXX                            应用实体名称
+                |─ ─ XXX-ui-service-base.ts     应用实体界面服务文件
+                |─ ─ XXX-ui-service.ts          自定义应用实体界面服务文件
+                |─ ─ YYY-ui-logic-base.ts       应用实体界面处理逻辑文件
+                |─ ─ YYY-ui-logic.ts            自定义应用实体界面处理逻辑文件
+        |─ ─ utils                              工具类文件
+        |─ ─ utilservice                        应用功能服务
+        |─ ─ widgets                            部件文件夹
+            |─ ─ appde                          应用实体名称
+​                |─ ─  XXX                       部件名称
+                    |─ ─  XXX-base.vue          视图基类
+                    |─ ─  XXX.vue               自定义部件文件
+                    |─ ─  XXX.less              部件样式文件
+        ​            |─ ─  XXX.model.ts          部件model文件 
+        ​            |─ ─  XXX.service.ts        部件服务文件
+        |─ ─ app-register.ts                    公共组件全局注册
+​        |─ ─ App.vue                            入口组件
+​        |─ ─ user-register.ts                   自定义组件全局注册
+        ​|─ ─ package.json                       依赖管理文件
+​        |─ ─ vue.config.js                      vue cli 配置
+```
+
+## 如何贡献
+
+如果你希望参与贡献，欢迎 [Pull Request](<http://demo.ibizlab.cn/ibiz_r7/vue_r7/issues/new>)，或通过自助服务群给我们报告 Bug。
+
+强烈推荐阅读 [《提问的智慧》](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way)(本指南不提供此项目的实际支持服务！)、[《如何向开源社区提问题》](https://github.com/seajs/seajs/issues/545) 和 [《如何有效地报告 Bug》](https://www.chiark.greenend.org.uk/~sgtatham/bugs-cn.html)、[《如何向开源项目提交无法解答的问题》](https://zhuanlan.zhihu.com/p/25795393)，更好的问题更容易获得帮助。
+
+## 社区互助
+
+1.[iBizLab论坛](https://bbs.ibizlab.cn/)
+
+2.加入钉钉 Vue_R7自助服务群（中文）
+
+<img src="./imgs/getting-started/vue-r7-group.png"  height="400" width="400">
\ No newline at end of file

app_web/public/assets/json/data-dictionary.json

@@ -8,6 +8,7 @@
                 "id": "aliyun",
                 "label": "阿里云",
                 "text": "阿里云",
+                "class":"",
                 "data":"",
                 "codename":"Aliyun",
                 "value": "aliyun",
@@ -18,6 +19,7 @@
                 "id": "wechat",
                 "label": "微信开放平台",
                 "text": "微信开放平台",
+                "class":"",
                 "data":"",
                 "codename":"Wechat",
                 "value": "wechat",
@@ -28,6 +30,7 @@
                 "id": "qq",
                 "label": "QQ互联",
                 "text": "QQ互联",
+                "class":"",
                 "data":"",
                 "codename":"Qq",
                 "value": "qq",
@@ -38,6 +41,7 @@
                 "id": "dingtalk",
                 "label": "钉钉开放平台",
                 "text": "钉钉开放平台",
+                "class":"",
                 "data":"",
                 "codename":"Dingtalk",
                 "value": "dingtalk",
@@ -55,6 +59,7 @@
                 "id": "aliyun-sms",
                 "label": "阿里云短信",
                 "text": "阿里云短信",
+                "class":"",
                 "data":"",
                 "codename":"Aliyun_SUB_sms",
                 "value": "aliyun-sms",
@@ -65,6 +70,7 @@
                 "id": "aliyun-email",
                 "label": "阿里云邮件",
                 "text": "阿里云邮件",
+                "class":"",
                 "data":"",
                 "codename":"Aliyun_SUB_email",
                 "value": "aliyun-email",
@@ -75,6 +81,7 @@
                 "id": "wechat-msg",
                 "label": "微信消息",
                 "text": "微信消息",
+                "class":"",
                 "data":"",
                 "codename":"Wechat_SUB_msg",
                 "value": "wechat-msg",
@@ -85,6 +92,7 @@
                 "id": "dingtalk-msg",
                 "label": "钉钉通知",
                 "text": "钉钉通知",
+                "class":"",
                 "data":"",
                 "codename":"Dingtalk_SUB_msg",
                 "value": "dingtalk-msg",

app_web/public/environments/environment.js

+window.Environment = {
+    // 应用基础路径
+    BaseUrl: '',
+    // 是否为开发模式
+    devMode: true,
+    // 是否为pc端应用
+    isAppMode:true,
+    // 是否开启权限认证
+    enablePermissionValid:false,
+    // 打开目标工具，可选参数：sln、mos
+    debugOpenMode:'mos',
+    // 配置平台地址
+    StudioUrl: "http://172.16.170.145/mos/",
+    // 中心标识
+    SlnId: "B4BF5C84-D020-4D9A-A986-8FA4FD72816C",
+    // 系统标识
+    SysId: "B428B5BE-EA90-4101-A493-BA7085D89F0A",
+    // 前端应用标识
+    AppId: "6e0b7357169ef4eba84e1347ed94bd84",
+}
\ No newline at end of file

app_web/src/app-register.ts

@@ -86,6 +86,9 @@ import AppLockScren from './components/app-lock-scren/app-lock-scren.vue'
 import ActionTimeline from './components/action-timeline/action-timeline.vue'
 import CronEditor from './components/cron-editor/cron-editor.vue'
 import AppMessagePopover from './components/app-message-popover/app-message-popover.vue'
+import AppPanelField from './components/app-panel-field/app-panel-field.vue'
+import AppPanelItem from './components/app-panel-item/app-panel-item.vue'
+
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -111,6 +114,8 @@ export const AppComponents = {
         v.prototype.$verify = Verify;
         v.prototype.$viewTool = ViewTool;
         v.prototype.$uiActionTool = UIActionTool;
+        v.component('app-panel-item',AppPanelItem);
+        v.component('app-panel-field',AppPanelField);
         v.component('app-full-scren',AppFullScren);
         v.component('app-lock-scren',AppLockScren);
         v.component('input-box', InputBox);

app_web/src/authservice/auth-service.ts

@@ -112,6 +112,9 @@ export default class AuthService {
      * @memberof AuthService
      */
     public getMenusPermission(item: any): boolean {
+        if(!this.$store.getters['authresource/getEnablePermissionValid']) {
+            return true;
+        }
         return this.$store.getters['authresource/getAuthMenu'](item);
     }
 
@@ -123,6 +126,9 @@ export default class AuthService {
      * @memberof AuthService
      */
     public getResourcePermission(tag: any): boolean {
+        if(!this.$store.getters['authresource/getEnablePermissionValid']) {
+            return true;
+        }
         return this.$store.getters['authresource/getResourceData'](tag);
     }
 

app_web/src/components/app-actionbar/app-actionbar.vue

@@ -12,6 +12,7 @@
 <script lang="ts">
 import { Vue, Component, Prop, Model, Emit,Inject, Watch } from "vue-property-decorator";
 import { Subject,Subscription } from "rxjs";
+import { Environment } from '@/environments/environment';
 
 @Component({})
 export default class AppActionBar extends Vue {

app_web/src/components/app-data-upload/app-data-upload.less

@@ -18,4 +18,7 @@
         font-family: '微软雅黑','黑体','宋体';
         font-size: 16px;
     }
+    .progress {
+        margin-top: -15px;
+    }
 }
\ No newline at end of file

app_web/src/components/app-data-upload/app-data-upload.vue

 <template>
-    <div class="app-data-upload-view">
+    <div class="app-data-upload-view" v-loading.fullscreen="isUploading" element-loading-background="rgba(57, 57, 57, 0.2)">
         <el-row style="margin-top:24px" :gutter="20">
             <el-col :span="4">
                 <el-button type="primary" @click="handleUpLoad">{{$t('components.appDataUploadView.selectfile')}}</el-button>
@@ -13,6 +13,7 @@
             </el-col>
         </el-row>
         <el-divider></el-divider>
+        <el-progress class="progress" v-show="isUploading" :text-inside="true" :stroke-width="14" :percentage="uploadProgress"></el-progress>
         <el-row style="height:480px;padding: 0px 12px;">
             <div class="data-info-content" >
                 <template v-if="importDataArray.length >0 && isUploading === false">
@@ -50,6 +51,7 @@ import XLSX from 'xlsx';
 import CodeListService from "@service/app/codelist-service";
 import EntityService from '@/service/entity-service';
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
+import { Environment } from '@/environments/environment';
 
 @Component({
 })
@@ -191,6 +193,22 @@ export default class AppDataUploadView extends Vue {
      * @memberof AppDataUploadView
      */
     public allFieldMap:Map<string,any> = new Map();
+    
+    /**
+     * 上传服务器数据切片数
+     *
+     * @type {number}
+     * @memberof AppDataUploadView
+     */
+    public sliceUploadCnt: number = Environment.sliceUploadCnt;
+
+    /**
+     * 上传服务器进度条百分比
+     *
+     * @type {number}
+     * @memberof AppDataUploadView
+     */
+    public uploadProgress: number = 0;
 
     /**
      * 视图参数变化
@@ -282,10 +300,29 @@ export default class AppDataUploadView extends Vue {
         this.transformData(this.importDataArray,tempDataArray);
         this.hasImported = true;
         this.isUploading = true;
+        this.uploadProgress = 0;
         this.importDataArray = [];
+        this.sliceUploadService(tempDataArray, 0);
+    }
+
+    /**
+     * 数据切片上传
+     *
+     * @memberof AppDataUploadView
+     */
+    public sliceUploadService(dataArray: Array<any>, cnt: number) {
+        if(cnt > dataArray.length) {
+            this.isUploading = false;
+            this.uploadProgress = 100;
+            return;
+        }
+        let sliceArray: Array<any> = [];
+        if(dataArray) {
+            sliceArray = dataArray.slice(cnt, cnt+this.sliceUploadCnt);
+        }
         try{
             this.entityService.getService(this.viewparams.serviceName).then((service:any) =>{
-            service.ImportData(this.viewdata,{name:this.importId,importData:tempDataArray}).then((res:any) =>{
+            service.ImportData(this.viewdata,{name:this.importId,importData:sliceArray}).then((res:any) =>{
                 const result:any = res.data;
                 if(result && result.rst !== 0){
                     this.promptInfo = (this.$t('components.appDataUploadView.importfailed') as string);
@@ -294,7 +331,8 @@ export default class AppDataUploadView extends Vue {
                 }
                 this.importSuccessData = result.data;
                 this.promptInfo = (this.$t('components.appDataUploadView.completed') as string);
-                this.isUploading = false;
+                this.uploadProgress = Number((cnt / dataArray.length * 100).toFixed(2));
+                this.sliceUploadService(dataArray, cnt + this.sliceUploadCnt);
             }).catch((error:any) =>{
                 this.isUploading = false;
                 this.promptInfo = (this.$t('components.appDataUploadView.importfailed') as string);
@@ -311,7 +349,6 @@ export default class AppDataUploadView extends Vue {
             console.error(error);
         };
     }
-
     /**
      * 导出excel
      *

app_web/src/components/app-embed-picker/app-embed-picker.vue

@@ -222,7 +222,12 @@ export default class AppEmbedPicker extends Vue {
         if(Object.is(newFormData[this.refreshitems], oldDormData[this.refreshitems])) {
             return;
         }
-        this.setValue([{srfmajortext: null, srfkey: null}]);
+        if (this.valueItem) {
+            this.$emit('formitemvaluechange', { name: this.valueItem, value: null });
+        }
+        if (this.name) {
+            this.$emit('formitemvaluechange', { name: this.name, value: null });
+        }
     }
 
     /**
@@ -231,6 +236,7 @@ export default class AppEmbedPicker extends Vue {
      * @memberof AppEmbedPicker
      */
     public created() {
+        this.setViewParam();
         if(this.formState) {
             this.formStateEvent = this.formState.subscribe(({ tag, action, data }) => {
                 if (Object.is('load', action)) {

app_web/src/components/app-form-group/app-form-group.vue

@@ -108,6 +108,7 @@
 
 <script lang="ts">
 import { Vue, Component, Prop, Watch } from 'vue-property-decorator';
+import { Environment } from '@/environments/environment';
 
 @Component({})
 export default class AppFormGroup extends Vue {

app_web/src/components/app-header-menus/app-header-menus.vue

@@ -41,7 +41,7 @@ export default class AppHeaderMenus extends Vue {
       {
           name: "ibizstudio",
           title: "components.appHeaderMenus.ibizstudio.title",
-          url: `${Environment.StudioUrl}?#/common_slnindex/srfkeys=${Environment.SlnId}/sysdesign_psdevslnsysmodeltreeexpview`,
+          url: `${Environment.StudioUrl}?#/common_mosindex/srfkeys=${Environment.SysId}`,
           iconcls: 'fa fa-wrench',
       },
       {

app_web/src/components/app-message-popover/app-message-popover.less

@@ -19,10 +19,12 @@
   padding-top: 2px;
   padding-right: 2px;
   color: #aaa;
+  cursor: pointer;
 }
 
 .Row {
-  height: 70px;
+  min-height: 70px;
+  height: auto;
   border-bottom: 1px solid lightgray;
   display: flex;
   align-items: center;
@@ -34,20 +36,24 @@
 
   .column2 {
     border: 0px red solid;
-
     .process-definition-name {
       font-size: 14px;
+      padding-top: 5px; 
+    }
+    .description {
+      margin-top: 6px;
+      margin-bottom: 6px;
+      max-width: 95%;
+    }
+    .createtime {
+      padding-bottom: 5px;
     }
 
     .el-row {
       display: flex;
-
       .el-col {
         flex-grow: 1;
 
-        div {
-          margin-bottom: 5px;
-        }
         div:first-child {
           font-weight: 500;
           overflow: hidden;

app_web/src/components/app-message-popover/app-message-popover.vue

@@ -20,8 +20,8 @@
                                     <el-row :draggable="false">
                                         <el-col :span="16" :draggable="false">
                                             <div class="process-definition-name" :draggable="false"><strong>{{myTask.processDefinitionName}}</strong></div>
-                                            <div :draggable="false">{{myTask.description}}</div>
-                                            <div :draggable="false">{{ formatDate(myTask.createTime, 'MM-DD hh:mm') }}</div>
+                                            <div class="description" :draggable="false">{{myTask.description}}</div>
+                                            <div class="createtime" :draggable="false">{{ formatDate(myTask.createTime, 'MM-DD hh:mm') }}</div>
                                         </el-col>
                                         <el-col :span="5" :draggable="false" style='display: flex; align-items: center'>
                                             <el-tag :type="myTask.name.indexOf('驳回')!=-1?'danger':(myTask.name.indexOf('成功')!=-1?'success':(myTask.name.indexOf('取消')!=-1?'info':'-'))"
@@ -54,8 +54,8 @@
                                     <el-row :draggable="false">
                                         <el-col :span="16" :draggable="false">
                                             <div class="process-definition-name" :draggable="false"><strong>{{myMsg.processDefinitionName}}</strong></div>
-                                            <div :draggable="false">{{myMsg.description}}</div>
-                                            <div :draggable="false">{{ formatDate(myMsg.createTime, 'MM-DD hh:mm') }}</div>
+                                            <div class="description" :draggable="false">{{myMsg.description}}</div>
+                                            <div class="createtime" :draggable="false">{{ formatDate(myMsg.createTime, 'MM-DD hh:mm') }}</div>
                                         </el-col>
                                         <el-col :span="5" :draggable="false" style='display: flex; align-items: center'>
                                             <el-tag :type="myMsg.name.indexOf('驳回')!=-1?'danger':(myMsg.name.indexOf('成功')!=-1?'success':(myMsg.name.indexOf('取消')!=-1?'info':'-'))"
@@ -149,7 +149,7 @@
                     this.getMyMsgs();
                 }
             }).catch((error: any) => {
-                this.$Notice.error({title: '错误', desc: error});
+                console.warn("加载数据错误");
             })
         }
 

app_web/src/components/app-panel-field/app-panel-field.less

+.app-panel-field {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  padding: 0 6px;
+  .editor{
+    flex-grow: 1;
+    .editorstyle{
+      .ivu-input.ivu-input-default{
+        border-color: red;
+      }
+    }
+    .errorstyle{
+      color:red !important;
+    }
+  }
+  .app-panel-field-label {
+    height: 34px !important;
+    line-height: 25px;
+    flex-shrink: 0;
+    padding: 6px 10px 6px 0px;
+  }
+}
+
+.app-panel-field.label-top {
+  flex-flow: column;
+}
+
+.app-panel-field.label-bottom{
+  flex-flow: column-reverse;
+}
+
+.app-panel-field.label-left {
+  .app-panel-field-label {
+      text-align: right;
+  }
+}
+
+.app-panel-field.label-right {
+  flex-flow: row-reverse;
+  .app-panel-field-label {
+      padding: 6px 0px 6px 10px;
+  }
+}
+
+.app-panel-field.label-none {
+  .app-panel-field-label {
+      display: none !important;
+  }
+}

app_web/src/components/app-panel-field/app-panel-field.vue

+<template>
+    <div :class="classes">
+        <div v-if="Object.is(labelPos,'NONE') || !labelPos" class="editor">
+            <div :class="valueCheck == true ?'':'editorstyle'">
+              <slot ></slot>
+              <span :class="error ? 'errorstyle':''">{{error}}</span>
+            </div>
+        </div>
+        <div v-if="!Object.is(labelPos,'NONE')" class="app-panel-field-label">
+            <span v-if="required" style="color:red;">* </span>
+            {{isEmptyCaption ? '' : caption}}
+        </div>
+        <div v-if="Object.is(labelPos,'BOTTOM') || Object.is(labelPos,'TOP') || Object.is(labelPos,'LEFT') || Object.is(labelPos,'RIGHT')" class="editor">
+          <div :class="valueCheck == true ?'':'editorstyle'">
+            <slot ></slot>
+            <span :class="error ? 'errorstyle':''">{{error}}</span>
+          </div>
+        </div>
+    </div>
+</template>
+<script lang="ts">
+import { Vue, Component, Prop, Watch } from "vue-property-decorator";
+
+@Component({})
+export default class AppPanelField extends Vue {
+  /**
+   * 名称
+   *
+   * @type {string}
+   * @memberof AppPanelField
+   */
+  @Prop() public caption!: string;
+
+  /**
+   * 错误信息
+   *
+   * @type {string}
+   * @memberof AppPanelField
+   */
+  @Prop() public error?: string;
+
+  /**
+   * 标签位置
+   *
+   * @type {(string | 'BOTTOM' | 'LEFT' | 'NONE' | 'RIGHT' | 'TOP')}
+   * @memberof AppPanelField
+   */
+  @Prop() public labelPos?:
+    | string
+    | "BOTTOM"
+    | "LEFT"
+    | "NONE"
+    | "RIGHT"
+    | "TOP";
+
+  /**
+   * 标签是否空白
+   *
+   * @type {boolean}
+   * @memberof AppPanelField
+   */
+  @Prop() public isEmptyCaption?: boolean;
+
+  /**
+   * 列表项名称
+   *
+   * @type {string}
+   * @memberof AppPanelField
+   */
+  @Prop() public name!: string;
+
+  /**
+   * 面板数据
+   *
+   * @type {any}
+   * @memberof AppPanelField
+   */
+  @Prop() public data!: any;
+
+  /**
+   * 编辑器值
+   *
+   * @type {any}
+   * @memberof AppPanelField
+   */
+  @Prop() public value !: any;
+
+  /**
+   * 值规则
+   *
+   * @type {string}
+   * @memberof AppPanelField
+   */
+  @Prop() public itemRules!: any;
+  
+  /**
+   * 是否必填
+   *
+   * @type {boolean}
+   * @memberof AppPanelField
+   */
+  public required: boolean = false;
+
+  /**
+   * 值规则数组
+   *
+   * @type {any[]}
+   * @memberof AppPanelField
+   */
+  public rules: any[] = [];
+
+  /**
+   * 值规则监控
+   *
+   * @param {*} newVal
+   * @param {*} oldVal
+   * @memberof AppPanelField
+   */
+  @Watch("itemRules", { deep: true })
+  onItemRulesChange(newVal: any, oldVal: any) {
+    if (newVal) {
+      try {
+        this.rules = [];
+        const _rules: any[] = newVal;
+        this.rules = [..._rules];
+        this.rules.some((rule: any) => {
+          if (rule.hasOwnProperty("required")) {
+            this.required = rule.required;
+            return true;
+          }
+          return false;
+        });
+      } catch (error) {}
+    }
+  }
+
+  /**
+   * 编辑器样式
+   *
+   * @type {boolean}
+   * @memberof AppPanelField
+   */
+  public valueCheck: boolean = true;
+
+  /**
+   * 编辑器值监控
+   *
+   * @param {*} newVal
+   * @param {*} oldVal
+   * @memberof AppPanelField
+   */
+  @Watch("value")
+  ItemValueRules(newVal: any, oldVal: any) {
+    if(this.required && !newVal) {
+        this.valueCheck = false;
+    }else{
+        this.valueCheck = true;
+    }
+  }
+
+  /**
+   * 计算样式
+   *
+   * @readonly
+   * @type {string []}
+   * @memberof AppPanelField
+   */
+  get classes(): string[] {
+    let posClass = "";
+    switch (this.labelPos) {
+      case "TOP":
+        posClass = "label-top";
+        break;
+      case "LEFT":
+        posClass = "label-left";
+        break;
+      case "BOTTOM":
+        posClass = "label-bottom";
+        break;
+      case "RIGHT":
+        posClass = "label-right";
+        break;
+      case "NONE":
+        posClass = "label-none";
+        break;
+    }
+    return [ "app-panel-field", posClass ];
+  }
+
+  /**
+   * vue 生命周期
+   *
+   * @memberof AppPanelField
+   */
+  public mounted() {
+    if (this.itemRules) {
+      try {
+        const _rules: any[] = this.itemRules;
+        this.rules = [..._rules];
+        this.rules.some((rule: any) => {
+          if (rule.hasOwnProperty("required")) {
+            this.required = rule.required;
+            return true;
+          }
+          return false;
+        });
+      } catch (error) {}
+    }
+  }
+}
+</script>
+<style lang='less'>
+@import "./app-panel-field.less";
+</style>
\ No newline at end of file

app_web/src/components/app-panel-item/app-panel-item.less

+.app-panel-item{
+    .app-panel-item-rawitem{
+        padding-right: 10px;
+    }
+}
\ No newline at end of file

app_web/src/components/app-panel-item/app-panel-item.vue

+<template>
+    <div class="app-panel-item">
+        <div v-if="Object.is(itemType,'BUTTON')" >
+        <Button type="primary" long @click="onClick">
+            <i v-if="icon" :class="icon"></i>
+            <span v-if="showCaption" :class="lableStyle">{{caption ? caption : ''}}</span>
+        </Button>
+        </div>
+        <div v-if="Object.is(itemType,'RAWITEM')">
+            <i v-if="icon" :class="icon"></i>
+            <span v-if="caption" class="app-panel-item-rawitem">{{caption}}</span>
+            <div :class="contentStyle">
+            <slot></slot>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+import { Vue, Component, Prop, Watch } from "vue-property-decorator";
+
+@Component({})
+export default class AppPanelItem extends Vue {
+
+    /**
+     * 面板成员类型
+     *  
+     * @type {string}
+     * @memberof AppPanelItem
+     */
+    @Prop() public itemType!: string;
+
+    /**
+     * 图标
+     *  
+     * @type {string}
+     * @memberof AppPanelItem
+     */
+    @Prop() public icon?: string;
+
+    /**
+     * 标题
+     *  
+     * @type {string}
+     * @memberof AppPanelItem
+     */
+    @Prop() public caption?: string;
+
+    /**
+     * 显示标题
+     *  
+     * @type {boolean}
+     * @memberof AppPanelItem
+     */
+    @Prop() public showCaption?: boolean;
+
+    /**
+     * 标题样式
+     *  
+     * @type {boolean}
+     * @memberof AppPanelItem
+     */
+    @Prop() public lableStyle?: string;
+
+    /**
+     * 内容样式
+     *  
+     * @type {boolean}
+     * @memberof AppPanelItem
+     */
+    @Prop() public contentStyle?: string;
+
+    /**
+     * 部件样式
+     *  
+     * @type {boolean}
+     * @memberof AppPanelItem
+     */
+    @Prop() public partsStyle?: string;
+
+    /**
+     * 点击按钮
+     *
+     * @param {*} $event
+     * @memberof AppPanelItem
+     */
+    public onClick($event: any){
+        this.$emit('onClick',$event);
+    }
+
+}
+</script>
+<style lang='less'>
+@import "./app-panel-item.less";
+</style>
\ No newline at end of file

app_web/src/components/app-span/app-span.vue

@@ -214,7 +214,8 @@ export default class AppSpan extends Vue {
             this.text = Number(number.toFixed(this.precision)).toLocaleString('en-US')+ ' '+ this.unitName;   
         }else if(Object.is(this.dataType,"FLOAT") || Object.is(this.dataType,"DECIMAL")){
             let number:any = Number(this.value);
-            this.text = number.toFixed(this.precision);
+            const decimalCnt:number = this.value.toString().split('.').length > 1 ? this.value.toString().split('.')[1].length : 0;
+            this.text = (Number(this.precision) === 0 && decimalCnt !== 0) ? number.toFixed(decimalCnt) : number.toFixed(this.precision);
         }else {
             this.text = this.value;
         }

app_web/src/components/app-transfer/app-transfer.less

@@ -5,11 +5,21 @@
           display: none;
       }
       .el-transfer{
+          max-height: 200px;
           min-width: 100% !important;
           display: flex;
           justify-content: space-between;
           .el-transfer-panel{
               min-width: 25%;
+              .el-transfer-panel__body{
+                max-height: 160px;
+                .el-checkbox-group{
+                    max-height: 160px;
+                    .el-checkbox+.el-checkbox {
+                        margin-left: 0px; 
+                    }
+                }
+            }
           }
           .el-transfer__buttons{
               align-self: center;

app_web/src/components/app-wf-approval/app-wf-approval.vue

@@ -5,30 +5,35 @@
             <span>{{data.startUserName}}{{$t('components.appWFApproval.commit')}}</span>
         </div>
         <div class="app-wf-approval-content" v-if="data.usertasks && data.usertasks.length >0">
-            <div class="approval-content-item" v-for="(usertask,index) in data.usertasks" :key="index">
-                <div class="approval-content-item-left">
-                    {{usertask.userTaskName}}
-                </div>
-                <div class="approval-content-item-right">
-                    <div class="approval-content-item-wait" v-if="usertask.identitylinks.length >0">
-                        {{$t('components.appWFApproval.wait')}}<span v-for="(identitylink,inx) in usertask.identitylinks" :key="inx">{{identitylink.displayname}}<span v-if="inx >0">、</span></span>{{$t('components.appWFApproval.handle')}}
-                    </div>
-                    <div class="approval-content-item-info" v-if="usertask.comments.length >0">
-                        <div v-for="(comment,commentInx) in usertask.comments" :key="commentInx">
-                            <div class="approval-content-item-info-item approval-content-item-info-top">
-                                {{`【${comment.type}】${comment.fullMessage}`}}
+            <template v-for="(usertask,index) in data.usertasks" >
+                <template v-if="usertask.identitylinks.length >0">
+                    <div class="approval-content-item" :key="index">
+                        <div class="approval-content-item-left">
+                            {{usertask.userTaskName}}
+                        </div>
+                        <div class="approval-content-item-right">
+                            <div class="approval-content-item-wait" v-if="usertask.identitylinks.length >0">
+                                {{$t('components.appWFApproval.wait')}}<span v-for="(identitylink,inx) in usertask.identitylinks" :key="inx">{{identitylink.displayname}}<span v-if="inx >0">、</span></span>{{$t('components.appWFApproval.handle')}}
                             </div>
-                             <div class="approval-content-item-info-item approval-content-item-info-bottom">
-                                <span class="info-bottom-name">{{comment.authorName}}</span>
-                                <span>{{comment.time}}</span>
+                            <div class="approval-content-item-info" v-if="usertask.comments.length >0">
+                                <div v-for="(comment,commentInx) in usertask.comments" :key="commentInx">
+                                    <div class="approval-content-item-info-item approval-content-item-info-top">
+                                        {{`【${comment.type}】${comment.fullMessage}`}}
+                                    </div>
+                                    <div class="approval-content-item-info-item approval-content-item-info-bottom">
+                                        <span class="info-bottom-name">{{comment.authorName}}</span>
+                                        <span>{{comment.time}}</span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="approval-content-item-memo" v-if="usertask.userTaskId === viewparams.userTaskId">
+                                <el-input type="textarea"  v-model="initmemo" :rows="2" @blur="handleBlur" :placeholder="$t('components.appWFApproval.placeholder')"></el-input>
                             </div>
                         </div>
                     </div>
-                    <div class="approval-content-item-memo" v-if="usertask.userTaskId === viewparams.userTaskId">
-                        <el-input type="textarea"  v-model="initmemo" :rows="2" @blur="handleBlur" :placeholder="$t('components.appWFApproval.placeholder')"></el-input>
-                    </div>
-                </div>
-            </div>
+                </template>
+            </template>
+            
         </div>
          <div class="app-wf-approval-bottom">
             <span v-if="data.endTime">{{data.endTime}}{{$t('components.appWFApproval.end')}}</span>

app_web/src/components/context-menu-drag/context-menu-drag.vue

@@ -293,12 +293,13 @@ export default class ContextMenuDrag extends Vue {
   mounted() {
     let that: any = this;
     const get: Promise<any> = this.entityService.getAllApp(null,{});
-    get
-      .then((response: any) => {
+    get.then((response: any) => {
         if (response) {
           that.list = response.data.model;
           that.listFilter();
         }
+      }).catch((error:any) =>{
+        console.warn("加载数据错误")
       });
   }
 }

app_web/src/components/context-menu/context-menu.tsx

@@ -92,6 +92,14 @@ export default class ContextMenu extends Vue {
      */
     @Prop()
     public menus?: any[]
+    /**
+     * 是否阻止默认绘制上下文菜单
+     *
+     * @type {any}
+     * @memberof ContextMenu
+     */
+    @Prop({default:false})
+    public isBlocked?:any;
 
     /**
      * 显示右键菜单
@@ -195,7 +203,10 @@ export default class ContextMenu extends Vue {
         if (contextRef) {
             contextRef.oncontextmenu = (event: MouseEvent) => {
                 event.preventDefault();
-                this.showContextMenu(event.clientX, event.clientY);
+                if(!this.isBlocked){
+                    this.showContextMenu(event.clientX, event.clientY);
+                }
+                this.$emit("showContext",event);
             };
         }
     }

app_web/src/components/dropdown-list-dynamic/dropdown-list-dynamic.vue

@@ -8,7 +8,7 @@
         :filterable="filterable"
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownListDynamic.placeholder')">
-        <i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('userCustom.'+tag+'.'+item.value)!== ('userCustom.'+tag+'.'+item.value))?$t('userCustom.'+tag+'.'+item.value) : item.text}}</i-option>
+        <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value">{{($t('userCustom.'+tag+'.'+item.value)!== ('userCustom.'+tag+'.'+item.value))?$t('userCustom.'+tag+'.'+item.value) : item.text}}</i-option>
     </i-select>
 </template>
 

app_web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue

@@ -12,7 +12,7 @@
             :filterable="filterable"
             @on-open-change="onClick"
             :placeholder="$t('components.dropDownListMpicker.placeholder')">
-            <i-option v-for="(item, index) in items" :key="index" :value="item.value.toString()" :label="item.text">
+            <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value.toString()" :label="item.text">
             <Checkbox :value = "(currentVal.indexOf(item.value.toString()))==-1?false:true">
                 {{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}}
             </Checkbox>

app_web/src/components/dropdown-list/dropdown-list.vue

@@ -9,7 +9,7 @@
         :filterable="filterable"
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownList.placeholder')">
-        <i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
+        <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
         </i-select>
         <ibiz-select-tree v-if="hasChildren" class="tree-dropdown-list" :disabled="disabled" :NodesData="items" v-model="currentVal" :multiple="false"></ibiz-select-tree>
     </div>

app_web/src/counter/counter-service.ts

 import { Store } from 'vuex';
+import EntityService from '@/service/entity-service';
+
 
 /**
  * 计数器服务基类
@@ -16,6 +18,51 @@ export default class CounterService {
      * @memberof CounterService
      */
     private $store: Store<any> | null = null;
+    
+    /**
+     * 当前计数器数据
+     * 
+     * @protected
+     * @type {*}
+     * @memberof  CounterService
+     */
+    protected counterData:any ={};
+
+    /**
+     * 应用实体数据服务
+     *
+     * @protected
+     * @type {EntityService}
+     * @memberof CounterService
+     */    
+    protected appEntityService:EntityService = new EntityService();
+
+    /**
+     * 当前计数器导航上下文
+     * 
+     * @protected
+     * @type {*}
+     * @memberof  CounterService
+     */
+    protected context:any ={};
+
+    /**
+     * 当前计数器导航参数
+     * 
+     * @protected
+     * @type {*}
+     * @memberof  CounterService
+     */
+    protected viewparams:any ={};
+
+    /**
+     * 当前计数器定时器对象
+     * 
+     * @protected
+     * @type {*}
+     * @memberof  CounterService
+     */
+    protected timer:any;
 
     /**
      * Creates an instance of CounterService.
@@ -25,6 +72,8 @@ export default class CounterService {
      */
     constructor(opts: any = {}) {
         this.$store = opts.$store;
+        this.context = opts.context?opts.context:{};
+        this.viewparams = opts.viewparams?opts.viewparams:{};
     }
 
     /**
@@ -49,5 +98,13 @@ export default class CounterService {
         return (window as any)['counterServiceRegister'].getService(name);
     }
 
-   
+    /**
+     * 销毁计数器
+     *
+     * @memberof ActionCounterCounterServiceBase
+     */
+    public destroyCounter(){
+        if(this.timer) clearInterval(this.timer);
+    }
+  
 }
\ No newline at end of file

app_web/src/engine/view/view-engine.ts

+import { Environment } from '@/environments/environment';
+
 /**
  * 
  *

app_web/src/environments/environment.ts

@@ -15,6 +15,8 @@ export const Environment = {
     ExportFile: '/ibizutil/download',
     // 文件上传
     UploadFile: '/ibizutil/upload',
+    // 数据导入单次上传最大数量
+    sliceUploadCnt: 100,
     // 是否为pc端应用
     isAppMode:true,
     //统一地址
@@ -25,8 +27,10 @@ export const Environment = {
     enablePermissionValid:false,
     // 项目模板地址
     ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7",
+    // 打开目标工具，可选参数：sln、mos
+    debugOpenMode:'mos',
     // 配置平台地址
-    StudioUrl: "http://172.16.170.145/slnstudio/",
+    StudioUrl: "http://172.16.170.145/mos/",
     // 中心标识
     SlnId: "B4BF5C84-D020-4D9A-A986-8FA4FD72816C",
     // 系统标识
@@ -39,4 +43,8 @@ export const Environment = {
     ibizlabtUrl: 'https://www.ibizlab.cn',
     // ibiz论坛地址
     ibizbbstUrl: 'https://bbs.ibizlab.cn',
-};
\ No newline at end of file
+};
+// 挂载外部配置文件
+if ((window as any).Environment) {
+    Object.assign(Environment, (window as any).Environment);
+}
\ No newline at end of file

app_web/src/locale/lanres/entities/msg-open-access/msg-open-access_en_US.ts

@@ -6,7 +6,7 @@ export default {
     open_type: "开放平台类型",
     access_key: "AccessKey(AppId)",
     secret_key: "SecretKey(AppSecret)",
-    region_id: "RegionId",
+    region_id: "RegionId（CorpId)",
     access_token: "管理账号token",
     expires_time: "管理账号token过期时间",
     disabled: "是否禁用",
@@ -45,7 +45,7 @@ export default {
 			open_type: "开放平台类型", 
 			access_key: "AccessKey(AppId)", 
 			secret_key: "SecretKey(AppSecret)", 
-			region_id: "RegionId", 
+			region_id: "RegionId（CorpId)", 
 			access_token: "管理账号token", 
 			expires_time: "管理账号token过期时间", 
 			accessid: "开放平台接入标识", 
@@ -58,7 +58,7 @@ export default {
 			accessname: "开放平台",
 			open_type: "开放平台类型",
 			access_key: "AccessKey(AppId)",
-			region_id: "RegionId",
+			region_id: "RegionId（CorpId)",
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/msg-open-access/msg-open-access_zh_CN.ts

@@ -5,7 +5,7 @@ export default {
     open_type: "开放平台类型",
     access_key: "AccessKey(AppId)",
     secret_key: "SecretKey(AppSecret)",
-    region_id: "RegionId",
+    region_id: "RegionId（CorpId)",
     access_token: "管理账号token",
     expires_time: "管理账号token过期时间",
     disabled: "是否禁用",
@@ -44,7 +44,7 @@ export default {
 			open_type: "开放平台类型", 
 			access_key: "AccessKey(AppId)", 
 			secret_key: "SecretKey(AppSecret)", 
-			region_id: "RegionId", 
+			region_id: "RegionId（CorpId)", 
 			access_token: "管理账号token", 
 			expires_time: "管理账号token过期时间", 
 			accessid: "开放平台接入标识", 
@@ -57,7 +57,7 @@ export default {
 			accessname: "开放平台",
 			open_type: "开放平台类型",
 			access_key: "AccessKey(AppId)",
-			region_id: "RegionId",
+			region_id: "RegionId（CorpId)",
 		},
 		uiactions: {
 		},

app_web/src/mock/appdata/appdata.ts

@@ -33,6 +33,7 @@ mock.onGet('/appdata').reply((config: any) => {
           // 当前用户条线代码
          srfsectorbc:""
         },
+        enablepermissionvalid:false,
         unires:["RESOURCE1","RESOURCE2"],
          //当前用户所有组织部门标识
          srforgsections:[{"srforgsectorid":"5bd1ecf4d3c31e31cb66373df56b852f","srforgsectorname":"项目一部"},{"srforgsectorid":"2ad1ecf4d3c31e31cb66373df56b852f","srforgsectorname":"项目二部"}]

app_web/src/mock/codelist/codelist.ts

@@ -16,6 +16,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: "aliyun",
                 label: "阿里云",
                 text: "阿里云",
+                "class":"",
                 "data":"",
                 "codename":"Aliyun",
                 value: "aliyun",
@@ -26,6 +27,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: "wechat",
                 label: "微信开放平台",
                 text: "微信开放平台",
+                "class":"",
                 "data":"",
                 "codename":"Wechat",
                 value: "wechat",
@@ -36,6 +38,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: "qq",
                 label: "QQ互联",
                 text: "QQ互联",
+                "class":"",
                 "data":"",
                 "codename":"Qq",
                 value: "qq",
@@ -46,6 +49,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: "dingtalk",
                 label: "钉钉开放平台",
                 text: "钉钉开放平台",
+                "class":"",
                 "data":"",
                 "codename":"Dingtalk",
                 value: "dingtalk",
@@ -63,6 +67,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: "aliyun-sms",
                 label: "阿里云短信",
                 text: "阿里云短信",
+                "class":"",
                 "data":"",
                 "codename":"Aliyun_SUB_sms",
                 value: "aliyun-sms",
@@ -73,6 +78,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: "aliyun-email",
                 label: "阿里云邮件",
                 text: "阿里云邮件",
+                "class":"",
                 "data":"",
                 "codename":"Aliyun_SUB_email",
                 value: "aliyun-email",
@@ -83,6 +89,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: "wechat-msg",
                 label: "微信消息",
                 text: "微信消息",
+                "class":"",
                 "data":"",
                 "codename":"Wechat_SUB_msg",
                 value: "wechat-msg",
@@ -93,6 +100,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: "dingtalk-msg",
                 label: "钉钉通知",
                 text: "钉钉通知",
+                "class":"",
                 "data":"",
                 "codename":"Dingtalk_SUB_msg",
                 value: "dingtalk-msg",

app_web/src/model/form-detail/form-button.ts

@@ -11,7 +11,7 @@ export class FormButtonModel extends FormDetailModel {
 
     constructor(opts: any = {}) {
         super(opts);
-        this.disabled = opts.disabled;
+        this.$disabled = opts.disabled;
         this.uiaction = opts.uiaction;
     }
 
@@ -21,7 +21,7 @@ export class FormButtonModel extends FormDetailModel {
      * @type {boolean}
      * @memberof FormButtonModel
      */
-    public disabled:boolean = false;
+    private $disabled:boolean = false;
 
     /**
      * 按钮对应的界面行为
@@ -31,4 +31,26 @@ export class FormButtonModel extends FormDetailModel {
      */
     public uiaction:any;
 
+    /**
+     * 是否启用
+     *
+     * @type {boolean}
+     * @memberof FormButtonModel
+     */
+    public get disabled(): boolean {
+        return this.$disabled;
+    }
+
+    /**
+     * 设置是否启用
+     *
+     * @memberof FormButtonModel
+     */
+    public set disabled(val: boolean) {
+        if(this.isPower) {
+            this.$disabled = val;
+        }
+    }
+
+
 }
\ No newline at end of file

app_web/src/model/form-detail/form-detail.ts

@@ -6,6 +6,14 @@
  */
 export class FormDetailModel {
 
+    /**
+     * 是否有权限
+     *
+     * @type {boolean}
+     * @memberof FormDetailModel
+     */
+    public isPower: boolean = true;
+
     /**
      * 成员标题
      *
@@ -44,7 +52,7 @@ export class FormDetailModel {
      * @type {boolean}
      * @memberof FormDetailModel
      */
-    public visible: boolean = true;
+    public $visible: boolean = true;
 
     /**
      * 成员是否显示(旧)
@@ -83,12 +91,33 @@ export class FormDetailModel {
         this.detailType = !Object.is(opts.detailType, '') ? opts.detailType : '';
         this.form = opts.form ? opts.form : {};
         this.name = !Object.is(opts.name, '') ? opts.name : '';
-        this.visible = opts.visible ? true : false;
+        this.$visible = opts.visible ? true : false;
         this.oldVisible = opts.visible ? true : false;
         this.isShowCaption = opts.isShowCaption ? true : false;
         this.isControlledContent = opts.isControlledContent ? true : false;
     }
 
+    /**
+     * 设置成员是否隐藏
+     *
+     * @memberof FormDetailModel
+     */
+    public set visible(val: boolean) {
+        if(this.isPower) {
+            this.$visible = val;
+        }
+    }
+
+    /**
+     * 获取成员是否隐藏
+     *
+     * @memberof FormDetailModel
+     */
+    public get visible() {
+        return  this.$visible;
+    }
+
+
     /**
      * 设置显示与隐藏
      *
@@ -96,7 +125,9 @@ export class FormDetailModel {
      * @memberof FormDetailModel
      */
     public setVisible(state: boolean): void {
-        this.visible = state;
+        if(this.isPower) {
+            this.visible = state;
+        }
     }
 
     /**

app_web/src/model/panel-detail/index.ts

+export { PanelDetailModel } from './panel-detail';
+export { PanelRawitemModel } from './panel-row-item';
+export { PanelTabPanelModel } from './panel-tab-panel';
+export { PanelTabPageModel } from './panel-tab-page';
+export { PanelFieldModel } from './panel-field';
+export { PanelContainerModel } from './panel-container';
+export { PanelControlModel } from './panel-control';
+export { PanelUserControlModel } from './panel-user-control';
+export { PanelButtonModel } from './panel-button';
\ No newline at end of file

app_web/src/model/panel-detail/panel-button.ts

+import { PanelDetailModel } from './panel-detail';
+
+/**
+ * 按钮模型
+ *
+ * @export
+ * @class PanelButtonModel
+ * @extends {PanelDetailModel}
+ */
+export class PanelButtonModel extends PanelDetailModel {
+
+    constructor(opts: any = {}) {
+        super(opts);
+        this.$disabled = opts.disabled;
+        this.uiaction = opts.uiaction;
+    }
+
+    /**
+     * 是否禁用
+     *
+     * @type {boolean}
+     * @memberof PanelButtonModel
+     */
+    private $disabled:boolean = false;
+
+    /**
+     * 按钮对应的界面行为
+     *
+     * @type {*}
+     * @memberof PanelButtonModel
+     */
+    public uiaction:any;
+
+    /**
+     * 是否启用
+     *
+     * @type {boolean}
+     * @memberof PanelButtonModel
+     */
+    public get disabled(): boolean {
+        return this.$disabled;
+    }
+
+    /**
+     * 设置是否启用
+     *
+     * @memberof PanelButtonModel
+     */
+    public set disabled(val: boolean) {
+        if(this.isPower) {
+            this.$disabled = val;
+        }
+    }
+
+
+}
\ No newline at end of file

app_web/src/model/panel-detail/panel-container.ts

+import { PanelDetailModel } from './panel-detail';
+
+/**
+ * 面板容器模型
+ *
+ * @export
+ * @class PanelContainerModel
+ * @extends {PanelDetailModel}
+ */
+export class PanelContainerModel extends PanelDetailModel {
+
+
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+}
\ No newline at end of file

app_web/src/model/panel-detail/panel-control.ts

+import { PanelDetailModel } from './panel-detail';
+
+/**
+ * 用户控件模型
+ *
+ * @export
+ * @class PanelControlModel
+ * @extends {PanelDetailModel}
+ */
+export class PanelControlModel extends PanelDetailModel {
+
+
+    constructor(otps:any = {}) {
+        super(otps);
+    }
+}
\ No newline at end of file

app_web/src/model/panel-detail/panel-detail.ts

+/**
+ * 表单成员模型
+ *
+ * @export
+ * @class PanelDetailModel
+ */
+export class PanelDetailModel {
+
+    /**
+     * 是否有权限
+     *
+     * @type {boolean}
+     * @memberof PanelDetailModel
+     */
+    public isPower: boolean = true;
+
+    /**
+     * 成员标题
+     *
+     * @type {string}
+     * @memberof PanelDetailModel
+     */
+    public caption: string = '';
+
+    /**
+     * 成员类型
+     *
+     * @type {string}
+     * @memberof PanelDetailModel
+     */
+    public itemType: string = '';
+
+    /**
+     * 面板对象
+     *
+     * @type {*}
+     * @memberof PanelDetailModel
+     */
+    public panel: any = null;
+
+    /**
+     * 成员名称
+     *
+     * @type {string}
+     * @memberof PanelDetailModel
+     */
+    public name: string = '';
+
+    /**
+     * 成员是否显示
+     *
+     * @type {boolean}
+     * @memberof PanelDetailModel
+     */
+    public $visible: boolean = true;
+
+    /**
+     * 成员是否显示(旧)
+     *
+     * @type {boolean}
+     * @memberof PanelDetailModel
+     */
+    public oldVisible: boolean = true;
+
+    /**
+     * 成员是否显示标题
+     *
+     * @type {boolean}
+     * @memberof PanelDetailModel
+     */
+    public isShowCaption: boolean = true;
+    
+
+    /**
+     * Creates an instance of PanelDetailModel.
+     * PanelDetailModel 实例
+     * 
+     * @param {*} [opts={}]
+     * @memberof PanelDetailModel
+     */
+    constructor(opts: any = {}) {
+        this.caption = !Object.is(opts.caption, '') ? opts.caption : '';
+        this.itemType = !Object.is(opts.itemType, '') ? opts.itemType : '';
+        this.panel = opts.panel ? opts.panel : {};
+        this.name = !Object.is(opts.name, '') ? opts.name : '';
+        this.$visible = opts.visible ? true : false;
+        this.oldVisible = opts.visible ? true : false;
+        this.isShowCaption = opts.isShowCaption ? true : false;
+    }
+
+    /**
+     * 设置成员是否隐藏
+     *
+     * @memberof PanelDetailModel
+     */
+    public set visible(val: boolean) {
+        if(this.isPower) {
+            this.$visible = val;
+        }
+    }
+
+    /**
+     * 获取成员是否隐藏
+     *
+     * @memberof PanelDetailModel
+     */
+    public get visible() {
+        return  this.$visible;
+    }
+
+
+    /**
+     * 设置显示与隐藏
+     *
+     * @param {boolean} state
+     * @memberof PanelDetailModel
+     */
+    public setVisible(state: boolean): void {
+        if(this.isPower) {
+            this.visible = state;
+        }
+    }
+
+    /**
+     * 设置显示标题栏
+     *
+     * @param {boolean} state
+     * @memberof PanelDetailModel
+     */
+    public setShowCaption(state: boolean): void {
+        this.isShowCaption = state;
+    }
+}
\ No newline at end of file

app_web/src/model/panel-detail/panel-field.ts

+import { PanelDetailModel } from './panel-detail';
+
+/**
+ * 面板属性项模型
+ *
+ * @export
+ * @class PanelFieldModel
+ * @extends {PanelDetailModel}
+ */
+export class PanelFieldModel extends PanelDetailModel {
+
+    /**
+     * 是否启用
+     *
+     * @type {boolean}
+     * @memberof PanelFieldModel
+     */
+    public disabled: boolean = false;
+
+    /**
+     * 错误信息
+     *
+     * @type {string}
+     * @memberof PanelFieldModel
+     */
+    public error: string = '';
+
+    /**
+     * 表单项启用条件
+     * 
+     * 0 不启用
+     * 1 新建
+     * 2 更新
+     * 3 全部启用
+     *
+     * @type {(number | 0 | 1 | 2 | 3)}
+     * @memberof PanelFieldModel
+     */
+    public enableCond: number | 0 | 1 | 2 | 3 = 3;
+
+    /**
+     * Creates an instance of PanelFieldModel.
+     * PanelFieldModel 实例
+     * 
+     * @param {*} [opts={}]
+     * @memberof PanelFieldModel
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+        this.disabled = opts.disabled ? true : false;
+        this.enableCond = opts.enableCond;
+    }
+
+    /**
+     * 设置是否启用
+     *
+     * @param {boolean} state
+     * @memberof PanelFieldModel
+     */
+    public setDisabled(state: boolean): void {
+        this.disabled = state;
+    }
+
+    /**
+     * 设置信息内容
+     *
+     * @param {string} error
+     * @memberof PanelFieldModel
+     */
+    public setError(error: string): void {
+        this.error = error;
+    }
+
+    /**
+     * 设置是否启用
+     *
+     * @param {string} srfuf
+     * @memberof PanelFieldModel
+     */
+    public setEnableCond(srfuf: string): void {
+        // 是否有权限
+        const isReadOk: boolean = true;
+        const _srfuf: number = parseInt(srfuf, 10);
+        let state: boolean = true;
+
+        if (isReadOk) {
+            if (_srfuf === 1) {
+                if ((this.enableCond & 2) === 2) {
+                    state = false;
+                }
+            } else {
+                if ((this.enableCond & 1) === 1) {
+                    state = false;
+                }
+            }
+        }
+        this.setDisabled(state);
+    }
+
+} 
\ No newline at end of file

app_web/src/model/panel-detail/panel-row-item.ts

+import { PanelDetailModel } from './panel-detail';
+
+/**
+ * 直接内容模型
+ *
+ * @export
+ * @class PanelRawitemModel
+ * @extends {PanelDetailModel}
+ */
+export class PanelRawitemModel extends PanelDetailModel {
+
+
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+}
\ No newline at end of file

app_web/src/model/panel-detail/panel-tab-page.ts

+import { PanelDetailModel } from './panel-detail';
+import { PanelTabPanelModel } from './panel-tab-panel';
+
+/**
+ * 分页面板模型
+ *
+ * @export
+ * @class PanelTabPageModel
+ * @extends {PanelDetailModel}
+ */
+export class PanelTabPageModel extends PanelDetailModel {
+
+
+    /**
+     * Creates an instance of PanelTabPageModel.
+     * PanelTabPageModel 实例
+     * 
+     * @param {*} [opts={}]
+     * @memberof PanelTabPageModel
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 设置分页是否启用
+     *
+     * @param {boolean} state
+     * @memberof PanelTabPageModel
+     */
+    public setVisible(state: boolean): void {
+        this.visible = state;
+        const tabPanel = this.getTabPanelModel();
+        if (tabPanel) {
+            tabPanel.setActiviePage();
+        }
+    }
+
+    /**
+     * 获取分页面板
+     *
+     * @returns {(PanelTabPanelModel | null)}
+     * @memberof PanelTabPageModel
+     */
+    public getTabPanelModel(): PanelTabPanelModel | null {
+        if (!this.panel) {
+            return null;
+        }
+        const tabPanels: any[] = Object.values(this.panel.detailsModel).filter((model: any) => Object.is(model.itemType, 'TABPANEL'));
+        let index = tabPanels.findIndex((tabPanel: any) => {
+            return tabPanel.tabPages.some((tabPag: any) => Object.is(tabPag.name, this.name));
+        });
+        if (index === -1) {
+            return null;
+        }
+        const tabPanel: PanelTabPanelModel = tabPanels[index];
+        return tabPanel;
+    }
+}
\ No newline at end of file

app_web/src/model/panel-detail/panel-tab-panel.ts

+import { PanelDetailModel } from './panel-detail';
+
+/**
+ * 分页部件模型
+ *
+ * @export
+ * @class PanelTabPanelModel
+ * @extends {PanelDetailModel}
+ */
+export class PanelTabPanelModel extends PanelDetailModel {
+
+    /**
+     * 被激活分页
+     *
+     * @type {string}
+     * @memberof PanelTabPanelModel
+     */
+    public activiedPage: string = '';
+
+    /**
+     * 选中激活状态
+     *
+     * @type {string}
+     * @memberof PanelTabPanelModel
+     */
+    public clickActiviePage: string = '';
+
+    /**
+     * 分页子成员
+     *
+     * @type {any[]}
+     * @memberof PanelTabPanelModel
+     */
+    public tabPages: any[] = [];
+
+    /**
+     * Creates an instance of PanelTabPanelModel.
+     * PanelTabPanelModel 实例
+     * 
+     * @param {*} [opts={}]
+     * @memberof PanelTabPanelModel
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+        this.tabPages = [...opts.tabPages];
+        if (this.tabPages.length > 0) {
+            this.activiedPage = this.tabPages[0].name;
+        }
+    }
+
+    /**
+     * 设置激活分页
+     *
+     * @memberof PanelTabPanelModel
+     */
+    public setActiviePage(): void {
+        if (!this.panel) {
+            return;
+        }
+        const detailsModel: any = this.panel.detailsModel;
+
+        const index = this.tabPages.findIndex((tabpage: any) => Object.is(tabpage.name, this.clickActiviePage) && Object.is(tabpage.name, this.activiedPage) && detailsModel[tabpage.name].visible);
+        if (index !== - 1) {
+            return;
+        }
+
+        this.tabPages.some((tabpage: any) => {
+            if (detailsModel[tabpage.name].visible) {
+                this.activiedPage = tabpage.name;
+                return true;
+            }
+            return false;
+        });
+    }
+
+    /**
+     * 选中页面
+     *
+     * @param {*} $event
+     * @returns {void}
+     * @memberof PanelTabPanelModel
+     */
+    public clickPage($event: any): void {
+        if (!$event) {
+            return;
+        }
+
+        this.clickActiviePage = $event;
+        this.activiedPage = $event;
+    }
+}
\ No newline at end of file

app_web/src/model/panel-detail/panel-user-control.ts

+import { PanelDetailModel } from './panel-detail';
+
+/**
+ * 用户控件模型
+ *
+ * @export
+ * @class PanelUserControlModel
+ * @extends {PanelDetailModel}
+ */
+export class PanelUserControlModel extends PanelDetailModel {
+
+
+    constructor(otps:any = {}) {
+        super(otps);
+    }
+}
\ No newline at end of file

app_web/src/pages/notify/msg-open-access-edit-view/msg-open-access-edit-view-base.vue

@@ -152,15 +152,6 @@ export default class MsgOpenAccessEditViewBase extends Vue {
      * @memberof MsgOpenAccessEditViewBase
      */
     public appUIService: MsgOpenAccessUIService = new MsgOpenAccessUIService(this.$store);
-
-
-    /**
-     * 计数器服务对象集合
-     *
-     * @type {Array<*>}
-     * @memberof MsgOpenAccessEditViewBase
-     */    
-    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -424,6 +415,15 @@ export default class MsgOpenAccessEditViewBase extends Vue {
      */
     public viewCacheData:any;
 
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof MsgOpenAccessEditViewBase
+     */    
+    public counterServiceArray:Array<any> = [];
+
     /**
      * 解析视图参数
      *

app_web/src/pages/notify/msg-open-access-grid-view/msg-open-access-grid-view-base.vue

@@ -182,15 +182,6 @@ export default class MsgOpenAccessGridViewBase extends Vue {
      * @memberof MsgOpenAccessGridViewBase
      */
     public appUIService: MsgOpenAccessUIService = new MsgOpenAccessUIService(this.$store);
-
-
-    /**
-     * 计数器服务对象集合
-     *
-     * @type {Array<*>}
-     * @memberof MsgOpenAccessGridViewBase
-     */    
-    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -459,6 +450,15 @@ export default class MsgOpenAccessGridViewBase extends Vue {
      */
     public viewCacheData:any;
 
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof MsgOpenAccessGridViewBase
+     */    
+    public counterServiceArray:Array<any> = [];
+
     /**
      * 解析视图参数
      *

app_web/src/pages/notify/msg-open-access-pickup-grid-view/msg-open-access-pickup-grid-view-base.vue

@@ -79,15 +79,6 @@ export default class MsgOpenAccessPickupGridViewBase extends Vue {
      * @memberof MsgOpenAccessPickupGridViewBase
      */
     public appUIService: MsgOpenAccessUIService = new MsgOpenAccessUIService(this.$store);
-
-
-    /**
-     * 计数器服务对象集合
-     *
-     * @type {Array<*>}
-     * @memberof MsgOpenAccessPickupGridViewBase
-     */    
-    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -314,6 +305,15 @@ export default class MsgOpenAccessPickupGridViewBase extends Vue {
      */
     public viewCacheData:any;
 
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof MsgOpenAccessPickupGridViewBase
+     */    
+    public counterServiceArray:Array<any> = [];
+
     /**
      * 解析视图参数
      *

app_web/src/pages/notify/msg-open-access-pickup-view/msg-open-access-pickup-view-base.vue

@@ -64,15 +64,6 @@ export default class MsgOpenAccessPickupViewBase extends Vue {
      * @memberof MsgOpenAccessPickupViewBase
      */
     public appUIService: MsgOpenAccessUIService = new MsgOpenAccessUIService(this.$store);
-
-
-    /**
-     * 计数器服务对象集合
-     *
-     * @type {Array<*>}
-     * @memberof MsgOpenAccessPickupViewBase
-     */    
-    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -307,6 +298,15 @@ export default class MsgOpenAccessPickupViewBase extends Vue {
      */
     public viewCacheData:any;
 
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof MsgOpenAccessPickupViewBase
+     */    
+    public counterServiceArray:Array<any> = [];
+
     /**
      * 解析视图参数
      *

app_web/src/pages/notify/msg-template-edit-view/msg-template-edit-view-base.vue

@@ -152,15 +152,6 @@ export default class MsgTemplateEditViewBase extends Vue {
      * @memberof MsgTemplateEditViewBase
      */
     public appUIService: MsgTemplateUIService = new MsgTemplateUIService(this.$store);
-
-
-    /**
-     * 计数器服务对象集合
-     *
-     * @type {Array<*>}
-     * @memberof MsgTemplateEditViewBase
-     */    
-    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -424,6 +415,15 @@ export default class MsgTemplateEditViewBase extends Vue {
      */
     public viewCacheData:any;
 
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof MsgTemplateEditViewBase
+     */    
+    public counterServiceArray:Array<any> = [];
+
     /**
      * 解析视图参数
      *

app_web/src/pages/notify/msg-template-grid-view/msg-template-grid-view-base.vue

@@ -182,15 +182,6 @@ export default class MsgTemplateGridViewBase extends Vue {
      * @memberof MsgTemplateGridViewBase
      */
     public appUIService: MsgTemplateUIService = new MsgTemplateUIService(this.$store);
-
-
-    /**
-     * 计数器服务对象集合
-     *
-     * @type {Array<*>}
-     * @memberof MsgTemplateGridViewBase
-     */    
-    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -459,6 +450,15 @@ export default class MsgTemplateGridViewBase extends Vue {
      */
     public viewCacheData:any;
 
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof MsgTemplateGridViewBase
+     */    
+    public counterServiceArray:Array<any> = [];
+
     /**
      * 解析视图参数
      *

app_web/src/pages/notify/msg-user-account-edit-view/msg-user-account-edit-view-base.vue

@@ -152,15 +152,6 @@ export default class MsgUserAccountEditViewBase extends Vue {
      * @memberof MsgUserAccountEditViewBase
      */
     public appUIService: MsgUserAccountUIService = new MsgUserAccountUIService(this.$store);
-
-
-    /**
-     * 计数器服务对象集合
-     *
-     * @type {Array<*>}
-     * @memberof MsgUserAccountEditViewBase
-     */    
-    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -424,6 +415,15 @@ export default class MsgUserAccountEditViewBase extends Vue {
      */
     public viewCacheData:any;
 
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof MsgUserAccountEditViewBase
+     */    
+    public counterServiceArray:Array<any> = [];
+
     /**
      * 解析视图参数
      *

app_web/src/pages/notify/msg-user-account-grid-view/msg-user-account-grid-view-base.vue

@@ -182,15 +182,6 @@ export default class MsgUserAccountGridViewBase extends Vue {
      * @memberof MsgUserAccountGridViewBase
      */
     public appUIService: MsgUserAccountUIService = new MsgUserAccountUIService(this.$store);
-
-
-    /**
-     * 计数器服务对象集合
-     *
-     * @type {Array<*>}
-     * @memberof MsgUserAccountGridViewBase
-     */    
-    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -459,6 +450,15 @@ export default class MsgUserAccountGridViewBase extends Vue {
      */
     public viewCacheData:any;
 
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof MsgUserAccountGridViewBase
+     */    
+    public counterServiceArray:Array<any> = [];
+
     /**
      * 解析视图参数
      *

app_web/src/pages/notify/notify-index-view/notify-index-view-base.vue

@@ -77,15 +77,6 @@ import { Subject,Subscription } from 'rxjs';
     },
 })
 export default class NotifyIndexViewBase extends Vue {
-
-
-    /**
-     * 计数器服务对象集合
-     *
-     * @type {Array<*>}
-     * @memberof NotifyIndexViewBase
-     */    
-    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -288,6 +279,15 @@ export default class NotifyIndexViewBase extends Vue {
      */
     public viewCacheData:any;
 
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof NotifyIndexViewBase
+     */    
+    public counterServiceArray:Array<any> = [];
+
     /**
      * 解析视图参数
      *

app_web/src/styles/app-code-list.less

+#app{
+    display: block;
+}

app_web/src/styles/default.less

@@ -2,6 +2,7 @@
 @import '../theme/blue.theme.less';
 @import '../theme/dark-blue.theme.less';
 @import '../theme/default.theme.less';
+@import './app-code-list.less';
 @import './var.css';
 
 .ibiz-page-tag .tags-body .tags-container .ivu-tag.tag-is-active .ivu-tag-text {

app_web/src/template.html

@@ -12,8 +12,6 @@
       <strong>We're sorry but app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app"></div>
-    <!-- <link rel="stylesheet" href="<%= BASE_URL %>assets/styles/loader.css">
-    <div class="loader" id="app-loader"></div> -->
-    <!-- built files will be auto injected -->
+    <script src="./environments/environment.js"></script>
   </body>
 </html>

app_web/src/utils/studio-action/StudioActionUtil.ts

@@ -119,8 +119,12 @@ export class StudioActionUtil {
                 }, '*');
                 Vue.prototype.$message.warning('请在已打开的配置平台查看!');
             } else {
-                console.log(`${Environment.StudioUrl}?ov=${JSON.stringify(params)}#/common_slnindex/srfkeys=${Environment.SlnId}/sysdesign_psdevslnsysmodeltreeexpview/srfkey=${Environment.SysId}`);
-                this.studioWin = window.open(`${Environment.StudioUrl}?ov=${encodeURIComponent(JSON.stringify(params))}#/common_slnindex/srfkeys=${Environment.SlnId}/sysdesign_psdevslnsysmodeltreeexpview/srfkey=${Environment.SysId}`, '_blank');
+                if(Environment.debugOpenMode === 'sln'){
+                    console.log("打开sln未支持");
+                    // this.studioWin = window.open(`${Environment.StudioUrl}?ov=${encodeURIComponent(JSON.stringify(params))}#/common_slnindex/srfkeys=${Environment.SlnId}/sysdesign_psdevslnsysmodeltreeexpview/srfkey=${Environment.SysId}`, '_blank');
+                }else{
+                    this.studioWin = window.open(`${Environment.StudioUrl}?ov=${encodeURIComponent(JSON.stringify(params))}#/common_mosindex/srfkeys=${Environment.SysId}`, '_blank');
+                }
             }
         }
     }

app_web/src/utils/types/README.md

+# util 工具包 
+
+## 工具包声明文件

app_web/src/utils/view-tool/view-tool.ts

@@ -252,9 +252,10 @@ export class ViewTool {
      * @memberof ViewTool
      */
     public static calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
+        let result: any[] = [];
         for (const key in ActionModel) {
             if (!ActionModel.hasOwnProperty(key)) {
-                return;
+                return result;
             }
             const _item = ActionModel[key];
             if(_item && _item['dataaccaction'] && UIService){
@@ -282,7 +283,9 @@ export class ViewTool {
                     _item.visabled = true;
                     _item.disabled = false;
                 }
+                result.push(dataActionResult);
             }
         }
+        return result;
     } 
 }
\ No newline at end of file

app_web/src/widgets/app/notify-index-view-appmenu/notify-index-view-appmenu-base.vue

@@ -606,7 +606,7 @@ export default class NotifyIndexViewBase extends Vue implements ControlInterface
      * @memberof NotifyIndexViewBase
      */
     public handleMenusResource(inputMenus:Array<any>){
-        if(Environment.enablePermissionValid){
+        if(this.$store.getters['authresource/getEnablePermissionValid']){
             this.computedEffectiveMenus(inputMenus);
             this.computeParentMenus(inputMenus);
         }

app_web/src/widgets/msg-open-access/main-form/main-form-base.vue

@@ -121,6 +121,7 @@ import MsgOpenAccessUIService from '@/uiservice/msg-open-access/msg-open-access-
 import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 import schema from 'async-validator';
+import { Environment } from '@/environments/environment';
 
 
 @Component({
@@ -557,10 +558,10 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: 'SecretKey(AppSecret) 值不能为空', trigger: 'blur' },
         ],
         region_id: [
-            { type: 'string', message: 'RegionId 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: 'RegionId 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: 'RegionId 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: 'RegionId 值不能为空', trigger: 'blur' },
+            { type: 'string', message: 'RegionId（CorpId) 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: 'RegionId（CorpId) 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: 'RegionId（CorpId) 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: 'RegionId（CorpId) 值不能为空', trigger: 'blur' },
         ],
         access_token: [
             { type: 'string', message: '管理账号token 值必须为字符串类型', trigger: 'change' },
@@ -694,7 +695,7 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
         secret_key: new FormItemModel({ caption: 'SecretKey(AppSecret)', detailType: 'FORMITEM', name: 'secret_key', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 
-        region_id: new FormItemModel({ caption: 'RegionId', detailType: 'FORMITEM', name: 'region_id', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
+        region_id: new FormItemModel({ caption: 'RegionId（CorpId)', detailType: 'FORMITEM', name: 'region_id', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 
         access_token: new FormItemModel({ caption: '管理账号token', detailType: 'FORMITEM', name: 'access_token', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 
@@ -1008,6 +1009,7 @@ export default class MainBase extends Vue implements ControlInterface {
             Object.assign(this.context,{msgopenaccess:data.msgopenaccess})
         }
         this.setFormEnableCond(data);
+        this.computeButtonState(data);
         this.fillForm(data,action);
         this.oldData = {};
         Object.assign(this.oldData, JSON.parse(JSON.stringify(this.data)));
@@ -1185,10 +1187,12 @@ export default class MainBase extends Vue implements ControlInterface {
         if(this.detailsModel && Object.keys(this.detailsModel).length >0){
             Object.keys(this.detailsModel).forEach((name:any) =>{
                 if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){
+                    this.detailsModel[name].isPower = true;
                     let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction));
-                    ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
+                    let result: any[] = ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
                     this.detailsModel[name].visible = tempUIAction.visabled;
                     this.detailsModel[name].disabled = tempUIAction.disabled;
+                    this.detailsModel[name].isPower = result[0] === 1 ? true : false;
                 }
             })
         }
@@ -1257,7 +1261,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.refresh(data);
                 }
                 if (Object.is('panelaction', action)) {
-                    this.panelAction(data.action,data.emitAction,data);
+                    this.panelAction(data.action,data.emitAction,data.data);
                 }
             });
         }
@@ -1368,7 +1372,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 const data = response.data;
                 this.onFormLoad(data,'load');
                 this.$emit('load', data);
-                this.computeButtonState(data);
                 this.$nextTick(() => {
                     this.formState.next({ type: 'load', data: data });
                 });
@@ -1412,7 +1415,6 @@ export default class MainBase extends Vue implements ControlInterface {
             this.onFormLoad(data,'loadDraft');
             data.msgopenaccess = null;
             this.$emit('load', data);
-            this.computeButtonState(data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });
             });
@@ -1470,7 +1472,6 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.onFormLoad(data,'autoSave');
             this.$emit('save', data);
-            this.computeButtonState(data);
             AppCenterService.notifyMessage({name:"MsgOpenAccess",action:'appRefresh',data:data});
             this.$nextTick(() => {
                 this.formState.next({ type: 'save', data: data });
@@ -1549,7 +1550,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 const data = response.data;
                 this.onFormLoad(data,'save');
                 this.$emit('save', data);
-                this.computeButtonState(data);
                 AppCenterService.notifyMessage({name:"MsgOpenAccess",action:'appRefresh',data:data});
                 this.$nextTick(() => {
                     this.formState.next({ type: 'save', data: data });

app_web/src/widgets/msg-open-access/main-form/main-form.less

@@ -40,10 +40,14 @@
         }
     }
 }
-// 表单行间距
 .app-form{
+  // 表单行间距
   .app-form-item{
     margin-bottom: 20px;
   }
+  // 表单按钮margin
+  .app-form-button{
+      margin:0 6px;
+  }
 }
 // this is less

app_web/src/widgets/msg-open-access/main-grid/main-grid-base.vue

@@ -125,6 +125,7 @@ import MainService from './main-grid-service';
 import MsgOpenAccessUIService from '@/uiservice/msg-open-access/msg-open-access-ui-service';
 import CodeListService from "@service/app/codelist-service";
 import { FormItemModel } from '@/model/form-detail';
+import { Environment } from '@/environments/environment';
 
 
 @Component({
@@ -637,7 +638,7 @@ export default class MainBase extends Vue implements ControlInterface {
         },
         {
             name: 'region_id',
-            label: 'RegionId',
+            label: 'RegionId（CorpId)',
             langtag: 'entities.msgopenaccess.main_grid.columns.region_id',
             show: true,
             unit: 'PX',
@@ -659,8 +660,8 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public getActionState(data:any){
-        let targetData:any = this.transformData(data);
         let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
+        let targetData:any = this.transformData(data);
         ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
         return tempActionModel;
     }

app_web/src/widgets/msg-template/main-form/main-form-base.vue

@@ -138,6 +138,7 @@ import MsgTemplateUIService from '@/uiservice/msg-template/msg-template-ui-servi
 import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 import schema from 'async-validator';
+import { Environment } from '@/environments/environment';
 
 
 @Component({
@@ -1050,6 +1051,7 @@ export default class MainBase extends Vue implements ControlInterface {
             Object.assign(this.context,{msgtemplate:data.msgtemplate})
         }
         this.setFormEnableCond(data);
+        this.computeButtonState(data);
         this.fillForm(data,action);
         this.oldData = {};
         Object.assign(this.oldData, JSON.parse(JSON.stringify(this.data)));
@@ -1227,10 +1229,12 @@ export default class MainBase extends Vue implements ControlInterface {
         if(this.detailsModel && Object.keys(this.detailsModel).length >0){
             Object.keys(this.detailsModel).forEach((name:any) =>{
                 if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){
+                    this.detailsModel[name].isPower = true;
                     let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction));
-                    ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
+                    let result: any[] = ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
                     this.detailsModel[name].visible = tempUIAction.visabled;
                     this.detailsModel[name].disabled = tempUIAction.disabled;
+                    this.detailsModel[name].isPower = result[0] === 1 ? true : false;
                 }
             })
         }
@@ -1299,7 +1303,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.refresh(data);
                 }
                 if (Object.is('panelaction', action)) {
-                    this.panelAction(data.action,data.emitAction,data);
+                    this.panelAction(data.action,data.emitAction,data.data);
                 }
             });
         }
@@ -1410,7 +1414,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 const data = response.data;
                 this.onFormLoad(data,'load');
                 this.$emit('load', data);
-                this.computeButtonState(data);
                 this.$nextTick(() => {
                     this.formState.next({ type: 'load', data: data });
                 });
@@ -1454,7 +1457,6 @@ export default class MainBase extends Vue implements ControlInterface {
             this.onFormLoad(data,'loadDraft');
             data.msgtemplate = null;
             this.$emit('load', data);
-            this.computeButtonState(data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });
             });
@@ -1512,7 +1514,6 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.onFormLoad(data,'autoSave');
             this.$emit('save', data);
-            this.computeButtonState(data);
             AppCenterService.notifyMessage({name:"MsgTemplate",action:'appRefresh',data:data});
             this.$nextTick(() => {
                 this.formState.next({ type: 'save', data: data });
@@ -1591,7 +1592,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 const data = response.data;
                 this.onFormLoad(data,'save');
                 this.$emit('save', data);
-                this.computeButtonState(data);
                 AppCenterService.notifyMessage({name:"MsgTemplate",action:'appRefresh',data:data});
                 this.$nextTick(() => {
                     this.formState.next({ type: 'save', data: data });

app_web/src/widgets/msg-template/main-form/main-form.less

@@ -40,10 +40,14 @@
         }
     }
 }
-// 表单行间距
 .app-form{
+  // 表单行间距
   .app-form-item{
     margin-bottom: 20px;
   }
+  // 表单按钮margin
+  .app-form-button{
+      margin:0 6px;
+  }
 }
 // this is less

app_web/src/widgets/msg-template/main-grid/main-grid-base.vue

@@ -139,6 +139,7 @@ import MainService from './main-grid-service';
 import MsgTemplateUIService from '@/uiservice/msg-template/msg-template-ui-service';
 import CodeListService from "@service/app/codelist-service";
 import { FormItemModel } from '@/model/form-detail';
+import { Environment } from '@/environments/environment';
 
 
 @Component({
@@ -681,8 +682,8 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public getActionState(data:any){
-        let targetData:any = this.transformData(data);
         let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
+        let targetData:any = this.transformData(data);
         ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
         return tempActionModel;
     }

app_web/src/widgets/msg-user-account/main-form/main-form-base.vue

@@ -71,6 +71,7 @@ import MsgUserAccountUIService from '@/uiservice/msg-user-account/msg-user-accou
 import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
 import schema from 'async-validator';
+import { Environment } from '@/environments/environment';
 
 
 @Component({
@@ -867,6 +868,7 @@ export default class MainBase extends Vue implements ControlInterface {
             Object.assign(this.context,{msguseraccount:data.msguseraccount})
         }
         this.setFormEnableCond(data);
+        this.computeButtonState(data);
         this.fillForm(data,action);
         this.oldData = {};
         Object.assign(this.oldData, JSON.parse(JSON.stringify(this.data)));
@@ -1044,10 +1046,12 @@ export default class MainBase extends Vue implements ControlInterface {
         if(this.detailsModel && Object.keys(this.detailsModel).length >0){
             Object.keys(this.detailsModel).forEach((name:any) =>{
                 if(this.detailsModel[name] && this.detailsModel[name].uiaction && this.detailsModel[name].uiaction.dataaccaction && Object.is(this.detailsModel[name].detailType,"BUTTON")){
+                    this.detailsModel[name].isPower = true;
                     let tempUIAction:any = JSON.parse(JSON.stringify(this.detailsModel[name].uiaction));
-                    ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
+                    let result: any[] = ViewTool.calcActionItemAuthState(targetData,[tempUIAction],this.appUIService);
                     this.detailsModel[name].visible = tempUIAction.visabled;
                     this.detailsModel[name].disabled = tempUIAction.disabled;
+                    this.detailsModel[name].isPower = result[0] === 1 ? true : false;
                 }
             })
         }
@@ -1116,7 +1120,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.refresh(data);
                 }
                 if (Object.is('panelaction', action)) {
-                    this.panelAction(data.action,data.emitAction,data);
+                    this.panelAction(data.action,data.emitAction,data.data);
                 }
             });
         }
@@ -1227,7 +1231,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 const data = response.data;
                 this.onFormLoad(data,'load');
                 this.$emit('load', data);
-                this.computeButtonState(data);
                 this.$nextTick(() => {
                     this.formState.next({ type: 'load', data: data });
                 });
@@ -1271,7 +1274,6 @@ export default class MainBase extends Vue implements ControlInterface {
             this.onFormLoad(data,'loadDraft');
             data.msguseraccount = null;
             this.$emit('load', data);
-            this.computeButtonState(data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });
             });
@@ -1329,7 +1331,6 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.onFormLoad(data,'autoSave');
             this.$emit('save', data);
-            this.computeButtonState(data);
             AppCenterService.notifyMessage({name:"MsgUserAccount",action:'appRefresh',data:data});
             this.$nextTick(() => {
                 this.formState.next({ type: 'save', data: data });
@@ -1408,7 +1409,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 const data = response.data;
                 this.onFormLoad(data,'save');
                 this.$emit('save', data);
-                this.computeButtonState(data);
                 AppCenterService.notifyMessage({name:"MsgUserAccount",action:'appRefresh',data:data});
                 this.$nextTick(() => {
                     this.formState.next({ type: 'save', data: data });

app_web/src/widgets/msg-user-account/main-form/main-form.less

@@ -40,10 +40,14 @@
         }
     }
 }
-// 表单行间距
 .app-form{
+  // 表单行间距
   .app-form-item{
     margin-bottom: 20px;
   }
+  // 表单按钮margin
+  .app-form-button{
+      margin:0 6px;
+  }
 }
 // this is less

app_web/src/widgets/msg-user-account/main-grid/main-grid-base.vue

@@ -113,6 +113,7 @@ import MainService from './main-grid-service';
 import MsgUserAccountUIService from '@/uiservice/msg-user-account/msg-user-account-ui-service';
 import CodeListService from "@service/app/codelist-service";
 import { FormItemModel } from '@/model/form-detail';
+import { Environment } from '@/environments/environment';
 
 
 @Component({
@@ -639,8 +640,8 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public getActionState(data:any){
-        let targetData:any = this.transformData(data);
         let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
+        let targetData:any = this.transformData(data);
         ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
         return tempActionModel;
     }

ibznotify-app/ibznotify-app-web/src/main/resources/application-web-prod.yml

@@ -43,6 +43,10 @@ zuul:
       path: /dictionarys/**/Ibzou**
       serviceId: ${ibiz.ref.service.ou:ibzou-api}
       stripPrefix: false
+    ou:
+      path: /ibzdepartments/**
+      serviceId: ${ibiz.ref.service.ou:ibzou-api}
+      stripPrefix: false
     uaadict:
       path: /dictionarys/**/SysOperator
       serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}

ibznotify-boot/src/main/resources/application-dev.yml

@@ -28,6 +28,10 @@ zuul:
         path: /dictionarys/**/Ibzou**
         serviceId: ${ibiz.ref.service.ou:ibzou-api}
         stripPrefix: false
+      ou:
+        path: /ibzdepartments/**
+        serviceId: ${ibiz.ref.service.ou:ibzou-api}
+        stripPrefix: false
       uaadict:
         path: /dictionarys/**/SysOperator
         serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}

ibznotify-core/src/main/java/cn/ibizlab/core/notify/domain/MsgBody.java

+package cn.ibizlab.core.notify.domain;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
+import cn.ibizlab.util.domain.EntityBase;
+import cn.ibizlab.util.annotation.DEField;
+import cn.ibizlab.util.enums.DEPredefinedFieldType;
+import cn.ibizlab.util.enums.DEFieldDefaultValueType;
+import java.io.Serializable;
+import lombok.*;
+import org.springframework.data.annotation.Transient;
+import cn.ibizlab.util.annotation.Audit;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.ibizlab.util.domain.EntityMP;
+
+/**
+ * 实体[消息]
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@JsonIgnoreProperties(value = "handler")
+@TableName(value = "IBZMSGBODY",resultMap = "MsgBodyResultMap")
+public class MsgBody extends EntityMP implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 消息模板标识
+     */
+    @TableField(value = "templateid")
+    @JSONField(name = "template_id")
+    @JsonProperty("template_id")
+    private String templateId;
+    /**
+     * 消息类型
+     */
+    @TableField(value = "msgtype")
+    @JSONField(name = "msg_type")
+    @JsonProperty("msg_type")
+    private Integer msgType;
+    /**
+     * 目标用户
+     */
+    @TableField(value = "tousers")
+    @JSONField(name = "to_users")
+    @JsonProperty("to_users")
+    private String toUsers;
+    /**
+     * 消息模板参数
+     */
+    @DEField(name = "templparams")
+    @TableField(value = "templparams")
+    @JSONField(name = "template_params")
+    @JsonProperty("template_params")
+    private String templateParams;
+    /**
+     * 是否发送
+     */
+    @TableField(value = "issend")
+    @JSONField(name = "is_send")
+    @JsonProperty("is_send")
+    private Integer isSend;
+    /**
+     * 是否出错
+     */
+    @TableField(value = "iserror")
+    @JSONField(name = "is_error")
+    @JsonProperty("is_error")
+    private Integer isError;
+    /**
+     * 消息标题
+     */
+    @TableField(value = "subject")
+    @JSONField(name = "subject")
+    @JsonProperty("subject")
+    private String subject;
+    /**
+     * 消息内容
+     */
+    @TableField(value = "content")
+    @JSONField(name = "content")
+    @JsonProperty("content")
+    private String content;
+    /**
+     * 消息链接
+     */
+    @TableField(value = "msglink")
+    @JSONField(name = "msg_link")
+    @JsonProperty("msg_link")
+    private String msgLink;
+    /**
+     * 用户数据
+     */
+    @TableField(value = "userdata")
+    @JSONField(name = "user_data")
+    @JsonProperty("user_data")
+    private String userData;
+    /**
+     * 消息标识
+     */
+    @DEField(isKeyField=true)
+    @TableId(value= "msgid",type=IdType.ASSIGN_UUID)
+    @JSONField(name = "msg_id")
+    @JsonProperty("msg_id")
+    private String msgId;
+    /**
+     * 消息名称
+     */
+    @TableField(value = "msgname")
+    @JSONField(name = "msg_name")
+    @JsonProperty("msg_name")
+    private String msgName;
+
+
+
+    /**
+     * 设置 [消息模板标识]
+     */
+    public void setTemplateId(String templateId){
+        this.templateId = templateId ;
+        this.modify("templateid",templateId);
+    }
+
+    /**
+     * 设置 [消息类型]
+     */
+    public void setMsgType(Integer msgType){
+        this.msgType = msgType ;
+        this.modify("msgtype",msgType);
+    }
+
+    /**
+     * 设置 [目标用户]
+     */
+    public void setToUsers(String toUsers){
+        this.toUsers = toUsers ;
+        this.modify("tousers",toUsers);
+    }
+
+    /**
+     * 设置 [消息模板参数]
+     */
+    public void setTemplateParams(String templateParams){
+        this.templateParams = templateParams ;
+        this.modify("templparams",templateParams);
+    }
+
+    /**
+     * 设置 [是否发送]
+     */
+    public void setIsSend(Integer isSend){
+        this.isSend = isSend ;
+        this.modify("issend",isSend);
+    }
+
+    /**
+     * 设置 [是否出错]
+     */
+    public void setIsError(Integer isError){
+        this.isError = isError ;
+        this.modify("iserror",isError);
+    }
+
+    /**
+     * 设置 [消息标题]
+     */
+    public void setSubject(String subject){
+        this.subject = subject ;
+        this.modify("subject",subject);
+    }
+
+    /**
+     * 设置 [消息内容]
+     */
+    public void setContent(String content){
+        this.content = content ;
+        this.modify("content",content);
+    }
+
+    /**
+     * 设置 [消息链接]
+     */
+    public void setMsgLink(String msgLink){
+        this.msgLink = msgLink ;
+        this.modify("msglink",msgLink);
+    }
+
+    /**
+     * 设置 [用户数据]
+     */
+    public void setUserData(String userData){
+        this.userData = userData ;
+        this.modify("userdata",userData);
+    }
+
+    /**
+     * 设置 [消息名称]
+     */
+    public void setMsgName(String msgName){
+        this.msgName = msgName ;
+        this.modify("msgname",msgName);
+    }
+
+
+}
+
+

ibznotify-core/src/main/java/cn/ibizlab/core/notify/domain/MsgOpenAccess.java

@@ -81,7 +81,7 @@ public class MsgOpenAccess extends EntityMP implements Serializable {
     @JsonProperty("secret_key")
     private String secretKey;
     /**
-     * RegionId
+     * RegionId（CorpId)
      */
     @DEField(name = "region_id")
     @TableField(value = "region_id")
@@ -157,7 +157,7 @@ public class MsgOpenAccess extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [RegionId]
+     * 设置 [RegionId（CorpId)]
      */
     public void setRegionId(String regionId){
         this.regionId = regionId ;

ibznotify-core/src/main/java/cn/ibizlab/core/notify/filter/MsgBodySearchContext.java

+package cn.ibizlab.core.notify.filter;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import lombok.*;
+import lombok.extern.slf4j.Slf4j;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson.annotation.JSONField;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+
+import cn.ibizlab.util.filter.QueryWrapperContext;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.ibizlab.core.notify.domain.MsgBody;
+/**
+ * 关系型数据实体[MsgBody] 查询条件对象
+ */
+@Slf4j
+@Data
+public class MsgBodySearchContext extends QueryWrapperContext<MsgBody> {
+
+	private Integer n_msgtype_eq;//[消息类型]
+	public void setN_msgtype_eq(Integer n_msgtype_eq) {
+        this.n_msgtype_eq = n_msgtype_eq;
+        if(!ObjectUtils.isEmpty(this.n_msgtype_eq)){
+            this.getSearchCond().eq("msgtype", n_msgtype_eq);
+        }
+    }
+	private String n_msgname_like;//[消息名称]
+	public void setN_msgname_like(String n_msgname_like) {
+        this.n_msgname_like = n_msgname_like;
+        if(!ObjectUtils.isEmpty(this.n_msgname_like)){
+            this.getSearchCond().like("msgname", n_msgname_like);
+        }
+    }
+
+    /**
+	 * 启用快速搜索
+	 */
+	public void setQuery(String query)
+	{
+		 this.query=query;
+		 if(!StringUtils.isEmpty(query)){
+            this.getSearchCond().and( wrapper ->
+                     wrapper.like("msgname", query)   
+            );
+		 }
+	}
+}
+
+
+

ibznotify-core/src/main/java/cn/ibizlab/core/notify/mapper/MsgBodyMapper.java

+package cn.ibizlab.core.notify.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.*;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.HashMap;
+import org.apache.ibatis.annotations.Select;
+import cn.ibizlab.core.notify.domain.MsgBody;
+import cn.ibizlab.core.notify.filter.MsgBodySearchContext;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.alibaba.fastjson.JSONObject;
+
+public interface MsgBodyMapper extends BaseMapper<MsgBody>{
+
+    Page<MsgBody> searchDefault(IPage page, @Param("srf") MsgBodySearchContext context, @Param("ew") Wrapper<MsgBody> wrapper) ;
+    @Override
+    MsgBody selectById(Serializable id);
+    @Override
+    int insert(MsgBody entity);
+    @Override
+    int updateById(@Param(Constants.ENTITY) MsgBody entity);
+    @Override
+    int update(@Param(Constants.ENTITY) MsgBody entity, @Param("ew") Wrapper<MsgBody> updateWrapper);
+    @Override
+    int deleteById(Serializable id);
+     /**
+      * 自定义查询SQL
+      * @param sql
+      * @return
+      */
+     @Select("${sql}")
+     List<JSONObject> selectBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义更新SQL
+    * @param sql
+    * @return
+    */
+    @Update("${sql}")
+    boolean updateBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义插入SQL
+    * @param sql
+    * @return
+    */
+    @Insert("${sql}")
+    boolean insertBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+    /**
+    * 自定义删除SQL
+    * @param sql
+    * @return
+    */
+    @Delete("${sql}")
+    boolean deleteBySQL(@Param("sql") String sql, @Param("et")Map param);
+
+}

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/IMsgBodyService.java

+package cn.ibizlab.core.notify.service;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.math.BigInteger;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.scheduling.annotation.Async;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cache.annotation.CacheEvict;
+
+import cn.ibizlab.core.notify.domain.MsgBody;
+import cn.ibizlab.core.notify.filter.MsgBodySearchContext;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 实体[MsgBody] 服务对象接口
+ */
+public interface IMsgBodyService extends IService<MsgBody>{
+
+    boolean create(MsgBody et) ;
+    void createBatch(List<MsgBody> list) ;
+    boolean update(MsgBody et) ;
+    void updateBatch(List<MsgBody> list) ;
+    boolean remove(String key) ;
+    void removeBatch(Collection<String> idList) ;
+    MsgBody get(String key) ;
+    MsgBody getDraft(MsgBody et) ;
+    boolean checkKey(MsgBody et) ;
+    boolean save(MsgBody et) ;
+    void saveBatch(List<MsgBody> list) ;
+    Page<MsgBody> searchDefault(MsgBodySearchContext context) ;
+    /**
+     *自定义查询SQL
+     * @param sql  select * from table where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return select * from table where id = '1'
+     */
+    List<JSONObject> select(String sql, Map param);
+    /**
+     *自定义SQL
+     * @param sql  update table  set name ='test' where id =#{et.param}
+     * @param param 参数列表  param.put("param","1");
+     * @return     update table  set name ='test' where id = '1'
+     */
+    boolean execute(String sql, Map param);
+
+}
+
+

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/IMsgOpenAccessService.java

@@ -11,6 +11,7 @@ import java.math.BigInteger;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.scheduling.annotation.Async;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.cache.annotation.CacheEvict;
 

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/IMsgTemplateService.java

@@ -11,6 +11,7 @@ import java.math.BigInteger;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.scheduling.annotation.Async;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.cache.annotation.CacheEvict;
 

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/IMsgUserAccountService.java

@@ -11,6 +11,7 @@ import java.math.BigInteger;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.scheduling.annotation.Async;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.cache.annotation.CacheEvict;
 

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgBodyServiceImpl.java

+package cn.ibizlab.core.notify.service.impl;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Optional;
+import java.math.BigInteger;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
+import org.springframework.stereotype.Service;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.ObjectUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.context.annotation.Lazy;
+import cn.ibizlab.core.notify.domain.MsgBody;
+import cn.ibizlab.core.notify.filter.MsgBodySearchContext;
+import cn.ibizlab.core.notify.service.IMsgBodyService;
+
+import cn.ibizlab.util.helper.CachedBeanCopier;
+import cn.ibizlab.util.helper.DEFieldCacheMap;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.ibizlab.core.notify.mapper.MsgBodyMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.util.StringUtils;
+
+/**
+ * 实体[消息] 服务对象接口实现
+ */
+@Slf4j
+@Service("MsgBodyServiceImpl")
+public class MsgBodyServiceImpl extends ServiceImpl<MsgBodyMapper, MsgBody> implements IMsgBodyService {
+
+
+    protected int batchSize = 500;
+
+    @Override
+    @Transactional
+    public boolean create(MsgBody et) {
+        if(!this.retBool(this.baseMapper.insert(et)))
+            return false;
+        CachedBeanCopier.copy(get(et.getMsgId()),et);
+        return true;
+    }
+
+    @Override
+    public void createBatch(List<MsgBody> list) {
+        this.saveBatch(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean update(MsgBody et) {
+        if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("msgid",et.getMsgId())))
+            return false;
+        CachedBeanCopier.copy(get(et.getMsgId()),et);
+        return true;
+    }
+
+    @Override
+    public void updateBatch(List<MsgBody> list) {
+        updateBatchById(list,batchSize);
+    }
+
+    @Override
+    @Transactional
+    public boolean remove(String key) {
+        boolean result=removeById(key);
+        return result ;
+    }
+
+    @Override
+    public void removeBatch(Collection<String> idList) {
+        removeByIds(idList);
+    }
+
+    @Override
+    @Transactional
+    public MsgBody get(String key) {
+        MsgBody et = getById(key);
+        if(et==null){
+            et=new MsgBody();
+            et.setMsgId(key);
+        }
+        else{
+        }
+        return et;
+    }
+
+    @Override
+    public MsgBody getDraft(MsgBody et) {
+        return et;
+    }
+
+    @Override
+    public boolean checkKey(MsgBody et) {
+        return (!ObjectUtils.isEmpty(et.getMsgId()))&&(!Objects.isNull(this.getById(et.getMsgId())));
+    }
+    @Override
+    @Transactional
+    public boolean save(MsgBody et) {
+        if(!saveOrUpdate(et))
+            return false;
+        return true;
+    }
+
+    @Override
+    @Transactional
+    public boolean saveOrUpdate(MsgBody et) {
+        if (null == et) {
+            return false;
+        } else {
+            return checkKey(et) ? this.update(et) : this.create(et);
+        }
+    }
+
+    @Override
+    public boolean saveBatch(Collection<MsgBody> list) {
+        saveOrUpdateBatch(list,batchSize);
+        return true;
+    }
+
+    @Override
+    public void saveBatch(List<MsgBody> list) {
+        saveOrUpdateBatch(list,batchSize);
+    }
+
+
+
+    /**
+     * 查询集合 数据集
+     */
+    @Override
+    public Page<MsgBody> searchDefault(MsgBodySearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MsgBody> pages=baseMapper.searchDefault(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<MsgBody>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
+
+
+
+
+
+
+    @Override
+    public List<JSONObject> select(String sql, Map param){
+        return this.baseMapper.selectBySQL(sql,param);
+    }
+
+    @Override
+    @Transactional
+    public boolean execute(String sql , Map param){
+        if (sql == null || sql.isEmpty()) {
+            return false;
+        }
+        if (sql.toLowerCase().trim().startsWith("insert")) {
+            return this.baseMapper.insertBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("update")) {
+            return this.baseMapper.updateBySQL(sql,param);
+        }
+        if (sql.toLowerCase().trim().startsWith("delete")) {
+            return this.baseMapper.deleteBySQL(sql,param);
+        }
+        log.warn("暂未支持的SQL语法");
+        return true;
+    }
+
+
+}
+
+
+

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgOpenAccessServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.core.notify.domain.MsgOpenAccess;

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgTemplateServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.core.notify.domain.MsgTemplate;

ibznotify-core/src/main/java/cn/ibizlab/core/notify/service/impl/MsgUserAccountServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.ObjectUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.context.annotation.Lazy;
 import cn.ibizlab.core.notify.domain.MsgUserAccount;

ibznotify-core/src/main/resources/liquibase/h2_table.xml

-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-
-
-
-    <!--输出实体[MSG_OPEN_ACCESS]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-msg_open_access-30-1">
-        <createTable tableName="IBZOPENACCESS">
-                <column name="ACCESSID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_MSG_OPEN_ACCESS_ACCESSID"/>
-                </column>
-                <column name="ACCESSNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="OPEN_TYPE" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ACCESS_KEY" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SECRET_KEY" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="REGION_ID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ACCESS_TOKEN" remarks="" type="VARCHAR(1000)">
-                </column>
-                <column name="EXPIRES_TIME" remarks="" type="DATETIME">
-                </column>
-                <column name="DISABLED" remarks="" type="INT">
-                </column>
-                <column name="REDIRECT_URI" remarks="" type="VARCHAR(500)">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[MSG_TEMPLATE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-msg_template-101-2">
-        <createTable tableName="IBZMSGTEMPL">
-                <column name="TID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_MSG_TEMPLATE_TID"/>
-                </column>
-                <column name="TEMPLATE_NAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="TEMPLATE_TYPE" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="CONTENT" remarks="" type="VARCHAR(4000)">
-                </column>
-                <column name="TEMPLATE_ID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="TEMPLATE_URL" remarks="" type="VARCHAR(1000)">
-                </column>
-                <column name="ACCESSID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ACCESSNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="OPEN_TYPE" remarks="" type="VARCHAR(100)">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[MSG_USER_ACCOUNT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-msg_user_account-54-3">
-        <createTable tableName="IBZUSERAUTH">
-                <column name="AUTHID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_MSG_USER_ACCOUNT_AUTHID"/>
-                </column>
-                <column name="USERID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="IDENTITY_TYPE" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="IDENTIFIER" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="CREDENTIAL" remarks="" type="VARCHAR(500)">
-                </column>
-        </createTable>
-    </changeSet>
-
-        <!--输出实体[MSG_OPEN_ACCESS]外键关系 -->
-        <!--输出实体[MSG_TEMPLATE]外键关系 -->
-        <!--输出实体[MSG_USER_ACCOUNT]外键关系 -->
-
-</databaseChangeLog>
+!!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${dbinst.getUserName()}  [in template "CODETEMPL_zh_CN" at line 28, column 24]
+----
\ No newline at end of file

ibznotify-core/src/main/resources/liquibase/rollback/README.md

+    此文件只用于让模板能发出[rollback]文件夹，无实际用途
\ No newline at end of file

ibznotify-core/src/main/resources/mapper/notify/msgbody/MsgBodyMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper	namespace="cn.ibizlab.core.notify.mapper.MsgBodyMapper">
+
+    <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
+	<select id="selectById"  resultMap="MsgBodyResultMap" databaseId="oracle">
+        <![CDATA[select t1.* from (SELECT t1.CONTENT, t1.ISERROR, t1.ISSEND, t1.MSGID, t1.MSGLINK, t1.MSGNAME, t1.MSGTYPE, t1.SUBJECT, t1.TEMPLATEID, t1.TEMPLPARAMS, t1.TOUSERS, t1.USERDATA FROM IBZMSGBODY t1  ) t1 where msgid=#{id}]]>
+    </select>
+
+    <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
+    <resultMap id="MsgBodyResultMap" type="cn.ibizlab.core.notify.domain.MsgBody" autoMapping="true">
+        <id property="msgId" column="msgid" /><!--主键字段映射-->
+		<result property="templateParams" column="templparams" />
+            
+		
+    </resultMap>
+
+
+    <!--数据集合[Default]-->
+	 <select id="searchDefault"  parameterType="cn.ibizlab.core.notify.filter.MsgBodySearchContext"  resultMap="MsgBodyResultMap">
+         select t1.* from (
+                <include refid="Default" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="oracle">
+		<![CDATA[ SELECT t1.CONTENT, t1.ISERROR, t1.ISSEND, t1.MSGID, t1.MSGLINK, t1.MSGNAME, t1.MSGTYPE, t1.SUBJECT, t1.TEMPLATEID, t1.TOUSERS, t1.USERDATA FROM IBZMSGBODY t1  
+			]]>
+    </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="oracle">
+		<![CDATA[ SELECT t1.CONTENT, t1.ISERROR, t1.ISSEND, t1.MSGID, t1.MSGLINK, t1.MSGNAME, t1.MSGTYPE, t1.SUBJECT, t1.TEMPLATEID, t1.TEMPLPARAMS, t1.TOUSERS, t1.USERDATA FROM IBZMSGBODY t1  
+			]]>
+    </sql>
+</mapper>
+

ibznotify-provider/ibznotify-provider-api/src/main/java/cn/ibizlab/api/rest/MsgOpenAccessResource.java

@@ -11,7 +11,6 @@ import com.alibaba.fastjson.JSONObject;
 import javax.servlet.ServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanCopier;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.http.HttpStatus;
@@ -50,7 +49,6 @@ public class MsgOpenAccessResource {
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibznotify-MsgOpenAccess-Create-all')")
     @ApiOperation(value = "新建接入开放平台", tags = {"接入开放平台" },  notes = "新建接入开放平台")
 	@RequestMapping(method = RequestMethod.POST, value = "/msgopenaccesses")
-    @Transactional
     public ResponseEntity<MsgOpenAccessDTO> create(@RequestBody MsgOpenAccessDTO msgopenaccessdto) {
         MsgOpenAccess domain = msgopenaccessMapping.toDomain(msgopenaccessdto);
 		msgopenaccessService.create(domain);
@@ -69,7 +67,6 @@ public class MsgOpenAccessResource {
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibznotify-MsgOpenAccess-Update-all')")
     @ApiOperation(value = "更新接入开放平台", tags = {"接入开放平台" },  notes = "更新接入开放平台")
 	@RequestMapping(method = RequestMethod.PUT, value = "/msgopenaccesses/{msgopenaccess_id}")
-    @Transactional
     public ResponseEntity<MsgOpenAccessDTO> update(@PathVariable("msgopenaccess_id") String msgopenaccess_id, @RequestBody MsgOpenAccessDTO msgopenaccessdto) {
 		MsgOpenAccess domain  = msgopenaccessMapping.toDomain(msgopenaccessdto);
         domain .setId(msgopenaccess_id);
@@ -89,7 +86,6 @@ public class MsgOpenAccessResource {
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibznotify-MsgOpenAccess-Remove-all')")
     @ApiOperation(value = "删除接入开放平台", tags = {"接入开放平台" },  notes = "删除接入开放平台")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/msgopenaccesses/{msgopenaccess_id}")
-    @Transactional
     public ResponseEntity<Boolean> remove(@PathVariable("msgopenaccess_id") String msgopenaccess_id) {
          return ResponseEntity.status(HttpStatus.OK).body(msgopenaccessService.remove(msgopenaccess_id));
     }

ibznotify-provider/ibznotify-provider-api/src/main/java/cn/ibizlab/api/rest/MsgTemplateResource.java

@@ -11,7 +11,6 @@ import com.alibaba.fastjson.JSONObject;
 import javax.servlet.ServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanCopier;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.http.HttpStatus;
@@ -50,7 +49,6 @@ public class MsgTemplateResource {
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibznotify-MsgTemplate-Create-all')")
     @ApiOperation(value = "新建消息模板", tags = {"消息模板" },  notes = "新建消息模板")
 	@RequestMapping(method = RequestMethod.POST, value = "/msgtemplates")
-    @Transactional
     public ResponseEntity<MsgTemplateDTO> create(@RequestBody MsgTemplateDTO msgtemplatedto) {
         MsgTemplate domain = msgtemplateMapping.toDomain(msgtemplatedto);
 		msgtemplateService.create(domain);
@@ -69,7 +67,6 @@ public class MsgTemplateResource {
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibznotify-MsgTemplate-Update-all')")
     @ApiOperation(value = "更新消息模板", tags = {"消息模板" },  notes = "更新消息模板")
 	@RequestMapping(method = RequestMethod.PUT, value = "/msgtemplates/{msgtemplate_id}")
-    @Transactional
     public ResponseEntity<MsgTemplateDTO> update(@PathVariable("msgtemplate_id") String msgtemplate_id, @RequestBody MsgTemplateDTO msgtemplatedto) {
 		MsgTemplate domain  = msgtemplateMapping.toDomain(msgtemplatedto);
         domain .setTid(msgtemplate_id);
@@ -89,7 +86,6 @@ public class MsgTemplateResource {
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibznotify-MsgTemplate-Remove-all')")
     @ApiOperation(value = "删除消息模板", tags = {"消息模板" },  notes = "删除消息模板")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/msgtemplates/{msgtemplate_id}")
-    @Transactional
     public ResponseEntity<Boolean> remove(@PathVariable("msgtemplate_id") String msgtemplate_id) {
          return ResponseEntity.status(HttpStatus.OK).body(msgtemplateService.remove(msgtemplate_id));
     }

ibznotify-provider/ibznotify-provider-api/src/main/java/cn/ibizlab/api/rest/MsgUserAccountResource.java

@@ -11,7 +11,6 @@ import com.alibaba.fastjson.JSONObject;
 import javax.servlet.ServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanCopier;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.http.HttpStatus;
@@ -50,7 +49,6 @@ public class MsgUserAccountResource {
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibznotify-MsgUserAccount-Create-all')")
     @ApiOperation(value = "新建绑定消息账号", tags = {"绑定消息账号" },  notes = "新建绑定消息账号")
 	@RequestMapping(method = RequestMethod.POST, value = "/msguseraccounts")
-    @Transactional
     public ResponseEntity<MsgUserAccountDTO> create(@RequestBody MsgUserAccountDTO msguseraccountdto) {
         MsgUserAccount domain = msguseraccountMapping.toDomain(msguseraccountdto);
 		msguseraccountService.create(domain);
@@ -69,7 +67,6 @@ public class MsgUserAccountResource {
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibznotify-MsgUserAccount-Update-all')")
     @ApiOperation(value = "更新绑定消息账号", tags = {"绑定消息账号" },  notes = "更新绑定消息账号")
 	@RequestMapping(method = RequestMethod.PUT, value = "/msguseraccounts/{msguseraccount_id}")
-    @Transactional
     public ResponseEntity<MsgUserAccountDTO> update(@PathVariable("msguseraccount_id") String msguseraccount_id, @RequestBody MsgUserAccountDTO msguseraccountdto) {
 		MsgUserAccount domain  = msguseraccountMapping.toDomain(msguseraccountdto);
         domain .setId(msguseraccount_id);
@@ -89,7 +86,6 @@ public class MsgUserAccountResource {
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibznotify-MsgUserAccount-Remove-all')")
     @ApiOperation(value = "删除绑定消息账号", tags = {"绑定消息账号" },  notes = "删除绑定消息账号")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/msguseraccounts/{msguseraccount_id}")
-    @Transactional
     public ResponseEntity<Boolean> remove(@PathVariable("msguseraccount_id") String msguseraccount_id) {
          return ResponseEntity.status(HttpStatus.OK).body(msguseraccountService.remove(msguseraccount_id));
     }

ibznotify-util/src/main/java/cn/ibizlab/util/security/AuthorizationTokenFilter.java

@@ -60,7 +60,7 @@ public class AuthorizationTokenFilter extends OncePerRequestFilter {
             if (authTokenUtil.validateToken(authToken, userDetails)) {
                 UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
                 authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-                log.info("authorizated user '{}', setting security context", username);
+            //    log.info("authorizated user '{}', setting security context", username);
                 SecurityContextHolder.getContext().setAuthentication(authentication);
             }
         }

ibznotify-util/src/main/resources/application-sys.yml

@@ -22,9 +22,9 @@ spring:
       max-file-size: 100MB
       max-request-size: 100MB
   datasource:
-    username: a_A_5d9d78509
-    password: '@6dEfb3@'
-    url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+    username: root
+    password: 'root'
+    url: jdbc:mysql://127.0.0.1:3306/ibznotify?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
     driver-class-name: com.mysql.jdbc.Driver
     filters: stat,wall,log4j2
     #配置初始化大小/最小/最大
@@ -45,7 +45,7 @@ spring:
     pool-prepared-statements: false
     max-pool-prepared-statement-per-connection-size: 20
     isSyncDBSchema: false
-    defaultSchema: a_A_5d9d78509
+    defaultSchema: root
     conf: classpath:liquibase/master.xml
 
 #Mybatis-plus配置