Teams/sy_hx_pbl_backend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	DOAN.Admin.WebApi/Controllers/PBL/MESInteractionController.cs
#	DOAN.Service/PBL/MESInteractionServcie.cs
#	Infrastructure/DOAN.Infrastructure.csproj
This commit is contained in:
qianhao.xu
2024-11-01 11:36:08 +08:00
parent e4da25b1ca b72c535054
commit 902f906426
11 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ClassLibrary1/Class1.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace ClassLibrary1
{
public class Class1
{
}
}

9
ClassLibrary1/ClassLibrary1.csproj Normal file
View File

@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>

2
DOAN.Admin.WebApi/Controllers/CommonController.cs
View File

@@ -53,7 +53,7 @@ namespace DOAN.Admin.WebApi.Controllers
{ {
var hello = _localizer["hello"].Value; var hello = _localizer["hello"].Value;
return Ok($"{hello}看到这里页面说明你已经成功启动了本项目:)\n\n" + return Ok($"{hello}看到这里页面说明你已经成功启动了本项目:)\n\n" +
"如果觉得项目有用，打赏作者喝杯咖啡作为奖励\n☛☛http://www.izhaorui.cn/vip\n"); "苏州道安自动化有限公司");
} }
/// <summary> /// <summary>

2
DOAN.Admin.WebApi/Controllers/PBL/BillofmaterialsController.cs
View File

