diff --git a/ClassLibrary1/Class1.cs b/ClassLibrary1/Class1.cs new file mode 100644 index 0000000..ca3cd76 --- /dev/null +++ b/ClassLibrary1/Class1.cs @@ -0,0 +1,7 @@ +namespace ClassLibrary1 +{ + public class Class1 + { + + } +} diff --git a/ClassLibrary1/ClassLibrary1.csproj b/ClassLibrary1/ClassLibrary1.csproj new file mode 100644 index 0000000..fa71b7a --- /dev/null +++ b/ClassLibrary1/ClassLibrary1.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + + diff --git a/DOAN.Admin.WebApi/Controllers/CommonController.cs b/DOAN.Admin.WebApi/Controllers/CommonController.cs index 443fce3..c3d0f5b 100644 --- a/DOAN.Admin.WebApi/Controllers/CommonController.cs +++ b/DOAN.Admin.WebApi/Controllers/CommonController.cs @@ -53,7 +53,7 @@ namespace DOAN.Admin.WebApi.Controllers { var hello = _localizer["hello"].Value; return Ok($"{hello}看到这里页面说明你已经成功启动了本项目:)\n\n" + - "如果觉得项目有用，打赏作者喝杯咖啡作为奖励\n☛☛http://www.izhaorui.cn/vip\n"); + "苏州道安自动化有限公司"); } /// diff --git a/DOAN.Admin.WebApi/Controllers/PBL/BillofmaterialsController.cs b/DOAN.Admin.WebApi/Controllers/PBL/BillofmaterialsController.cs index 7c00f48..3273838 100644 --- a/DOAN.Admin.WebApi/Controllers/PBL/BillofmaterialsController.cs +++ b/DOAN.Admin.WebApi/Controllers/PBL/BillofmaterialsController.cs @@ -5,7 +5,7 @@ using DOAN.Service.PBL.IService; using DOAN.Admin.WebApi.Filters; //创建时间：2024-09-23 -namespace DOAN.Admin.WebApi.Controllers.Business +namespace DOAN.Admin.WebApi.Controllers.PBL { /// /// 物料清单 diff --git a/DOAN.Admin.WebApi/Controllers/PBL/StoragelocationController.cs b/DOAN.Admin.WebApi/Controllers/PBL/StoragelocationController.cs index 8717aab..751abac 100644 --- a/DOAN.Admin.WebApi/Controllers/PBL/StoragelocationController.cs +++ b/DOAN.Admin.WebApi/Controllers/PBL/StoragelocationController.cs @@ -5,7 +5,7 @@ using DOAN.Service.PBL.IService; using DOAN.Admin.WebApi.Filters; //创建时间：2024-09-23 -namespace DOAN.Admin.WebApi.Controllers.Business +namespace DOAN.Admin.WebApi.Controllers.PBL { /// /// 料架表 diff --git a/DOAN.Admin.WebApi/Program.cs b/DOAN.Admin.WebApi/Program.cs index 4b33ef3..67a2f26 100644 --- a/DOAN.Admin.WebApi/Program.cs +++ b/DOAN.Admin.WebApi/Program.cs @@ -84,6 +84,9 @@ builder.Services.AddSignalR() builder.Services.AddSwaggerConfig(); // 显示logo builder.Services.AddLogo(); +//激活 HslCommunication +builder.Services.AddHslCommunication(); + // 添加本地化服务 builder.Services.AddLocalization(options => options.ResourcesPath = ""); diff --git a/DOAN.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml b/DOAN.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml index 426a9b5..7372c62 100644 --- a/DOAN.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml +++ b/DOAN.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml @@ -14,8 +14,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem <_TargetId>Folder - net7.0 + net8.0 e5497bb4-b0c1-4794-9fae-163f626ec399 - false + true + win-x64 \ No newline at end of file diff --git a/DOAN.Admin.WebApi/appsettings.Development.json b/DOAN.Admin.WebApi/appsettings.Development.json index e07a8c7..79d78d5 100644 --- a/DOAN.Admin.WebApi/appsettings.Development.json +++ b/DOAN.Admin.WebApi/appsettings.Development.json @@ -10,7 +10,7 @@ "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 "ConfigId": "0", //多租户唯一标识 "IsAutoCloseConnection": true @@ -20,12 +20,12 @@ //代码生成数据库配置 "CodeGenDbConfig": { //代码生成连接字符串，注意{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, "IsAutoCloseConnection": true, "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" ], //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开 "JwtSettings": { "Issuer": "DOANAdmin.NET", //即token的签发者。 diff --git a/DOAN.Admin.WebApi/appsettings.Production.json b/DOAN.Admin.WebApi/appsettings.Production.json index 923cf2e..b433de2 100644 --- a/DOAN.Admin.WebApi/appsettings.Production.json +++ b/DOAN.Admin.WebApi/appsettings.Production.json @@ -8,8 +8,8 @@ }, "dbConfigs": [ { - "Conn": "Data Source=LAPTOP-STKF2M8H\\SQLEXPRESS;User ID=admin;Password=123456;Initial Catalog=DOANAdmin;", - "DbType": 1, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4 + "Conn": "Data Source=127.0.0.1;User ID=root;Password=123456;Initial Catalog=pbl_huaxiang;", + "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4 "ConfigId": "0", //多租户唯一标识 "IsAutoCloseConnection": true } @@ -18,12 +18,12 @@ //代码生成数据库配置 "CodeGenDbConfig": { //代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名 - "Conn": "Data Source=LAPTOP-STKF2M8H\\SQLEXPRESS;User ID=admin;Password=admin123;Initial Catalog={dbName};", - "DbType": 1, + "Conn": "Data Source=127.0.0.1;User ID=admin;Password=admin123;Initial Catalog={dbName};", + "DbType": 0, "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" ], //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开 "JwtSettings": { "Issuer": "DOANAdmin.NET", //即token的签发者。 diff --git a/DOAN.ServiceCore/Middleware/GlobalExceptionMiddleware.cs b/DOAN.ServiceCore/Middleware/GlobalExceptionMiddleware.cs index 0c2ac11..4610700 100644 --- a/DOAN.ServiceCore/Middleware/GlobalExceptionMiddleware.cs +++ b/DOAN.ServiceCore/Middleware/GlobalExceptionMiddleware.cs @@ -85,7 +85,7 @@ namespace DOAN.ServiceCore.Middleware #if DEBUG if (logLevel == LogLevel.Error) { - apiResult.Add("error", "请在issue里面寻找答案或者官方文档查看常见问题：https://gitee.com/izory/DOANAdminNetCore/issues"); + apiResult.Add("error", "请在issue里面寻找答案或者官方文档查看常见问题："); } #endif string responseResult = textJson.JsonSerializer.Serialize(apiResult, options); diff --git a/DOAN.ServiceCore/Services/SysLoginService.cs b/DOAN.ServiceCore/Services/SysLoginService.cs index 5654b9d..cd453e2 100644 --- a/DOAN.ServiceCore/Services/SysLoginService.cs +++ b/DOAN.ServiceCore/Services/SysLoginService.cs @@ -67,7 +67,7 @@ namespace DOAN.ServiceCore.Services { logininfor.Msg = _localizer["login_user_disabled"].Value;//該用戶已禁用 AddLoginInfo(logininfor); - throw new CustomException(ResultCode.LOGIN_ERROR, logininfor.Msg, false); + throw new CustomException(ResultCode.LOGIN_ERROR, logininfor.Msg, false); } logininfor.Status = "0";