sozsoft/erp-platform
1
0
Fork 0
Code Issues 6 Pull requests Projects 3 Releases Packages Wiki Activity Actions

Login Tenant Arızası

Browse source
This commit is contained in:
Sedat ÖZTÜRK 2025-05-23 17:45:10 +03:00
parent d64a419396
commit 60bf112fd7
24 changed files with 26 additions and 1834 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
api/src/Kurs.Platform.DbMigrator/Seeds/GlobalSearchSeeder.cs
View file

@ -22,27 +22,6 @@ public class GlobalSearchSeeder : IDataSeedContributor, ITransientDependency
#region GlobalSearch
await _globalSearchRepository.InsertManyAsync([
new() {
System = "KIM",
Group = "Firma Listesi",
Term = "BRU TEXTILES",
Weight = "0.9",
Url = "/list/List-0009"
},
new() {
System = "KIM",
Group = "Sipariş Listesi",
Term = "BRUTEX_00002",
Weight = "0.5",
Url = "/list/List-0009"
},
new() {
System = "KIM",
Group = "Sipariş Listesi",
Term = "BRUTEX_00003",
Weight = "0.8",
Url = "/list/List-0009"
},
new() {
System = "Platform",
Group = "Setting Definitions",

1445
api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs
View file

File diff suppressed because it is too large Load diff

66
api/src/Kurs.Platform.DbMigrator/Seeds/MenuSeeder.cs
View file

@ -455,72 +455,6 @@ public class MenuSeeder : IDataSeedContributor, ITransientDependency
RequiredPermissionName = AppCodes.PublicApis
});
#endregion
#region CRM
//CRM
var menuCRM = await _repository.InsertAsync(new Menu
{
Code = AppCodes.Crm.Default,
DisplayName = AppCodes.Crm.Default,
Order = 4,
IsDisabled = false,
ParentCode = null,
Icon = "FcContacts",
Target = null,
ElementId = null,
CssClass = null
});
//Orders
await _repository.InsertAsync(new Menu
{
Code = AppCodes.Crm.Orders,
DisplayName = AppCodes.Crm.Orders,
Order = 1,
IsDisabled = false,
ParentCode = menuCRM.Code,
Icon = "FcCustomerSupport",
Target = null,
ElementId = null,
CssClass = null,
Url = $"/list/{PlatformConsts.ListFormCodes.Order}",
RequiredPermissionName = AppCodes.Crm.Orders
});
//Complaints
await _repository.InsertAsync(new Menu
{
Code = AppCodes.Crm.Complaints,
DisplayName = AppCodes.Crm.Complaints,
Order = 2,
IsDisabled = false,
ParentCode = menuCRM.Code,
Icon = "FcCollaboration",
Target = null,
ElementId = null,
CssClass = null,
Url = $"/list/{PlatformConsts.ListFormCodes.Complaint}",
RequiredPermissionName = AppCodes.Crm.Complaints
});
//Shipments
await _repository.InsertAsync(new Menu
{
Code = AppCodes.Crm.Shipments,
DisplayName = AppCodes.Crm.Shipments,
Order = 3,
IsDisabled = false,
ParentCode = menuCRM.Code,
Icon = "FcShipped",
Target = null,
ElementId = null,
CssClass = null,
Url = $"/list/{PlatformConsts.ListFormCodes.Shipment}",
RequiredPermissionName = AppCodes.Crm.Shipments
});
#endregion
}
}

69
api/src/Kurs.Platform.DbMigrator/Seeds/PermissionSeeder.cs
View file

@ -685,75 +685,6 @@ public class PermissionSeeder : IDataSeedContributor, ITransientDependency
));
}
#endregion
#region Crm
await repositoryGroup.InsertAsync(new PermissionGroupDefinitionRecord
{
Name = AppCodes.Crm.Default,
DisplayName = AppCodes.Crm.Default
});
var permOrders = await repository.InsertAsync(
GetNewPermission(
AppCodes.Crm.Default,
AppCodes.Crm.Orders,
AppCodes.Crm.Orders
));
foreach (var item in CUDE)
{
permissionName = AppCodes.Crm.Orders + "." + item;
await repository.InsertAsync(
GetNewPermission(
AppCodes.Crm.Default,
permissionName,
item,
permOrders.Name
));
}
//Müşteri Şikayetleri
var permComplaints = await repository.InsertAsync(
GetNewPermission(
AppCodes.Crm.Default,
AppCodes.Crm.Complaints,
AppCodes.Crm.Complaints
));
foreach (var item in CUDE)
{
permissionName = AppCodes.Crm.Complaints + "." + item;
await repository.InsertAsync(
GetNewPermission(
AppCodes.Crm.Default,
permissionName,
item,
permComplaints.Name
));
}
var permShipments = await repository.InsertAsync(
GetNewPermission(
AppCodes.Crm.Default,
AppCodes.Crm.Shipments,
AppCodes.Crm.Shipments
));
foreach (var item in CUDE)
{
permissionName = AppCodes.Crm.Shipments + "." + item;
await repository.InsertAsync(
GetNewPermission(
AppCodes.Crm.Default,
permissionName,
item,
permShipments.Name
));
}
#endregion
}
public static PermissionDefinitionRecord GetNewPermission(

4
api/src/Kurs.Platform.DbMigrator/Seeds/PlatformIdentityDataSeeder.cs
View file

@ -98,10 +98,6 @@ public class PlatformIdentityDataSeeder : IdentityDataSeeder
{
await permissionGrantRepository.InsertManyAsync(
[
new(Guid.NewGuid(), AbpIdentity.Permissions.Default, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, tenantId),
new(Guid.NewGuid(), AbpIdentity.Permissions.Create, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, tenantId),
new(Guid.NewGuid(), AbpIdentity.Permissions.Update, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, tenantId),
new(Guid.NewGuid(), AbpIdentity.Permissions.Delete, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, tenantId),
new(Guid.NewGuid(), IdentityPermissions.Roles.Default, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, tenantId),
new(Guid.NewGuid(), IdentityPermissions.Roles.Create, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, tenantId),
new(Guid.NewGuid(), IdentityPermissions.Roles.Delete, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, tenantId),

2
api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.Dev.json
View file

@ -3,7 +3,7 @@
{
"code": "Default",
"dataSourceType": 2,
"connectionString": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=Demo;"
"connectionString": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=KURS;"
}
]
}

2
api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.Production.json
View file

@ -3,7 +3,7 @@
{
"code": "Default",
"dataSourceType": 2,
"connectionString": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=Demo;"
"connectionString": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=KURS;"
}
]
}

84
api/src/Kurs.Platform.DbMigrator/Seeds/SeederData.json
View file

