chorm: 合并

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs

@@ -27,7 +27,6 @@ namespace Yi.Framework.Rbac.Application.Services.System
     public class UserService : YiCrudAppService<UserEntity, UserGetOutputDto, UserGetListOutputDto, Guid, UserGetListInputVo, UserCreateInputVo, UserUpdateInputVo>,IUserService
     //IUserService
     {
-        private IDistributedCache<UserInfoCacheItem, UserInfoCacheKey> _userCache;
         public UserService(ISqlSugarRepository<UserEntity, Guid> repository, UserManager userManager, IUserRepository userRepository, ICurrentUser currentUser, IDeptService deptService, ILocalEventBus localEventBus, IDistributedCache<UserInfoCacheItem, UserInfoCacheKey> userCache) : base(repository)
             =>
             (_userManager, _userRepository, _currentUser, _deptService, _repository, _localEventBus, _userCache) =
@@ -171,9 +170,6 @@ namespace Yi.Framework.Rbac.Application.Services.System
             var res1 = await _repository.UpdateAsync(entity);
             await _userManager.GiveUserSetRoleAsync(new List<Guid> { id }, input.RoleIds);
             await _userManager.GiveUserSetPostAsync(new List<Guid> { id }, input.PostIds);
-
-            await _userCache.RefreshAsync(new UserInfoCacheKey(_currentUser.GetId()));
-     
             return await MapToGetOutputDtoAsync(entity);
         }
 

Yi.Abp.Net8/src/Yi.Abp.Web/Program.cs

@@ -29,6 +29,8 @@ try
     Log.Information("Yi框架-Abp.vNext，启动！");
 
     var builder = WebApplication.CreateBuilder(args);
+    Log.Information($"当前主机启动环境-【{builder.Environment.EnvironmentName}】");
+    Log.Information($"当前主机启动地址-【{builder.Configuration["App:SelfUrl"]}】");
     builder.WebHost.UseUrls(builder.Configuration["App:SelfUrl"]);
     builder.Host.UseAutofac();
     builder.Host.UseSerilog();

Yi.Abp.Net8/src/Yi.Abp.Web/Properties/launchSettings.json

@@ -5,8 +5,8 @@
       "launchBrowser": true,
       "launchUrl": "swagger",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-        //,"ASPNETCORE_ENVIRONMENT": "Staging"
+        //"ASPNETCORE_ENVIRONMENT": "Development"
+        ,"ASPNETCORE_ENVIRONMENT": "Staging"
       },
       "dotnetRunMessages": true,
       "applicationUrl": "http://localhost:19001"

Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.Staging.json

@@ -0,0 +1,87 @@
+{
+  "Logging": {
+    "LogLevel": {
+      //"Default": "Information",
+      "Default": "Debug",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  //应用启动
+  "App": {
+    "SelfUrl": "http://*:19001",
+    "CorsOrigins": "http://localhost:19001;http://localhost:18000"
+  },
+
+  //数据库类型列表
+  "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ],
+
+  "DbConnOptions": {
+    "Url": "DataSource=yi-abp-dev.db",
+    "DbType": "Sqlite",
+    "EnabledReadWrite": false,
+    "EnabledCodeFirst": true,
+    "EnabledSqlLog": true,
+    "EnabledDbSeed": true,
+    //SAAS多租户
+    "EnabledSaasMultiTenancy": false
+    //读写分离地址
+    //"ReadUrl": [
+    //  "DataSource=[xxxx]", //Sqlite
+    //  "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql
+    //  "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver
+    //]
+  },
+
+  //redis使用freeesql参数在“FreeSqlOptions的ConnectionStringBuilder中”
+  "Redis": {
+    "IsEnabled": false,
+    "Configuration": "127.0.0.1:6379,password=123,defaultDatabase=13"
+  },
+
+  //鉴权
+  "JwtOptions": {
+    "Issuer": "https://ccnetcore.com",
+    "Audience": "https://ccnetcore.com",
+    "SecurityKey": "zqxwcevrbtnymu312412ihe9rfwhe78rh23djoi32hrui3ryf9e8wfh34iuj54y0934uti4h97fgw7hf97wyh8yy69520",
+    "ExpiresMinuteTime": 86400
+  },
+  //刷新token
+  "RefreshJwtOptions": {
+    "Issuer": "https://yi.ccnetcore.com",
+    "Audience": "https://yi.ccnetcore.com",
+    "SecurityKey": "67ij4o6jo4i5j6io45j6i4j74p5k6i54ojoi5t9g8ergoj34ofgkrtbmreog894jbioemgropihj48rj4io5juopjgior",
+    "ExpiresMinuteTime": 172800
+  },
+
+
+  //第三方登录
+  "OAuth": {
+    //QQ
+    "QQ": {
+      "ClientId": "",
+      "ClientSecret": "",
+      "RedirectUri": ""
+    },
+    //码云
+    "Gitee": {
+      "ClientId": "",
+      "ClientSecret": "",
+      "RedirectUri": ""
+    }
+  },
+
+  //Rbac模块
+  "RbacOptions": {
+    //超级管理员种子数据默认密码
+    "AdminPassword": "123456",
+
+    //是否开启验证码验证
+    "EnableCaptcha": true,
+
+    //是否开启注册功能
+    "EnableRegister": false,
+
+    //开启定时数据库备份
+    "EnableDataBaseBackup": false
+  }
+}