From 431b1a57104a5a7fe08eeb73d5f150a97d83d62b Mon Sep 17 00:00:00 2001 From: bairubing Date: Wed, 16 Oct 2024 17:39:12 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E4=BF=AE=E6=94=B9SolidWorksManage?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=8E=B7=E5=8F=96token=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin.NET.Web.Entry/.config/dotnet-tools.json | 13 +++++++++++++ .../Vistar.Application/Configuration/Database.json | 4 ++-- .../SapOpenInterface/SapOpenInterfaceService.cs | 3 ++- .../SolidWorksManageService.cs | 5 +++++ 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 admin.net.pro/Admin.NET/Admin.NET.Web.Entry/.config/dotnet-tools.json diff --git a/admin.net.pro/Admin.NET/Admin.NET.Web.Entry/.config/dotnet-tools.json b/admin.net.pro/Admin.NET/Admin.NET.Web.Entry/.config/dotnet-tools.json new file mode 100644 index 0000000..76ca931 --- /dev/null +++ b/admin.net.pro/Admin.NET/Admin.NET.Web.Entry/.config/dotnet-tools.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "8.0.10", + "commands": [ + "dotnet-ef" + ], + "rollForward": false + } + } +} \ No newline at end of file diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Configuration/Database.json b/admin.net.pro/Admin.NET/Vistar.Application/Configuration/Database.json index 987c53b..56d97f5 100644 --- a/admin.net.pro/Admin.NET/Vistar.Application/Configuration/Database.json +++ b/admin.net.pro/Admin.NET/Vistar.Application/Configuration/Database.json @@ -9,7 +9,7 @@ { //"ConfigId": "1300000000001", // 默认库标识-禁止修改 "DbType": "SqlServer", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access、OpenGauss、QuestDB、HG、ClickHouse、GBase、Odbc、Custom - "ConnectionString": "Data Source=127.0.0.1;Initial Catalog=VistarStarDataManage;User ID=sa;Password=123456", // Sqlite 库连接字符串 + "ConnectionString": "Data Source=192.168.10.101;Initial Catalog=VistarStarDataManage;User ID=sa;Password=Vistar2024.", // Sqlite 库连接字符串123456 //"ConnectionString": "PORT=5432;DATABASE=xxx;HOST=localhost;PASSWORD=xxx;USER ID=xxx", // PostgreSQL 库连接字符串 //"ConnectionString": "Server=localhost;Database=xxx;Uid=xxx;Pwd=xxx;SslMode=None;", // MySql 库连接字符串", //"ConnectionString": "User Id=xxx; Password=xxx; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))", // Oracle 库连接字符串 @@ -62,7 +62,7 @@ { "ConfigId": "启威星 1.94.4.74", // 库标识 "DbType": "SqlServer", // 库类型 - "ConnectionString": "Data Source=1.94.4.74;Initial Catalog=SWManage_Vistar;User ID=sa;Password=ASDzxc123.", // 库连接字符串 + "ConnectionString": "Data Source=192.168.10.101;Initial Catalog=SWManage_Vistar;User ID=sa;Password=Vistar2024.", // 库连接字符串ASDzxc123. "DbSettings": { "EnableInitDb": false, // 启用库初始化 "EnableDiffLog": false, // 启用库表差异日志 diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Service/SapOpenInterface/SapOpenInterfaceService.cs b/admin.net.pro/Admin.NET/Vistar.Application/Service/SapOpenInterface/SapOpenInterfaceService.cs index 2a06b34..6780bee 100644 --- a/admin.net.pro/Admin.NET/Vistar.Application/Service/SapOpenInterface/SapOpenInterfaceService.cs +++ b/admin.net.pro/Admin.NET/Vistar.Application/Service/SapOpenInterface/SapOpenInterfaceService.cs @@ -7,6 +7,7 @@ using Admin.NET.Core; using Furion.DependencyInjection; using Furion.DynamicApiController; +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using System; @@ -40,7 +41,7 @@ public class SapOpenInterfaceService : IDynamicApiController, ITransient /// /// /// - [Authorize(AuthenticationSchemes = SignatureAuthenticationDefaults.AuthenticationScheme)] + [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme + "," + SignatureAuthenticationDefaults.AuthenticationScheme)] [ApiDescriptionSettings(Name = "CreateClientRecord"), HttpPost] [DisplayName("SAP创建、修改客户档案")] public async Task CreateClientRecord(CreateClientRecordInput input) diff --git a/admin.net.pro/Admin.NET/Vistar.Application/SolidWorksManageService/SolidWorksManageService.cs b/admin.net.pro/Admin.NET/Vistar.Application/SolidWorksManageService/SolidWorksManageService.cs index f30bc11..6512a90 100644 --- a/admin.net.pro/Admin.NET/Vistar.Application/SolidWorksManageService/SolidWorksManageService.cs +++ b/admin.net.pro/Admin.NET/Vistar.Application/SolidWorksManageService/SolidWorksManageService.cs @@ -2,6 +2,7 @@ using Admin.NET.Core.Service; using Furion.DependencyInjection; using Furion.DynamicApiController; +using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Caching.Memory; using Newtonsoft.Json; using System; @@ -30,6 +31,7 @@ public class SolidWorksManageService : IDynamicApiController, ITransient /// 获取 token /// /// 授权响应对象 + [AllowAnonymous] public async Task Authenticate() { // 获取 SolidWorksManage 地址 @@ -58,6 +60,9 @@ public class SolidWorksManageService : IDynamicApiController, ITransient { // 读取响应内容并反序列化为授权响应对象 string responseBody = await response.Content.ReadAsStringAsync(); + AuthorizationResponse jsondata = JsonConvert.DeserializeObject(responseBody); + string value = jsondata.access_token; + await _sysConfigService.UpdateConfigValue(ConfigConst.SolidWorksManageAuthorization, value); return JsonConvert.DeserializeObject(responseBody); } else