diff --git a/ruoyi-ui/public/bpmnjs/index.js b/ruoyi-ui/public/bpmnjs/index.js
index ba53f696..4cbcb9a8 100644
--- a/ruoyi-ui/public/bpmnjs/index.js
+++ b/ruoyi-ui/public/bpmnjs/index.js
@@ -76,7 +76,7 @@ if (!window.FileList || !window.FileReader) {
       };
 
       _jquery.default.ajax({
-        url: localStorage.getItem("VUE_APP_BASE_API") + '/activitiHistory/gethighLine',
+        url: localStorage.getItem("VUE_APP_BASE_API") + '/workflow/activitiHistory/gethighLine',
         // url: 'http://localhost:8080/activitiHistory/gethighLine',
         type: 'GET',
         data: param1,
diff --git a/ruoyi-ui/src/store/getters.js b/ruoyi-ui/src/store/getters.js
index d31a7454..eff315e3 100644
--- a/ruoyi-ui/src/store/getters.js
+++ b/ruoyi-ui/src/store/getters.js
@@ -7,6 +7,7 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  nickName :state => state.user.nickName,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index 103706da..ce94c609 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -1,115 +1,121 @@
-import { login, logout, getInfo, refreshToken } from '@/api/login'
-import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
-
-const user = {
-  state: {
-    token: getToken(),
-    name: '',
-    avatar: '',
-    roles: [],
-    permissions: []
-  },
-
-  mutations: {
-    SET_TOKEN: (state, token) => {
-      state.token = token
-    },
-    SET_EXPIRES_IN: (state, time) => {
-      state.expires_in = time
-    },
-    SET_NAME: (state, name) => {
-      state.name = name
-    },
-    SET_AVATAR: (state, avatar) => {
-      state.avatar = avatar
-    },
-    SET_ROLES: (state, roles) => {
-      state.roles = roles
-    },
-    SET_PERMISSIONS: (state, permissions) => {
-      state.permissions = permissions
-    }
-  },
-
-  actions: {
-    // 登录
-    Login({ commit }, userInfo) {
-      const username = userInfo.username.trim()
-      const password = userInfo.password
-      const code = userInfo.code
-      const uuid = userInfo.uuid
-      return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
-          let data = res.data
-          setToken(data.access_token)
-          commit('SET_TOKEN', data.access_token)
-          setExpiresIn(data.expires_in)
-          commit('SET_EXPIRES_IN', data.expires_in)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 获取用户信息
-    GetInfo({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        getInfo().then(res => {
-          const user = res.user
-          const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : user.avatar;
-          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-            commit('SET_ROLES', res.roles)
-            commit('SET_PERMISSIONS', res.permissions)
-          } else {
-            commit('SET_ROLES', ['ROLE_DEFAULT'])
-          }
-          commit('SET_NAME', user.userName)
-          commit('SET_AVATAR', avatar)
-          resolve(res)
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 刷新token
-    RefreshToken({commit, state}) {
-      return new Promise((resolve, reject) => {
-        refreshToken(state.token).then(res => {
-          setExpiresIn(res.data)
-          commit('SET_EXPIRES_IN', res.data)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-    
-    // 退出系统
-    LogOut({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        logout(state.token).then(() => {
-          commit('SET_TOKEN', '')
-          commit('SET_ROLES', [])
-          commit('SET_PERMISSIONS', [])
-          removeToken()
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    // 前端 登出
-    FedLogOut({ commit }) {
-      return new Promise(resolve => {
-        commit('SET_TOKEN', '')
-        removeToken()
-        resolve()
-      })
-    }
-  }
-}
-
-export default user
+import {login, logout, getInfo, refreshToken} from '@/api/login'
+import {getToken, setToken, setExpiresIn, removeToken} from '@/utils/auth'
+
+const user = {
+  state: {
+    token: getToken(),
+    name: '',
+    nickName: '',
+    avatar: '',
+    roles: [],
+    permissions: []
+  },
+
+  mutations: {
+    SET_TOKEN: (state, token) => {
+      state.token = token
+    },
+    SET_EXPIRES_IN: (state, time) => {
+      state.expires_in = time
+    },
+    SET_NAME: (state, name) => {
+      state.name = name
+    },
+    SET_NICK_NAME: (state, nickName) => {
+      state.nickName = nickName
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar
+    },
+    SET_ROLES: (state, roles) => {
+      state.roles = roles
+    },
+    SET_PERMISSIONS: (state, permissions) => {
+      state.permissions = permissions
+    },
+
+  },
+
+  actions: {
+    // 登录
+    Login({commit}, userInfo) {
+      const username = userInfo.username.trim()
+      const password = userInfo.password
+      const code = userInfo.code
+      const uuid = userInfo.uuid
+      return new Promise((resolve, reject) => {
+        login(username, password, code, uuid).then(res => {
+          let data = res.data
+          setToken(data.access_token)
+          commit('SET_TOKEN', data.access_token)
+          setExpiresIn(data.expires_in)
+          commit('SET_EXPIRES_IN', data.expires_in)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    // 获取用户信息
+    GetInfo({commit, state}) {
+      return new Promise((resolve, reject) => {
+        getInfo().then(res => {
+          const user = res.user
+          const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : user.avatar;
+          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+            commit('SET_ROLES', res.roles)
+            commit('SET_PERMISSIONS', res.permissions)
+          } else {
+            commit('SET_ROLES', ['ROLE_DEFAULT'])
+          }
+          commit('SET_NAME', user.userName)
+          commit('SET_AVATAR', avatar)
+          commit('SET_NICK_NAME', user.nickName)
+          resolve(res)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    // 刷新token
+    RefreshToken({commit, state}) {
+      return new Promise((resolve, reject) => {
+        refreshToken(state.token).then(res => {
+          setExpiresIn(res.data)
+          commit('SET_EXPIRES_IN', res.data)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    // 退出系统
+    LogOut({commit, state}) {
+      return new Promise((resolve, reject) => {
+        logout(state.token).then(() => {
+          commit('SET_TOKEN', '')
+          commit('SET_ROLES', [])
+          commit('SET_PERMISSIONS', [])
+          removeToken()
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
+    // 前端 登出
+    FedLogOut({commit}) {
+      return new Promise(resolve => {
+        commit('SET_TOKEN', '')
+        removeToken()
+        resolve()
+      })
+    }
+  }
+}
+
+export default user
diff --git a/ruoyi-ui/src/views/business/workflow/activiti/definition/index.vue b/ruoyi-ui/src/views/business/workflow/activiti/definition/index.vue
index 59e0ee50..bc10a9c4 100644
--- a/ruoyi-ui/src/views/business/workflow/activiti/definition/index.vue
+++ b/ruoyi-ui/src/views/business/workflow/activiti/definition/index.vue
@@ -6,6 +6,7 @@
           v-model="queryParams.key"
           placeholder="请输入流程KEY"
           clearable
+          maxlength="20"
           size="small"
           @keyup.enter.native="handleQuery"
         />
@@ -15,6 +16,7 @@
           v-model="queryParams.name"
           placeholder="请输入名称"
           clearable
+          maxlength="50"
           size="small"
           @keyup.enter.native="handleQuery"
         />
@@ -30,14 +32,14 @@
         <at-button type="info" hollow
                    size="smaller"
                    icon="icon-settings"
-                   v-hasPermi="['activiti:modeler']"
+                   v-hasPermi="['activiti:definition']"
                    @click="OnlineDrawingProcess" >在线绘制流程</at-button>
       </el-col>
       <el-col :span="1.5">
         <at-button type="info" hollow
                    size="smaller"
                    icon="icon-arrow-up"
-                   v-hasPermi="['activiti:modeler']"
+                   v-hasPermi="['activiti:definition']"
                    @click="handleImport" >部署流程</at-button>
       </el-col>
 
@@ -67,7 +69,7 @@
             type="text"
             icon="el-icon-edit"
             @click="OnlineModificationProcess(scope.row)"
-            v-hasPermi="['activiti:modeler']"
+            v-hasPermi="['activiti:definition']"
           >查看
           </el-button>
           <el-button
@@ -75,7 +77,7 @@
             type="text"
             icon="el-icon-edit"
             @click="suspendOrActiveApply(scope.row)"
-            v-hasPermi="['activiti:modeler']"
+            v-hasPermi="['activiti:definition']"
           >{{scope.row.suspendState===1?'挂起':'激活'}}
           </el-button>
 
@@ -84,7 +86,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['activiti:modeler']"
+            v-hasPermi="['activiti:definition']"
           >删除
           </el-button>
         </template>
diff --git a/ruoyi-ui/src/views/business/workflow/workflow/leave/index.vue b/ruoyi-ui/src/views/business/workflow/workflow/leave/index.vue
index 5cf7dc7f..bac01c1e 100644
--- a/ruoyi-ui/src/views/business/workflow/workflow/leave/index.vue
+++ b/ruoyi-ui/src/views/business/workflow/workflow/leave/index.vue
@@ -2,12 +2,13 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="请假类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择请假类型" clearable size="small">
+        <el-select style="width: 150px" v-model="queryParams.type" placeholder="请选择请假类型" clearable size="small"
+                   @change="handleQuery">
           <el-option
-            v-for="dict in typeOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.activiti_leave_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -22,20 +23,17 @@
       </el-form-item>
 
       <el-form-item label="状态" prop="state">
-        <el-select v-model="queryParams.state" placeholder="请选择状态" clearable size="small">
+        <el-select style="width: 150px" v-model="queryParams.state" placeholder="请选择状态" clearable size="small"
+                   @change="handleQuery">
           <el-option
-            v-for="dict in stateOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
+            v-for="dict in dict.type.activiti_flow_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <!--      <el-form-item label="创建者" prop="createBy">-->
-      <!--        <el-select v-model="queryParams.createBy" placeholder="请选择创建者" clearable size="small">-->
-      <!--          <el-option label="请选择字典生成" value="" />-->
-      <!--        </el-select>-->
-      <!--      </el-form-item>-->
+
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -68,37 +66,35 @@
 
     <el-table v-loading="loading" :data="leaveList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <!--      <el-table-column label="主键ID" align="center" prop="id" />-->
-      <el-table-column label="请假类型" align="center" prop="type" :formatter="typeFormat"/>
-      <el-table-column label="标题" align="center" prop="title"/>
-      <el-table-column label="原因" align="center" prop="reason"/>
-      <el-table-column label="开始时间" align="center" prop="leaveStartTime" width="180">
+      <el-table-column label="请假类型" align="center" prop="type" :show-overflow-tooltip="true">
+
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.leaveStartTime, '{y}-{m}-{d}') }}</span>
+          <dict-tag :options="dict.type.activiti_leave_type" :value="scope.row.type"/>
         </template>
+
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="leaveEndTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.leaveEndTime, '{y}-{m}-{d}') }}</span>
-        </template>
+      <el-table-column label="标题" align="center" prop="title" :show-overflow-tooltip="true"/>
+      <el-table-column label="原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
+      <el-table-column label="流程进度" align="center" prop="taskName" :show-overflow-tooltip="true"/>
+
+      <el-table-column label="创建者" align="center" prop="createName" :show-overflow-tooltip="true"/>
+      <el-table-column label="开始时间" align="center" prop="leaveStartTime" width="180" :show-overflow-tooltip="true">
+
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="leaveEndTime" width="180" :show-overflow-tooltip="true">
+
       </el-table-column>
 
+      <el-table-column label="状态" align="center" prop="state" :show-overflow-tooltip="true">
 
-      <!--      <el-table-column label="状态" align="center" prop="state" :formatter="stateFormat">-->
-      <el-table-column label="状态" align="center">
         <template slot-scope="scope">
-          <div v-if="scope.row.state!==0">
-            {{ stateFormat(scope.row) }}
-          </div>
-          <div v-else>
-            {{ scope.row.taskName }}
-          </div>
+          <dict-tag :options="dict.type.activiti_flow_type" :value="scope.row.state"/>
         </template>
+
       </el-table-column>
-      <!--      <el-table-column label="创建者" align="center" prop="createName" />-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="200px" class-name="small-padding fixed-width" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <el-button v-if="2===scope.row.state"
+          <el-button v-if="'2'===scope.row.state"
                      size="mini"
                      type="text"
                      icon="el-icon-edit"
@@ -106,14 +102,7 @@
                      v-hasPermi="['workflow:leave:edit']"
           >修改
           </el-button>
-          <!--          <el-button v-if="1==scope.row.state"-->
-          <!--            size="mini"-->
-          <!--            type="text"-->
-          <!--            icon="el-icon-edit"-->
-          <!--            @click="terminateLeave(scope.row)"-->
-          <!--            v-hasPermi="['workflow:leave:edit']"-->
-          <!--          >销假-->
-          <!--          </el-button>-->
+
           <el-button
             size="mini"
             type="text"
@@ -123,7 +112,7 @@
           >审批详情
           </el-button>
 
-          <el-button v-if="0===scope.row.state"
+          <el-button v-if="'0'===scope.row.state"
                      size="mini"
                      type="text"
                      icon="el-icon-edit"
@@ -162,47 +151,43 @@
     </el-dialog>
 
     <!-- 查看详细信息话框 -->
-    <el-dialog :title="title" :visible.sync="open2" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open2" width="450px" append-to-body>
       <leaveHistoryForm :businessKey="businessKey" v-if="open2"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="open2=!open2">关闭</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="530px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="请假类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择请假类型" @change="chooseMedicine">
+          <el-select v-model="form.type"  placeholder="请选择请假类型" @change="chooseMedicine" style="width: 150px">
             <el-option
-              v-for="dict in typeOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
+              v-for="dict in dict.type.activiti_leave_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
           </el-select>
         </el-form-item>
-        <el-form-item label="标题" prop="title">
+        <el-form-item label="标题" prop="title" style="width: 460px">
           <el-input v-model="form.title"/>
         </el-form-item>
         <el-form-item label="原因" prop="reason">
-          <el-input v-model="form.reason" type="textarea" placeholder="请输入内容"/>
-        </el-form-item>
-        <el-form-item label="开始时间" prop="leaveStartTime">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.leaveStartTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择开始时间">
-          </el-date-picker>
+          <el-input v-model="form.reason" type="textarea" style="width: 380px" placeholder="请输入原因"/>
         </el-form-item>
-        <el-form-item label="结束时间" prop="leaveEndTime">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.leaveEndTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择结束时间">
+
+        <el-form-item label="选择时间" prop="betDateTime">
+          <el-date-picker
+            style="width: 380px"
+            v-model="form.betDateTime"
+            type="datetimerange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="['12:00:00']">
           </el-date-picker>
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -229,6 +214,7 @@ import {getDefinitionsByInstanceId} from "@/api/business/workflow/activiti/defin
 export default {
   name: 'Leave',
   components: {leaveHistoryForm},
+  dicts: ['activiti_leave_type', 'activiti_flow_type'],
   data() {
     return {
       modelVisible: false,
@@ -275,7 +261,10 @@ export default {
         createBy: null
       },
       // 表单参数
-      form: {},
+      form: {
+        //时间日期选择器时间区间
+        betDateTime: []
+      },
       // 表单校验
       rules: {
         type: [
@@ -287,24 +276,16 @@ export default {
         reason: [
           {required: true, message: '原因不能为空', trigger: 'blur'}
         ],
-        leaveStartTime: [
-          {required: true, message: '开始时间不能为空', trigger: 'blur'}
-        ],
-        leaveEndTime: [
-          {required: true, message: '结束时间不能为空', trigger: 'blur'}
+        betDateTime: [
+          {required: true, message: '时间不能为空', trigger: 'blur'}
         ]
       }
     }
   },
   created() {
     this.getList()
-    this.getDicts('activiti_leave_type').then(response => {
-      this.typeOptions = response.data
-    })
-    this.getDicts('activiti_flow_type').then(response => {
-      this.stateOptions = response.data
-    })
   },
+
   methods: {
     /** 查询请假列表 */
     getList() {
@@ -315,14 +296,7 @@ export default {
         this.loading = false
       })
     },
-    // 请假类型字典翻译
-    typeFormat(row, column) {
-      return this.selectDictLabel(this.typeOptions, row.type)
-    },
-    // 状态字典翻译
-    stateFormat(row, column) {
-      return this.selectDictLabel(this.stateOptions, row.state)
-    },
+
 
     // 取消按钮
     cancel() {
@@ -365,17 +339,12 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.createName = this.$store.getters.nickName
-      if (this.$store.getters.name !== "admin") {
-        this.reset()
-        this.open = true
-        this.title = '添加请假'
-      } else {
-        this.$alert('管理员不能创建流程', '管理员不能创建流程', {
-          confirmButtonText: '确定',
-        });
-      }
 
+      this.reset()
+      this.open = true
+      this.title = '添加请假'
     },
+
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
@@ -407,15 +376,19 @@ export default {
     submitForm() {
       this.$refs['form'].validate(valid => {
         if (valid) {
+
+          this.form.leaveStartTime=this.form.betDateTime[0]
+          this.form.leaveEndTime=this.form.betDateTime[1]
+
           if (this.form.id != null) {
             updateLeave(this.form).then(response => {
-              this.msgSuccess('修改成功')
+              this.$Message.success('修改成功')
               this.open = false
               this.getList()
             })
           } else {
             addLeave(this.form).then(response => {
-              this.msgSuccess('新增成功')
+              this.$Message.success('新增成功')
               this.open = false
               this.getList()
             })
@@ -423,20 +396,7 @@ export default {
         }
       })
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids
-      this.$confirm('是否确认删除请假编号为"' + ids + '"的数据项?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function () {
-        return delLeave(ids)
-      }).then(() => {
-        this.getList()
-        this.msgSuccess('删除成功')
-      })
-    },
+
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams
diff --git a/ruoyi-ui/src/views/business/workflow/workflow/leave/leaveAll.vue b/ruoyi-ui/src/views/business/workflow/workflow/leave/leaveAll.vue
index 1f7c45bf..0d2e61ec 100644
--- a/ruoyi-ui/src/views/business/workflow/workflow/leave/leaveAll.vue
+++ b/ruoyi-ui/src/views/business/workflow/workflow/leave/leaveAll.vue
@@ -113,7 +113,7 @@ import leaveHistoryForm from "./leaveHistoryForm";
 import {exportLeave, listLeaveAll} from "@/api/business/workflow/workflow/leave";
 
 export default {
-  name: 'Leave',
+  name: 'LeaveAll',
   components: {leaveHistoryForm},
   data() {
     return {
diff --git a/ruoyi-ui/xjs-bpmnjs/app/index.js b/ruoyi-ui/xjs-bpmnjs/app/index.js
index 38efc228..c25b5ba5 100644
--- a/ruoyi-ui/xjs-bpmnjs/app/index.js
+++ b/ruoyi-ui/xjs-bpmnjs/app/index.js
@@ -65,7 +65,7 @@ $(function () {
                 instanceId
             }
             $.ajax({
-                url: localStorage.getItem("VUE_APP_BASE_API")+'/activitiHistory/gethighLine',
+                url: localStorage.getItem("VUE_APP_BASE_API")+'/workflow/activitiHistory/gethighLine',
                 // url: 'http://localhost:8080/activitiHistory/gethighLine',
                 type: 'GET',
                 data: param1,
diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/consts/WorkflowConst.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/consts/WorkflowConst.java
new file mode 100644
index 00000000..0a343dfb
--- /dev/null
+++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/consts/WorkflowConst.java
@@ -0,0 +1,41 @@
+package com.xjs.consts;
+
+/**
+ * 工作流常用常量
+ * @author xiejs
+ * @since 2022-04-18
+ */
+public class WorkflowConst {
+
+    public enum WorkflowEnum {
+        ING(0,"进行中"),
+        SUCCESS(1,"成功"),
+        ERROR(2,"失败");
+
+        private Integer code;
+        private String desc;
+
+        WorkflowEnum(Integer code, String desc) {
+            this.code = code;
+            this.desc = desc;
+        }
+
+        public Integer getCode() {
+            return code;
+        }
+
+        public void setCode(Integer code) {
+            this.code = code;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+
+        public void setDesc(String desc) {
+            this.desc = desc;
+        }
+    }
+
+
+}
diff --git a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/activiti/controller/ProcessDefinitionController.java b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/activiti/controller/ProcessDefinitionController.java
index 8481f41c..52adeec7 100644
--- a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/activiti/controller/ProcessDefinitionController.java
+++ b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/activiti/controller/ProcessDefinitionController.java
@@ -8,11 +8,14 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.xjs.activiti.domain.dto.ProcessDefinitionDTO;
 import com.xjs.activiti.service.IProcessDefinitionService;
+import com.xjs.validation.group.SelectGroup;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -36,7 +39,8 @@ public class ProcessDefinitionController extends BaseController {
      */
     @GetMapping(value = "/list")
     @ApiOperation("获取流程定义集合")
-    public TableDataInfo list(ProcessDefinitionDTO processDefinition) {
+    @RequiresPermissions("activiti:definition")
+    public TableDataInfo list(@Validated(SelectGroup.class) ProcessDefinitionDTO processDefinition) {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         return getDataTable(processDefinitionService.selectProcessDefinitionList(processDefinition, pageDomain));
 
@@ -45,6 +49,7 @@ public class ProcessDefinitionController extends BaseController {
 
     @GetMapping(value = "/getDefinitions/{instanceId}")
     @ApiOperation("按实例 ID 获取定义")
+    @RequiresPermissions("activiti:definition")
     public AjaxResult getDefinitionsByInstanceId(@PathVariable("instanceId") String instanceId) {
         return AjaxResult.success(processDefinitionService.getDefinitionsByInstanceId(instanceId));
     }
@@ -58,6 +63,7 @@ public class ProcessDefinitionController extends BaseController {
     @Log(title = "流程定义管理", businessType = BusinessType.DELETE)
     @DeleteMapping(value = "/remove/{deploymentId}")
     @ApiOperation("删除流程定义")
+    @RequiresPermissions("activiti:definition")
     public AjaxResult delDefinition(@PathVariable("deploymentId") String deploymentId) {
         return toAjax(processDefinitionService.deleteProcessDefinitionById(deploymentId));
     }
@@ -72,6 +78,7 @@ public class ProcessDefinitionController extends BaseController {
     @Log(title = "流程定义管理", businessType = BusinessType.IMPORT)
     @PostMapping(value = "/uploadStreamAndDeployment")
     @ApiOperation("上传并部署流程定义")
+    @RequiresPermissions("activiti:definition")
     public AjaxResult uploadStreamAndDeployment(@RequestParam("file") MultipartFile file) throws IOException {
         processDefinitionService.uploadStreamAndDeployment(file);
         return AjaxResult.success();
@@ -87,6 +94,7 @@ public class ProcessDefinitionController extends BaseController {
     @Log(title = "流程定义管理", businessType = BusinessType.UPDATE)
     @PostMapping("/suspendOrActiveApply")
     @ApiOperation("启动挂起流程流程定义")
+    @RequiresPermissions("activiti:definition")
     public AjaxResult suspendOrActiveApply(@RequestBody ProcessDefinitionDTO processDefinition) {
         processDefinitionService.suspendOrActiveApply(processDefinition.getId(), processDefinition.getSuspendState());
         return AjaxResult.success();
@@ -102,6 +110,7 @@ public class ProcessDefinitionController extends BaseController {
     @Log(title = "流程定义管理", businessType = BusinessType.IMPORT)
     @PostMapping(value = "/upload")
     @ApiOperation("上传流程流程定义")
+    @RequiresPermissions("activiti:definition")
     public AjaxResult upload(@RequestParam("processFile") MultipartFile multipartFile) throws IOException {
 
         if (!multipartFile.isEmpty()) {
@@ -121,6 +130,7 @@ public class ProcessDefinitionController extends BaseController {
      */
     @PostMapping(value = "/addDeploymentByString")
     @ApiOperation("通过stringBPMN添加流程定义")
+    @RequiresPermissions("activiti:definition")
     public AjaxResult addDeploymentByString(@RequestParam("stringBPMN") String stringBPMN) {
         processDefinitionService.addDeploymentByString(stringBPMN);
         return AjaxResult.success();
diff --git a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/activiti/domain/dto/ProcessDefinitionDTO.java b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/activiti/domain/dto/ProcessDefinitionDTO.java
index ad6fb99e..10a789c8 100644
--- a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/activiti/domain/dto/ProcessDefinitionDTO.java
+++ b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/activiti/domain/dto/ProcessDefinitionDTO.java
@@ -1,10 +1,10 @@
 package com.xjs.activiti.domain.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.xjs.activiti.domain.vo.ActReDeploymentVO;
 import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntityImpl;
 
+import javax.validation.constraints.Size;
 import java.util.Date;
 
 /**
@@ -19,15 +19,36 @@ public class ProcessDefinitionDTO extends BaseEntity {
 
     private String id;
 
+    /**
+     * 流程名称
+     */
+    @Size(min = 1, max = 50, message = "流程名称不能超过 50 个字符")
     private String name;
 
+    /**
+     * 流程key
+     */
+    @Size(min = 1, max = 20, message = "流程key不能超过 20 个字符")
     private String key;
 
+    /**
+     * 流程版本号
+     */
     private int version;
 
+    /**
+     * 部署id
+     */
     private String deploymentId;
+
+    /**
+     * 资源名称
+     */
     private String resourceName;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
+    /**
+     * 部署时间
+     */
     private Date deploymentTime;
 
 
diff --git a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/domain/WorkflowLeave.java b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/domain/WorkflowLeave.java
index 6d8b48e1..d509f2a8 100644
--- a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/domain/WorkflowLeave.java
+++ b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/domain/WorkflowLeave.java
@@ -1,6 +1,5 @@
 package com.xjs.workflow.leave.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -43,14 +42,12 @@ public class WorkflowLeave extends BaseEntity {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date leaveStartTime;
 
     /**
      * 结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date leaveEndTime;
 
diff --git a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/mapper/WorkflowLeaveMapper.java b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/mapper/WorkflowLeaveMapper.java
index a8452bb9..9983a19a 100644
--- a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/mapper/WorkflowLeaveMapper.java
+++ b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/mapper/WorkflowLeaveMapper.java
@@ -9,7 +9,7 @@ import java.util.List;
  * 请假Mapper接口
  *
  * @author xiejs
- * @since  2022-04-17 17:54:39
+ * @since 2022-04-17 17:54:39
  */
 public interface WorkflowLeaveMapper {
     /**
@@ -42,7 +42,7 @@ public interface WorkflowLeaveMapper {
      * @param workflowLeave 请假
      * @return 请假集合
      */
-    public List<WorkflowLeave> selectWorkflowLeaveList(WorkflowLeave workflowLeave);
+    List<WorkflowLeave> selectWorkflowLeaveList(WorkflowLeave workflowLeave);
 
 
     /**
@@ -51,7 +51,7 @@ public interface WorkflowLeaveMapper {
      * @param workflowLeave 请假
      * @return 结果
      */
-    public int insertWorkflowLeave(WorkflowLeave workflowLeave);
+    int insertWorkflowLeave(WorkflowLeave workflowLeave);
 
     /**
      * 修改请假
diff --git a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/service/impl/WorkflowLeaveServiceImpl.java b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/service/impl/WorkflowLeaveServiceImpl.java
index b16eae1b..db361882 100644
--- a/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/service/impl/WorkflowLeaveServiceImpl.java
+++ b/xjs-business/xjs-business-workflow/src/main/java/com/xjs/workflow/leave/service/impl/WorkflowLeaveServiceImpl.java
@@ -1,5 +1,6 @@
 package com.xjs.workflow.leave.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.ruoyi.common.core.text.UUID;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
@@ -8,18 +9,22 @@ import com.ruoyi.system.api.RemoteUserService;
 import com.xjs.workflow.leave.domain.WorkflowLeave;
 import com.xjs.workflow.leave.mapper.WorkflowLeaveMapper;
 import com.xjs.workflow.leave.service.IWorkflowLeaveService;
-import org.activiti.api.process.model.ProcessInstance;
-import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
 import org.activiti.api.process.runtime.ProcessRuntime;
+import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
+import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.xjs.consts.WorkflowConst.WorkflowEnum.ING;
+
 /**
  * 请假Service业务层处理
  *
@@ -31,8 +36,11 @@ public class WorkflowLeaveServiceImpl implements IWorkflowLeaveService {
 
     @Resource
     private WorkflowLeaveMapper workflowLeaveMapper;
+    //7.0的需要整合springSercuity
     @Autowired
     private ProcessRuntime processRuntime;
+    @Autowired
+    private RuntimeService runtimeService;
     @Resource
     private RemoteUserService remoteUserService;
     @Autowired
@@ -71,7 +79,7 @@ public class WorkflowLeaveServiceImpl implements IWorkflowLeaveService {
     public List<WorkflowLeave> selectWorkflowLeaveAndTaskNameList(WorkflowLeave workflowLeave) {
         List<WorkflowLeave> workflowLeaves = workflowLeaveMapper.selectWorkflowLeaveList(workflowLeave);
         List<String> collect = workflowLeaves.parallelStream().map(WorkflowLeave::getInstanceId).collect(Collectors.toList());
-        if (collect != null && !collect.isEmpty()) {
+        if (CollUtil.isNotEmpty(collect)) {
             List<Task> tasks = taskService.createTaskQuery().processInstanceIdIn(collect).list();
             workflowLeaves.forEach(
                     wl -> {
@@ -93,20 +101,22 @@ public class WorkflowLeaveServiceImpl implements IWorkflowLeaveService {
      */
     @Override
     public int insertWorkflowLeave(WorkflowLeave workflowLeave) {
-
         String id = UUID.randomUUID().toString();
         workflowLeave.setId(id);
         workflowLeave.setCreateTime(DateUtils.getNowDate());
         String join = StringUtils.join(remoteUserService.selectUserNameByPostCodeAndDeptId("se", SecurityUtils.getLoginUser().getSysUser().getDeptId()), ",");
-        ProcessInstance processInstance = processRuntime.start(ProcessPayloadBuilder
-                .start()
-                .withProcessDefinitionKey("leave")
-                .withName(workflowLeave.getTitle())
-                .withBusinessKey(id)
-                .withVariable("deptLeader", join)
-                .build());
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("deptLeader", join);
+        ProcessInstance processInstance = runtimeService.createProcessInstanceBuilder()
+                .variables(map)
+                .processDefinitionKey("leave")
+                .businessKey(id)
+                .name(workflowLeave.getTitle())
+                .start();
+
         workflowLeave.setInstanceId(processInstance.getId());
-        workflowLeave.setState("0");
+        workflowLeave.setState(String.valueOf(ING.getCode()));
         workflowLeave.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         workflowLeave.setCreateBy(SecurityUtils.getUsername());
         workflowLeave.setCreateTime(DateUtils.getNowDate());
diff --git a/xjs-business/xjs-business-workflow/src/main/resources/mybatis/mybatis-config.xml b/xjs-business/xjs-business-workflow/src/main/resources/mybatis/mybatis-config.xml
index ab1d9503..e56452a0 100644
--- a/xjs-business/xjs-business-workflow/src/main/resources/mybatis/mybatis-config.xml
+++ b/xjs-business/xjs-business-workflow/src/main/resources/mybatis/mybatis-config.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE configuration
-PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-config.dtd">
+        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-config.dtd">
 <configuration>
 
-	<settings>
-		<setting name="cacheEnabled"             value="true" />  <!-- 全局映射器启用缓存 -->
-		<setting name="useGeneratedKeys"         value="true" />  <!-- 允许 JDBC 支持自动生成主键 -->
-		<setting name="defaultExecutorType"      value="REUSE" /> <!-- 配置默认的执行器 -->
-		<setting name="logImpl"                  value="SLF4J" /> <!-- 指定 MyBatis 所用日志的具体实现 -->
-		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/>  驼峰式命名 -->
-	</settings>
+    <settings>
+        <setting name="cacheEnabled" value="true"/>  <!-- 全局映射器启用缓存 -->
+        <setting name="useGeneratedKeys" value="true"/>  <!-- 允许 JDBC 支持自动生成主键 -->
+        <setting name="defaultExecutorType" value="REUSE"/> <!-- 配置默认的执行器 -->
+        <setting name="logImpl" value="STDOUT_LOGGING"/> <!-- 指定 MyBatis 所用日志的具体实现  -->
+        <!--SLF4J、Apache Commons Logging、Log4j 2、Log4j、JDK logging-->
+
+        <!-- <setting name="mapUnderscoreToCamelCase" value="true"/>  驼峰式命名 -->
+    </settings>
 
 </configuration>
diff --git a/xjs-business/xjs-project-mall/mall-product/README.md b/xjs-business/xjs-project-mall/mall-product/README.md
new file mode 100644
index 00000000..8f55e55d
--- /dev/null
+++ b/xjs-business/xjs-project-mall/mall-product/README.md
@@ -0,0 +1,2 @@
+商品检索页面地址：http://localhost:9981/
+