😎同步代码
This commit is contained in:
zuohuaijun
parent
de7d688e9a
commit
012867a4ee
@ -103,7 +103,7 @@ public abstract class EntityBaseData : EntityBase, IOrgIdFilter
|
||||
[Newtonsoft.Json.JsonIgnore]
|
||||
[System.Text.Json.Serialization.JsonIgnore]
|
||||
[Navigate(NavigateType.OneToOne, nameof(CreateOrgId))]
|
||||
public virtual SysOrg SysOrg { get; set; }
|
||||
public virtual SysOrg CreateOrg { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建者机构名称
|
||||
@ -129,7 +129,7 @@ public abstract class EntityTenant : EntityBase, ITenantIdFilter
|
||||
[Newtonsoft.Json.JsonIgnore]
|
||||
[System.Text.Json.Serialization.JsonIgnore]
|
||||
[Navigate(NavigateType.OneToOne, nameof(TenantId))]
|
||||
public SysTenant SysTenant { get; set; }
|
||||
public SysTenant Tenant { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -149,7 +149,7 @@ public abstract class EntityTenantId : EntityBaseId, ITenantIdFilter
|
||||
[Newtonsoft.Json.JsonIgnore]
|
||||
[System.Text.Json.Serialization.JsonIgnore]
|
||||
[Navigate(NavigateType.OneToOne, nameof(TenantId))]
|
||||
public SysTenant SysTenant { get; set; }
|
||||
public SysTenant Tenant { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -169,5 +169,5 @@ public abstract class EntityTenantBaseData : EntityBaseData, ITenantIdFilter
|
||||
[Newtonsoft.Json.JsonIgnore]
|
||||
[System.Text.Json.Serialization.JsonIgnore]
|
||||
[Navigate(NavigateType.OneToOne, nameof(TenantId))]
|
||||
public SysTenant SysTenant { get; set; }
|
||||
public SysTenant Tenant { get; set; }
|
||||
}
|
||||
@ -110,4 +110,9 @@ public class UploadFileFromBase64Input
|
||||
/// 是否公开
|
||||
/// </summary>
|
||||
public bool IsPublic { get; set; } = false;
|
||||
|
||||
/// <summary>
|
||||
/// 业务Id
|
||||
/// </summary>
|
||||
public long? DataId { get; set; }
|
||||
}
|
||||
@ -561,6 +561,6 @@ public static class CommonHelper
|
||||
public static bool IsMobile(string userAgent)
|
||||
{
|
||||
var mobilePatterns = new[] { "android.*mobile", "iphone", "ipod", "windows phone", "blackberry", "nokia", "mobile", "opera mini", "opera mobi", "palm", "webos", "bb\\d+", "meego" };
|
||||
return mobilePatterns.Any(pattern => Regex.IsMatch(userAgent, pattern, RegexOptions.IgnoreCase));
|
||||
return mobilePatterns.Any(pattern => Regex.IsMatch(userAgent ?? "", pattern, RegexOptions.IgnoreCase));
|
||||
}
|
||||
}
|
||||
@ -382,6 +382,7 @@ public class Startup : AppStartup
|
||||
var contentTypeProvider = FS.GetFileExtensionContentTypeProvider();
|
||||
// contentTypeProvider.Mappings[".文件后缀"] = "MIME 类型";
|
||||
var cpMappings = App.GetConfig<Dictionary<string, string>>("StaticContentTypeMappings");
|
||||
var uploadOption = App.GetConfig<UploadOptions>("Upload");
|
||||
if (cpMappings != null)
|
||||
{
|
||||
if (cpMappings.TryGetValue(".*", out string value))
|
||||
@ -401,6 +402,7 @@ public class Startup : AppStartup
|
||||
contentTypeProvider.Mappings[key] = cpMappings[key];
|
||||
app.UseStaticFiles(new StaticFileOptions
|
||||
{
|
||||
FileProvider = uploadOption.Path.StartsWith('/') ? new PhysicalFileProvider("/") : null,
|
||||
ContentTypeProvider = contentTypeProvider
|
||||
});
|
||||
}
|
||||
@ -409,6 +411,7 @@ public class Startup : AppStartup
|
||||
{
|
||||
app.UseStaticFiles(new StaticFileOptions
|
||||
{
|
||||
FileProvider = uploadOption.Path.StartsWith('/') ? new PhysicalFileProvider("/") : null,
|
||||
ContentTypeProvider = contentTypeProvider
|
||||
});
|
||||
}
|
||||
|
||||
@ -65,7 +65,6 @@
|
||||
<el-button icon="ele-Coin" size="small" text type="danger" @click="createTenantData(row)" :v-auth="'sysTenant/createDb'" v-if="row.tenantType === 0"> 创建租户数据 </el-button>
|
||||
<el-button icon="ele-Coin" size="small" text type="danger" @click="createTenantDb(row)" :v-auth="'sysTenant/createDb'" v-else> 创建租户库表 </el-button>
|
||||
<el-button icon="ele-Menu" size="small" text type="primary" @click="openGrantMenu(row)" v-auth="'sysTenant/grantMenu'"> 授权菜单 </el-button>
|
||||
<el-button icon="ele-Position" text type="success" v-auth="'sysTenant/goLoginUser'" @click="goUserLogin(row)">{{ $t('message.list.goTenantUserLogin') }}</el-button>
|
||||
<el-button icon="ele-Link" size="small" text type="primary" @click="openGrantApi(row)"> 接口黑名单 </el-button>
|
||||
</template>
|
||||
</vxe-grid>
|
||||
@ -94,7 +93,6 @@ import ModifyRecord from '/@/components/table/modifyRecord.vue';
|
||||
import { getAPI } from '/@/utils/axios-utils';
|
||||
import { SysTenantApi } from '/@/api-services/system/api';
|
||||
import { PageTenantInput, TenantOutput } from '/@/api-services/system/models';
|
||||
import { reLoadLoginAccessToken } from '/@/utils/request';
|
||||
|
||||
const xGrid = ref<VxeGridInstance>();
|
||||
const editTenantRef = ref<InstanceType<typeof EditTenant>>();
|
||||
@ -312,17 +310,4 @@ const syncTenantDb = () => {
|
||||
})
|
||||
.catch(() => {});
|
||||
};
|
||||
|
||||
// 进入用户端
|
||||
const goUserLogin = (row: any) => {
|
||||
ElMessageBox.confirm(`确定要进入【${row.realName}】用户端?`, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
}).then(() =>
|
||||
getAPI(SysTenantApi)
|
||||
.apiSysTenantGoLoginUserPost({ id: row.id })
|
||||
.then((res) => reLoadLoginAccessToken(res.data.result))
|
||||
);
|
||||
};
|
||||
</script>
|
||||
|
||||
@ -88,9 +88,6 @@
|
||||
<el-tooltip :content="$t('message.list.copy')" placement="top">
|
||||
<el-button icon="ele-CopyDocument" text type="primary" v-auth="'sysUser/add'" @click="openCopyMenu(row)"> </el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip :content="$t('message.list.goUserLogin')" placement="top">
|
||||
<el-button icon="ele-Position" text type="success" v-auth="'sysTenant/goLoginUser'" @click="goUserLogin(row)"> </el-button>
|
||||
</el-tooltip>
|
||||
|
||||
<el-button icon="ele-RefreshLeft" text type="danger" v-auth="'sysUser/resetPwd'" @click="resetQueryPwd(row)">{{ $t('message.list.resetPassword') }}</el-button>
|
||||
<el-button icon="ele-Unlock" text type="primary" v-auth="'sysUser/unlockLogin'" @click="handleUnlock(row)">{{ $t('message.list.unlockAccount') }}</el-button>
|
||||
@ -122,9 +119,8 @@ import EditUser from '/@/views/system/user/component/editUser.vue';
|
||||
import ModifyRecord from '/@/components/table/modifyRecord.vue';
|
||||
|
||||
import { getAPI } from '/@/utils/axios-utils';
|
||||
import { SysUserApi, SysOrgApi, SysTenantApi } from '/@/api-services/system/api';
|
||||
import { SysUserApi, SysOrgApi } from '/@/api-services/system/api';
|
||||
import { SysOrg, PageTenantInput, UserOutput, UpdateUserInput } from '/@/api-services/system/models';
|
||||
import { reLoadLoginAccessToken } from '/@/utils/request';
|
||||
|
||||
const { t } = useI18n();
|
||||
const xGrid = ref<VxeGridInstance>();
|
||||
@ -338,17 +334,4 @@ const handleNodeChange = async (node: any) => {
|
||||
state.queryParams.phone = undefined;
|
||||
await handleQuery();
|
||||
};
|
||||
|
||||
// 进入用户端
|
||||
const goUserLogin = (row: any) => {
|
||||
ElMessageBox.confirm(`确定要进入【${row.realName}】用户端?`, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
}).then(() =>
|
||||
getAPI(SysTenantApi)
|
||||
.apiSysTenantGoLoginUserPost({ id: row.id })
|
||||
.then((res) => reLoadLoginAccessToken(res.data.result))
|
||||
);
|
||||
};
|
||||
</script>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user