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

同步

Browse Source
This commit is contained in:
lzw
2021-11-03 21:14:58 +08:00
parent eb51c3c755
commit 6f79f870bb
7 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
View File

@@ -50,6 +50,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
if ( user_data!=null) if ( user_data!=null)
{ {
var token = MakeJwt.app(new jwtUser() {user=user_data,menuIds= menuList}); var token = MakeJwt.app(new jwtUser() {user=user_data,menuIds= menuList});
JobModel.visitNum += 1;
return Result.Success().SetData(new { user = new { user_data.id, user_data.username, user_data.introduction, user_data.icon, user_data.nick }, token }); return Result.Success().SetData(new { user = new { user_data.id, user_data.username, user_data.introduction, user_data.icon, user_data.nick }, token });
} }
return Result.Error(); return Result.Error();

11
Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/SettingController.cs
View File

@@ -38,8 +38,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
[HttpGet] [HttpGet]
public Result GetSetting() public Result GetSetting()
{ {
var setDto = Common.Helper.JsonHelper.ParseFormByJson<SettingDto>(_cacheClientDB.Get<string>(RedisConst.key)); var setDto = Common.Helper.JsonHelper.StrToObj<SettingDto>(_cacheClientDB.Get<string>(RedisConst.key));
return Result.Success().SetData(setDto); return Result.Success().SetData( setDto);
} }
/// <summary> /// <summary>
@@ -48,14 +48,13 @@ namespace Yi.Framework.ApiMicroservice.Controllers
/// <param name="settingDto"></param> /// <param name="settingDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPut] [HttpPut]
public Result UpdateSetting(SettingDto settingDto) public Result UpdateSetting(SettingDto settingDto)
{ {
var setDto = Common.Helper.JsonHelper.GetJSON<SettingDto>(settingDto); var setDto = Common.Helper.JsonHelper.ObjToStr<SettingDto>(settingDto);
_cacheClientDB.Set(RedisConst.key, setDto); _cacheClientDB.Set(RedisConst.key, setDto);
return Result.Success(); return Result.Success();
} }
} }
} }

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

@@ -101,7 +101,7 @@ namespace Yi.Framework.ApiMicroservice
#region #region
//<2F><><EFBFBD><EFBFBD>ץȡ<D7A5><C8A1><EFBFBD><EFBFBD>ע<EFBFBD><D7A2> //<2F><><EFBFBD><EFBFBD>ץȡ<D7A5><C8A1><EFBFBD><EFBFBD>ע<EFBFBD><D7A2>
#endregion #endregion
//app.UseErrorHandlingService(); app.UseErrorHandlingService();
#region #region
//<2F><>̬<EFBFBD>ļ<EFBFBD>ע<EFBFBD><D7A2> //<2F><>̬<EFBFBD>ļ<EFBFBD>ע<EFBFBD><D7A2>

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

@@ -15,7 +15,7 @@
"Cors_Enabled": true, "Cors_Enabled": true,
"RabbitMQ_Enabled": false, "RabbitMQ_Enabled": false,
"Redis_Enabled": true, "Redis_Enabled": true,
"RedisSeed_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" ],

BIN
Yi.Framework/Yi.Framework.ApiMicroservice/wwwroot/image/966200f6-265c-4470-ad20-c91c3d84a1cc.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 47 KiB

11
Yi.Framework/Yi.Framework.Common/Helper/JsonHelper.cs
View File

@@ -6,6 +6,17 @@ namespace Yi.Framework.Common.Helper
{ {
public class JsonHelper public class JsonHelper
{ {
public static string ObjToStr<T>(T obj)
{
return Newtonsoft.Json.JsonConvert.SerializeObject(obj);
}
public static T StrToObj<T>(string str)
{
return Newtonsoft.Json.JsonConvert.DeserializeObject<T>(str);
}
/// <summary> /// <summary>
/// 转换对象为JSON格式数据 /// 转换对象为JSON格式数据
/// </summary> /// </summary>

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

@@ -13,11 +13,11 @@ namespace Yi.Framework.WebCore.Init
{ {
public static void Seed(CacheClientDB _cacheClientDB) public static void Seed(CacheClientDB _cacheClientDB)
{ {
var setDto = Common.Helper.JsonHelper.GetJSON<SettingDto>(new SettingDto() var setDto = Common.Helper.JsonHelper.ObjToStr(new SettingDto()
{ {
ImageList_key = { "默认图片", "默认图片" }, ImageList_key =new List<string> { "默认图片", "默认图片" },
InitRole_key = "默认角色", InitRole_key = "普通用户",
Title_key = "默认标题", Title_key = "YiFramework",
InitIcon_key = "默认头像" InitIcon_key = "默认头像"
}); });
if (_cacheClientDB.Get<SettingDto>(RedisConst.key)==null) if (_cacheClientDB.Get<SettingDto>(RedisConst.key)==null)