Browse Source

Close #36: Rename EasyMall to EShopSample.

pull/49/head
gdlcf88 6 years ago
parent
commit
88d779523b
  1. 0
      samples/EShopSample/angular/.editorconfig
  2. 0
      samples/EShopSample/angular/.gitignore
  3. 0
      samples/EShopSample/angular/.prettierrc
  4. 0
      samples/EShopSample/angular/.vscode/extensions.json
  5. 2
      samples/EShopSample/angular/README.md
  6. 16
      samples/EShopSample/angular/angular.json
  7. 0
      samples/EShopSample/angular/browserslist
  8. 0
      samples/EShopSample/angular/e2e/protractor.conf.js
  9. 0
      samples/EShopSample/angular/e2e/src/app.e2e-spec.ts
  10. 0
      samples/EShopSample/angular/e2e/src/app.po.ts
  11. 0
      samples/EShopSample/angular/e2e/tsconfig.json
  12. 0
      samples/EShopSample/angular/karma.conf.js
  13. 2
      samples/EShopSample/angular/package.json
  14. 0
      samples/EShopSample/angular/src/app/app-routing.module.ts
  15. 0
      samples/EShopSample/angular/src/app/app.component.ts
  16. 0
      samples/EShopSample/angular/src/app/app.module.ts
  17. 0
      samples/EShopSample/angular/src/app/home/home-routing.module.ts
  18. 0
      samples/EShopSample/angular/src/app/home/home.component.html
  19. 0
      samples/EShopSample/angular/src/app/home/home.component.ts
  20. 0
      samples/EShopSample/angular/src/app/home/home.module.ts
  21. 0
      samples/EShopSample/angular/src/app/shared/shared.module.ts
  22. 0
      samples/EShopSample/angular/src/assets/.gitkeep
  23. 8
      samples/EShopSample/angular/src/environments/environment.prod.ts
  24. 8
      samples/EShopSample/angular/src/environments/environment.ts
  25. 0
      samples/EShopSample/angular/src/favicon.ico
  26. 2
      samples/EShopSample/angular/src/index.html
  27. 0
      samples/EShopSample/angular/src/main.ts
  28. 0
      samples/EShopSample/angular/src/polyfills.ts
  29. 0
      samples/EShopSample/angular/src/styles.scss
  30. 0
      samples/EShopSample/angular/src/test.ts
  31. 0
      samples/EShopSample/angular/start.ps1
  32. 0
      samples/EShopSample/angular/tsconfig.app.json
  33. 0
      samples/EShopSample/angular/tsconfig.json
  34. 0
      samples/EShopSample/angular/tsconfig.spec.json
  35. 0
      samples/EShopSample/angular/tslint.json
  36. 0
      samples/EShopSample/aspnet-core/.gitattributes
  37. 14
      samples/EShopSample/aspnet-core/.gitignore
  38. 32
      samples/EShopSample/aspnet-core/EShopSample.sln
  39. 0
      samples/EShopSample/aspnet-core/EShopSample.sln.DotSettings
  40. 0
      samples/EShopSample/aspnet-core/common.props
  41. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj
  42. 8
      samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSampleApplicationContractsModule.cs
  43. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSampleDtoExtensions.cs
  44. 22
      samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/Permissions/EShopSamplePermissionDefinitionProvider.cs
  45. 10
      samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/Permissions/EShopSamplePermissions.cs
  46. 6
      samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj
  47. 18
      samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSampleAppService.cs
  48. 6
      samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSampleApplicationAutoMapperProfile.cs
  49. 10
      samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSampleApplicationModule.cs
  50. 8
      samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/DbMigratorHostedService.cs
  51. 4
      samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSample.DbMigrator.csproj
  52. 10
      samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSampleDbMigratorModule.cs
  53. 6
      samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/Program.cs
  54. 18
      samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/appsettings.json
  55. 6
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj
  56. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSampleDomainErrorCodes.cs
  57. 12
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSampleDomainSharedModule.cs
  58. 0
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/cs.json
  59. 0
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/en.json
  60. 0
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/pl.json
  61. 0
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/pt-BR.json
  62. 0
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/sl.json
  63. 0
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/tr.json
  64. 0
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/vi.json
  65. 0
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/zh-Hans.json
  66. 0
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/zh-Hant.json
  67. 10
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSampleResource.cs
  68. 2
      samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs
  69. 14
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/Data/EShopSampleDbMigrationService.cs
  70. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/Data/IEShopSampleDbSchemaMigrator.cs
  71. 6
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/Data/NullEShopSampleDbSchemaMigrator.cs
  72. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj
  73. 4
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSampleConsts.cs
  74. 12
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSampleDomainModule.cs
  75. 18
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
  76. 6
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/ObjectExtending/EShopSampleDomainObjectExtensions.cs
  77. 13
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/Settings/EShopSampleSettingDefinitionProvider.cs
  78. 6
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/Settings/EShopSampleSettings.cs
  79. 6
      samples/EShopSample/aspnet-core/src/EShopSample.Domain/Users/AppUser.cs
  80. 4
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EShopSample.EntityFrameworkCore.DbMigrations.csproj
  81. 16
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleEntityFrameworkCoreDbMigrationsModule.cs
  82. 12
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleMigrationsDbContext.cs
  83. 12
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleMigrationsDbContextFactory.cs
  84. 14
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EntityFrameworkCoreEShopSampleDbSchemaMigrator.cs
  85. 6
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200526074907_AddedCodeToProductSku.Designer.cs
  86. 2
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200526074907_AddedCodeToProductSku.cs
  87. 6
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200527083620_ChangedToSerializedEntityData.Designer.cs
  88. 2
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200527083620_ChangedToSerializedEntityData.cs
  89. 8
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/EShopSampleMigrationsDbContextModelSnapshot.cs
  90. 4
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj
  91. 18
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EntityFrameworkCore/EShopSampleDbContext.cs
  92. 8
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EntityFrameworkCore/EShopSampleDbContextModelCreatingExtensions.cs
  93. 6
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EntityFrameworkCore/EShopSampleEfCoreEntityExtensionMappings.cs
  94. 12
      samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EntityFrameworkCore/EShopSampleEntityFrameworkCoreModule.cs
  95. 4
      samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj
  96. 8
      samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSampleHttpApiClientModule.cs
  97. 15
      samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/Controllers/EShopSampleController.cs
  98. 4
      samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj
  99. 6
      samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSampleHttpApiModule.cs
  100. 2
      samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/Models/Test/TestModel.cs

0
samples/EasyMall/angular/.editorconfig → samples/EShopSample/angular/.editorconfig

0
samples/EasyMall/angular/.gitignore → samples/EShopSample/angular/.gitignore

0
samples/EasyMall/angular/.prettierrc → samples/EShopSample/angular/.prettierrc

0
samples/EasyMall/angular/.vscode/extensions.json → samples/EShopSample/angular/.vscode/extensions.json

2
samples/EasyMall/angular/README.md → samples/EShopSample/angular/README.md

@ -1,4 +1,4 @@
# EasyMall # EShopSample
This is a startup project based on the ABP framework. For more information, visit <a href="https://abp.io/" target="_blank">abp.io</a> This is a startup project based on the ABP framework. For more information, visit <a href="https://abp.io/" target="_blank">abp.io</a>

16
samples/EasyMall/angular/angular.json → samples/EShopSample/angular/angular.json

