Merge remote-tracking branch 'origin/message_bus' into message_bus

# Conflicts:
#	src/api/message_bus.js

@@ -322,6 +322,9 @@
                     username: [
                     username: [
                         {required: true, message: '请输入用户名称', trigger: ['blur', 'change']},
                         {required: true, message: '请输入用户名称', trigger: ['blur', 'change']},
                     ],
                     ],
+                    consumerGroupName:[
+                        {required: true, message: '请输入消费者组名称', trigger: ['blur', 'change']},
+                    ]
                     // // 所属虚拟机id
                     // // 所属虚拟机id
                     // virtualHostId: [
                     // virtualHostId: [
                     //     {required: true, message: '请选择所属虚拟机', trigger: ['blur', 'change']},
                     //     {required: true, message: '请选择所属虚拟机', trigger: ['blur', 'change']},
@@ -400,10 +403,10 @@
                 userList = userListInfo;
                 userList = userListInfo;
                 if (userList.length>0){
                 if (userList.length>0){
                     let user = userList.pop();
                     let user = userList.pop();
-                    this.queue_addForm.username = user.username;
-                    this.queue_addForm.queueName = user.username;
-                    this.queue_addForm.userId = user.userId;
-                    this.queue_addForm.consumerGroupName = user.username+"Group";
+                    this.queue_addForm.username = user.account;
+                    this.queue_addForm.queueName = user.account;
+                    this.queue_addForm.userId = user.id;
+                    this.queue_addForm.consumerGroupName = user.account+"Group";
                 }
                 }
             },
             },
             /**
             /**

@@ -281,8 +281,7 @@
                 },
                 },
                 rules: {
                 rules: {
                     sndr: [
                     sndr: [
-                        { required: true, message: '请输入账户名称', trigger: 'blur' },
-                        { min: 3, max: 10, message: '长度在 3 到 10 个字符', trigger: 'blur' }
+                        { required: true, message: '请输入账户名称', trigger: 'blur' }
                     ],
                     ],
                     btype: [
                     btype: [
                         { required: true, message: '请输入消息大类', trigger: 'blur' }
                         { required: true, message: '请输入消息大类', trigger: 'blur' }

@@ -50,7 +50,7 @@
 <script>
 <script>
     import util from '@/common/js/util'
     import util from '@/common/js/util'
     import NProgress from 'nprogress'
     import NProgress from 'nprogress'
-    import {getUserList, removeUser, batchRemoveUser, editUser, addUser, setUserRole} from '@/views/bus/dsly/api/user';
+    import {getUserList, removeUser, batchRemoveUser, editUser, addUser, setUserRole,getMockUserList} from '@/views/bus/dsly/api/user';
     import {getList} from '@/api/role_api';
     import {getList} from '@/api/role_api';
     import moment from 'moment'
     import moment from 'moment'
     import {getServerAndHostList, insertUserInfo} from "@/api/message_bus";
     import {getServerAndHostList, insertUserInfo} from "@/api/message_bus";
@@ -172,7 +172,7 @@
                 };
                 };
                 this.listLoading = true;
                 this.listLoading = true;
                 getUserList(para).then((res) => {
                 getUserList(para).then((res) => {
-                    let response = res.data;
+                    let response = res.data.data;
                     this.total = response.totalCount;
                     this.total = response.totalCount;
                     this.users = response.data;
                     this.users = response.data;
                     this.listLoading = false;
                     this.listLoading = false;