@@ -5,7 +5,7 @@ using DOAN.Service.PBL.IService;
using DOAN.Admin.WebApi.Filters; using DOAN.Admin.WebApi.Filters;
//创建时间：2024-09-23 //创建时间：2024-09-23
namespace DOAN.Admin.WebApi.Controllers.Business namespace DOAN.Admin.WebApi.Controllers.PBL
{ {
/// <summary> /// <summary>
/// 物料清单 /// 物料清单

2
DOAN.Admin.WebApi/Controllers/PBL/StoragelocationController.cs
View File

@@ -5,7 +5,7 @@ using DOAN.Service.PBL.IService;
using DOAN.Admin.WebApi.Filters; using DOAN.Admin.WebApi.Filters;
//创建时间：2024-09-23 //创建时间：2024-09-23
namespace DOAN.Admin.WebApi.Controllers.Business namespace DOAN.Admin.WebApi.Controllers.PBL
{ {
/// <summary> /// <summary>
/// 料架表 /// 料架表

3
DOAN.Admin.WebApi/Program.cs
View File

@@ -84,6 +84,9 @@ builder.Services.AddSignalR()
builder.Services.AddSwaggerConfig(); builder.Services.AddSwaggerConfig();
// 显示logo // 显示logo
builder.Services.AddLogo(); builder.Services.AddLogo();
//激活 HslCommunication
builder.Services.AddHslCommunication();
// 添加本地化服务 // 添加本地化服务
builder.Services.AddLocalization(options => options.ResourcesPath = ""); builder.Services.AddLocalization(options => options.ResourcesPath = "");

5
DOAN.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml
View File

@@ -14,8 +14,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<WebPublishMethod>FileSystem</WebPublishMethod> <WebPublishMethod>FileSystem</WebPublishMethod>
<_TargetId>Folder</_TargetId> <_TargetId>Folder</_TargetId>
<SiteUrlToLaunchAfterPublish /> <SiteUrlToLaunchAfterPublish />
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ProjectGuid>e5497bb4-b0c1-4794-9fae-163f626ec399</ProjectGuid> <ProjectGuid>e5497bb4-b0c1-4794-9fae-163f626ec399</ProjectGuid>
<SelfContained>false</SelfContained> <SelfContained>true</SelfContained>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

6
DOAN.Admin.WebApi/appsettings.Development.json
View File

@@ -10,7 +10,7 @@
"dbConfigs": [ "dbConfigs": [
{ {
"Conn": "Data Source=192.168.0.58;User ID=root;Password=123456;Initial Catalog=pbl_huaxiang;Charset=utf8mb4", "Conn": "Data Source=127.0.0.1;User ID=root;Password=123456;Initial Catalog=pbl_huaxiang;Charset=utf8mb4",
"DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4 "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4
"ConfigId": "0", //多租户唯一标识 "ConfigId": "0", //多租户唯一标识
"IsAutoCloseConnection": true "IsAutoCloseConnection": true
@@ -20,12 +20,12 @@
//代码生成数据库配置 //代码生成数据库配置
"CodeGenDbConfig": { "CodeGenDbConfig": {
//代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名 //代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名
"Conn": "Data Source=192.168.0.58;User ID=root;Password=123456;Initial Catalog={dbName};", "Conn": "Data Source=127.0.0.1;User ID=root;Password=123456;Initial Catalog={dbName};",
"DbType": 0, "DbType": 0,
"IsAutoCloseConnection": true, "IsAutoCloseConnection": true,
"DbName": "pbl_huaxiang" //代码生成默认连接数据库,Oracle库是实例的名称 "DbName": "pbl_huaxiang" //代码生成默认连接数据库,Oracle库是实例的名称
}, },
"urls": "http://localhost:8888", //项目启动url，如果改动端口前端对应devServer也需要进行修改 "urls": "http://0.0.0.0:8888", //项目启动url，如果改动端口前端对应devServer也需要进行修改
"corsUrls": [ "http://localhost:8887", "http://localhost:8886" ], //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开 "corsUrls": [ "http://localhost:8887", "http://localhost:8886" ], //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开
"JwtSettings": { "JwtSettings": {
"Issuer": "DOANAdmin.NET", //即token的签发者。 "Issuer": "DOANAdmin.NET", //即token的签发者。

12
DOAN.Admin.WebApi/appsettings.Production.json
View File

@@ -8,8 +8,8 @@
}, },
"dbConfigs": [ "dbConfigs": [
{ {
"Conn": "Data Source=LAPTOP-STKF2M8H\\SQLEXPRESS;User ID=admin;Password=123456;Initial Catalog=DOANAdmin;", "Conn": "Data Source=127.0.0.1;User ID=root;Password=123456;Initial Catalog=pbl_huaxiang;",
"DbType": 1, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4 "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4
"ConfigId": "0", //多租户唯一标识 "ConfigId": "0", //多租户唯一标识
"IsAutoCloseConnection": true "IsAutoCloseConnection": true
} }
@@ -18,12 +18,12 @@
//代码生成数据库配置 //代码生成数据库配置
"CodeGenDbConfig": { "CodeGenDbConfig": {
//代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名 //代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名
"Conn": "Data Source=LAPTOP-STKF2M8H\\SQLEXPRESS;User ID=admin;Password=admin123;Initial Catalog={dbName};", "Conn": "Data Source=127.0.0.1;User ID=admin;Password=admin123;Initial Catalog={dbName};",
"DbType": 1, "DbType": 0,
"IsAutoCloseConnection": true, "IsAutoCloseConnection": true,
"DbName": "DOANAdmin" //代码生成默认连接数据库,Oracle库是实例的名称 "DbName": "pbl_huaxiang" //代码生成默认连接数据库,Oracle库是实例的名称
}, },
"urls": "http://localhost:8888", //项目启动url，如果改动端口前端对应devServer也需要进行修改 "urls": "http://127.0.0.1:8888", //项目启动url，如果改动端口前端对应devServer也需要进行修改
"corsUrls": [ "http://localhost:8887", "http://localhost:8886" ], //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开 "corsUrls": [ "http://localhost:8887", "http://localhost:8886" ], //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开
"JwtSettings": { "JwtSettings": {
"Issuer": "DOANAdmin.NET", //即token的签发者。 "Issuer": "DOANAdmin.NET", //即token的签发者。

2
DOAN.ServiceCore/Middleware/GlobalExceptionMiddleware.cs
View File

@@ -85,7 +85,7 @@ namespace DOAN.ServiceCore.Middleware
#if DEBUG #if DEBUG
if (logLevel == LogLevel.Error) if (logLevel == LogLevel.Error)
{ {
apiResult.Add("error", "请在issue里面寻找答案或者官方文档查看常见问题：https://gitee.com/izory/DOANAdminNetCore/issues"); apiResult.Add("error", "请在issue里面寻找答案或者官方文档查看常见问题：");
} }
#endif #endif
string responseResult = textJson.JsonSerializer.Serialize(apiResult, options); string responseResult = textJson.JsonSerializer.Serialize(apiResult, options);

2
DOAN.ServiceCore/Services/SysLoginService.cs
View File

@@ -67,7 +67,7 @@ namespace DOAN.ServiceCore.Services
{ {
logininfor.Msg = _localizer["login_user_disabled"].Value;//該用戶已禁用 logininfor.Msg = _localizer["login_user_disabled"].Value;//該用戶已禁用
AddLoginInfo(logininfor); AddLoginInfo(logininfor);
throw new CustomException(ResultCode.LOGIN_ERROR, logininfor.Msg, false); throw new CustomException(ResultCode.LOGIN_ERROR, logininfor.Msg, false);
} }
logininfor.Status = "0"; logininfor.Status = "0";