@ -3,7 +3,7 @@
"version": 1, "version": 1,
"newProjectRoot": "projects", "newProjectRoot": "projects",
"projects": { "projects": {
"EasyMall": { "EShopSample": {
"projectType": "application", "projectType": "application",
"schematics": { "schematics": {
"@schematics/angular:component": { "@schematics/angular:component": {
@ -17,7 +17,7 @@
"build": { "build": {
"builder": "@angular-devkit/build-angular:browser", "builder": "@angular-devkit/build-angular:browser",
"options": { "options": {
"outputPath": "dist/EasyMall", "outputPath": "dist/EShopSample",
"index": "src/index.html", "index": "src/index.html",
"main": "src/main.ts", "main": "src/main.ts",
"polyfills": "src/polyfills.ts", "polyfills": "src/polyfills.ts",
@ -79,18 +79,18 @@
"serve": { "serve": {
"builder": "@angular-devkit/build-angular:dev-server", "builder": "@angular-devkit/build-angular:dev-server",
"options": { "options": {
"browserTarget": "EasyMall:build" "browserTarget": "EShopSample:build"
}, },
"configurations": { "configurations": {
"production": { "production": {
"browserTarget": "EasyMall:build:production" "browserTarget": "EShopSample:build:production"
} }
} }
}, },
"extract-i18n": { "extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n", "builder": "@angular-devkit/build-angular:extract-i18n",
"options": { "options": {
"browserTarget": "EasyMall:build" "browserTarget": "EShopSample:build"
} }
}, },
"test": { "test": {
@ -133,18 +133,18 @@
"builder": "@angular-devkit/build-angular:protractor", "builder": "@angular-devkit/build-angular:protractor",
"options": { "options": {
"protractorConfig": "e2e/protractor.conf.js", "protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "EasyMall:serve" "devServerTarget": "EShopSample:serve"
}, },
"configurations": { "configurations": {
"production": { "production": {
"devServerTarget": "EasyMall:serve:production" "devServerTarget": "EShopSample:serve:production"
} }
} }
} }
} }
} }
}, },
"defaultProject": "EasyMall", "defaultProject": "EShopSample",
"cli": { "cli": {
"analytics": false "analytics": false
} }

0
samples/EasyMall/angular/browserslist → samples/EShopSample/angular/browserslist

0
samples/EasyMall/angular/e2e/protractor.conf.js → samples/EShopSample/angular/e2e/protractor.conf.js

0
samples/EasyMall/angular/e2e/src/app.e2e-spec.ts → samples/EShopSample/angular/e2e/src/app.e2e-spec.ts

0
samples/EasyMall/angular/e2e/src/app.po.ts → samples/EShopSample/angular/e2e/src/app.po.ts

0
samples/EasyMall/angular/e2e/tsconfig.json → samples/EShopSample/angular/e2e/tsconfig.json

0
samples/EasyMall/angular/karma.conf.js → samples/EShopSample/angular/karma.conf.js

2
samples/EasyMall/angular/package.json → samples/EShopSample/angular/package.json

@ -1,5 +1,5 @@
{ {
"name": "EasyMall", "name": "EShopSample",
"version": "0.0.0", "version": "0.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",

0
samples/EasyMall/angular/src/app/app-routing.module.ts → samples/EShopSample/angular/src/app/app-routing.module.ts

0
samples/EasyMall/angular/src/app/app.component.ts → samples/EShopSample/angular/src/app/app.component.ts

0
samples/EasyMall/angular/src/app/app.module.ts → samples/EShopSample/angular/src/app/app.module.ts

0
samples/EasyMall/angular/src/app/home/home-routing.module.ts → samples/EShopSample/angular/src/app/home/home-routing.module.ts

0
samples/EasyMall/angular/src/app/home/home.component.html → samples/EShopSample/angular/src/app/home/home.component.html

0
samples/EasyMall/angular/src/app/home/home.component.ts → samples/EShopSample/angular/src/app/home/home.component.ts

0
samples/EasyMall/angular/src/app/home/home.module.ts → samples/EShopSample/angular/src/app/home/home.module.ts

0
samples/EasyMall/angular/src/app/shared/shared.module.ts → samples/EShopSample/angular/src/app/shared/shared.module.ts

0
samples/EasyMall/angular/src/assets/.gitkeep → samples/EShopSample/angular/src/assets/.gitkeep

8
samples/EasyMall/angular/src/environments/environment.prod.ts → samples/EShopSample/angular/src/environments/environment.prod.ts

@ -1,14 +1,14 @@
export const environment = { export const environment = {
production: true, production: true,
application: { application: {
name: 'EasyMall', name: 'EShopSample',
logoUrl: '', logoUrl: '',
}, },
oAuthConfig: { oAuthConfig: {
issuer: 'https://localhost:44340', issuer: 'https://localhost:44340',
clientId: 'EasyMall_App', clientId: 'EShopSample_App',
dummyClientSecret: '1q2w3e*', dummyClientSecret: '1q2w3e*',
scope: 'EasyMall', scope: 'EShopSample',
showDebugInformation: true, showDebugInformation: true,
oidc: false, oidc: false,
requireHttps: true, requireHttps: true,
@ -19,6 +19,6 @@ export const environment = {
}, },
}, },
localization: { localization: {
defaultResourceName: 'EasyMall', defaultResourceName: 'EShopSample',
}, },
}; };

8
samples/EasyMall/angular/src/environments/environment.ts → samples/EShopSample/angular/src/environments/environment.ts

@ -1,14 +1,14 @@
export const environment = { export const environment = {
production: false, production: false,
application: { application: {
name: 'EasyMall', name: 'EShopSample',
logoUrl: '', logoUrl: '',
}, },
oAuthConfig: { oAuthConfig: {
issuer: 'https://localhost:44340', issuer: 'https://localhost:44340',
clientId: 'EasyMall_App', clientId: 'EShopSample_App',
dummyClientSecret: '1q2w3e*', dummyClientSecret: '1q2w3e*',
scope: 'EasyMall', scope: 'EShopSample',
showDebugInformation: true, showDebugInformation: true,
oidc: false, oidc: false,
requireHttps: true, requireHttps: true,
@ -19,6 +19,6 @@ export const environment = {
}, },
}, },
localization: { localization: {
defaultResourceName: 'EasyMall', defaultResourceName: 'EShopSample',
}, },
}; };

0
samples/EasyMall/angular/src/favicon.ico → samples/EShopSample/angular/src/favicon.ico

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 101 KiB

2
samples/EasyMall/angular/src/index.html → samples/EShopSample/angular/src/index.html

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>EasyMall</title> <title>EShopSample</title>
<base href="/" /> <base href="/" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />

0
samples/EasyMall/angular/src/main.ts → samples/EShopSample/angular/src/main.ts

0
samples/EasyMall/angular/src/polyfills.ts → samples/EShopSample/angular/src/polyfills.ts

0
samples/EasyMall/angular/src/styles.scss → samples/EShopSample/angular/src/styles.scss

0
samples/EasyMall/angular/src/test.ts → samples/EShopSample/angular/src/test.ts

0
samples/EasyMall/angular/start.ps1 → samples/EShopSample/angular/start.ps1

0
samples/EasyMall/angular/tsconfig.app.json → samples/EShopSample/angular/tsconfig.app.json

0
samples/EasyMall/angular/tsconfig.json → samples/EShopSample/angular/tsconfig.json

0
samples/EasyMall/angular/tsconfig.spec.json → samples/EShopSample/angular/tsconfig.spec.json

0
samples/EasyMall/angular/tslint.json → samples/EShopSample/angular/tslint.json

0
samples/EasyMall/aspnet-core/.gitattributes → samples/EShopSample/aspnet-core/.gitattributes

14
samples/EasyMall/aspnet-core/.gitignore → samples/EShopSample/aspnet-core/.gitignore

@ -251,12 +251,12 @@ paket-files/
.idea/ .idea/
*.sln.iml *.sln.iml
# EasyMall # EShopSample
src/EasyMall.Web/Logs/* src/EShopSample.Web/Logs/*
src/EasyMall.Web.Host/Logs/* src/EShopSample.Web.Host/Logs/*
src/EasyMall.IdentityServer/Logs/* src/EShopSample.IdentityServer/Logs/*
src/EasyMall.HttpApi.Host/Logs/* src/EShopSample.HttpApi.Host/Logs/*
src/EasyMall.HttpApi.HostWithIds/Logs/* src/EShopSample.HttpApi.HostWithIds/Logs/*
src/EasyMall.DbMigrator/Logs/* src/EShopSample.DbMigrator/Logs/*
appsettings.*.json appsettings.*.json

32
samples/EasyMall/aspnet-core/EasyMall.sln → samples/EShopSample/aspnet-core/EShopSample.sln

@ -3,41 +3,41 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.29020.237 VisualStudioVersion = 16.0.29020.237
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.Domain", "src\EasyMall.Domain\EasyMall.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.Domain", "src\EShopSample.Domain\EShopSample.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.Application", "src\EasyMall.Application\EasyMall.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.Application", "src\EShopSample.Application\EShopSample.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.EntityFrameworkCore", "src\EasyMall.EntityFrameworkCore\EasyMall.EntityFrameworkCore.csproj", "{C956DD76-69C8-4A9C-83EA-D17DF83340FD}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.EntityFrameworkCore", "src\EShopSample.EntityFrameworkCore\EShopSample.EntityFrameworkCore.csproj", "{C956DD76-69C8-4A9C-83EA-D17DF83340FD}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.Web", "src\EasyMall.Web\EasyMall.Web.csproj", "{068855E8-9240-4F1A-910B-CF825794513B}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.Web", "src\EShopSample.Web\EShopSample.Web.csproj", "{068855E8-9240-4F1A-910B-CF825794513B}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CA9AC87F-097E-4F15-8393-4BC07735A5B0}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CA9AC87F-097E-4F15-8393-4BC07735A5B0}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-70F4-4E06-B468-8F87850B22BE}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-70F4-4E06-B468-8F87850B22BE}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.Application.Tests", "test\EasyMall.Application.Tests\EasyMall.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.Application.Tests", "test\EShopSample.Application.Tests\EShopSample.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.Web.Tests", "test\EasyMall.Web.Tests\EasyMall.Web.Tests.csproj", "{5F1B28C6-8D0C-4155-92D0-252F7EA5F674}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.Web.Tests", "test\EShopSample.Web.Tests\EShopSample.Web.Tests.csproj", "{5F1B28C6-8D0C-4155-92D0-252F7EA5F674}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.EntityFrameworkCore.DbMigrations", "src\EasyMall.EntityFrameworkCore.DbMigrations\EasyMall.EntityFrameworkCore.DbMigrations.csproj", "{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.EntityFrameworkCore.DbMigrations", "src\EShopSample.EntityFrameworkCore.DbMigrations\EShopSample.EntityFrameworkCore.DbMigrations.csproj", "{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.Domain.Shared", "src\EasyMall.Domain.Shared\EasyMall.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.Domain.Shared", "src\EShopSample.Domain.Shared\EShopSample.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.Application.Contracts", "src\EasyMall.Application.Contracts\EasyMall.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.Application.Contracts", "src\EShopSample.Application.Contracts\EShopSample.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.HttpApi", "src\EasyMall.HttpApi\EasyMall.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.HttpApi", "src\EShopSample.HttpApi\EShopSample.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.HttpApi.Client", "src\EasyMall.HttpApi.Client\EasyMall.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.HttpApi.Client", "src\EShopSample.HttpApi.Client\EShopSample.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.EntityFrameworkCore.Tests", "test\EasyMall.EntityFrameworkCore.Tests\EasyMall.EntityFrameworkCore.Tests.csproj", "{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.EntityFrameworkCore.Tests", "test\EShopSample.EntityFrameworkCore.Tests\EShopSample.EntityFrameworkCore.Tests.csproj", "{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.TestBase", "test\EasyMall.TestBase\EasyMall.TestBase.csproj", "{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.TestBase", "test\EShopSample.TestBase\EShopSample.TestBase.csproj", "{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.Domain.Tests", "test\EasyMall.Domain.Tests\EasyMall.Domain.Tests.csproj", "{E512F4D9-9375-480F-A2F6-A46509F9D824}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.Domain.Tests", "test\EShopSample.Domain.Tests\EShopSample.Domain.Tests.csproj", "{E512F4D9-9375-480F-A2F6-A46509F9D824}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.HttpApi.Client.ConsoleTestApp", "test\EasyMall.HttpApi.Client.ConsoleTestApp\EasyMall.HttpApi.Client.ConsoleTestApp.csproj", "{EF480016-9127-4916-8735-D2466BDBC582}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.HttpApi.Client.ConsoleTestApp", "test\EShopSample.HttpApi.Client.ConsoleTestApp\EShopSample.HttpApi.Client.ConsoleTestApp.csproj", "{EF480016-9127-4916-8735-D2466BDBC582}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMall.DbMigrator", "src\EasyMall.DbMigrator\EasyMall.DbMigrator.csproj", "{AA94D832-1CCC-4715-95A9-A483F23A1A5D}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EShopSample.DbMigrator", "src\EShopSample.DbMigrator\EShopSample.DbMigrator.csproj", "{AA94D832-1CCC-4715-95A9-A483F23A1A5D}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{7FA8569F-8D62-4C13-9C8A-98DADA1F09A0}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{7FA8569F-8D62-4C13-9C8A-98DADA1F09A0}"
EndProject EndProject

0
samples/EasyMall/aspnet-core/EasyMall.sln.DotSettings → samples/EShopSample/aspnet-core/EShopSample.sln.DotSettings

0
samples/EasyMall/aspnet-core/common.props → samples/EShopSample/aspnet-core/common.props

4
samples/EasyMall/aspnet-core/src/EasyMall.Application.Contracts/EasyMall.Application.Contracts.csproj → samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj

@ -4,12 +4,12 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>EasyMall</RootNamespace> <RootNamespace>EShopSample</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.Application.Contracts\EasyAbp.EShop.Application.Contracts.csproj" /> <ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.Application.Contracts\EasyAbp.EShop.Application.Contracts.csproj" />
<ProjectReference Include="..\EasyMall.Domain.Shared\EasyMall.Domain.Shared.csproj" /> <ProjectReference Include="..\EShopSample.Domain.Shared\EShopSample.Domain.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
samples/EasyMall/aspnet-core/src/EasyMall.Application.Contracts/EasyMallApplicationContractsModule.cs → samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSampleApplicationContractsModule.cs

@ -8,10 +8,10 @@ using Volo.Abp.ObjectExtending;
using Volo.Abp.PermissionManagement; using Volo.Abp.PermissionManagement;
using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement;
namespace EasyMall namespace EShopSample
{ {
[DependsOn( [DependsOn(
typeof(EasyMallDomainSharedModule), typeof(EShopSampleDomainSharedModule),
typeof(AbpAccountApplicationContractsModule), typeof(AbpAccountApplicationContractsModule),
typeof(AbpFeatureManagementApplicationContractsModule), typeof(AbpFeatureManagementApplicationContractsModule),
typeof(AbpIdentityApplicationContractsModule), typeof(AbpIdentityApplicationContractsModule),
@ -21,11 +21,11 @@ namespace EasyMall
typeof(EShopApplicationContractsModule), typeof(EShopApplicationContractsModule),
typeof(PaymentServiceWeChatPayApplicationContractsModule) typeof(PaymentServiceWeChatPayApplicationContractsModule)
)] )]
public class EasyMallApplicationContractsModule : AbpModule public class EShopSampleApplicationContractsModule : AbpModule
{ {
public override void PreConfigureServices(ServiceConfigurationContext context) public override void PreConfigureServices(ServiceConfigurationContext context)
{ {
EasyMallDtoExtensions.Configure(); EShopSampleDtoExtensions.Configure();
} }
} }
} }

4
samples/EasyMall/aspnet-core/src/EasyMall.Application.Contracts/EasyMallDtoExtensions.cs → samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSampleDtoExtensions.cs

@ -2,9 +2,9 @@
using Volo.Abp.ObjectExtending; using Volo.Abp.ObjectExtending;
using Volo.Abp.Threading; using Volo.Abp.Threading;
namespace EasyMall namespace EShopSample
{ {
public static class EasyMallDtoExtensions public static class EShopSampleDtoExtensions
{ {
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();

22
samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/Permissions/EShopSamplePermissionDefinitionProvider.cs

@ -0,0 +1,22 @@
using EShopSample.Localization;
using Volo.Abp.Authorization.Permissions;
using Volo.Abp.Localization;
namespace EShopSample.Permissions
{
public class EShopSamplePermissionDefinitionProvider : PermissionDefinitionProvider
{
public override void Define(IPermissionDefinitionContext context)
{
var myGroup = context.AddGroup(EShopSamplePermissions.GroupName);
//Define your own permissions here. Example:
//myGroup.AddPermission(EShopSamplePermissions.MyPermission1, L("Permission:MyPermission1"));
}
private static LocalizableString L(string name)
{
return LocalizableString.Create<EShopSampleResource>(name);
}
}
}

10
samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/Permissions/EShopSamplePermissions.cs

@ -0,0 +1,10 @@
namespace EShopSample.Permissions
{
public static class EShopSamplePermissions
{
public const string GroupName = "EasyAbp.EShop.EShopSample";
//Add your own permission names. Example:
//public const string MyPermission1 = GroupName + ".MyPermission1";
}
}

6
samples/EasyMall/aspnet-core/src/EasyMall.Application/EasyMall.Application.csproj → samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj

@ -4,13 +4,13 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>EasyMall</RootNamespace> <RootNamespace>EShopSample</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.Application\EasyAbp.EShop.Application.csproj" /> <ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.Application\EasyAbp.EShop.Application.csproj" />
<ProjectReference Include="..\EasyMall.Domain\EasyMall.Domain.csproj" /> <ProjectReference Include="..\EShopSample.Domain\EShopSample.Domain.csproj" />
<ProjectReference Include="..\EasyMall.Application.Contracts\EasyMall.Application.Contracts.csproj" /> <ProjectReference Include="..\EShopSample.Application.Contracts\EShopSample.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

18
samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSampleAppService.cs

@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Text;
using EShopSample.Localization;
using Volo.Abp.Application.Services;
namespace EShopSample
{
/* Inherit your application services from this class.
*/
public abstract class EShopSampleAppService : ApplicationService
{
protected EShopSampleAppService()
{
LocalizationResource = typeof(EShopSampleResource);
}
}
}

6
samples/EasyMall/aspnet-core/src/EasyMall.Application/EasyMallApplicationAutoMapperProfile.cs → samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSampleApplicationAutoMapperProfile.cs

@ -1,10 +1,10 @@
using AutoMapper; using AutoMapper;
namespace EasyMall namespace EShopSample
{ {
public class EasyMallApplicationAutoMapperProfile : Profile public class EShopSampleApplicationAutoMapperProfile : Profile
{ {
public EasyMallApplicationAutoMapperProfile() public EShopSampleApplicationAutoMapperProfile()
{ {
/* You can configure your AutoMapper mapping configuration here. /* You can configure your AutoMapper mapping configuration here.
* Alternatively, you can split your mapping configurations * Alternatively, you can split your mapping configurations

10
samples/EasyMall/aspnet-core/src/EasyMall.Application/EasyMallApplicationModule.cs → samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSampleApplicationModule.cs

@ -8,12 +8,12 @@ using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement; using Volo.Abp.PermissionManagement;
using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement;
namespace EasyMall namespace EShopSample
{ {
[DependsOn( [DependsOn(
typeof(EasyMallDomainModule), typeof(EShopSampleDomainModule),
typeof(AbpAccountApplicationModule), typeof(AbpAccountApplicationModule),
typeof(EasyMallApplicationContractsModule), typeof(EShopSampleApplicationContractsModule),
typeof(AbpIdentityApplicationModule), typeof(AbpIdentityApplicationModule),
typeof(AbpPermissionManagementApplicationModule), typeof(AbpPermissionManagementApplicationModule),
typeof(AbpTenantManagementApplicationModule), typeof(AbpTenantManagementApplicationModule),
@ -21,13 +21,13 @@ namespace EasyMall
typeof(EShopApplicationModule), typeof(EShopApplicationModule),
typeof(PaymentServiceWeChatPayApplicationModule) typeof(PaymentServiceWeChatPayApplicationModule)
)] )]
public class EasyMallApplicationModule : AbpModule public class EShopSampleApplicationModule : AbpModule
{ {
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
{ {
Configure<AbpAutoMapperOptions>(options => Configure<AbpAutoMapperOptions>(options =>
{ {
options.AddMaps<EasyMallApplicationModule>(); options.AddMaps<EShopSampleApplicationModule>();
}); });
} }
} }

8
samples/EasyMall/aspnet-core/src/EasyMall.DbMigrator/DbMigratorHostedService.cs → samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/DbMigratorHostedService.cs

@ -2,17 +2,17 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using EasyMall.Data; using EShopSample.Data;
using Serilog; using Serilog;
using Volo.Abp; using Volo.Abp;
namespace EasyMall.DbMigrator namespace EShopSample.DbMigrator
{ {
public class DbMigratorHostedService : IHostedService public class DbMigratorHostedService : IHostedService
{ {
public async Task StartAsync(CancellationToken cancellationToken) public async Task StartAsync(CancellationToken cancellationToken)
{ {
using (var application = AbpApplicationFactory.Create<EasyMallDbMigratorModule>(options => using (var application = AbpApplicationFactory.Create<EShopSampleDbMigratorModule>(options =>
{ {
options.UseAutofac(); options.UseAutofac();
options.Services.AddLogging(c => c.AddSerilog()); options.Services.AddLogging(c => c.AddSerilog());
@ -22,7 +22,7 @@ namespace EasyMall.DbMigrator
await application await application
.ServiceProvider .ServiceProvider
.GetRequiredService<EasyMallDbMigrationService>() .GetRequiredService<EShopSampleDbMigrationService>()
.MigrateAsync(); .MigrateAsync();
application.Shutdown(); application.Shutdown();

4
samples/EasyMall/aspnet-core/src/EasyMall.DbMigrator/EasyMall.DbMigrator.csproj → samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSample.DbMigrator.csproj

@ -27,8 +27,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="2.8.0" /> <PackageReference Include="Volo.Abp.Autofac" Version="2.8.0" />
<ProjectReference Include="..\EasyMall.Application.Contracts\EasyMall.Application.Contracts.csproj" /> <ProjectReference Include="..\EShopSample.Application.Contracts\EShopSample.Application.Contracts.csproj" />
<ProjectReference Include="..\EasyMall.EntityFrameworkCore.DbMigrations\EasyMall.EntityFrameworkCore.DbMigrations.csproj" /> <ProjectReference Include="..\EShopSample.EntityFrameworkCore.DbMigrations\EShopSample.EntityFrameworkCore.DbMigrations.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

10
samples/EasyMall/aspnet-core/src/EasyMall.DbMigrator/EasyMallDbMigratorModule.cs → samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/EShopSampleDbMigratorModule.cs

@ -1,16 +1,16 @@
using EasyMall.EntityFrameworkCore; using EShopSample.EntityFrameworkCore;
using Volo.Abp.Autofac; using Volo.Abp.Autofac;
using Volo.Abp.BackgroundJobs; using Volo.Abp.BackgroundJobs;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
namespace EasyMall.DbMigrator namespace EShopSample.DbMigrator
{ {
[DependsOn( [DependsOn(
typeof(AbpAutofacModule), typeof(AbpAutofacModule),
typeof(EasyMallEntityFrameworkCoreDbMigrationsModule), typeof(EShopSampleEntityFrameworkCoreDbMigrationsModule),
typeof(EasyMallApplicationContractsModule) typeof(EShopSampleApplicationContractsModule)
)] )]
public class EasyMallDbMigratorModule : AbpModule public class EShopSampleDbMigratorModule : AbpModule
{ {
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
{ {

6
samples/EasyMall/aspnet-core/src/EasyMall.DbMigrator/Program.cs → samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/Program.cs

@ -5,7 +5,7 @@ using Microsoft.Extensions.Hosting;
using Serilog; using Serilog;
using Serilog.Events; using Serilog.Events;
namespace EasyMall.DbMigrator namespace EShopSample.DbMigrator
{ {
class Program class Program
{ {
@ -16,9 +16,9 @@ namespace EasyMall.DbMigrator
.MinimumLevel.Override("Microsoft", LogEventLevel.Warning) .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
.MinimumLevel.Override("Volo.Abp", LogEventLevel.Warning) .MinimumLevel.Override("Volo.Abp", LogEventLevel.Warning)
#if DEBUG #if DEBUG
.MinimumLevel.Override("EasyMall", LogEventLevel.Debug) .MinimumLevel.Override("EShopSample", LogEventLevel.Debug)
#else #else
.MinimumLevel.Override("EasyMall", LogEventLevel.Information) .MinimumLevel.Override("EShopSample", LogEventLevel.Information)
#endif #endif
.Enrich.FromLogContext() .Enrich.FromLogContext()
.WriteTo.File(Path.Combine(Directory.GetCurrentDirectory(), "Logs/logs.txt")) .WriteTo.File(Path.Combine(Directory.GetCurrentDirectory(), "Logs/logs.txt"))

18
samples/EShopSample/aspnet-core/src/EShopSample.DbMigrator/appsettings.json

@ -0,0 +1,18 @@
{
"ConnectionStrings": {
"Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=EShopSample;Trusted_Connection=True;MultipleActiveResultSets=true"
},
"IdentityServer": {
"Clients": {
"EShopSample_Web": {
"ClientId": "EShopSample_Web",
"ClientSecret": "1q2w3e*",
"RootUrl": "https://localhost:44340"
},
"EShopSample_App": {
"ClientId": "EShopSample_App",
"ClientSecret": "1q2w3e*"
}
}
}
}

6
samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/EasyMall.Domain.Shared.csproj → samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj

@ -4,7 +4,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>EasyMall</RootNamespace> <RootNamespace>EShopSample</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -21,8 +21,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Localization\EasyMall\*.json" /> <EmbeddedResource Include="Localization\EShopSample\*.json" />
<Content Remove="Localization\EasyMall\*.json" /> <Content Remove="Localization\EShopSample\*.json" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/EasyMallDomainErrorCodes.cs → samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSampleDomainErrorCodes.cs

@ -1,6 +1,6 @@
namespace EasyMall namespace EShopSample
{ {
public static class EasyMallDomainErrorCodes public static class EShopSampleDomainErrorCodes
{ {
/* You can add your business exception error codes here, as constants */ /* You can add your business exception error codes here, as constants */
} }

12
samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/EasyMallDomainSharedModule.cs → samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSampleDomainSharedModule.cs

@ -1,6 +1,6 @@
using EasyAbp.EShop; using EasyAbp.EShop;
using EasyAbp.PaymentService.WeChatPay; using EasyAbp.PaymentService.WeChatPay;
using EasyMall.Localization; using EShopSample.Localization;
using Volo.Abp.AuditLogging; using Volo.Abp.AuditLogging;
using Volo.Abp.BackgroundJobs; using Volo.Abp.BackgroundJobs;
using Volo.Abp.FeatureManagement; using Volo.Abp.FeatureManagement;
@ -14,7 +14,7 @@ using Volo.Abp.TenantManagement;
using Volo.Abp.Validation.Localization; using Volo.Abp.Validation.Localization;
using Volo.Abp.VirtualFileSystem; using Volo.Abp.VirtualFileSystem;
namespace EasyMall namespace EShopSample
{ {
[DependsOn( [DependsOn(
typeof(AbpAuditLoggingDomainSharedModule), typeof(AbpAuditLoggingDomainSharedModule),
@ -28,21 +28,21 @@ namespace EasyMall
typeof(EShopDomainSharedModule), typeof(EShopDomainSharedModule),
typeof(PaymentServiceWeChatPayDomainSharedModule) typeof(PaymentServiceWeChatPayDomainSharedModule)
)] )]
public class EasyMallDomainSharedModule : AbpModule public class EShopSampleDomainSharedModule : AbpModule
{ {
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
{ {
Configure<AbpVirtualFileSystemOptions>(options => Configure<AbpVirtualFileSystemOptions>(options =>
{ {
options.FileSets.AddEmbedded<EasyMallDomainSharedModule>("EasyMall"); options.FileSets.AddEmbedded<EShopSampleDomainSharedModule>("EShopSample");
}); });
Configure<AbpLocalizationOptions>(options => Configure<AbpLocalizationOptions>(options =>
{ {
options.Resources options.Resources
.Add<EasyMallResource>("en") .Add<EShopSampleResource>("en")
.AddBaseTypes(typeof(AbpValidationResource)) .AddBaseTypes(typeof(AbpValidationResource))
.AddVirtualJson("/Localization/EasyMall"); .AddVirtualJson("/Localization/EShopSample");
}); });
} }
} }

0
samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/Localization/EasyMall/cs.json → samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/cs.json

0
samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/Localization/EasyMall/en.json → samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/en.json

0
samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/Localization/EasyMall/pl.json → samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/pl.json

0
samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/Localization/EasyMall/pt-BR.json → samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/pt-BR.json

0
samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/Localization/EasyMall/sl.json → samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/sl.json

0
samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/Localization/EasyMall/tr.json → samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/tr.json

0
samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/Localization/EasyMall/vi.json → samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/vi.json

0
samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/Localization/EasyMall/zh-Hans.json → samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/zh-Hans.json

0
samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/Localization/EasyMall/zh-Hant.json → samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/zh-Hant.json

10
samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSampleResource.cs

@ -0,0 +1,10 @@
using Volo.Abp.Localization;
namespace EShopSample.Localization
{
[LocalizationResourceName("EasyAbpEShopEShopSample")]
public class EShopSampleResource
{
}
}

2
samples/EasyMall/aspnet-core/src/EasyMall.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs → samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs

@ -1,4 +1,4 @@
namespace EasyMall.MultiTenancy namespace EShopSample.MultiTenancy
{ {
public static class MultiTenancyConsts public static class MultiTenancyConsts
{ {

14
samples/EasyMall/aspnet-core/src/EasyMall.Domain/Data/EasyMallDbMigrationService.cs → samples/EShopSample/aspnet-core/src/EShopSample.Domain/Data/EShopSampleDbMigrationService.cs

@ -8,20 +8,20 @@ using Volo.Abp.DependencyInjection;
using Volo.Abp.MultiTenancy; using Volo.Abp.MultiTenancy;
using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement;
namespace EasyMall.Data namespace EShopSample.Data
{ {
public class EasyMallDbMigrationService : ITransientDependency public class EShopSampleDbMigrationService : ITransientDependency
{ {
public ILogger<EasyMallDbMigrationService> Logger { get; set; } public ILogger<EShopSampleDbMigrationService> Logger { get; set; }
private readonly IDataSeeder _dataSeeder; private readonly IDataSeeder _dataSeeder;
private readonly IEnumerable<IEasyMallDbSchemaMigrator> _dbSchemaMigrators; private readonly IEnumerable<IEShopSampleDbSchemaMigrator> _dbSchemaMigrators;
private readonly ITenantRepository _tenantRepository; private readonly ITenantRepository _tenantRepository;
private readonly ICurrentTenant _currentTenant; private readonly ICurrentTenant _currentTenant;
public EasyMallDbMigrationService( public EShopSampleDbMigrationService(
IDataSeeder dataSeeder, IDataSeeder dataSeeder,
IEnumerable<IEasyMallDbSchemaMigrator> dbSchemaMigrators, IEnumerable<IEShopSampleDbSchemaMigrator> dbSchemaMigrators,
ITenantRepository tenantRepository, ITenantRepository tenantRepository,
ICurrentTenant currentTenant) ICurrentTenant currentTenant)
{ {
@ -30,7 +30,7 @@ namespace EasyMall.Data
_tenantRepository = tenantRepository; _tenantRepository = tenantRepository;
_currentTenant = currentTenant; _currentTenant = currentTenant;
Logger = NullLogger<EasyMallDbMigrationService>.Instance; Logger = NullLogger<EShopSampleDbMigrationService>.Instance;
} }
public async Task MigrateAsync() public async Task MigrateAsync()

4
samples/EasyMall/aspnet-core/src/EasyMall.Domain/Data/IEasyMallDbSchemaMigrator.cs → samples/EShopSample/aspnet-core/src/EShopSample.Domain/Data/IEShopSampleDbSchemaMigrator.cs

@ -1,8 +1,8 @@
using System.Threading.Tasks; using System.Threading.Tasks;
namespace EasyMall.Data namespace EShopSample.Data
{ {
public interface IEasyMallDbSchemaMigrator public interface IEShopSampleDbSchemaMigrator
{ {
Task MigrateAsync(); Task MigrateAsync();
} }

6
samples/EasyMall/aspnet-core/src/EasyMall.Domain/Data/NullEasyMallDbSchemaMigrator.cs → samples/EShopSample/aspnet-core/src/EShopSample.Domain/Data/NullEShopSampleDbSchemaMigrator.cs

@ -1,12 +1,12 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
namespace EasyMall.Data namespace EShopSample.Data
{ {
/* This is used if database provider does't define /* This is used if database provider does't define
* IEasyMallDbSchemaMigrator implementation. * IEShopSampleDbSchemaMigrator implementation.
*/ */
public class NullEasyMallDbSchemaMigrator : IEasyMallDbSchemaMigrator, ITransientDependency public class NullEShopSampleDbSchemaMigrator : IEShopSampleDbSchemaMigrator, ITransientDependency
{ {
public Task MigrateAsync() public Task MigrateAsync()
{ {

4
samples/EasyMall/aspnet-core/src/EasyMall.Domain/EasyMall.Domain.csproj → samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj

@ -4,12 +4,12 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>EasyMall</RootNamespace> <RootNamespace>EShopSample</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.Domain\EasyAbp.EShop.Domain.csproj" /> <ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.Domain\EasyAbp.EShop.Domain.csproj" />
<ProjectReference Include="..\EasyMall.Domain.Shared\EasyMall.Domain.Shared.csproj" /> <ProjectReference Include="..\EShopSample.Domain.Shared\EShopSample.Domain.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
samples/EasyMall/aspnet-core/src/EasyMall.Domain/EasyMallConsts.cs → samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSampleConsts.cs

@ -1,6 +1,6 @@
namespace EasyMall namespace EShopSample
{ {
public static class EasyMallConsts public static class EShopSampleConsts
{ {
public const string DbTablePrefix = "App"; public const string DbTablePrefix = "App";

12
samples/EasyMall/aspnet-core/src/EasyMall.Domain/EasyMallDomainModule.cs → samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSampleDomainModule.cs

@ -1,8 +1,8 @@
using EasyAbp.EShop; using EasyAbp.EShop;
using EasyAbp.PaymentService.Payments; using EasyAbp.PaymentService.Payments;
using EasyAbp.PaymentService.WeChatPay; using EasyAbp.PaymentService.WeChatPay;
using EasyMall.MultiTenancy; using EShopSample.MultiTenancy;
using EasyMall.ObjectExtending; using EShopSample.ObjectExtending;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.AuditLogging; using Volo.Abp.AuditLogging;
@ -17,10 +17,10 @@ using Volo.Abp.PermissionManagement.IdentityServer;
using Volo.Abp.SettingManagement; using Volo.Abp.SettingManagement;
using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement;
namespace EasyMall namespace EShopSample
{ {
[DependsOn( [DependsOn(
typeof(EasyMallDomainSharedModule), typeof(EShopSampleDomainSharedModule),
typeof(AbpAuditLoggingDomainModule), typeof(AbpAuditLoggingDomainModule),
typeof(AbpBackgroundJobsDomainModule), typeof(AbpBackgroundJobsDomainModule),
typeof(AbpFeatureManagementDomainModule), typeof(AbpFeatureManagementDomainModule),
@ -33,11 +33,11 @@ namespace EasyMall
typeof(EShopDomainModule), typeof(EShopDomainModule),
typeof(PaymentServiceWeChatPayDomainModule) typeof(PaymentServiceWeChatPayDomainModule)
)] )]
public class EasyMallDomainModule : AbpModule public class EShopSampleDomainModule : AbpModule
{ {
public override void PreConfigureServices(ServiceConfigurationContext context) public override void PreConfigureServices(ServiceConfigurationContext context)
{ {
EasyMallDomainObjectExtensions.Configure(); EShopSampleDomainObjectExtensions.Configure();
} }
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)

18
samples/EasyMall/aspnet-core/src/EasyMall.Domain/IdentityServer/IdentityServerDataSeedContributor.cs → samples/EShopSample/aspnet-core/src/EShopSample.Domain/IdentityServer/IdentityServerDataSeedContributor.cs

@ -15,7 +15,7 @@ using Volo.Abp.Uow;
using ApiResource = Volo.Abp.IdentityServer.ApiResources.ApiResource; using ApiResource = Volo.Abp.IdentityServer.ApiResources.ApiResource;
using Client = Volo.Abp.IdentityServer.Clients.Client; using Client = Volo.Abp.IdentityServer.Clients.Client;
namespace EasyMall.IdentityServer namespace EShopSample.IdentityServer
{ {
public class IdentityServerDataSeedContributor : IDataSeedContributor, ITransientDependency public class IdentityServerDataSeedContributor : IDataSeedContributor, ITransientDependency
{ {
@ -62,7 +62,7 @@ namespace EasyMall.IdentityServer
"role" "role"
}; };
await CreateApiResourceAsync("EasyMall", commonApiUserClaims); await CreateApiResourceAsync("EShopSample", commonApiUserClaims);
} }
private async Task<ApiResource> CreateApiResourceAsync(string name, IEnumerable<string> claims) private async Task<ApiResource> CreateApiResourceAsync(string name, IEnumerable<string> claims)
@ -101,39 +101,39 @@ namespace EasyMall.IdentityServer
"role", "role",
"phone", "phone",
"address", "address",
"EasyMall" "EShopSample"
}; };
var configurationSection = _configuration.GetSection("IdentityServer:Clients"); var configurationSection = _configuration.GetSection("IdentityServer:Clients");
//Web Client //Web Client
var webClientId = configurationSection["EasyMall_Web:ClientId"]; var webClientId = configurationSection["EShopSample_Web:ClientId"];
if (!webClientId.IsNullOrWhiteSpace()) if (!webClientId.IsNullOrWhiteSpace())
{ {
var webClientRootUrl = configurationSection["EasyMall_Web:RootUrl"].EnsureEndsWith('/'); var webClientRootUrl = configurationSection["EShopSample_Web:RootUrl"].EnsureEndsWith('/');
/* EasyMall_Web client is only needed if you created a tiered /* EShopSample_Web client is only needed if you created a tiered
* solution. Otherwise, you can delete this client. */ * solution. Otherwise, you can delete this client. */
await CreateClientAsync( await CreateClientAsync(
webClientId, webClientId,
commonScopes, commonScopes,
new[] { "hybrid" }, new[] { "hybrid" },
(configurationSection["EasyMall_Web:ClientSecret"] ?? "1q2w3e*").Sha256(), (configurationSection["EShopSample_Web:ClientSecret"] ?? "1q2w3e*").Sha256(),
redirectUri: $"{webClientRootUrl}signin-oidc", redirectUri: $"{webClientRootUrl}signin-oidc",
postLogoutRedirectUri: $"{webClientRootUrl}signout-callback-oidc" postLogoutRedirectUri: $"{webClientRootUrl}signout-callback-oidc"
); );
} }
//Console Test Client //Console Test Client
var consoleClientId = configurationSection["EasyMall_App:ClientId"]; var consoleClientId = configurationSection["EShopSample_App:ClientId"];
if (!consoleClientId.IsNullOrWhiteSpace()) if (!consoleClientId.IsNullOrWhiteSpace())
{ {
await CreateClientAsync( await CreateClientAsync(
consoleClientId, consoleClientId,
commonScopes, commonScopes,
new[] { "password", "client_credentials" }, new[] { "password", "client_credentials" },
(configurationSection["EasyMall_App:ClientSecret"] ?? "1q2w3e*").Sha256() (configurationSection["EShopSample_App:ClientSecret"] ?? "1q2w3e*").Sha256()
); );
} }
} }

6
samples/EasyMall/aspnet-core/src/EasyMall.Domain/ObjectExtending/EasyMallDomainObjectExtensions.cs → samples/EShopSample/aspnet-core/src/EShopSample.Domain/ObjectExtending/EShopSampleDomainObjectExtensions.cs

@ -2,9 +2,9 @@
using Volo.Abp.ObjectExtending; using Volo.Abp.ObjectExtending;
using Volo.Abp.Threading; using Volo.Abp.Threading;
namespace EasyMall.ObjectExtending namespace EShopSample.ObjectExtending
{ {
public static class EasyMallDomainObjectExtensions public static class EShopSampleDomainObjectExtensions
{ {
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
@ -16,7 +16,7 @@ namespace EasyMall.ObjectExtending
* defined in the depended modules. * defined in the depended modules.
* *
* If you are using EF Core and want to map the entity extension properties to new * If you are using EF Core and want to map the entity extension properties to new
* table fields in the database, then configure them in the EasyMallEfCoreEntityExtensionMappings * table fields in the database, then configure them in the EShopSampleEfCoreEntityExtensionMappings
* *
* Example: * Example:
* *

13
samples/EShopSample/aspnet-core/src/EShopSample.Domain/Settings/EShopSampleSettingDefinitionProvider.cs

@ -0,0 +1,13 @@
using Volo.Abp.Settings;
namespace EShopSample.Settings
{
public class EShopSampleSettingDefinitionProvider : SettingDefinitionProvider
{
public override void Define(ISettingDefinitionContext context)
{
//Define your own settings here. Example:
//context.Add(new SettingDefinition(EShopSampleSettings.MySetting1));
}
}
}

6
samples/EasyMall/aspnet-core/src/EasyMall.Domain/Settings/EasyMallSettings.cs → samples/EShopSample/aspnet-core/src/EShopSample.Domain/Settings/EShopSampleSettings.cs

@ -1,8 +1,8 @@
namespace EasyMall.Settings namespace EShopSample.Settings
{ {
public static class EasyMallSettings public static class EShopSampleSettings
{ {
private const string Prefix = "EasyMall"; private const string Prefix = "EShopSample";
//Add your own setting names here. Example: //Add your own setting names here. Example:
//public const string MySetting1 = Prefix + ".MySetting1"; //public const string MySetting1 = Prefix + ".MySetting1";

6
samples/EasyMall/aspnet-core/src/EasyMall.Domain/Users/AppUser.cs → samples/EShopSample/aspnet-core/src/EShopSample.Domain/Users/AppUser.cs

@ -2,7 +2,7 @@
using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.Domain.Entities.Auditing;
using Volo.Abp.Users; using Volo.Abp.Users;
namespace EasyMall.Users namespace EShopSample.Users
{ {
/* This entity shares the same table/collection ("AbpUsers" by default) with the /* This entity shares the same table/collection ("AbpUsers" by default) with the
* IdentityUser entity of the Identity module. * IdentityUser entity of the Identity module.
@ -46,9 +46,9 @@ namespace EasyMall.Users
* *
* If you add a property and using the EF Core, remember these; * If you add a property and using the EF Core, remember these;
* *
* 1. Update EasyMallDbContext.OnModelCreating * 1. Update EShopSampleDbContext.OnModelCreating
* to configure the mapping for your new property * to configure the mapping for your new property
* 2. Update EasyMallEfCoreEntityExtensionMappings to extend the IdentityUser entity * 2. Update EShopSampleEfCoreEntityExtensionMappings to extend the IdentityUser entity
* and add your new property to the migration. * and add your new property to the migration.
* 3. Use the Add-Migration to add a new database migration. * 3. Use the Add-Migration to add a new database migration.
* 4. Run the .DbMigrator project (or use the Update-Database command) to apply * 4. Run the .DbMigrator project (or use the Update-Database command) to apply

4
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/EasyMall.EntityFrameworkCore.DbMigrations.csproj → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EShopSample.EntityFrameworkCore.DbMigrations.csproj

@ -4,7 +4,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>EasyMall</RootNamespace> <RootNamespace>EShopSample</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -15,7 +15,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\EasyMall.EntityFrameworkCore\EasyMall.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\EShopSample.EntityFrameworkCore\EShopSample.EntityFrameworkCore.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

16
samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleEntityFrameworkCoreDbMigrationsModule.cs

@ -0,0 +1,16 @@
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.Modularity;
namespace EShopSample.EntityFrameworkCore
{
[DependsOn(
typeof(EShopSampleEntityFrameworkCoreModule)
)]
public class EShopSampleEntityFrameworkCoreDbMigrationsModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
context.Services.AddAbpDbContext<EShopSampleMigrationsDbContext>();
}
}
}

12
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EasyMallMigrationsDbContext.cs → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleMigrationsDbContext.cs

@ -11,16 +11,16 @@ using Volo.Abp.PermissionManagement.EntityFrameworkCore;
using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore;
using Volo.Abp.TenantManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement.EntityFrameworkCore;
namespace EasyMall.EntityFrameworkCore namespace EShopSample.EntityFrameworkCore
{ {
/* This DbContext is only used for database migrations. /* This DbContext is only used for database migrations.
* It is not used on runtime. See EasyMallDbContext for the runtime DbContext. * It is not used on runtime. See EShopSampleDbContext for the runtime DbContext.
* It is a unified model that includes configuration for * It is a unified model that includes configuration for
* all used modules and your application. * all used modules and your application.
*/ */
public class EasyMallMigrationsDbContext : AbpDbContext<EasyMallMigrationsDbContext> public class EShopSampleMigrationsDbContext : AbpDbContext<EShopSampleMigrationsDbContext>
{ {
public EasyMallMigrationsDbContext(DbContextOptions<EasyMallMigrationsDbContext> options) public EShopSampleMigrationsDbContext(DbContextOptions<EShopSampleMigrationsDbContext> options)
: base(options) : base(options)
{ {
@ -41,9 +41,9 @@ namespace EasyMall.EntityFrameworkCore
builder.ConfigureFeatureManagement(); builder.ConfigureFeatureManagement();
builder.ConfigureTenantManagement(); builder.ConfigureTenantManagement();
/* Configure your own tables/entities inside the ConfigureEasyMall method */ /* Configure your own tables/entities inside the ConfigureEShopSample method */
builder.ConfigureEasyMall(); builder.ConfigureEShopSample();
builder.ConfigureEShop(); builder.ConfigureEShop();
builder.ConfigurePaymentServiceWeChatPay(); builder.ConfigurePaymentServiceWeChatPay();

12
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EasyMallMigrationsDbContextFactory.cs → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EShopSampleMigrationsDbContextFactory.cs

@ -3,22 +3,22 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Design; using Microsoft.EntityFrameworkCore.Design;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
namespace EasyMall.EntityFrameworkCore namespace EShopSample.EntityFrameworkCore
{ {
/* This class is needed for EF Core console commands /* This class is needed for EF Core console commands
* (like Add-Migration and Update-Database commands) */ * (like Add-Migration and Update-Database commands) */
public class EasyMallMigrationsDbContextFactory : IDesignTimeDbContextFactory<EasyMallMigrationsDbContext> public class EShopSampleMigrationsDbContextFactory : IDesignTimeDbContextFactory<EShopSampleMigrationsDbContext>
{ {
public EasyMallMigrationsDbContext CreateDbContext(string[] args) public EShopSampleMigrationsDbContext CreateDbContext(string[] args)
{ {
EasyMallEfCoreEntityExtensionMappings.Configure(); EShopSampleEfCoreEntityExtensionMappings.Configure();
var configuration = BuildConfiguration(); var configuration = BuildConfiguration();
var builder = new DbContextOptionsBuilder<EasyMallMigrationsDbContext>() var builder = new DbContextOptionsBuilder<EShopSampleMigrationsDbContext>()
.UseSqlServer(configuration.GetConnectionString("Default")); .UseSqlServer(configuration.GetConnectionString("Default"));
return new EasyMallMigrationsDbContext(builder.Options); return new EShopSampleMigrationsDbContext(builder.Options);
} }
private static IConfigurationRoot BuildConfiguration() private static IConfigurationRoot BuildConfiguration()

14
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EntityFrameworkCoreEasyMallDbSchemaMigrator.cs → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EntityFrameworkCoreEShopSampleDbSchemaMigrator.cs

@ -2,17 +2,17 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using EasyMall.Data; using EShopSample.Data;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
namespace EasyMall.EntityFrameworkCore namespace EShopSample.EntityFrameworkCore
{ {
public class EntityFrameworkCoreEasyMallDbSchemaMigrator public class EntityFrameworkCoreEShopSampleDbSchemaMigrator
: IEasyMallDbSchemaMigrator, ITransientDependency : IEShopSampleDbSchemaMigrator, ITransientDependency
{ {
private readonly IServiceProvider _serviceProvider; private readonly IServiceProvider _serviceProvider;
public EntityFrameworkCoreEasyMallDbSchemaMigrator( public EntityFrameworkCoreEShopSampleDbSchemaMigrator(
IServiceProvider serviceProvider) IServiceProvider serviceProvider)
{ {
_serviceProvider = serviceProvider; _serviceProvider = serviceProvider;
@ -20,14 +20,14 @@ namespace EasyMall.EntityFrameworkCore
public async Task MigrateAsync() public async Task MigrateAsync()
{ {
/* We intentionally resolving the EasyMallMigrationsDbContext /* We intentionally resolving the EShopSampleMigrationsDbContext
* from IServiceProvider (instead of directly injecting it) * from IServiceProvider (instead of directly injecting it)
* to properly get the connection string of the current tenant in the * to properly get the connection string of the current tenant in the
* current scope. * current scope.
*/ */
await _serviceProvider await _serviceProvider
.GetRequiredService<EasyMallMigrationsDbContext>() .GetRequiredService<EShopSampleMigrationsDbContext>()
.Database .Database
.MigrateAsync(); .MigrateAsync();
} }

6
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200526074907_AddedCodeToProductSku.Designer.cs → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200526074907_AddedCodeToProductSku.Designer.cs

@ -1,15 +1,15 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using EasyMall.EntityFrameworkCore; using EShopSample.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace EasyMall.Migrations namespace EShopSample.Migrations
{ {
[DbContext(typeof(EasyMallMigrationsDbContext))] [DbContext(typeof(EShopSampleMigrationsDbContext))]
[Migration("20200526074907_AddedCodeToProductSku")] [Migration("20200526074907_AddedCodeToProductSku")]
partial class AddedCodeToProductSku partial class AddedCodeToProductSku
{ {

2
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200526074907_AddedCodeToProductSku.cs → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200526074907_AddedCodeToProductSku.cs

@ -1,7 +1,7 @@
using System; using System;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
namespace EasyMall.Migrations namespace EShopSample.Migrations
{ {
public partial class AddedCodeToProductSku : Migration public partial class AddedCodeToProductSku : Migration
{ {

6
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200527083620_ChangedToSerializedEntityData.Designer.cs → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200527083620_ChangedToSerializedEntityData.Designer.cs

@ -1,15 +1,15 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using EasyMall.EntityFrameworkCore; using EShopSample.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace EasyMall.Migrations namespace EShopSample.Migrations
{ {
[DbContext(typeof(EasyMallMigrationsDbContext))] [DbContext(typeof(EShopSampleMigrationsDbContext))]
[Migration("20200527083620_ChangedToSerializedEntityData")] [Migration("20200527083620_ChangedToSerializedEntityData")]
partial class ChangedToSerializedEntityData partial class ChangedToSerializedEntityData
{ {

2
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/20200527083620_ChangedToSerializedEntityData.cs → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/20200527083620_ChangedToSerializedEntityData.cs

@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
namespace EasyMall.Migrations namespace EShopSample.Migrations
{ {
public partial class ChangedToSerializedEntityData : Migration public partial class ChangedToSerializedEntityData : Migration
{ {

8
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore.DbMigrations/Migrations/EasyMallMigrationsDbContextModelSnapshot.cs → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore.DbMigrations/Migrations/EShopSampleMigrationsDbContextModelSnapshot.cs

@ -1,15 +1,15 @@
// <auto-generated /> // <auto-generated />
using System; using System;
using EasyMall.EntityFrameworkCore; using EShopSample.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace EasyMall.Migrations namespace EShopSample.Migrations
{ {
[DbContext(typeof(EasyMallMigrationsDbContext))] [DbContext(typeof(EShopSampleMigrationsDbContext))]
partial class EasyMallMigrationsDbContextModelSnapshot : ModelSnapshot partial class EShopSampleMigrationsDbContextModelSnapshot : ModelSnapshot
{ {
protected override void BuildModel(ModelBuilder modelBuilder) protected override void BuildModel(ModelBuilder modelBuilder)
{ {

4
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore/EasyMall.EntityFrameworkCore.csproj → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj

@ -4,12 +4,12 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>EasyMall</RootNamespace> <RootNamespace>EShopSample</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.EntityFrameworkCore\EasyAbp.EShop.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.EntityFrameworkCore\EasyAbp.EShop.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EasyMall.Domain\EasyMall.Domain.csproj" /> <ProjectReference Include="..\EShopSample.Domain\EShopSample.Domain.csproj" />
<PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="0.1.6" /> <PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="0.1.6" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.8.0" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="2.8.0" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.8.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="2.8.0" />

18
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore/EntityFrameworkCore/EasyMallDbContext.cs → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EntityFrameworkCore/EShopSampleDbContext.cs

@ -1,12 +1,12 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using EasyMall.Users; using EShopSample.Users;
using Volo.Abp.Data; using Volo.Abp.Data;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore.Modeling; using Volo.Abp.EntityFrameworkCore.Modeling;
using Volo.Abp.Identity; using Volo.Abp.Identity;
using Volo.Abp.Users.EntityFrameworkCore; using Volo.Abp.Users.EntityFrameworkCore;
namespace EasyMall.EntityFrameworkCore namespace EShopSample.EntityFrameworkCore
{ {
/* This is your actual DbContext used on runtime. /* This is your actual DbContext used on runtime.
* It includes only your entities. * It includes only your entities.
@ -15,18 +15,18 @@ namespace EasyMall.EntityFrameworkCore
* just create a structure like done for AppUser. * just create a structure like done for AppUser.
* *
* Don't use this DbContext for database migrations since it does not contain tables of the * Don't use this DbContext for database migrations since it does not contain tables of the
* used modules (as explained above). See EasyMallMigrationsDbContext for migrations. * used modules (as explained above). See EShopSampleMigrationsDbContext for migrations.
*/ */
[ConnectionStringName("Default")] [ConnectionStringName("Default")]
public class EasyMallDbContext : AbpDbContext<EasyMallDbContext> public class EShopSampleDbContext : AbpDbContext<EShopSampleDbContext>
{ {
public DbSet<AppUser> Users { get; set; } public DbSet<AppUser> Users { get; set; }
/* Add DbSet properties for your Aggregate Roots / Entities here. /* Add DbSet properties for your Aggregate Roots / Entities here.
* Also map them inside EasyMallDbContextModelCreatingExtensions.ConfigureEasyMall * Also map them inside EShopSampleDbContextModelCreatingExtensions.ConfigureEShopSample
*/ */
public EasyMallDbContext(DbContextOptions<EasyMallDbContext> options) public EShopSampleDbContext(DbContextOptions<EShopSampleDbContext> options)
: base(options) : base(options)
{ {
@ -46,13 +46,13 @@ namespace EasyMall.EntityFrameworkCore
b.ConfigureAbpUser(); b.ConfigureAbpUser();
/* Configure mappings for your additional properties /* Configure mappings for your additional properties
* Also see the EasyMallEfCoreEntityExtensionMappings class * Also see the EShopSampleEfCoreEntityExtensionMappings class
*/ */
}); });
/* Configure your own tables/entities inside the ConfigureEasyMall method */ /* Configure your own tables/entities inside the ConfigureEShopSample method */
builder.ConfigureEasyMall(); builder.ConfigureEShopSample();
} }
} }
} }

8
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore/EntityFrameworkCore/EasyMallDbContextModelCreatingExtensions.cs → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EntityFrameworkCore/EShopSampleDbContextModelCreatingExtensions.cs

@ -1,11 +1,11 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Volo.Abp; using Volo.Abp;
namespace EasyMall.EntityFrameworkCore namespace EShopSample.EntityFrameworkCore
{ {
public static class EasyMallDbContextModelCreatingExtensions public static class EShopSampleDbContextModelCreatingExtensions
{ {
public static void ConfigureEasyMall(this ModelBuilder builder) public static void ConfigureEShopSample(this ModelBuilder builder)
{ {
Check.NotNull(builder, nameof(builder)); Check.NotNull(builder, nameof(builder));
@ -13,7 +13,7 @@ namespace EasyMall.EntityFrameworkCore
//builder.Entity<YourEntity>(b => //builder.Entity<YourEntity>(b =>
//{ //{
// b.ToTable(EasyMallConsts.DbTablePrefix + "YourEntities", EasyMallConsts.DbSchema); // b.ToTable(EShopSampleConsts.DbTablePrefix + "YourEntities", EShopSampleConsts.DbSchema);
// //... // //...
//}); //});

6
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore/EntityFrameworkCore/EasyMallEfCoreEntityExtensionMappings.cs → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EntityFrameworkCore/EShopSampleEfCoreEntityExtensionMappings.cs

@ -2,9 +2,9 @@
using Volo.Abp.ObjectExtending; using Volo.Abp.ObjectExtending;
using Volo.Abp.Threading; using Volo.Abp.Threading;
namespace EasyMall.EntityFrameworkCore namespace EShopSample.EntityFrameworkCore
{ {
public static class EasyMallEfCoreEntityExtensionMappings public static class EShopSampleEfCoreEntityExtensionMappings
{ {
private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner(); private static readonly OneTimeRunner OneTimeRunner = new OneTimeRunner();
@ -18,7 +18,7 @@ namespace EasyMall.EntityFrameworkCore
* The properties defined here becomes table fields. * The properties defined here becomes table fields.
* If you want to use the ExtraProperties dictionary of the entity * If you want to use the ExtraProperties dictionary of the entity
* instead of creating a new field, then define the property in the * instead of creating a new field, then define the property in the
* EasyMallDomainObjectExtensions class. * EShopSampleDomainObjectExtensions class.
* *
* Example: * Example:
* *

12
samples/EasyMall/aspnet-core/src/EasyMall.EntityFrameworkCore/EntityFrameworkCore/EasyMallEntityFrameworkCoreModule.cs → samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EntityFrameworkCore/EShopSampleEntityFrameworkCoreModule.cs

@ -13,10 +13,10 @@ using Volo.Abp.PermissionManagement.EntityFrameworkCore;
using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore;
using Volo.Abp.TenantManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement.EntityFrameworkCore;
namespace EasyMall.EntityFrameworkCore namespace EShopSample.EntityFrameworkCore
{ {
[DependsOn( [DependsOn(
typeof(EasyMallDomainModule), typeof(EShopSampleDomainModule),
typeof(AbpIdentityEntityFrameworkCoreModule), typeof(AbpIdentityEntityFrameworkCoreModule),
typeof(AbpIdentityServerEntityFrameworkCoreModule), typeof(AbpIdentityServerEntityFrameworkCoreModule),
typeof(AbpPermissionManagementEntityFrameworkCoreModule), typeof(AbpPermissionManagementEntityFrameworkCoreModule),
@ -29,16 +29,16 @@ namespace EasyMall.EntityFrameworkCore
typeof(EShopEntityFrameworkCoreModule), typeof(EShopEntityFrameworkCoreModule),
typeof(PaymentServiceWeChatPayEntityFrameworkCoreModule) typeof(PaymentServiceWeChatPayEntityFrameworkCoreModule)
)] )]
public class EasyMallEntityFrameworkCoreModule : AbpModule public class EShopSampleEntityFrameworkCoreModule : AbpModule
{ {
public override void PreConfigureServices(ServiceConfigurationContext context) public override void PreConfigureServices(ServiceConfigurationContext context)
{ {
EasyMallEfCoreEntityExtensionMappings.Configure(); EShopSampleEfCoreEntityExtensionMappings.Configure();
} }
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
{ {
context.Services.AddAbpDbContext<EasyMallDbContext>(options => context.Services.AddAbpDbContext<EShopSampleDbContext>(options =>
{ {
/* Remove "includeAllEntities: true" to create /* Remove "includeAllEntities: true" to create
* default repositories only for aggregate roots */ * default repositories only for aggregate roots */
@ -48,7 +48,7 @@ namespace EasyMall.EntityFrameworkCore
Configure<AbpDbContextOptions>(options => Configure<AbpDbContextOptions>(options =>
{ {
/* The main point to change your DBMS. /* The main point to change your DBMS.
* See also EasyMallMigrationsDbContextFactory for EF Core tooling. */ * See also EShopSampleMigrationsDbContextFactory for EF Core tooling. */
options.UseSqlServer(); options.UseSqlServer();
}); });
} }

4
samples/EasyMall/aspnet-core/src/EasyMall.HttpApi.Client/EasyMall.HttpApi.Client.csproj → samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj

@ -4,12 +4,12 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>EasyMall</RootNamespace> <RootNamespace>EShopSample</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.HttpApi.Client\EasyAbp.EShop.HttpApi.Client.csproj" /> <ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.HttpApi.Client\EasyAbp.EShop.HttpApi.Client.csproj" />
<ProjectReference Include="..\EasyMall.Application.Contracts\EasyMall.Application.Contracts.csproj" /> <ProjectReference Include="..\EShopSample.Application.Contracts\EShopSample.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
samples/EasyMall/aspnet-core/src/EasyMall.HttpApi.Client/EasyMallHttpApiClientModule.cs → samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSampleHttpApiClientModule.cs

@ -8,10 +8,10 @@ using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement; using Volo.Abp.PermissionManagement;
using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement;
namespace EasyMall namespace EShopSample
{ {
[DependsOn( [DependsOn(
typeof(EasyMallApplicationContractsModule), typeof(EShopSampleApplicationContractsModule),
typeof(AbpAccountHttpApiClientModule), typeof(AbpAccountHttpApiClientModule),
typeof(AbpIdentityHttpApiClientModule), typeof(AbpIdentityHttpApiClientModule),
typeof(AbpPermissionManagementHttpApiClientModule), typeof(AbpPermissionManagementHttpApiClientModule),
@ -20,14 +20,14 @@ namespace EasyMall
typeof(EShopHttpApiClientModule), typeof(EShopHttpApiClientModule),
typeof(PaymentServiceWeChatPayHttpApiClientModule) typeof(PaymentServiceWeChatPayHttpApiClientModule)
)] )]
public class EasyMallHttpApiClientModule : AbpModule public class EShopSampleHttpApiClientModule : AbpModule
{ {
public const string RemoteServiceName = "Default"; public const string RemoteServiceName = "Default";
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
{ {
context.Services.AddHttpClientProxies( context.Services.AddHttpClientProxies(
typeof(EasyMallApplicationContractsModule).Assembly, typeof(EShopSampleApplicationContractsModule).Assembly,
RemoteServiceName RemoteServiceName
); );
} }

15
samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/Controllers/EShopSampleController.cs

@ -0,0 +1,15 @@
using EShopSample.Localization;
using Volo.Abp.AspNetCore.Mvc;
namespace EShopSample.Controllers
{
/* Inherit your controllers from this class.
*/
public abstract class EShopSampleController : AbpController
{
protected EShopSampleController()
{
LocalizationResource = typeof(EShopSampleResource);
}
}
}

4
samples/EasyMall/aspnet-core/src/EasyMall.HttpApi/EasyMall.HttpApi.csproj → samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj

@ -4,12 +4,12 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>EasyMall</RootNamespace> <RootNamespace>EShopSample</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.HttpApi\EasyAbp.EShop.HttpApi.csproj" /> <ProjectReference Include="..\..\..\..\..\integration\EasyAbp.EShop\src\EasyAbp.EShop.HttpApi\EasyAbp.EShop.HttpApi.csproj" />
<ProjectReference Include="..\EasyMall.Application.Contracts\EasyMall.Application.Contracts.csproj" /> <ProjectReference Include="..\EShopSample.Application.Contracts\EShopSample.Application.Contracts.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
samples/EasyMall/aspnet-core/src/EasyMall.HttpApi/EasyMallHttpApiModule.cs → samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSampleHttpApiModule.cs

@ -7,10 +7,10 @@ using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement.HttpApi; using Volo.Abp.PermissionManagement.HttpApi;
using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement;
namespace EasyMall namespace EShopSample
{ {
[DependsOn( [DependsOn(
typeof(EasyMallApplicationContractsModule), typeof(EShopSampleApplicationContractsModule),
typeof(AbpAccountHttpApiModule), typeof(AbpAccountHttpApiModule),
typeof(AbpIdentityHttpApiModule), typeof(AbpIdentityHttpApiModule),
typeof(AbpPermissionManagementHttpApiModule), typeof(AbpPermissionManagementHttpApiModule),
@ -19,7 +19,7 @@ namespace EasyMall
typeof(EShopHttpApiModule), typeof(EShopHttpApiModule),
typeof(PaymentServiceWeChatPayHttpApiModule) typeof(PaymentServiceWeChatPayHttpApiModule)
)] )]
public class EasyMallHttpApiModule : AbpModule public class EShopSampleHttpApiModule : AbpModule
{ {
} }

2
samples/EasyMall/aspnet-core/src/EasyMall.HttpApi/Models/Test/TestModel.cs → samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/Models/Test/TestModel.cs

@ -1,6 +1,6 @@
using System; using System;
namespace EasyMall.Models.Test namespace EShopSample.Models.Test
{ {
public class TestModel public class TestModel
{ {

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save