diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/AbpPermissionManagementHttpApiModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/AbpPermissionManagementHttpApiModule.cs
index 6e1b377d028..a45354c8b7f 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/AbpPermissionManagementHttpApiModule.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/AbpPermissionManagementHttpApiModule.cs
@@ -19,6 +19,7 @@ public override void PreConfigureServices(ServiceConfigurationContext context)
             {
                 mvcBuilder.AddApplicationPartIfNotExists(typeof(AbpPermissionManagementHttpApiModule).Assembly);
             });
+
         }
 
         public override void ConfigureServices(ServiceConfigurationContext context)
diff --git a/samples/Microservice/databases/Ms_Identity.zip b/samples/Microservice/databases/Ms_Identity.zip
deleted file mode 100644
index 0c2604e30bf..00000000000
Binary files a/samples/Microservice/databases/Ms_Identity.zip and /dev/null differ
diff --git a/samples/Microservice/databases/Ms_Identity_Auth.zip b/samples/Microservice/databases/Ms_Identity_Auth.zip
new file mode 100644
index 00000000000..e5096bd3205
Binary files /dev/null and b/samples/Microservice/databases/Ms_Identity_Auth.zip differ
diff --git a/samples/Microservice/modules/app-microservice/src/api/rbac/menu.js b/samples/Microservice/modules/app-microservice/src/api/rbac/menu.js
index a3afedda165..cd4560c614d 100644
--- a/samples/Microservice/modules/app-microservice/src/api/rbac/menu.js
+++ b/samples/Microservice/modules/app-microservice/src/api/rbac/menu.js
@@ -2,7 +2,7 @@ import axios from "@/libs/api.request";
 
 export const getMenuList = data => {
   return axios.request({
-    url: "rbac/menu/list",
+    url: "rbac/menu",
     method: "post",
     data
   });
diff --git a/samples/Microservice/modules/app-microservice/src/api/rbac/permission.js b/samples/Microservice/modules/app-microservice/src/api/rbac/permission.js
index 8c434e7271d..ba9cca77e46 100644
--- a/samples/Microservice/modules/app-microservice/src/api/rbac/permission.js
+++ b/samples/Microservice/modules/app-microservice/src/api/rbac/permission.js
@@ -2,9 +2,9 @@ import axios from '@/libs/api.request'
 
 
 // edit submit
-export const editPermission = (providerName,providerKey,data) => {
+export const editPermission = (providerName, providerKey, data) => {
   return axios.request({
-    url: 'abp/permissions?providerName='+providerName+'&providerKey='+providerKey,
+    url: 'abp/permissions?providerName=' + providerName + '&providerKey=' + providerKey,
     method: 'put',
     data
   })
@@ -15,6 +15,6 @@ export const loadPermissionTree = (data) => {
   return axios.request({
     url: 'abp/permissions',
     method: 'get'
-    ,params:data
+    , params: data
   })
 }
diff --git a/samples/Microservice/modules/app-microservice/src/api/rbac/profile.js b/samples/Microservice/modules/app-microservice/src/api/rbac/profile.js
index cc884aa5cd9..2b140b901fa 100644
--- a/samples/Microservice/modules/app-microservice/src/api/rbac/profile.js
+++ b/samples/Microservice/modules/app-microservice/src/api/rbac/profile.js
@@ -2,15 +2,15 @@ import axios from '@/libs/api.request'
 
 export const getProfile = (data) => {
   return axios.request({
-    url: 'identity/profile',
+    url: 'identity/my-profile',
     method: 'get',
-    params:data
+    params: data
   })
 }
 
 export const editProfile = (data) => {
   return axios.request({
-    url: 'identity/profile',
+    url: 'identity/my-profile',
     method: 'put',
     data
   })
@@ -18,8 +18,8 @@ export const editProfile = (data) => {
 
 export const changePassword = (data) => {
   return axios.request({
-    url: 'identity/profile/changePassword',
+    url: 'identity/my-profile/changePassword',
     method: 'post',
-    params:data
+    params: data
   })
 }
\ No newline at end of file
diff --git a/samples/Microservice/modules/app-microservice/src/api/rbac/role.js b/samples/Microservice/modules/app-microservice/src/api/rbac/role.js
index ba5e5c48d2d..19265d219df 100644
--- a/samples/Microservice/modules/app-microservice/src/api/rbac/role.js
+++ b/samples/Microservice/modules/app-microservice/src/api/rbac/role.js
@@ -2,16 +2,16 @@ import axios from '@/libs/api.request'
 
 export const getRoleList = (data) => {
   return axios.request({
-    url: 'identity/identityRole',
+    url: 'identity/roles',
     method: 'get',
-    params:data
+    params: data
   })
 }
 
 // createRole
 export const createRole = (data) => {
   return axios.request({
-    url: 'identity/identityRole',
+    url: 'identity/roles',
     method: 'post',
     data
   })
@@ -20,7 +20,7 @@ export const createRole = (data) => {
 //loadRole
 export const loadRole = (data) => {
   return axios.request({
-    url: 'identity/identityRole/' + data.id,
+    url: 'identity/roles/' + data.id,
     method: 'get'
   })
 }
@@ -28,7 +28,7 @@ export const loadRole = (data) => {
 // editRole
 export const editRole = (data) => {
   return axios.request({
-    url: 'identity/identityRole/'+data.id,
+    url: 'identity/roles/' + data.id,
     method: 'put',
     data
   })
@@ -37,21 +37,21 @@ export const editRole = (data) => {
 // delete role
 export const deleteRole = (ids) => {
   return axios.request({
-    url: 'identity/identityRole/' + ids,
+    url: 'identity/roles/' + ids,
     method: 'delete'
   })
 }
 
-export const loadSimpleList=()=>{
+export const loadSimpleList = () => {
   return axios.request({
-    url: 'identity/identityRole/list',
+    url: 'identity/roles',
     method: 'get'
   })
 }
 
-export const loadRoleListByUserGuid=(user_guid)=>{
+export const loadRoleListByUserGuid = (user_guid) => {
   return axios.request({
-    url: 'identity/identityUser/'+user_guid+'/roles',
+    url: 'identity/users/' + user_guid + '/roles',
     method: 'get'
   })
 }
\ No newline at end of file
diff --git a/samples/Microservice/modules/app-microservice/src/api/rbac/user.js b/samples/Microservice/modules/app-microservice/src/api/rbac/user.js
index 9745c36af4c..d5322b2c47c 100644
--- a/samples/Microservice/modules/app-microservice/src/api/rbac/user.js
+++ b/samples/Microservice/modules/app-microservice/src/api/rbac/user.js
@@ -2,16 +2,16 @@ import axios from '@/libs/api.request'
 
 export const getUserList = (data) => {
   return axios.request({
-    url: 'identity/identityUser',
+    url: 'identity/users',
     method: 'get',
-    params:data
+    params: data
   })
 }
 
 // createUser
 export const createUser = (data) => {
   return axios.request({
-    url: 'identity/identityUser',
+    url: 'identity/users',
     method: 'post',
     data
   })
@@ -20,7 +20,7 @@ export const createUser = (data) => {
 //loadUser
 export const loadUser = (data) => {
   return axios.request({
-    url: 'identity/identityUser/' + data.id,
+    url: 'identity/users/' + data.id,
     method: 'get'
   })
 }
@@ -28,7 +28,7 @@ export const loadUser = (data) => {
 // editUser
 export const editUser = (data) => {
   return axios.request({
-    url: 'identity/identityUser/'+data.id,
+    url: 'identity/users/' + data.id,
     method: 'put',
     data
   })
@@ -37,7 +37,7 @@ export const editUser = (data) => {
 // delete user
 export const deleteUser = (ids) => {
   return axios.request({
-    url: 'identity/identityUser/' + ids,
+    url: 'identity/users/' + ids,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export const deleteUser = (ids) => {
 
 export const emailConfirmation = (data) => {
   return axios.request({
-    url: 'identity/identityUser/emailConfirmation',
+    url: 'identity/users/emailConfirmation',
     method: 'put',
     data
   })
diff --git a/samples/Microservice/modules/app-microservice/src/api/user.js b/samples/Microservice/modules/app-microservice/src/api/user.js
index cfb9c8cec0f..34ff1d80422 100644
--- a/samples/Microservice/modules/app-microservice/src/api/user.js
+++ b/samples/Microservice/modules/app-microservice/src/api/user.js
@@ -15,10 +15,10 @@ export const login = ({
   //   "rememberMe": true,
   //   "tenanId": ""
   // });
- return axios.request({
+  return axios.request({
     url: 'http://localhost:64999/api/account/token',
     method: 'post',
-    data:{
+    data: {
       "userNameOrEmailAddress": userName,
       "password": password,
       "rememberMe": true,
@@ -30,16 +30,16 @@ export const login = ({
 
 export const getUserInfo = (token) => {
   return axios.request({
-    url: 'identity/profile',
+    url: 'identity/my-profile',
     method: 'get',
     //是否在请求资源中添加资源的前缀
     withPrefix: false,  //设置为true或者不设置此属性，将默认添加配置文件config.baseUrl.defaultPrefix的前缀，如果设置下面这个属性[prefix]，默认配置文件中的默认前缀将不生效
     //请求资源的前缀重写
-    prefix:"api/"    //设此属性权重最高，将覆盖配置文件[baseUrl.defaultPrefix]中的前缀，withPrefix对此属性不起作用(也就是说只要设置了此属性，都将在请求中添加设置的前缀)
+    prefix: "api/"    //设此属性权重最高，将覆盖配置文件[baseUrl.defaultPrefix]中的前缀，withPrefix对此属性不起作用(也就是说只要设置了此属性，都将在请求中添加设置的前缀)
   })
 }
 
-export const getAuthConfig=(token)=>{
+export const getAuthConfig = (token) => {
   return axios.request({
     url: 'identity/abpApplication/getAuthConfig',
     method: 'get',
diff --git a/samples/Microservice/modules/app-microservice/src/view/base/baseItem.vue b/samples/Microservice/modules/app-microservice/src/view/base/baseItem.vue
index c8f52d712c4..518f985650b 100644
--- a/samples/Microservice/modules/app-microservice/src/view/base/baseItem.vue
+++ b/samples/Microservice/modules/app-microservice/src/view/base/baseItem.vue
@@ -19,44 +19,44 @@ a<template>
       >
         <div slot="search">
           <section class="dnc-toolbar-wrap">
-             <Row :gutter="16">
-               <Col span="16">
+            <Row :gutter="16">
+              <Col span="16">
                 <Form inline>
                   <FormItem>
                     <Dropdown
-                        trigger="click"
-                        :transfer="true"
-                        placement="bottom-start"
-                        style="min-width:80px;"
-                        @on-visible-change="handleSearchTypeTreeVisibleChange"
-                      >
-                        <Button type="primary">
-                          <span v-text="stores.baseItem.query.typeName"></span>
-                          <Icon type="ios-arrow-down"></Icon>
-                        </Button>
-                        <div class="text-left pad10" slot="list" style="min-width:360px;">
-                          <div>
-                            <Button
-                              type="primary"
-                              size="small"
-                              icon="ios-search"
-                              @click="handleRefreshSearchTypeTreeData"
-                            >刷新菜单</Button>
-                            <Button
-                              class="ml3"
-                              type="primary"
-                              size="small"
-                              icon="md-close"
-                              @click="handleClearSearchTypeTreeSelection"
-                            >清空</Button>
-                          </div>
-                          <Tree
-                            class="text-left dropdown-tree"
-                            :data="stores.baseItem.sources.typeTree.data"
-                            @on-select-change="handleSearchTypeTreeSelectChange"
-                          ></Tree>
+                      trigger="click"
+                      :transfer="true"
+                      placement="bottom-start"
+                      style="min-width:80px;"
+                      @on-visible-change="handleSearchTypeTreeVisibleChange"
+                    >
+                      <Button type="primary">
+                        <span v-text="stores.baseItem.query.typeName"></span>
+                        <Icon type="ios-arrow-down"></Icon>
+                      </Button>
+                      <div class="text-left pad10" slot="list" style="min-width:360px;">
+                        <div>
+                          <Button
+                            type="primary"
+                            size="small"
+                            icon="ios-search"
+                            @click="handleRefreshSearchTypeTreeData"
+                          >刷新菜单</Button>
+                          <Button
+                            class="ml3"
+                            type="primary"
+                            size="small"
+                            icon="md-close"
+                            @click="handleClearSearchTypeTreeSelection"
+                          >清空</Button>
                         </div>
-                      </Dropdown>
+                        <Tree
+                          class="text-left dropdown-tree"
+                          :data="stores.baseItem.sources.typeTree.data"
+                          @on-select-change="handleSearchTypeTreeSelectChange"
+                        ></Tree>
+                      </div>
+                    </Dropdown>
                   </FormItem>
                 </Form>
               </Col>
@@ -108,16 +108,16 @@ a<template>
           </Col>
         </Row>
         <FormItem label="编码" prop="code" label-position="left">
-          <Input v-model="formModel.fields.code" placeholder="请输入编码"/>
+          <Input v-model="formModel.fields.code" placeholder="请输入编码" />
         </FormItem>
         <FormItem label="名称" prop="name" label-position="left">
-          <Input v-model="formModel.fields.name" placeholder="请输入名称"/>
+          <Input v-model="formModel.fields.name" placeholder="请输入名称" />
         </FormItem>
         <FormItem label="排序码" prop="sort" label-position="left">
-          <Input v-model="formModel.fields.sort" placeholder="请输入排序码"/>
+          <Input v-model="formModel.fields.sort" placeholder="请输入排序码" />
         </FormItem>
         <FormItem label="备注" prop="remark" label-position="left">
-          <Input v-model="formModel.fields.remark" placeholder="请输入备注"/>
+          <Input v-model="formModel.fields.remark" placeholder="请输入备注" />
         </FormItem>
       </Form>
       <div class="demo-drawer-footer">
@@ -142,7 +142,7 @@ import {
 } from "@/api/base/baseItem";
 
 export default {
-  name: "Album",
+  name: "baseItem",
   components: {
     Tables
   },
@@ -186,7 +186,7 @@ export default {
             SkipCount: 0,
             Sorting: "sort",
             typeName: "请选择...",
-            BaseTypeGuid:""
+            BaseTypeGuid: ""
           },
           sources: {
             statusSources: [
@@ -198,17 +198,17 @@ export default {
               { value: 0, text: "禁用" },
               { value: 1, text: "正常" }
             ],
-             typeTree: {
+            typeTree: {
               inited: false,
               data: []
-            },
+            }
           },
           columns: [
             { type: "selection", width: 50, key: "handle" },
             { title: "编码名称", key: "code", width: 150 },
             { title: "名称", key: "name", width: 250 },
             { title: "排序码", key: "sort", width: 250 },
-            { title: "备注", key: "remark"},
+            { title: "备注", key: "remark" },
             {
               title: "操作",
               align: "center",
@@ -319,7 +319,8 @@ export default {
       });
     },
     handlePageChanged(page) {
-      this.stores.baseItem.query.SkipCount =  (page - 1) * this.stores.baseItem.query.MaxResultCount;
+      this.stores.baseItem.query.SkipCount =
+        (page - 1) * this.stores.baseItem.query.MaxResultCount;
       this.loadbaseItemList();
     },
     handlePageSizeChanged(MaxResultCount) {
@@ -341,24 +342,12 @@ export default {
         that.loadbaseItemList();
       });
     },
-    validatebaseItemForm() {
-      let _valid = false;
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          this.$Message.error("请完善表单信息");
-          _valid = false;
-        } else {
-          _valid = true;
-        }
-      });
-      return _valid;
-    },
     handleShowCreateWindow() {
       this.$refs["form"].resetFields();
       this.formModel.mode = "create";
       this.formModel.opened = true;
       this.formModel.parentName = "";
-      this.formModel.parentGuid=""
+      this.formModel.parentGuid = "";
       this.getViewTrees(null);
     },
     handleEdit(data) {
@@ -370,7 +359,7 @@ export default {
         that.formModel.fields = res.data;
 
         that.formModel.parentName = "";
-        that.formModel.parentGuid = res.data.parentId;
+        that.formModel.parentGuid = res.data.baseTypeGuid;
 
         this.getViewTrees(data.row.baseTypeGuid).then(() => {
           var selectNodes = that.$refs.tree.getSelectedNodes();
@@ -389,29 +378,35 @@ export default {
       });
     },
     handleSubmit() {
-      let valid = this.validatebaseItemForm();
       var that = this;
-      if (valid) {
-        if (this.formModel.parentGuid == ""||this.formModel.parentGuid==undefined) {
-          this.$Message.error("请选择字典类别!");
-          return;
-        }
-        this.formModel.fields.baseTypeGuid = this.formModel.parentGuid;
-        if (this.formModel.mode === "create") {
-          createBaseItem(this.formModel.fields).then(res => {
-            this.$Message.success("新增字典成功");
-            that.loadbaseItemList();
-            that.formModel.opened = false;
-          });
-        }
-        if (this.formModel.mode === "edit") {
-          editBaseItem(this.formModel.fields).then(res => {
-            this.$Message.success("修改字典成功");
-            that.loadbaseItemList();
-            that.formModel.opened = false;
-          });
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          this.$Message.error("请完善表单信息");
+        } else {
+          if (
+            this.formModel.parentGuid == "" ||
+            this.formModel.parentGuid == undefined
+          ) {
+            this.$Message.error("请选择字典类别!");
+            return;
+          }
+          this.formModel.fields.baseTypeGuid = this.formModel.parentGuid;
+          if (this.formModel.mode === "create") {
+            createBaseItem(this.formModel.fields).then(res => {
+              this.$Message.success("新增字典成功");
+              that.loadbaseItemList();
+              that.formModel.opened = false;
+            });
+          }
+          if (this.formModel.mode === "edit") {
+            editBaseItem(this.formModel.fields).then(res => {
+              this.$Message.success("修改字典成功");
+              that.loadbaseItemList();
+              that.formModel.opened = false;
+            });
+          }
         }
-      }
+      });
     },
     handleSearchTypeTreeSelectChange(nodes) {
       var node = nodes[0];
@@ -429,8 +424,8 @@ export default {
         });
       }
     },
-   handleRefreshSearchTypeTreeData() {
-     getViewTrees({}).then(res => {
+    handleRefreshSearchTypeTreeData() {
+      getViewTrees({}).then(res => {
         this.stores.baseItem.sources.typeTree.data = res.data;
       });
     },
@@ -442,7 +437,7 @@ export default {
   },
   mounted() {
     this.loadbaseItemList();
-    this.handleRefreshSearchTypeTreeData()
+    this.handleRefreshSearchTypeTreeData();
   }
 };
 </script>
diff --git a/samples/Microservice/modules/app-microservice/src/view/base/baseType.vue b/samples/Microservice/modules/app-microservice/src/view/base/baseType.vue
index b84e231ed95..41a0450697a 100644
--- a/samples/Microservice/modules/app-microservice/src/view/base/baseType.vue
+++ b/samples/Microservice/modules/app-microservice/src/view/base/baseType.vue
@@ -37,16 +37,16 @@
           </Col>
         </Row>
         <FormItem label="编码" prop="code" label-position="left">
-          <Input v-model="formModel.fields.code" placeholder="请输入编码"/>
+          <Input v-model="formModel.fields.code" placeholder="请输入编码" />
         </FormItem>
         <FormItem label="名称" prop="name" label-position="left">
-          <Input v-model="formModel.fields.name" placeholder="请输入名称"/>
+          <Input v-model="formModel.fields.name" placeholder="请输入名称" />
         </FormItem>
         <FormItem label="排序码" prop="sort" label-position="left">
-          <Input v-model="formModel.fields.sort" placeholder="请输入排序码"/>
+          <Input v-model="formModel.fields.sort" placeholder="请输入排序码" />
         </FormItem>
         <FormItem label="备注" prop="remark" label-position="left">
-          <Input v-model="formModel.fields.remark" placeholder="请输入备注"/>
+          <Input v-model="formModel.fields.remark" placeholder="请输入备注" />
         </FormItem>
       </Form>
       <div class="demo-drawer-footer">
@@ -273,24 +273,12 @@ export default {
         }
       });
     },
-    validateRoleForm() {
-      let _valid = false;
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          this.$Message.error("请完善表单信息");
-          _valid = false;
-        } else {
-          _valid = true;
-        }
-      });
-      return _valid;
-    },
     add() {
       this.$refs["form"].resetFields();
       this.formModel.mode = "create";
       this.formModel.opened = true;
       this.formModel.parentName = "";
-      this.formModel.parentGuid=""
+      this.formModel.parentGuid = "";
       this.getBaseTypeViewTrees(null);
     },
     edit(data) {
@@ -301,8 +289,8 @@ export default {
       loadBaseType({ id: data.id }).then(res => {
         that.formModel.fields = res.data;
 
-        that.formModel.parentName='';
-        that.formModel.parentGuid=res.data.parentId;
+        that.formModel.parentName = "";
+        that.formModel.parentGuid = res.data.parentId;
 
         this.getBaseTypeViewTrees(data.id).then(() => {
           var selectNodes = that.$refs.tree.getSelectedNodes();
@@ -320,29 +308,32 @@ export default {
         that.formModel.data = res.data;
       });
     },
-    
+
     handleSubmit() {
-      let valid = this.validateRoleForm();
       var that = this;
-      if (valid) {
-        if (this.formModel.parentGuid != "") {
-          this.formModel.fields.parentId = this.formModel.parentGuid;
-        }
-        if (this.formModel.mode === "create") {
-          createBaseType(this.formModel.fields).then(res => {
-            this.$Message.success("新增字典类别成功");
-            that.queryCategoryList();
-            that.formModel.opened = false;
-          });
-        }
-        if (this.formModel.mode === "edit") {
-          editBaseType(this.formModel.fields).then(res => {
-            this.$Message.success("修改字典类别成功");
-            that.queryCategoryList();
-            that.formModel.opened = false;
-          });
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          this.$Message.error("请完善表单信息");
+        } else {
+          if (this.formModel.parentGuid != "") {
+            this.formModel.fields.parentId = this.formModel.parentGuid;
+          }
+          if (this.formModel.mode === "create") {
+            createBaseType(this.formModel.fields).then(res => {
+              this.$Message.success("新增字典类别成功");
+              that.queryCategoryList();
+              that.formModel.opened = false;
+            });
+          }
+          if (this.formModel.mode === "edit") {
+            editBaseType(this.formModel.fields).then(res => {
+              this.$Message.success("修改字典类别成功");
+              that.queryCategoryList();
+              that.formModel.opened = false;
+            });
+          }
         }
-      }
+      });
     }
   },
   mounted() {
diff --git a/samples/Microservice/modules/app-microservice/src/view/rbac/organization.vue b/samples/Microservice/modules/app-microservice/src/view/rbac/organization.vue
index ec19eb5e2cd..b0855f5e378 100644
--- a/samples/Microservice/modules/app-microservice/src/view/rbac/organization.vue
+++ b/samples/Microservice/modules/app-microservice/src/view/rbac/organization.vue
@@ -6,13 +6,7 @@
       </Col>
     </Row>
     <Tree :data="treeData" :load-data="loadData" :render="renderContent"></Tree>
-    <Drawer
-      title="部门"
-      v-model="formModel.opened"
-      width="400"
-      :mask-closable="false"
-      :mask="false"
-    >
+    <Drawer title="部门" v-model="formModel.opened" width="400" :mask-closable="false" :mask="false">
       <Form :model="formModel.fields" ref="form" :rules="formModel.rules" label-position="left">
         <Row>
           <Col span="24">
@@ -37,16 +31,16 @@
           </Col>
         </Row>
         <FormItem label="编码" prop="code" label-position="left">
-          <Input v-model="formModel.fields.code" placeholder="请输入编码"/>
+          <Input v-model="formModel.fields.code" placeholder="请输入编码" />
         </FormItem>
         <FormItem label="部门名称" prop="name" label-position="left">
-          <Input v-model="formModel.fields.name" placeholder="请输入部门名称"/>
+          <Input v-model="formModel.fields.name" placeholder="请输入部门名称" />
         </FormItem>
         <FormItem label="排序码" prop="sort" label-position="left">
-          <Input v-model="formModel.fields.sort" placeholder="请输入排序码"/>
+          <Input v-model="formModel.fields.sort" placeholder="请输入排序码" />
         </FormItem>
         <FormItem label="备注" prop="remark" label-position="left">
-          <Input v-model="formModel.fields.remark" placeholder="请输入备注"/>
+          <Input v-model="formModel.fields.remark" placeholder="请输入备注" />
         </FormItem>
       </Form>
       <div class="demo-drawer-footer">
@@ -273,25 +267,20 @@ export default {
         }
       });
     },
-    validateForm() {
-      let _valid = false;
-      this.$refs["form"].validate(valid => {
-        if (!valid) {
-          this.$Message.error("请完善表单信息");
-          _valid = false;
-        } else {
-          _valid = true;
-        }
-      });
-      return _valid;
-    },
     add() {
       this.$refs["form"].resetFields();
       this.formModel.mode = "create";
       this.formModel.opened = true;
       this.formModel.parentName = "";
-      this.formModel.parentGuid=""
-      this.getViewTrees(null);
+      this.formModel.parentGuid = "";
+      (this.formModel.fields = {
+        parentId: "",
+        code: "",
+        name: "",
+        sort: 0,
+        remark: ""
+      }),
+        this.getViewTrees(null);
     },
     edit(data) {
       this.formModel.mode = "edit";
@@ -301,8 +290,8 @@ export default {
       loadOrganization({ id: data.id }).then(res => {
         that.formModel.fields = res.data;
 
-        that.formModel.parentName='';
-        that.formModel.parentGuid=res.data.parentId;
+        that.formModel.parentName = "";
+        that.formModel.parentGuid = res.data.parentId;
         this.getViewTrees(data.id).then(() => {
           var selectNodes = that.$refs.tree.getSelectedNodes();
           if (selectNodes.length > 0) {
@@ -320,27 +309,31 @@ export default {
       });
     },
     handleSubmit() {
-      let valid = this.validateForm();
       var that = this;
-      if (valid) {
-        if (this.formModel.parentGuid != "") {
-          this.formModel.fields.parentId = this.formModel.parentGuid;
-        }
-        if (this.formModel.mode === "create") {
-          createOrganization(this.formModel.fields).then(res => {
-            this.$Message.success("新增部门成功");
-            that.queryCategoryList();
-            that.formModel.opened = false;
-          });
-        }
-        if (this.formModel.mode === "edit") {
-          editOrganization(this.formModel.fields).then(res => {
-            this.$Message.success("修改部门成功");
-            that.queryCategoryList();
-            that.formModel.opened = false;
-          });
+
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          this.$Message.error("请完善表单信息");
+        } else {
+          if (this.formModel.parentGuid != "") {
+            this.formModel.fields.parentId = this.formModel.parentGuid;
+          }
+          if (this.formModel.mode === "create") {
+            createOrganization(this.formModel.fields).then(res => {
+              this.$Message.success("新增部门成功");
+              that.queryCategoryList();
+              that.formModel.opened = false;
+            });
+          }
+          if (this.formModel.mode === "edit") {
+            editOrganization(this.formModel.fields).then(res => {
+              this.$Message.success("修改部门成功");
+              that.queryCategoryList();
+              that.formModel.opened = false;
+            });
+          }
         }
-      }
+      });
     }
   },
   mounted() {
diff --git a/samples/Microservice/modules/app-microservice/src/view/rbac/role.vue b/samples/Microservice/modules/app-microservice/src/view/rbac/role.vue
index 8f4a0a532bd..132e24ce9d5 100644
--- a/samples/Microservice/modules/app-microservice/src/view/rbac/role.vue
+++ b/samples/Microservice/modules/app-microservice/src/view/rbac/role.vue
@@ -106,7 +106,7 @@
     >
       <Form ref="permissionRole" :model="permissionModal" label-position="left">
         <FormItem label="角色名称" prop="entityDisplayName" label-position="left">
-          <Input v-model="permissionModal.entityDisplayName" disabled/>
+          <Input v-model="permissionModal.entityDisplayName" disabled />
         </FormItem>
         <FormItem>
           <Row :gutter="16">
@@ -147,6 +147,7 @@ export default {
   },
   data() {
     return {
+      providerName: "R",
       formModel: {
         opened: false,
         title: "创建角色",
@@ -534,15 +535,19 @@ export default {
       this.handleResetFormRole();
     },
     handleSubmitRole() {
-      let valid = this.validateRoleForm();
-      if (valid) {
-        if (this.formModel.mode === "create") {
-          this.doCreateRole();
-        }
-        if (this.formModel.mode === "edit") {
-          this.doEditRole();
+      let _valid = false;
+      this.$refs["formRole"].validate(valid => {
+        if (!valid) {
+          this.$Message.error("请完善表单信息");
+        } else {
+          if (this.formModel.mode === "create") {
+            this.doCreateRole();
+          }
+          if (this.formModel.mode === "edit") {
+            this.doEditRole();
+          }
         }
-      }
+      });
     },
     handleResetFormRole() {
       this.$refs["formRole"].resetFields();
@@ -562,18 +567,6 @@ export default {
         this.handleCloseFormWindow();
       });
     },
-    validateRoleForm() {
-      let _valid = false;
-      this.$refs["formRole"].validate(valid => {
-        if (!valid) {
-          this.$Message.error("请完善表单信息");
-          _valid = false;
-        } else {
-          _valid = true;
-        }
-      });
-      return _valid;
-    },
     doLoadRole(id) {
       loadRole({ id: id }).then(res => {
         this.formModel.fields = res.data;
@@ -634,7 +627,7 @@ export default {
       this.permissionModal.opened = true;
       var that = this;
       loadPermissionTree({
-        providerName: "Role",
+        providerName: that.providerName,
         providerKey: params.row.name
       }).then(res => {
         that.permissionModal.name = params.row.name;
@@ -667,7 +660,7 @@ export default {
         });
       });
 
-      editPermission("Role", that.permissionModal.name, {
+      editPermission(that.providerName, that.permissionModal.name, {
         permissions: permissions
       }).then(res => {
         this.$Message.success("配置权限成功!");
diff --git a/samples/Microservice/modules/app-microservice/src/view/rbac/user.vue b/samples/Microservice/modules/app-microservice/src/view/rbac/user.vue
index 0df4f2159f5..0588519f5ec 100644
--- a/samples/Microservice/modules/app-microservice/src/view/rbac/user.vue
+++ b/samples/Microservice/modules/app-microservice/src/view/rbac/user.vue
@@ -66,36 +66,36 @@
         <Row :gutter="16">
           <Col span="12">
             <FormItem label="登录名" prop="userName">
-              <Input v-model="formModel.fields.userName" placeholder="请输入登录名"/>
+              <Input v-model="formModel.fields.userName" placeholder="请输入登录名" />
             </FormItem>
           </Col>
-          <Col span="12" v-show="formModel.fields.id==''">
+          <Col span="12">
             <FormItem label="登录密码" prop="password">
-              <Input type="password" v-model="formModel.fields.password" placeholder="请输入登录密码"/>
+              <Input type="text" v-model="formModel.fields.password" placeholder="不修改时，请留空" />
             </FormItem>
           </Col>
         </Row>
         <Row :gutter="16">
           <Col span="12">
             <FormItem label="姓" prop="surname">
-              <Input v-model="formModel.fields.surname" placeholder="请输入姓"/>
+              <Input v-model="formModel.fields.surname" placeholder="请输入姓" />
             </FormItem>
           </Col>
           <Col span="12">
             <FormItem label="名" prop="name">
-              <Input v-model="formModel.fields.name" placeholder="请输入名"/>
+              <Input v-model="formModel.fields.name" placeholder="请输入名" />
             </FormItem>
           </Col>
         </Row>
         <Row :gutter="16">
           <Col span="12">
             <FormItem label="email" prop="email">
-              <Input type="text" v-model="formModel.fields.email" placeholder="请输入email"/>
+              <Input type="text" v-model="formModel.fields.email" placeholder="请输入email" />
             </FormItem>
           </Col>
           <Col span="12">
             <FormItem label="手机号" prop="phoneNumber">
-              <Input type="text" v-model="formModel.fields.phoneNumber" placeholder="请输入手机号"/>
+              <Input type="text" v-model="formModel.fields.phoneNumber" placeholder="请输入手机号" />
             </FormItem>
           </Col>
         </Row>
@@ -195,7 +195,7 @@
     >
       <Form ref="permissionRole" :model="permissionModal" label-position="left">
         <FormItem label="用户Id" prop="entityDisplayName" label-position="left">
-          <Input v-model="permissionModal.entityDisplayName" disabled/>
+          <Input v-model="permissionModal.entityDisplayName" disabled />
         </FormItem>
         <FormItem>
           <Row :gutter="16">
@@ -238,7 +238,7 @@ export default {
   },
   data() {
     return {
-      providerName:"User",
+      providerName: "U",
       permissionModal: {
         opened: false,
         rolePermission: [],
@@ -256,7 +256,7 @@ export default {
         organizationData: [],
         visible: false,
         fields: {
-          sendActivationEmail:false,
+          sendActivationEmail: false,
           id: "",
           password: "",
           userName: "",
@@ -284,13 +284,6 @@ export default {
               message: "请输入email格式,大于三个字符",
               min: 3
             }
-          ],
-          password: [
-            {
-              type: "string",
-              required: true,
-              message: "请输入密码!"
-            }
           ]
         }
       },
@@ -539,15 +532,19 @@ export default {
       this.getUserViewTrees(null);
     },
     handleSubmitUser() {
-      let valid = this.validateUserForm();
-      if (valid) {
-        if (this.formModel.mode === "create") {
-          this.doCreateUser();
-        }
-        if (this.formModel.mode === "edit") {
-          this.doEditUser();
+      let _valid = false;
+      this.$refs["formUser"].validate(valid => {
+        if (!valid) {
+          this.$Message.error("请完善表单信息");
+        } else {
+          if (this.formModel.mode === "create") {
+            this.doCreateUser();
+          }
+          if (this.formModel.mode === "edit") {
+            this.doEditUser();
+          }
         }
-      }
+      });
     },
     handleResetFormUser() {
       this.$refs["formUser"].resetFields();
@@ -579,21 +576,10 @@ export default {
         });
       });
     },
-    validateUserForm() {
-      let _valid = false;
-      this.$refs["formUser"].validate(valid => {
-        if (!valid) {
-          this.$Message.error("请完善表单信息");
-        } else {
-          _valid = true;
-        }
-      });
-      return _valid;
-    },
     doLoadUser(id) {
       loadUser({ id: id }).then(res => {
         this.formModel.fields = res.data;
-        this.formModel.fields.password = "t";
+        this.formModel.fields.password = "";
       });
     },
     handleDelete(params) {
@@ -625,13 +611,13 @@ export default {
       var defaults = [];
       loadSimpleList().then(res => {
         var result = [];
-        for (var i = 0; i < res.data.length; i++) {
+        for (var i = 0; i < res.data.items.length; i++) {
           result.push({
-            key: res.data[i].name,
-            label: res.data[i].name
+            key: res.data.items[i].name,
+            label: res.data.items[i].name
           });
-          if (res.data[i].isDefault == true) {
-            defaults.push(res.data[i].name);
+          if (res.data.items[i].isDefault == true) {
+            defaults.push(res.data.items[i].name);
           }
         }
         this.formAssignRole.roles = result;
@@ -674,7 +660,7 @@ export default {
       this.permissionModal.opened = true;
       var that = this;
       loadPermissionTree({
-        providerName:this.providerName,
+        providerName: this.providerName,
         providerKey: params.row.id
       }).then(res => {
         that.permissionModal.name = params.row.id;
@@ -692,18 +678,22 @@ export default {
     isDisabled(isGranted, grantedProviders) {
       return (
         isGranted &&
-        grantedProviders.filter(it => it.providerName != this.providerName).length > 0
+        grantedProviders.filter(it => it.providerName != this.providerName)
+          .length > 0
       );
     },
     getShownName(item) {
-      if (!this.isDisabled(item.isGranted,item.grantedProviders)) {
-         return item.displayName;
+      if (!this.isDisabled(item.isGranted, item.grantedProviders)) {
+        return item.displayName;
       }
       return (
         item.displayName +
         "(" +
         item.grantedProviders
-          .filter(it => it.providerName != this.providerName).map(r=>{return r.providerName})
+          .filter(it => it.providerName != this.providerName)
+          .map(r => {
+            return r.providerName;
+          })
           .join(",") +
         ")"
       );