Skip to content

Commit

Permalink
修改前端api地址问题及验证规则,新增数据库文件
Browse files Browse the repository at this point in the history
  • Loading branch information
luoyunchong committed Feb 23, 2020
1 parent 732d59c commit f57cfc2
Show file tree
Hide file tree
Showing 14 changed files with 231 additions and 268 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public override void PreConfigureServices(ServiceConfigurationContext context)
{
mvcBuilder.AddApplicationPartIfNotExists(typeof(AbpPermissionManagementHttpApiModule).Assembly);
});

}

public override void ConfigureServices(ServiceConfigurationContext context)
Expand Down
Binary file removed samples/Microservice/databases/Ms_Identity.zip
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
Expand All @@ -15,6 +15,6 @@ export const loadPermissionTree = (data) => {
return axios.request({
url: 'abp/permissions',
method: 'get'
,params:data
, params: data
})
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ 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
})
}

export const changePassword = (data) => {
return axios.request({
url: 'identity/profile/changePassword',
url: 'identity/my-profile/changePassword',
method: 'post',
params:data
params: data
})
}
20 changes: 10 additions & 10 deletions samples/Microservice/modules/app-microservice/src/api/rbac/role.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
Expand All @@ -20,15 +20,15 @@ export const createRole = (data) => {
//loadRole
export const loadRole = (data) => {
return axios.request({
url: 'identity/identityRole/' + data.id,
url: 'identity/roles/' + data.id,
method: 'get'
})
}

// editRole
export const editRole = (data) => {
return axios.request({
url: 'identity/identityRole/'+data.id,
url: 'identity/roles/' + data.id,
method: 'put',
data
})
Expand All @@ -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'
})
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
Expand All @@ -20,15 +20,15 @@ export const createUser = (data) => {
//loadUser
export const loadUser = (data) => {
return axios.request({
url: 'identity/identityUser/' + data.id,
url: 'identity/users/' + data.id,
method: 'get'
})
}

// editUser
export const editUser = (data) => {
return axios.request({
url: 'identity/identityUser/'+data.id,
url: 'identity/users/' + data.id,
method: 'put',
data
})
Expand All @@ -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'
})
}
Expand All @@ -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
})
Expand Down
10 changes: 5 additions & 5 deletions samples/Microservice/modules/app-microservice/src/api/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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',
Expand Down
Loading

0 comments on commit f57cfc2

Please sign in to comment.