@ -906,30 +906,6 @@
"en": "Public Apis",
"tr": "Genel Api'ler"
},
{
"resourceName": "Platform",
"key": "App.Crm",
"en": "CRM",
"tr": "MIY"
},
{
"resourceName": "Platform",
"key": "App.Crm.Orders",
"en": "Orders",
"tr": "Sipariş Listesi"
},
{
"resourceName": "Platform",
"key": "App.Crm.Complaints",
"en": "Complaints",
"tr": "Şikayet Listesi"
},
{
"resourceName": "Platform",
"key": "App.Crm.Shipments",
"en": "Shipments",
"tr": "Yükleme Listesi"
},
{
"resourceName": "Platform",
"key": "Abp.Identity.NotificationSettings",
@ -4080,12 +4056,7 @@
{
"code": "Default",
"dataSourceType": 2,
"connectionString": "User ID=sa;Password=NvQp8s@l;Host=localhost;Port=5432;Database=Demo;"
},
{
"code": "KIM",
"dataSourceType": 1,
"connectionString": "Server=192.168.1.61;Database=KADIFETEKS;User Id=sa;password=Smgc3519;Trusted_Connection=False;TrustServerCertificate=True;"
"connectionString": "User ID=sa;Password=NvQp8s@l;Host=localhost;Port=5432;Database=KURS;"
}
],
"Settings": [
@ -4957,59 +4928,6 @@
}
],
"Charts": [
{
"chartCode": "Chart-0001",
"cultureName": "en",
"dataSourceCode": "KIM",
"userId": "",
"roleId": "",
"isTenant": true,
"IsOrganizationUnit": true,
"title": {
"text": "Top Selling",
"subtitle": ""
},
"dataSource": {
"query": "SELECT TOP 10 \"Kumaslar_Siparis_Yukleme_Sub\".\"DesenAdi\", SUM(\"Kumaslar_Siparis_Yukleme_Sub\".\"SipMiktar\") AS \"SipMiktar\", \"OrganizationUnitId\" FROM \"Kumaslar_Siparis_Yukleme\" WITH (NOLOCK) INNER JOIN \"Kumaslar_Siparis_Yukleme_Sub\" WITH (NOLOCK) ON \"Kumaslar_Siparis_Yukleme\".\"YuklemeID\" = \"Kumaslar_Siparis_Yukleme_Sub\".\"YuklemeID\" INNER JOIN \"Firmalar\" WITH (NOLOCK) ON \"Kumaslar_Siparis_Yukleme\".\"FirmaKodu\" = \"Firmalar\".\"FirmaKodu\" WHERE NOT \"OrganizationUnitId\" IS NULL AND CONVERT(DATE, \"Kumaslar_Siparis_Yukleme\".\"YuklemeTarihi\", 103) BETWEEN @startDate AND @endDate GROUP BY \"Kumaslar_Siparis_Yukleme_Sub\".\"DesenAdi\", \"OrganizationUnitId\" ORDER BY SUM(\"Kumaslar_Siparis_Yukleme_Sub\".\"SipMiktar\") DESC"
},
"series": [
{
"name": "Seri1",
"argumentField": "DesenAdi",
"valueField": "SipMiktar",
"type": "bar",
"label": {
"visible": true
}
}
],
"crosshair": {
"enabled": true,
"color": "#949494",
"dashStyle": "dot",
"horizontalLine": {
"dashStyle": "solid"
}
},
"size": {
"width": 500,
"height": 250
},
"argumentAxis": {
"label": {
"displayMode": "rotate"
}
},
"permission": {
"c": "App.Listforms.Chart.Create",
"r": "App.Listforms.Chart",
"u": "App.Listforms.Chart.Update",
"d": "App.Listforms.Chart.Delete"
},
"export": {
"enabled": true
}
},
{
"chartCode": "Chart-0002",
"cultureName": "en",

4
api/src/Kurs.Platform.DbMigrator/appsettings.Dev.json
View file

@ -1,7 +1,7 @@
{
"ConnectionStrings": {
// "Default": "Server=sql;Database=Demo;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;TrustServerCertificate=True;"
"Default": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=Demo;"
// "Default": "Server=sql;Database=KURS;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;TrustServerCertificate=True;"
"Default": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=KURS;"
},
"Redis": {
"IsEnabled": "true",

4
api/src/Kurs.Platform.DbMigrator/appsettings.Production.json
View file

@ -1,7 +1,7 @@
{
"ConnectionStrings": {
// "Default": "Server=sql;Database=Demo;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;TrustServerCertificate=True;"
"Default": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=Demo;"
// "Default": "Server=sql;Database=KURS;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;TrustServerCertificate=True;"
"Default": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=KURS;"
},
"Redis": {
"IsEnabled": "true",

4
api/src/Kurs.Platform.DbMigrator/appsettings.json
View file

@ -1,8 +1,8 @@
{
"Seed": false,
"ConnectionStrings": {
// "Default": "Server=localhost;Database=Demo;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;TrustServerCertificate=True;"
"Default": "User ID=sa;Password=NvQp8s@l;Host=localhost;Port=5432;Database=Demo;"
// "Default": "Server=localhost;Database=KURS;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;TrustServerCertificate=True;"
"Default": "User ID=sa;Password=NvQp8s@l;Host=localhost;Port=5432;Database=KURS;"
},
"Redis": {
"IsEnabled": "true",

7
api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs
View file

@ -282,13 +282,6 @@ public static class PlatformConsts
public const string Get = Default + ".Get";
public const string Post = Default + ".Post";
}
public static class Crm
{
public const string Default = Prefix.App + ".Crm";
public const string Orders = Default + ".Orders";
public const string Complaints = Default + ".Complaints"; //Müşteri Şikayetleri
}
}
public static class ListFormCodes

8
api/src/Kurs.Platform.Domain/Data/SeedConsts.cs
View file

@ -350,14 +350,6 @@ public static class SeedConsts
public const string IpRestrictions = Prefix.App + ".IpRestrictions";
public const string PublicApis = Prefix.App + ".PublicApis";
public static class Crm
{
public const string Default = Prefix.App + ".Crm";
public const string Orders = Default + ".Orders";
public const string Complaints = Default + ".Complaints"; //Müşteri Şikayetleri
public const string Shipments = Default + ".Shipments";
}
}
}

4
api/src/Kurs.Platform.EntityFrameworkCore/DatabaseMigrationEventHandlerBase.cs
View file

@ -244,10 +244,6 @@ public class DatabaseMigrationEventHandler :
{
await PermissionGrantRepository.InsertManyAsync(
[
new(Guid.NewGuid(), AbpIdentity.Permissions.Default, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, eventData.TenantId),
new(Guid.NewGuid(), AbpIdentity.Permissions.Create, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, eventData.TenantId),
new(Guid.NewGuid(), AbpIdentity.Permissions.Update, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, eventData.TenantId),
new(Guid.NewGuid(), AbpIdentity.Permissions.Delete, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, eventData.TenantId),
new(Guid.NewGuid(), IdentityPermissions.Roles.Default, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, eventData.TenantId),
new(Guid.NewGuid(), IdentityPermissions.Roles.Create, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, eventData.TenantId),
new(Guid.NewGuid(), IdentityPermissions.Roles.Delete, "R", PlatformConsts.AbpIdentity.User.AdminRoleName, eventData.TenantId),

4
api/src/Kurs.Platform.HttpApi.Host/appsettings.Dev.json
View file

@ -8,8 +8,8 @@
"CdnPath": "/etc/api/cdn"
},
"ConnectionStrings": {
// "Default": "Server=sql;Database=Demo;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;TrustServerCertificate=True;"
"Default": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=Demo;"
// "Default": "Server=sql;Database=KURS;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;TrustServerCertificate=True;"
"Default": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=KURS;"
},
"Redis": {
"IsEnabled": "true",

4
api/src/Kurs.Platform.HttpApi.Host/appsettings.Production.json
View file

@ -8,8 +8,8 @@
"CdnPath": "/etc/api/cdn"
},
"ConnectionStrings": {
// "Default": "Server=sql;Database=Demo;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;TrustServerCertificate=True;"
"Default": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=Demo;"
// "Default": "Server=sql;Database=KURS;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;TrustServerCertificate=True;"
"Default": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=KURS;"
},
"Redis": {
"IsEnabled": "true",

4
api/src/Kurs.Platform.HttpApi.Host/appsettings.json
View file

@ -9,8 +9,8 @@
"Version": "1.0.4"
},
"ConnectionStrings": {
// "Default": "Server=localhost;Database=Demo;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;TrustServerCertificate=True;"
"Default": "User ID=sa;Password=NvQp8s@l;Host=localhost;Port=5432;Database=Demo;"
// "Default": "Server=localhost;Database=KURS;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;TrustServerCertificate=True;"
"Default": "User ID=sa;Password=NvQp8s@l;Host=localhost;Port=5432;Database=KURS;"
},
"Redis": {
"IsEnabled": "true",

6
configs/deployment/configs/nginx.conf
View file

@ -89,9 +89,15 @@ server {
ssl_certificate /etc/ssl/sozsoft.com/cert1.pem;
ssl_certificate_key /etc/ssl/sozsoft.com/privkey1.pem;
underscores_in_headers on;
ignore_invalid_headers off;
large_client_header_buffers 4 16k;
location / {
proxy_pass http://127.0.0.1:8080/;
include /etc/nginx/proxy_params;
proxy_set_header __tenant $http___tenant; # ← ÖNEMLİ
}
}

2
ui/dev-dist/sw.js
View file

@ -82,7 +82,7 @@ define(['./workbox-54d0af47'], (function (workbox) { 'use strict';
"revision": "3ca0b8505b4bec776b69afdba2768812"
}, {
"url": "index.html",
"revision": "0.8un1j0slu5o"
"revision": "0.ndk83qv1fe"
}], {});
workbox.cleanupOutdatedCaches();
workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

2
ui/src/components/template/Theme.tsx
View file

@ -14,12 +14,10 @@ let didInit = false
const Theme = (props: CommonProps) => {
// ABP App Config'i uygulama acilirken al
const { getConfig } = useStoreActions((a) => a.abpConfig)
const { setTenantId } = useStoreActions((a) => a.auth)
useEffect(() => {
if (!didInit) {
didInit = true
setTenantId('')
getConfig(false)
}
}, [])

101
ui/src/views/Home.tsx
View file

@ -1,78 +1,9 @@
import { useLocalization } from '@/utils/hooks/useLocalization'
import { Helmet } from 'react-helmet'
import { useCallback, useEffect, useState } from 'react'
import WidgetFilter from './dashboard/WidgetFilter'
import { getDashboardWidgetList } from '@/proxy/dashboard/widgets'
import dayjs from 'dayjs'
import { WidgetsData } from './dashboard/models'
import Widgets from './dashboard/Widgets'
import WidgetProgress from './dashboard/WidgetProgress'
import WidgetBarChart from './dashboard/WidgetBarChart'
const Home = () => {
const { translate } = useLocalization()
const [loading, setLoading] = useState(false)
const [widgetData, setWidgetData] = useState<WidgetsData[]>()
const [startDate, setStartDate] = useState<number>(dayjs().subtract(30, 'day').unix())
const [endDate, setEndDate] = useState<number>(dayjs().unix())
const startDateFormat = dayjs(startDate * 1000).format('YYYY-MM-DD')
const endDateFormat = dayjs(endDate * 1000).format('YYYY-MM-DD')
const [chartKey, setChartKey] = useState(0)
const handleDateChange = ([start, end]: [Date | null, Date | null]) => {
if (start && end) {
setStartDate(dayjs(start).unix())
setEndDate(dayjs(end).unix())
}
}
const getPerformancePercent = () => {
const orders = widgetData?.find((a) => a.label == 'Orders')?.datavalue ?? 0
const shipment = widgetData?.find((a) => a.label == 'Shipment')?.datavalue ?? 0
if (shipment > orders)
return (orders / shipment * 100.0)
else
return (shipment / orders * 100.0)
}
const getDashboardWidgets = useCallback(async () => {
const dashboardWidgetsRequestDto = {
tarih1: startDateFormat,
tarih2: endDateFormat,
}
setChartKey((prevKey) => prevKey + 1)
try {
setLoading(true)
const response = await getDashboardWidgetList(dashboardWidgetsRequestDto)
if (response?.data) {
setWidgetData(
response.data.map((a) => ({
id: a.id,
label: a.label,
datavalue: a.dataValue,
datagrowShrink: a.dataGrowShrink,
valuePrefix: a.valuePrefix,
date: a.date,
})),
)
}
} catch (error) {
console.error('Dashboard widget yüklenirken hata oluştu:', error)
} finally {
setLoading(false)
}
}, [startDateFormat, endDateFormat])
useEffect(() => {
getDashboardWidgets()
}, [])
return (
<>
<Helmet
@ -80,38 +11,6 @@ const Home = () => {
title={translate('::' + 'Home')}
defaultTitle="Kurs Platform"
></Helmet>
<WidgetFilter
onFilter={getDashboardWidgets}
handleDateChange={handleDateChange}
startDate={startDate}
endDate={endDate}
/>
<Widgets loading={loading} widgetData={widgetData} />
<div className="grid grid-cols-1 lg:grid-cols-3 gap-4 mt-4">
<WidgetBarChart
chartKey={`Chart-${chartKey}`}
startDateFormat={startDateFormat}
endDateFormat={endDateFormat}
/>
<WidgetProgress percent={getPerformancePercent()} />
</div>
{/* <Button
onClick={() => {
// x.setConfig({
// component: 'RolesPermission',
// props: { name: 'admin' },
// })
// apiService.fetchData({
// method: 'GET',
// url: '/api/app/test/test',
// })
}}
>
FIRE
</Button> */}
</>
)
}

2
ui/src/views/admin/tenant-management/TenantsConnectionString.tsx
View file

@ -67,7 +67,7 @@ function TenantConnectionString({
if (response.data.length == 0) {
isNew = true
value = 'User ID=sa;Password=NvQp8s@l;Host=localhost;Port=5432;Database=' + name + ';'
value = 'User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=' + name + ';'
} else {
isNew = false
value = response.data

3
ui/src/views/auth/Login.tsx
View file

@ -174,6 +174,7 @@ const Login = () => {
}
const subDomainName = getSubdomain()
//const subDomainName = 'KURS2'
const tenantId = useStoreState((a) => a.auth.tenantId) ?? subDomainName
const tenantStyle: React.CSSProperties | undefined =
subDomainName && subDomainName !== defaultSubDomain
@ -216,7 +217,7 @@ const Login = () => {
value={tenantId || ''}
onChange={(e) => setTenantId(e.target.value)}
style={tenantStyle}
//aria-hidden={subDomainName && subDomainName !== defaultSubDomain ? 'true' : 'false'}
aria-hidden={subDomainName && subDomainName !== defaultSubDomain ? 'true' : 'false'}
/>
</div>
</>

8
ui/src/views/docs/ChangeLog.tsx
View file

@ -14,14 +14,6 @@ type LogProps = Omit<Log, 'updateContent'> & {
}
const logData: Log[] = [
{
version: '1.0.4',
date: '07 Şubat 2025',
updateContent: [
'[Change] KIM Sistemi entegrasyonu',
'[Fix] OrganizationUnitId belirlenmesi',
],
},
{
version: '1.0.3',
date: '04 Şubat 2025',