wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:1839d30ff35873b149886f83cd101da183b3da27
Branches Tags
wyw:master
..
compare: wyw:51064548fc454cbd7d735d5f37cacee040e96487
Branches Tags
wyw:master

2 Commits
1839d30ff3 ... 51064548fc

Author SHA1 Message Date
ccy
51064548fc Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe 2025-10-16 10:03:37 +08:00
ccy
7c3eda48a5 APP登录 2025-10-16 10:03:33 +08:00
2 changed files with 13 additions and 12 deletions
Show Stats Expand all files Collapse all files

23
APT.MicroApi/APT.FM.WebApi/Startup.cs
View File

@ -39,13 +39,13 @@ namespace APT.FM.WebApi
public Startup(IConfiguration configuration) public Startup(IConfiguration configuration)
{ {
Configuration = configuration; Configuration = configuration;
var repository = LogManager.GetRepository var repository = LogManager.GetRepository
(System.Reflection.Assembly.GetEntryAssembly()); (System.Reflection.Assembly.GetEntryAssembly());
var fileInfo = new FileInfo("log4net.config"); var fileInfo = new FileInfo("log4net.config");
if(!fileInfo.Exists) if (!fileInfo.Exists)
fileInfo=new FileInfo(Path.Combine(System.AppContext.BaseDirectory, "log4net.config")); fileInfo = new FileInfo(Path.Combine(System.AppContext.BaseDirectory, "log4net.config"));
XmlConfigurator.Configure(repository, fileInfo); XmlConfigurator.Configure(repository, fileInfo);
ConfigurationManager.Register(configuration); ConfigurationManager.Register(configuration);
InitUtils.Init(); InitUtils.Init();
} }
@ -69,8 +69,9 @@ namespace APT.FM.WebApi
services.AddCors(o => o.AddPolicy("AllowAllPolicy", builder => services.AddCors(o => o.AddPolicy("AllowAllPolicy", builder =>
{ {
builder.AllowAnyOrigin() builder.AllowAnyOrigin()
.AllowAnyMethod() .AllowAnyHeader() // 允许任何头
.AllowAnyHeader(); .AllowAnyMethod() // 允许任何方法
;
})); }));
services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>(); services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
@ -113,13 +114,13 @@ namespace APT.FM.WebApi
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
app.UseHsts(); app.UseHsts();
} }
Infrastructure.Api.HttpContext.Register(app.ApplicationServices. Infrastructure.Api.HttpContext.Register(app.ApplicationServices.
GetRequiredService<IHttpContextAccessor>() GetRequiredService<IHttpContextAccessor>()
); );
app.UseCors("AllowAllPolicy"); app.UseCors("AllowAllPolicy");
@ -134,7 +135,7 @@ namespace APT.FM.WebApi
app.UseMvc(); app.UseMvc();
app.UseStaticFiles(); app.UseStaticFiles();
//fMOrganizationService.SetOrgCache(); //fMOrganizationService.SetOrgCache();
@ -147,6 +148,6 @@ namespace APT.FM.WebApi
builder.RegisterComponents(); builder.RegisterComponents();
} }
} }
} }

2
APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs
View File

@ -325,7 +325,7 @@ namespace APT.PF.WebApiControllers.Api.PF
var userFilter = new BaseFilter(orgId); var userFilter = new BaseFilter(orgId);
//userFilter.IgnoreOrgRule = true; //userFilter.IgnoreOrgRule = true;
//userFilter.IsMultipleDb = true;//多库查询 //userFilter.IsMultipleDb = true;//多库查询
user.ORG_ID = orgId; userFilter.OrgId = orgId;
userFilter.SelectField = new string[] { "CODE", "Nav_ProdutionUnit.Nav_Enums.VALUE", "DEPARTMENT_ID" }; userFilter.SelectField = new string[] { "CODE", "Nav_ProdutionUnit.Nav_Enums.VALUE", "DEPARTMENT_ID" };
user = this.GetEntity<T_FM_USER>(expression, userFilter); user = this.GetEntity<T_FM_USER>(expression, userFilter);
if (user == null) if (user == null)