zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改配置

集成Redis
郑勃旭 2 years ago
parent
d2ae5f1a6b
commit
fdeb8126ec
4 changed files with 43 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.EntityFrameworkCore/Menus/MenuDbContextModelCreatingExtensions.cs
  2. 4
      fe/PC/public/config.js
  3. 70
      fe/PC/src/api/wms-auth.js
  4. 6
      fe/PC/src/store/modules/user.js

2
be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.EntityFrameworkCore/Menus/MenuDbContextModelCreatingExtensions.cs
View File

@ -27,7 +27,7 @@ public static class MenuDbContextModelCreatingExtensions
b.Property(q => q.Portal).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
b.Property(q => q.ParentCode).HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.Permission).HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.Component).HasMaxLength(SfsPropertyConst.CodeLength);
b.Property(q => q.Component).HasMaxLength(SfsPropertyConst.DescLength);
b.Property(q => q.Sort);
b.Property(q => q.GroupSort);
b.Property(q => q.CountUrl);

4
fe/PC/public/config.js
View File

@ -1,6 +1,6 @@
// dev
window.SITE_CONFIG['base'] = 'http://localhost:21093'
window.SITE_CONFIG['user'] = 'http://localhost:21093/api/auth'
window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:21093'
window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:21093/api/auth'
window.SITE_CONFIG['print'] = 'print'
window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:21093'
window.SITE_CONFIG['warehouseCode'] = 'T8'

70
fe/PC/src/api/wms-auth.js
View File

