Merge branch 'master' into 2.5dev

.env.production

 ENV = 'production'
 
-# 接口地址
+# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
 VUE_APP_BASE_API  = 'https://api.auauz.net'
-VUE_APP_WS_API = 'ws://api.auauz.net'
+# 如果接口是 http 形式， wss 需要改为 ws
+VUE_APP_WS_API = 'wss://api.auauz.net'

src/views/monitor/online/index.vue

@@ -86,11 +86,6 @@ export default {
     }
   },
   methods: {
-    // 获取数据前设置好接口地址
-    beforeInit() {
-      this.url = 'auth/online'
-      return true
-    },
     doDelete(datas) {
       this.$confirm(`确认强退选中的${datas.length}个用户?`, '提示', {
         confirmButtonText: '确定',

src/views/system/dept/index.vue

@@ -123,7 +123,7 @@ export default {
     },
     // 提交前的验证
     [CRUD.HOOK.afterValidateCU]() {
-      if (!this.form.pid) {
+      if (!this.form.pid && this.form.id !== 1) {
         this.$message({
           message: '上级部门不能为空',
           type: 'warning'

src/views/system/menu/index.vue

@@ -157,7 +157,7 @@ import udOperation from '@crud/UD.operation'
 
 // crud交由presenter持有
 const defaultCrud = CRUD({ title: '菜单', url: 'api/menus', crudMethod: { ...crudMenu }})
-const defaultForm = { name: null, sort: 999, path: null, component: null, componentName: null, iframe: false, roles: [], pid: 0, icon: null, cache: false, hidden: false, type: 0, permission: null }
+const defaultForm = { id: null, name: null, sort: 999, path: null, component: null, componentName: null, iframe: false, roles: [], pid: 0, icon: null, cache: false, hidden: false, type: 0, permission: null }
 export default {
   name: 'Menu',
   components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation },

src/views/system/role/index.vue

@@ -135,7 +135,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 // crud交由presenter持有
 const defaultCrud = CRUD({ title: '角色', url: 'api/roles', sort: 'level,asc', crudMethod: { ...crudRoles }})
-const defaultForm = { name: null, depts: [], remark: null, dataScope: '全部', level: 3, permission: null }
+const defaultForm = { id: null, name: null, depts: [], remark: null, dataScope: '全部', level: 3, permission: null }
 export default {
   name: 'Role',
   components: { Treeselect, pagination, crudOperation, rrOperation, udOperation },

src/views/system/timing/index.vue

@@ -119,7 +119,7 @@ import pagination from '@crud/Pagination'
 
 // crud交由presenter持有
 const defaultCrud = CRUD({ title: '定时任务', url: 'api/jobs', crudMethod: { ...crudJob }})
-const defaultForm = { jobName: null, beanName: null, methodName: null, params: null, cronExpression: null, isPause: false, remark: null }
+const defaultForm = { id: null, jobName: null, beanName: null, methodName: null, params: null, cronExpression: null, isPause: false, remark: null }
 export default {
   name: 'Timing',
   components: { Log, pagination, crudOperation, rrOperation },

src/views/system/user/index.vue

@@ -211,7 +211,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 let userRoles = []
 // crud交由presenter持有
 const defaultCrud = CRUD({ title: '用户', url: 'api/users', crudMethod: { ...crudUser }})
-const defaultForm = { username: null, nickName: null, sex: '男', email: null, enabled: 'false', roles: [], job: { id: null }, dept: { id: null }, phone: null }
+const defaultForm = { id: null, username: null, nickName: null, sex: '男', email: null, enabled: 'false', roles: [], job: { id: null }, dept: { id: null }, phone: null }
 export default {
   name: 'User',
   components: { Treeselect, crudOperation, rrOperation, udOperation, pagination },
@@ -308,10 +308,6 @@ export default {
         }
       })
     },
-    beforeInit() {
-      this.url = 'api/users'
-      return true
-    },
     // 新增与编辑前做的操作
     [CRUD.HOOK.afterToCU](crud, form) {
       this.getDepts()