xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复问题

Browse Source
This commit is contained in:
橙子
2021-11-03 18:58:44 +08:00
parent 492c0203b6
commit b0a7408177
7 changed files with 87 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Yi.Framework/Yi.Framework.ApiMicroservice/Startup.cs
View File

@@ -84,7 +84,7 @@ namespace Yi.Framework.ApiMicroservice
#endregion #endregion
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IWebHostEnvironment env,IDbContextFactory _DbFactory) public void Configure(IApplicationBuilder app, IWebHostEnvironment env,IDbContextFactory _DbFactory, CacheClientDB _cacheClientDB)
{ {
//if (env.IsDevelopment()) //if (env.IsDevelopment())
{ {
@@ -142,7 +142,11 @@ namespace Yi.Framework.ApiMicroservice
//<2F><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>ע<EFBFBD><D7A2> //<2F><><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD>ע<EFBFBD><D7A2>
#endregion #endregion
app.UseDbSeedInitService(_DbFactory); app.UseDbSeedInitService(_DbFactory);
//app.UseRedisInitService(_cacheClientDB);
#region
//redis<69><73><EFBFBD><EFBFBD>ע<EFBFBD><D7A2>
#endregion
app.UseRedisSeedInitService(_cacheClientDB);
#region #region
//Endpointsע<73><D7A2> //Endpointsע<73><D7A2>
#endregion #endregion

12
Yi.Framework/Yi.Framework.ApiMicroservice/SwaggerDoc.xml
View File

@@ -39,6 +39,14 @@
<param name="pwdDto"></param> <param name="pwdDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.FileController.Upload(System.String,Microsoft.AspNetCore.Http.IFormFile)">
<summary>
该方法不对外暴露
</summary>
<param name="type"></param>
<param name="file"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.MenuController.GetMenuInMould"> <member name="M:Yi.Framework.ApiMicroservice.Controllers.MenuController.GetMenuInMould">
<summary> <summary>
这个是要递归的，但是要过滤掉删除的，所以，可以写一个通用过滤掉删除的方法 这个是要递归的，但是要过滤掉删除的，所以，可以写一个通用过滤掉删除的方法
@@ -159,11 +167,11 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.SettingController.UpdateSetting"> <member name="M:Yi.Framework.ApiMicroservice.Controllers.SettingController.UpdateSetting(Yi.Framework.DTOModel.SettingDto)">
<summary> <summary>
更 更
</summary> </summary>
<param name="_Setting"></param> <param name="settingDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.UserController.GetUser"> <member name="M:Yi.Framework.ApiMicroservice.Controllers.UserController.GetUser">

130
Yi.Framework/Yi.Framework.ApiMicroservice/appsettings.json
View File

@@ -1,69 +1,69 @@
{ {
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"Consul_Enabled": false, "Consul_Enabled": false,
"DbSeed_Enabled": true, "DbSeed_Enabled": true,
"Apollo_Enabled": false, "Apollo_Enabled": false,
"HealthCheck_Enabled": false, "HealthCheck_Enabled": false,
"Cors_Enabled": true, "Cors_Enabled": true,
"RabbitMQ_Enabled": false, "RabbitMQ_Enabled": false,
"Redis_Enabled": false, "Redis_Enabled": true,
"RedisSet_Enabled": false, "RedisSeed_Enabled": true,
"Kafka_Enabled": false, "Kafka_Enabled": false,
"MutiDB_Enabled": false, "MutiDB_Enabled": false,
"DbList": ["Sqlite", "Mysql", "Sqlserver", "Oracle"], "DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ],
"DbSelect": "Mysql", "DbSelect": "Mysql",
"DbConn": { "DbConn": {
"WriteUrl": "server=118.195.191.41;port=3306;database=YIDB;user id=root;password=Qz52013142020.", "WriteUrl": "server=118.195.191.41;port=3306;database=YIDB;user id=root;password=Qz52013142020.",
"ReadUrl": [ "ReadUrl": [
"server=118.195.191.41;port=3306;database=YIDB;user id=root;password=Qz52013142020.", "server=118.195.191.41;port=3306;database=YIDB;user id=root;password=Qz52013142020.",
"server=118.195.191.41;port=3306;database=YIDB;user id=root;password=Qz52013142020.", "server=118.195.191.41;port=3306;database=YIDB;user id=root;password=Qz52013142020.",
"server=118.195.191.41;port=3306;database=YIDB;user id=root;password=Qz52013142020." "server=118.195.191.41;port=3306;database=YIDB;user id=root;password=Qz52013142020."
] ]
}, },
"Apollo": { "Apollo": {
"AppId": "Yi.Framework.ApiMicroservice", "AppId": "Yi.Framework.ApiMicroservice",
"Env": "DEV", "Env": "DEV",
"MetaServer": "http://192.168.2.168:8080", "MetaServer": "http://192.168.2.168:8080",
"ConfigServer": ["http://192.168.2.168:8080"] "ConfigServer": [ "http://192.168.2.168:8080" ]
}, },
"JWTTokenOptions": { "JWTTokenOptions": {
"Audience": "http://localhost:7000", "Audience": "http://localhost:7000",
"Issuer": "http://localhost:7000", "Issuer": "http://localhost:7000",
"SecurityKey": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDI2a2EJ7m872v0afyoSDJT2o1+SitIeJSWtLJU8/Wz2m7gStexajkeD+Lka6DSTy8gt9UwfgVQo6uKjVLG5Ex7PiGOODVqAEghBuS7JzIYU5RvI543nNDAPfnJsas96mSA7L/mD7RTE2drj6hf3oZjJpMPZUQI/B1Qjb5H3K3PNwIDAQAB" "SecurityKey": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDI2a2EJ7m872v0afyoSDJT2o1+SitIeJSWtLJU8/Wz2m7gStexajkeD+Lka6DSTy8gt9UwfgVQo6uKjVLG5Ex7PiGOODVqAEghBuS7JzIYU5RvI543nNDAPfnJsas96mSA7L/mD7RTE2drj6hf3oZjJpMPZUQI/B1Qjb5H3K3PNwIDAQAB"
}, },
"RedisConn": { "RedisConnOptions": {
"Host": "118.195.191.41", "Host": "118.195.191.41",
"Prot": 6379, "Prot": 6379,
"DB": 1, "DB": 1,
"Password": "Qz52013142020." "Password": "Qz52013142020."
}, },
"KafkaOptions": { "KafkaOptions": {
"BrokerList": "192.168.3.230:9092", "BrokerList": "192.168.3.230:9092",
"TopicName": "kafkalog" "TopicName": "kafkalog"
}, },
"ConsulClientOption": { "ConsulClientOption": {
"IP": "192.168.2.128", "IP": "192.168.2.128",
"Port": "8500", "Port": "8500",
"Datacenter": "dc1" "Datacenter": "dc1"
}, },
"ConsulRegisterOption": { "ConsulRegisterOption": {
"IP": "192.168.1.104", "IP": "192.168.1.104",
"Port": "7001", "Port": "7001",
"GroupName": "ApiMicroservice", "GroupName": "ApiMicroservice",
"HealthCheckUrl": "/Health", "HealthCheckUrl": "/Health",
"Interval": 10, "Interval": 10,
"Timeout": 5, "Timeout": 5,
"DeregisterCriticalServiceAfter": 60, "DeregisterCriticalServiceAfter": 60,
"Tag": "13" "Tag": "13"
}, },
"IPLibraryServiceUrl": "http://gRPCIPLibraryService" "IPLibraryServiceUrl": "http://gRPCIPLibraryService"
} }

4
Yi.Framework/Yi.Framework.Core/CacheClientDB.cs
View File

@@ -44,9 +44,9 @@ namespace Yi.Framework.Core
// } // }
//} //}
#endregion #endregion
public CacheClientDB(IOptionsMonitor<RedisConnOptions> jwtTokenOptions) public CacheClientDB(IOptionsMonitor<RedisConnOptions> redisConnOptions)
{ {
this._RedisOptions = jwtTokenOptions.CurrentValue; this._RedisOptions = redisConnOptions.CurrentValue;
client = new RedisClient(_RedisOptions.Host, _RedisOptions.Prot, _RedisOptions.Password, _RedisOptions.DB); client = new RedisClient(_RedisOptions.Host, _RedisOptions.Prot, _RedisOptions.Password, _RedisOptions.DB);
} }
// 管道模式 三种模式 // 管道模式 三种模式

1
Yi.Framework/Yi.Framework.WebCore/Init/RedisInit.cs
View File

@@ -16,6 +16,7 @@ namespace Yi.Framework.WebCore.Init
if (_cacheClientDB.Get<SettingDto>(RedisConst.key)==null) if (_cacheClientDB.Get<SettingDto>(RedisConst.key)==null)
{ {
Newtonsoft.Json.JsonConvert.SerializeObject();
_cacheClientDB.Add(RedisConst.key, new SettingDto() _cacheClientDB.Add(RedisConst.key, new SettingDto()
{ {
ImageList_key = { "默认图片", "默认图片" } , ImageList_key = { "默认图片", "默认图片" } ,

2
Yi.Framework/Yi.Framework.WebCore/MiddlewareExtend/RedisExtension.cs
View File

@@ -17,7 +17,7 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
{ {
if (Appsettings.appBool("Redis_Enabled")) if (Appsettings.appBool("Redis_Enabled"))
{ {
services.Configure<RedisConnOptions>(Appsettings.appConfiguration("RedisConn")); services.Configure<RedisConnOptions>(Appsettings.appConfiguration("RedisConnOptions"));
services.AddTransient<CacheClientDB>(); services.AddTransient<CacheClientDB>();
} }
return services; return services;

4
Yi.Framework/Yi.Framework.WebCore/MiddlewareExtend/RedisInitExtend.cs
View File

@@ -15,10 +15,10 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
public static class RedisInitExtend public static class RedisInitExtend
{ {
private static readonly ILog log = LogManager.GetLogger(typeof(RedisInitExtend)); private static readonly ILog log = LogManager.GetLogger(typeof(RedisInitExtend));
public static void UseRedisInitService(this IApplicationBuilder app, CacheClientDB _cacheClientDB) public static void UseRedisSeedInitService(this IApplicationBuilder app, CacheClientDB _cacheClientDB)
{ {
if (Appsettings.appBool("RedisSet_Enabled")) if (Appsettings.appBool("RedisSeed_Enabled"))
{ {
if (app == null) throw new ArgumentNullException(nameof(app)); if (app == null) throw new ArgumentNullException(nameof(app));