@ -3,7 +3,7 @@ let baseURL = localStorage.getItem('user')
export function login(data) {
return request({
url: baseURL + '/api/account/login',
url: baseURL + '/account/login',
method: 'post',
data
})
@ -11,21 +11,21 @@ export function login(data) {
export function token(data) {
return request({
url: baseURL + '/connect/token',
url: baseURL + '/token',
method: 'post',
data
})
}
export function getInfo() {
return request({
url: baseURL + '/api/abp/application-configuration',
url: baseURL + '/abp/application-configuration',
method: 'get',
})
}
export function logout() {
return request({
url: baseURL + '/api/account/logout',
url: baseURL + '/account/logout',
method: 'get'
})
}
@ -33,7 +33,7 @@ export function logout() {
//获取PC菜单
export function getWebMenu(params) {
return request({
url: baseURL + '/api/auth/user-menu/web-menu/' + params.userId,
url: baseURL + '/auth/user-menu/web-menu/' + params.userId,
method: 'get',
params: params
})
@ -42,7 +42,7 @@ export function getWebMenu(params) {
//新建
export function postCreate(data) {
return request({
url: baseURL + '/api/identity/users',
url: baseURL + '/identity/users',
method: 'post',
data
})
@ -50,21 +50,21 @@ export function postCreate(data) {
//获取全部角色 | 用户信息维护
export function usersroles() {
return request({
url: baseURL + '/api/identity/users/assignable-roles',
url: baseURL + '/identity/users/assignable-roles',
method: 'get'
})
}
//获取当前角色 | 用户信息维护
export function getusersID(data) {
return request({
url: baseURL + '/api/identity/users/' + data + '/roles',
url: baseURL + '/identity/users/' + data + '/roles',
method: 'get'
})
}
//编辑
export function postUpdate(data, id) {
return request({
url: baseURL + '/api/identity/users/' + id,
url: baseURL + '/identity/users/' + id,
method: 'put',
data
})
@ -72,14 +72,14 @@ export function postUpdate(data, id) {
//删除
export function postDelete(id) {
return request({
url: baseURL + '/api/identity/users/' + id,
url: baseURL + '/identity/users/' + id,
method: 'delete',
})
}
//分页+筛选
export function getPageList(data) {
return request({
url: baseURL + '/api/identity/users',
url: baseURL + '/identity/users',
method: 'get',
params: data
})
@ -87,7 +87,7 @@ export function getPageList(data) {
//重置密码功能 | 用户信息维护
export function putpassword(id) {
return request({
url: baseURL + '/api/account/reset-password/' + id,
url: baseURL + '/account/reset-password/' + id,
method: 'put'
})
}
@ -95,7 +95,7 @@ export function putpassword(id) {
//获取全部权限（包含PDA+pc） | PC菜单信息维护 | PDA菜单信息维护 | PDA用户权限维护 | PC角色权限维护
export function menuPermissions(data) {
return request({
url: baseURL + '/api/auth/menu/list',
url: baseURL + '/auth/menu/list',
method: 'post',
data
})
@ -103,7 +103,7 @@ export function menuPermissions(data) {
//新建菜单 | PC菜单信息维护 | PDA菜单信息维护
export function postCreateMenu(data) {
return request({
url: baseURL + '/api/auth/menu',
url: baseURL + '/auth/menu',
method: 'post',
data
})
@ -111,7 +111,7 @@ export function postCreateMenu(data) {
//编辑菜单 | PC菜单信息维护 | PDA菜单信息维护
export function postUpdateMenu(data, id) {
return request({
url: baseURL + '/api/auth/menu/' + id,
url: baseURL + '/auth/menu/' + id,
method: 'put',
data
})
@ -119,21 +119,21 @@ export function postUpdateMenu(data, id) {
//删除菜单 | PC菜单信息维护 | PDA菜单信息维护
export function postDeleteMenu(id) {
return request({
url: baseURL + '/api/auth/menu/' + id,
url: baseURL + '/auth/menu/' + id,
method: 'delete',
})
}
//获取菜单详情 | PC菜单信息维护 | PDA菜单信息维护
export function getDetailedMenu(id) {
return request({
url: baseURL + '/api/auth/menu/' + id,
url: baseURL + '/auth/menu/' + id,
method: 'get',
})
}
//获取用户全部工作组 | 用户工作组对应关系
// export function workgroupPermissions() {
// return request({
// url: baseURL + '/api/auth/user-workgroup/get-list',
// url: baseURL + '/auth/user-workgroup/get-list',
// method: 'get',
// params:{
// SkipCount:0,
@ -144,7 +144,7 @@ export function getDetailedMenu(id) {
//获取已有权限 | PDA用户权限维护
export function UserPermissions(id, url) {
return request({
url: baseURL + '/api/' + url + '/' + id.userId,
url: baseURL + '/' + url + '/' + id.userId,
method: 'get',
params:id
})
@ -153,7 +153,7 @@ export function UserPermissions(id, url) {
//保存权限 | PDA用户权限维护
export function SetUserPermissions(data, id, url) {
return request({
url: baseURL + '/api/' + url + '/' + id.userId,
url: baseURL + '/' + url + '/' + id.userId,
method: 'put',
params:id,
data
@ -163,7 +163,7 @@ export function SetUserPermissions(data, id, url) {
//获取用户已有工作组 | 用户工作组对应关系
export function userWorkgroupPermissions(id) {
return request({
url: baseURL + '/api/auth/user-workgroup/get-user-work-group-by-user-id',
url: baseURL + '/auth/user-workgroup/get-user-work-group-by-user-id',
method: 'get',
params:id
})
@ -172,7 +172,7 @@ export function userWorkgroupPermissions(id) {
//保存用户与工作组关系 | 用户工作组对应关系
export function SetUserWorkgroupPermissions(data,id) {
return request({
url: baseURL + '/api/auth/user-workgroup/add-many',
url: baseURL + '/auth/user-workgroup/add-many',
method: 'post',
params:id,
data
@ -181,14 +181,14 @@ export function SetUserWorkgroupPermissions(data,id) {
//加载用户登录信息
export function loadLoginUserInfo() {
return request({
url: baseURL + '/api/identity/my-profile',
url: baseURL + '/identity/my-profile',
method: 'get'
})
}
//修改登录用户基本信息
export function putLoginUserInfo(data) {
return request({
url: baseURL + '/api/identity/my-profile',
url: baseURL + '/identity/my-profile',
method: 'put',
data
})
@ -196,7 +196,7 @@ export function putLoginUserInfo(data) {
//修改登录用户的密码-强密码规则
export function postLoginUserInfo(data) {
return request({
url: baseURL + '/api/identity/my-profile/change-password',
url: baseURL + '/identity/my-profile/change-password',
method: 'post',
data
})
@ -205,7 +205,7 @@ export function postLoginUserInfo(data) {
//获取部门列表 | 用户信息维护 | 部门信息维护
export function departmentList(data) {
return request({
url: baseURL + '/api/auth/department/list',
url: baseURL + '/auth/department/list',
method: 'post',
data
})
@ -231,7 +231,7 @@ export function authCreate(data, url) {
data.worker = store.getters.name.userName
}
return request({
url: baseURL + '/api/' + url,
url: baseURL + '/' + url,
method: 'post',
data
})
@ -239,7 +239,7 @@ export function authCreate(data, url) {
//编辑 | 部门信息维护
export function authUpdate(data, id, url) {
return request({
url: baseURL + '/api/' + url + '/' + id,
url: baseURL + '/' + url + '/' + id,
method: 'put',
data
})
@ -247,7 +247,7 @@ export function authUpdate(data, id, url) {
//删除 | 部门信息维护
export function authDelete(id, url) {
return request({
url: baseURL + '/api/' + url + '/' + id,
url: baseURL + '/' + url + '/' + id,
method: 'delete',
})
}
@ -256,7 +256,7 @@ export function authDelete(id, url) {
// 创建 | PC角色权限维护
export function postCreateRoles(data) {
return request({
url: baseURL + '/api/identity/roles',
url: baseURL + '/identity/roles',
method: 'post',
data
})
@ -264,7 +264,7 @@ export function postCreateRoles(data) {
//编辑 | PC角色权限维护
export function postUpdateRoles(data, id) {
return request({
url: baseURL+'/api/identity/roles/' + id,
url: baseURL+'/identity/roles/' + id,
method: 'put',
data
})
@ -272,14 +272,14 @@ export function postUpdateRoles(data, id) {
//删除 | PC角色权限维护
export function postDeleteRoles(id) {
return request({
url: baseURL + '/api/identity/roles/' + id,
url: baseURL + '/identity/roles/' + id,
method: 'delete',
})
}
// 描述修改 | PC角色权限维护
export function saveOrUpdateDescribe(params,id) {
return request({
url: baseURL + '/api/identity/roles/' + id + '/description',
url: baseURL + '/identity/roles/' + id + '/description',
method: 'post',
params: params
})
@ -287,7 +287,7 @@ export function saveOrUpdateDescribe(params,id) {
//分页+筛选 | PC角色权限维护
export function getPageListRoles(data) {
return request({
url: baseURL + '/api/identity/roles',
url: baseURL + '/identity/roles',
method: 'get',
params: data
})
@ -296,7 +296,7 @@ export function getPageListRoles(data) {
//获取权限模板 | PC角色权限维护
export function getpermissionsRoles(data) {
return request({
url: baseURL +'/api/permission-management/permissions',
url: baseURL +'/permission-management/permissions',
method: 'get',
params: data
})

6
fe/PC/src/store/modules/user.js
View File

@ -65,7 +65,11 @@ const actions = {
let tokenData = qs.stringify(parseData)
return new Promise((resolve, reject) => {
// login(loginData).then(response => {
token(tokenData).then(response => {
let params = {
password: password,
userName: username
}
token(params).then(response => {
const {
access_token,
token_type

Write Preview
Loading…
Cancel
Save