Skip to content

M
mall.oytour.com
Commit ef4aec86 authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

parents ad9d812c adf45be8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 480 additions and 110 deletions
Mall.CacheManager/User/UserReidsCache.cs
View file @ ef4aec86
......@@ -87,44 +87,52 @@ namespace Mall.CacheManager.User
/// <returns></returns>
public static UserInfo GetUserLoginInfo(object TenantId)
{
string cacheKey = UserModuleCacheKeyConfig.Mall_Login_Info + TenantId.ToString();
UserInfo userInfo = null;
try
{
userInfo = redis.StringGet<UserInfo>(cacheKey);
}
catch (Exception ex)
if (TenantId != null)
{
LogHelper.Write(ex, "GetUserLoginInfo");
}
if (userInfo == null)
{
Int32.TryParse(TenantId.ToString(), out int NewTenantId);
if (NewTenantId > 0)
string cacheKey = UserModuleCacheKeyConfig.Mall_Login_Info + TenantId.ToString();
try
{
string token = "";
var extModel = tenantRepository.GetEntity<RB_Tenant_Extend>(NewTenantId);
if (extModel != null)
userInfo = redis.StringGet<UserInfo>(cacheKey);
}
catch (Exception ex)
{
LogHelper.Write(ex, "GetUserLoginInfo");
}
if (userInfo == null)
{
Int32.TryParse(TenantId.ToString(), out int NewTenantId);
if (NewTenantId > 0)
{
UserInfo obj = new UserInfo
string token = "";
var extModel = tenantRepository.GetEntity<RB_Tenant_Extend>(NewTenantId);
if (extModel != null)
{
TenantId = extModel.TenantId,
Account = extModel.Account,
Name = extModel.Name,
MobilePhone = extModel.MobilePhone,
WeChatNum = extModel.WeChatNum,
IsEffective = extModel.IsEffective,
AccountValidate = extModel.AccountValidate,
CreateMiniPrograme = extModel.CreateMiniPrograme,
//MallName = extModel.MallName,
AccountStatus = extModel.AccountStatus,
Token = token,
SecretKey = "",
};
UserInfoSet(UserModuleCacheKeyConfig.Mall_Login_Info + TenantId, obj, Config.JwtExpirTime);
UserInfo obj = new UserInfo
{
TenantId = extModel.TenantId,
Account = extModel.Account,
Name = extModel.Name,
MobilePhone = extModel.MobilePhone,
WeChatNum = extModel.WeChatNum,
IsEffective = extModel.IsEffective,
AccountValidate = extModel.AccountValidate,
CreateMiniPrograme = extModel.CreateMiniPrograme,
//MallName = extModel.MallName,
AccountStatus = extModel.AccountStatus,
Token = token,
SecretKey = "",
};
UserInfoSet(UserModuleCacheKeyConfig.Mall_Login_Info + TenantId, obj, Config.JwtExpirTime);
}
}
}
}
else
{
userInfo = new UserInfo();
}
return userInfo;
}
......
Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
View file @ ef4aec86
......@@ -883,45 +883,22 @@ namespace Mall.Model.Extend.MarketingCenter
/// <summary>
/// 商品编号
/// </summary>
public int Id { get; set; }
public int id { get; set; }
/// <summary>
/// 商品名称
/// </summary>
public string Name { get; set; }
public string name { get; set; }
/// <summary>
/// 商品图片
/// </summary>
public string CoverImage { get; set; }
public string picUrl { get; set; }
/// <summary>
/// 售价
/// </summary>
public decimal SellingPrice { get; set; }
public int SalesNum { get; set; }
/// <summary>
/// 商品分类列表
/// </summary>
public List<CategoryItem> CategoryList { get; set; }
}
/// <summary>
/// 商品分类
/// </summary>
public class CategoryItem
{
/// <summary>
/// 商品分类编号
/// </summary>
public int Id { get; set; }
/// <summary>
/// 商品分类名称
/// </summary>
public string CategoryName { get; set; }
public decimal price { get; set; }
}
/// <summary>
......@@ -935,12 +912,12 @@ namespace Mall.Model.Extend.MarketingCenter
public int id { get; set; }
/// <summary>
/// 分类名称
/// 商品分类
/// </summary>
public string name { get; set; }
/// <summary>
/// 分类名称
/// 菜单名称
/// </summary>
public string menuName { get; set; }
......@@ -950,36 +927,16 @@ namespace Mall.Model.Extend.MarketingCenter
public int goodsNum { get; set; }
/// <summary>
/// 商品列表
/// </summary>
public List<GoodsDetailsItem> goodsList { get; set; }
}
/// <summary>
/// 商品详情项
/// </summary>
public class GoodsDetailsItem
{
/// <summary>
/// 商品编号
/// </summary>
public int id { get; set; }
/// <summary>
/// 商品名称
/// 是否显示自定义商品
/// </summary>
public string Name { get; set; }
public bool staticGoods { get; set; }
/// <summary>
/// 商品图片
/// </summary>
public string picUrl { get; set; }
/// <summary>
/// 售价
/// 商品列表
/// </summary>
public decimal SellingPrice { get; set; }
public List<GoodsDetailsItem2> goodsList { get; set; }
}
/// <summary>
/// 门店插件
......
Mall.WebApi/Controllers/User/TenantController.cs
View file @ ef4aec86
......@@ -20,6 +20,7 @@ using Mall.Common.Plugin;
using Mall.Common.Enum.MallBase;
using Mall.Model.Entity.User;
using Mall.Module.Product;
using Microsoft.AspNetCore.Authorization;
namespace Mall.WebApi.Controllers.User
{
......@@ -76,6 +77,7 @@ namespace Mall.WebApi.Controllers.User
#region 商户信息
[AllowAnonymous]
/// <summary>
/// 用户登录
/// </summary>
......@@ -151,6 +153,7 @@ namespace Mall.WebApi.Controllers.User
/// 用户注册第一步
/// </summary>
/// <returns></returns>
[AllowAnonymous]
public ApiResult SetTenantFirst()
{
var extModel = JsonConvert.DeserializeObject<RB_Tenant_Extend>(RequestParm.msg.ToString());
......@@ -170,6 +173,7 @@ namespace Mall.WebApi.Controllers.User
/// 用户注册第二步
/// </summary>
/// <returns></returns>
[AllowAnonymous]
public ApiResult SetTenantSecond()
{
var extModel = JsonConvert.DeserializeObject<RB_Tenant_Extend>(RequestParm.msg.ToString());
......@@ -193,6 +197,7 @@ namespace Mall.WebApi.Controllers.User
/// 修改密码账号
/// </summary>
/// <returns></returns>
[AllowAnonymous]
public ApiResult UpdateTenantPwd()
{
var extModel = JsonConvert.DeserializeObject<RB_Tenant_Extend>(RequestParm.msg.ToString());
......
Mall.WebApi/Controllers/User/UserController.cs
View file @ ef4aec86
......@@ -14,6 +14,7 @@ using Mall.Common.Enum.User;
using Mall.CacheManager.User;
using Newtonsoft.Json.Linq;
using Mall.Common;
using Microsoft.AspNetCore.Authorization;
namespace Mall.WebApi.Controllers.User
{
......
Mall.WebApi/Filter/ApiFilterAttribute.cs
View file @ ef4aec86
......@@ -17,6 +17,10 @@ using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Json;
using Mall.CacheManager.User;
using System.Linq;
using Microsoft.AspNetCore.Mvc.Authorization;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http.Features;
namespace Mall.WebApi.Filter
{
......@@ -39,22 +43,15 @@ namespace Mall.WebApi.Filter
#region api监控日志
parm = DoApiMonitorLog(actionContext, ref token);
#endregion
//不需要验证TOKEN的CMD
List<string> notValidatList = new List<string>()
{
"/api/Tenant/Login",//用户登录
"/api/Tenant/SetTenantFirst",//用户注册第一步
"/api/Tenant/SetTenantSecond",//用户注册第二步
"/api/Tenant/UpdateTenantPwd",//忘记密码
};
bool isCheckToken = true;
foreach (var item in notValidatList)
var endpoint = actionContext.HttpContext.Features.Get<IEndpointFeature>()?.Endpoint;
if (endpoint != null && endpoint.Metadata.GetMetadata<AllowAnonymousAttribute>() != null)
{
if (item== parm["cmd"].ToString())
{
isCheckToken = false;
}
isCheckToken = false;
}
#region Token校验
if (isCheckToken)
......
Mall.WebApi/Startup.cs
View file @ ef4aec86
......@@ -5,6 +5,7 @@ using System.Text.Encodings.Web;
using System.Text.Unicode;
using System.Threading.Tasks;
using Mall.ThirdCore.Message;
using Mall.WebApi.Filter;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
......@@ -34,7 +35,8 @@ namespace Mall.WebApi
.Configure<IISServerOptions>(x => x.AllowSynchronousIO = true);
services.AddControllers();
services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>(); //注入http上下文
services.AddMvc().AddJsonOptions(options =>
{
options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
......@@ -44,7 +46,9 @@ namespace Mall.WebApi
{
"http://localhost:8081",
"http://localhost:8080",
"http://localhost:8082"
"http://localhost:8082",
"http://127.0.0.1:50512",
"http://127.0.0.1:20224"
};
services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray())));
}
......@@ -65,6 +69,7 @@ namespace Mall.WebApi
app.UseAuthorization();
app.UseEndpoints(endpoints =>
{
endpoints.MapControllers();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment