diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..3729ff0 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,25 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b652904 --- /dev/null +++ b/.gitignore @@ -0,0 +1,391 @@ +# ---> VisualStudio +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Nuget personal access tokens and Credentials +nuget.config + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +.idea/ +*.sln.iml + +/Dockerfile.bak diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1144e16 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,48 @@ +#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. + +FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +WORKDIR /app +EXPOSE 8001 +EXPOSE 443 + +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + + + + +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +WORKDIR /src +COPY ["Znyc.CloudCar/Znyc.CloudCar.csproj", "Znyc.CloudCar/"] +COPY ["Znyc.CloudCar.Services/Znyc.CloudCar.Services.csproj", "Znyc.CloudCar.Services/"] +COPY ["Znyc.CloudCar.Auth/Znyc.CloudCar.Auth.csproj", "Znyc.CloudCar.Auth/"] +COPY ["Znyc.CloudCar.Configuration/Znyc.CloudCar.Configuration.csproj", "Znyc.CloudCar.Configuration/"] +COPY ["Znyc.CloudCar.Utility/Znyc.CloudCar.Utility.csproj", "Znyc.CloudCar.Utility/"] +COPY ["Znyc.CloudCar.Model/Znyc.CloudCar.Model.csproj", "Znyc.CloudCar.Model/"] +COPY ["Znyc.CloudCar.FreeSql/Znyc.CloudCar.FreeSql.csproj", "Znyc.CloudCar.FreeSql/"] +COPY ["Znyc.CloudCar.Core/Znyc.CloudCar.Core.csproj", "Znyc.CloudCar.Core/"] +COPY ["Znyc.CloudCar.RedisMQ/Znyc.CloudCar.RedisMQ.csproj", "Znyc.CloudCar.RedisMQ/"] +COPY ["Znyc.CloudCar.Loging/Znyc.CloudCar.Loging.csproj", "Znyc.CloudCar.Loging/"] +COPY ["Znyc.CloudCar.Caching/Znyc.CloudCar.Caching.csproj", "Znyc.CloudCar.Caching/"] +COPY ["Zncy.CloudCar.WeChat.Service/Zncy.CloudCar.WeChat.Service.csproj", "Zncy.CloudCar.WeChat.Service/"] +COPY ["Znyc.CloudCar.IServices/Znyc.CloudCar.IServices.csproj", "Znyc.CloudCar.IServices/"] +COPY ["Znyc.CloudCar.Swagger/Znyc.CloudCar.Swagger.csproj", "Znyc.CloudCar.Swagger/"] +COPY ["Znyc.CloudCar.Mapster/Znyc.CloudCar.Mapster.csproj", "Znyc.CloudCar.Mapster/"] +COPY ["Znyc.CloudCar.Hangfire/Znyc.CloudCar.Hangfire.csproj", "Znyc.CloudCar.Hangfire/"] +COPY ["Znyc.CloudCar.IRepository/Znyc.CloudCar.IRepository.csproj", "Znyc.CloudCar.IRepository/"] +COPY ["Znyc.CloudCar.Filter/Znyc.CloudCar.Filter.csproj", "Znyc.CloudCar.Filter/"] +COPY ["Znyc.CloudCar.Repository/Znyc.CloudCar.Repository.csproj", "Znyc.CloudCar.Repository/"] +COPY ["Znyc.CloudCar.Task/Znyc.CloudCar.Task.csproj", "Znyc.CloudCar.Task/"] +COPY ["Znyc.CloudCar.Middlewares/Znyc.CloudCar.Middlewares.csproj", "Znyc.CloudCar.Middlewares/"] +RUN dotnet restore "Znyc.CloudCar/Znyc.CloudCar.csproj" +COPY . . +WORKDIR "/src/Znyc.CloudCar" +RUN dotnet build "Znyc.CloudCar.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "Znyc.CloudCar.csproj" -c Release -o /app/publish + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "Znyc.CloudCar.dll"] \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..63598b6 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# znyc.CloudCar + +云车二手 \ No newline at end of file diff --git a/Zncy.CloudCar.Tests/UnitTest1.cs b/Zncy.CloudCar.Tests/UnitTest1.cs new file mode 100644 index 0000000..a3c854d --- /dev/null +++ b/Zncy.CloudCar.Tests/UnitTest1.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Xunit; + +namespace Zncy.CloudCar.Tests +{ + public class UnitTest1 + { + [Fact] + public void Test1() + { + + Assert.Equal(4, Add(2, 3)); + } + + [Fact] + public void FailingTest() + { + Assert.Equal(5, Add(2, 2)); + } + + int Add(int x, int y) + { + return x + y; + } + } +} diff --git a/Zncy.CloudCar.Tests/Zncy.CloudCar.Tests.csproj b/Zncy.CloudCar.Tests/Zncy.CloudCar.Tests.csproj new file mode 100644 index 0000000..b264c88 --- /dev/null +++ b/Zncy.CloudCar.Tests/Zncy.CloudCar.Tests.csproj @@ -0,0 +1,13 @@ + + + + net6.0 + enable + enable + + + + + + + diff --git a/Zncy.CloudCar.WeChat.Service/Configuration/EventType.cs b/Zncy.CloudCar.WeChat.Service/Configuration/EventType.cs new file mode 100644 index 0000000..fbbf13b --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Configuration/EventType.cs @@ -0,0 +1,55 @@ +namespace Zncy.CloudCar.WeChat.Service.Configuration +{ + /// + /// 常见消息类型 + /// + public static class EventType + { + + #region 公众号类型 + + /// + /// 关注 + /// + public const string Subscribe = "subscribe"; + /// + /// 取消订阅 + /// + public const string Unsubscribe = "unsubscribe"; + /// + /// 上报地理位置事件 + /// 用户同意上报地理位置后，每次进入公众号会话时，都会在进入时上报地理位置，或在进入会话后每5秒上报一次地理位置，公众号可以在公众平台网站中修改以上设置。上报地理位置时，微信会将上报地理位置事件推送到开发者填写的URL。 + /// + public const string Localtion = "LOCATION"; + + /// + /// 自定义菜单事件-用户点击自定义菜单后，微信会把点击事件推送给开发者，请注意，点击菜单弹出子菜单，不会产生上报。 + /// + public const string Click = "CLICK"; + + + #endregion + + + #region 小程序 + + + + #endregion + + #region 自定义交易组件 + + + + #endregion + + /// + /// 图片消息 + /// + public const string Image = "image"; + + + + + } +} \ No newline at end of file diff --git a/Zncy.CloudCar.WeChat.Service/Configuration/RequestMsgType.cs b/Zncy.CloudCar.WeChat.Service/Configuration/RequestMsgType.cs new file mode 100644 index 0000000..f73b351 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Configuration/RequestMsgType.cs @@ -0,0 +1,62 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2021/7/30 14:19:49 + * Description: 暂无 + ***********************************************************************/ + +namespace Zncy.CloudCar.WeChat.Service.Configuration +{ + /// + /// 常用常量配置 + /// + public static class RequestMsgType + { + // 各种消息类型,除了扫带二维码事件 + /// + /// 文本消息 + /// + public const string Text = "text"; + + /// + /// 图片消息 + /// + public const string Image = "image"; + + /// + /// 语音消息 + /// + public const string Voice = "voice"; + + /// + /// 视频消息 + /// + public const string Video = "video"; + + /// + /// 小视频消息 + /// + public const string ShortVideo = "shortvideo"; + + /// + /// 地理位置消息 + /// + public const string Location = "location"; + + /// + /// 链接消息 + /// + public const string Link = "link"; + + /// + /// 事件推送消息 + /// + public const string MessageEvent = "event"; + + + + } +} \ No newline at end of file diff --git a/Zncy.CloudCar.WeChat.Service/Enums/WeChatReturnCode.cs b/Zncy.CloudCar.WeChat.Service/Enums/WeChatReturnCode.cs new file mode 100644 index 0000000..b064ad7 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Enums/WeChatReturnCode.cs @@ -0,0 +1,271 @@ +namespace Zncy.CloudCar.WeChat.Service.Enums +{ + public class WeChatReturnCode + { + /// + /// 公众号返回码（JSON） + /// 应该更名为ReturnCode_MP，但为减少项目中的修改，此处依旧用ReturnCode命名 + /// + public enum ReturnCode + { + SenparcWeixinSDK配置错误 = -99, // 0xFFFFFF9D + 系统繁忙此时请开发者稍候再试 = -1, // 0xFFFFFFFF + 请求成功 = 0, + 工商数据返回_企业已注销 = 101, // 0x00000065 + 工商数据返回_企业不存在或企业信息未更新 = 102, // 0x00000066 + 工商数据返回_企业法定代表人姓名不一致 = 103, // 0x00000067 + 工商数据返回_企业法定代表人身份证号码不一致 = 104, // 0x00000068 + 法定代表人身份证号码_工商数据未更新_请5_15个工作日之后尝试 = 105, // 0x00000069 + 工商数据返回_企业信息或法定代表人信息不一致 = 1000, // 0x000003E8 + 对方不是粉丝 = 10700, // 0x000029CC + 发送消息失败_对方关闭了接收消息 = 10703, // 0x000029CF + 发送消息失败_48小时内用户未互动 = 10706, // 0x000029D2 + POST参数非法 = 20002, // 0x00004E22 + 获取access_token时AppSecret错误或者access_token无效 = 40001, // 0x00009C41 + /// + /// 公众号：不合法的凭证类型 + /// 小程序：暂无生成权限 + /// + 不合法的凭证类型 = 40002, // 0x00009C42 + 不合法的OpenID = 40003, // 0x00009C43 + 不合法的媒体文件类型 = 40004, // 0x00009C44 + 不合法的文件类型 = 40005, // 0x00009C45 + 不合法的文件大小 = 40006, // 0x00009C46 + 不合法的媒体文件id = 40007, // 0x00009C47 + 不合法的消息类型_40008 = 40008, // 0x00009C48 + 不合法的图片文件大小 = 40009, // 0x00009C49 + 不合法的语音文件大小 = 40010, // 0x00009C4A + 不合法的视频文件大小 = 40011, // 0x00009C4B + 不合法的缩略图文件大小 = 40012, // 0x00009C4C + /// + /// 微信：不合法的APPID + /// 小程序：生成权限被封禁 + /// + 不合法的APPID = 40013, // 0x00009C4D + 不合法的access_token = 40014, // 0x00009C4E + 不合法的菜单类型 = 40015, // 0x00009C4F + 不合法的按钮个数1 = 40016, // 0x00009C50 + 不合法的按钮个数2 = 40017, // 0x00009C51 + 不合法的按钮名字长度 = 40018, // 0x00009C52 + 不合法的按钮KEY长度 = 40019, // 0x00009C53 + 不合法的按钮URL长度 = 40020, // 0x00009C54 + 不合法的菜单版本号 = 40021, // 0x00009C55 + 不合法的子菜单级数 = 40022, // 0x00009C56 + 不合法的子菜单按钮个数 = 40023, // 0x00009C57 + 不合法的子菜单按钮类型 = 40024, // 0x00009C58 + 不合法的子菜单按钮名字长度 = 40025, // 0x00009C59 + 不合法的子菜单按钮KEY长度 = 40026, // 0x00009C5A + 不合法的子菜单按钮URL长度 = 40027, // 0x00009C5B + 不合法的自定义菜单使用用户 = 40028, // 0x00009C5C + 不合法的oauth_code = 40029, // 0x00009C5D + 不合法的refresh_token = 40030, // 0x00009C5E + 不合法的openid列表 = 40031, // 0x00009C5F + 不合法的openid列表长度 = 40032, // 0x00009C60 + 不合法的请求字符不能包含uxxxx格式的字符 = 40033, // 0x00009C61 + 不合法的参数 = 40035, // 0x00009C63 + template_id不正确 = 40037, // 0x00009C65 + 不合法的请求格式 = 40038, // 0x00009C66 + 不合法的URL长度 = 40039, // 0x00009C67 + 不合法的分组id = 40050, // 0x00009C72 + 分组名字不合法 = 40051, // 0x00009C73 + /// + /// 公众号：输入参数有误 + /// 小程序：参数expire_time填写错误 + /// + 输入参数有误 = 40097, // 0x00009CA1 + appsecret不正确 = 40125, // 0x00009CBD + 调用接口的IP地址不在白名单中 = 40164, // 0x00009CE4 + 参数path填写错误 = 40165, // 0x00009CE5 + 小程序Appid不存在 = 40166, // 0x00009CE6 + 参数query填写错误 = 40212, // 0x00009D14 + 缺少access_token参数 = 41001, // 0x0000A029 + 缺少appid参数 = 41002, // 0x0000A02A + 缺少refresh_token参数 = 41003, // 0x0000A02B + 缺少secret参数 = 41004, // 0x0000A02C + 缺少多媒体文件数据 = 41005, // 0x0000A02D + 缺少media_id参数 = 41006, // 0x0000A02E + 缺少子菜单数据 = 41007, // 0x0000A02F + 缺少oauth_code = 41008, // 0x0000A030 + 缺少openid = 41009, // 0x0000A031 + form_id不正确_或者过期 = 41028, // 0x0000A044 + form_id已被使用 = 41029, // 0x0000A045 + page不正确 = 41030, // 0x0000A046 + access_token超时 = 42001, // 0x0000A411 + refresh_token超时 = 42002, // 0x0000A412 + oauth_code超时 = 42003, // 0x0000A413 + 需要GET请求 = 43001, // 0x0000A7F9 + 需要POST请求 = 43002, // 0x0000A7FA + 需要HTTPS请求 = 43003, // 0x0000A7FB + 需要接收者关注 = 43004, // 0x0000A7FC + 需要好友关系 = 43005, // 0x0000A7FD + /// [小程序订阅消息]用户拒绝接受消息，如果用户之前曾经订阅过，则表示用户取消了订阅关系 + 用户拒绝接受消息 = 43101, // 0x0000A85D + 没有权限 = 43104, // 0x0000A860 + 多媒体文件为空 = 44001, // 0x0000ABE1 + POST的数据包为空 = 44002, // 0x0000ABE2 + 图文消息内容为空 = 44003, // 0x0000ABE3 + 文本消息内容为空 = 44004, // 0x0000ABE4 + 多媒体文件大小超过限制 = 45001, // 0x0000AFC9 + 消息内容超过限制 = 45002, // 0x0000AFCA + 标题字段超过限制 = 45003, // 0x0000AFCB + 描述字段超过限制 = 45004, // 0x0000AFCC + 链接字段超过限制 = 45005, // 0x0000AFCD + 图片链接字段超过限制 = 45006, // 0x0000AFCE + 语音播放时间超过限制 = 45007, // 0x0000AFCF + 图文消息超过限制 = 45008, // 0x0000AFD0 + 接口调用超过限制 = 45009, // 0x0000AFD1 + 创建菜单个数超过限制 = 45010, // 0x0000AFD2 + 回复时间超过限制 = 45015, // 0x0000AFD7 + 系统分组不允许修改 = 45016, // 0x0000AFD8 + 分组名字过长 = 45017, // 0x0000AFD9 + 分组数量超过上限 = 45018, // 0x0000AFDA + 超出响应数量限制 = 45047, // 0x0000AFF7 + 创建的标签数过多请注意不能超过100个 = 45056, // 0x0000B000 + 标签名非法请注意不能和其他标签重名 = 45157, // 0x0000B065 + 标签名长度超过30个字节 = 45158, // 0x0000B066 + 不存在媒体数据 = 46001, // 0x0000B3B1 + 不存在的菜单版本 = 46002, // 0x0000B3B2 + 不存在的菜单数据 = 46003, // 0x0000B3B3 + 解析JSON_XML内容错误 = 47001, // 0x0000B799 + /// [小程序订阅消息]模板参数不准确，可能为空或者不满足规则，errmsg会提示具体是哪个字段出错 + 模板参数不准确 = 47003, // 0x0000B79B + api功能未授权 = 48001, // 0x0000BB81 + 用户未授权该api = 50001, // 0x0000C351 + 名称格式不合法 = 53010, // 0x0000CF12 + 名称检测命中频率限制 = 53011, // 0x0000CF13 + 禁止使用该名称 = 53012, // 0x0000CF14 + 公众号_名称与已有公众号名称重复_小程序_该名称与已有小程序名称重复 = 53013, // 0x0000CF15 + 公众号_公众号已有_名称A_时_需与该帐号相同主体才可申请_名称A_小程序_小程序已有_名称A_时_需与该帐号相同主体才可申请_名称A_ = 53014, // 0x0000CF16 + 公众号_该名称与已有小程序名称重复_需与该小程序帐号相同主体才可申请_小程序_该名称与已有公众号名称重复_需与该公众号帐号相同主体才可申请 = 53015, // 0x0000CF17 + 公众号_该名称与已有多个小程序名称重复_暂不支持申请_小程序_该名称与已有多个公众号名称重复_暂不支持申请 = 53016, // 0x0000CF18 + 公众号_小程序已有_名称A_时_需与该帐号相同主体才可申请_名称A_小程序_公众号已有_名称A_时_需与该帐号相同主体才可申请_名称A = 53017, // 0x0000CF19 + 名称命中微信号 = 53018, // 0x0000CF1A + 名称在保护期内 = 53019, // 0x0000CF1B + 法人姓名与微信号不一致 = 61070, // 0x0000EE8E + 系统错误system_error = 61450, // 0x0000F00A + 参数错误invalid_parameter = 61451, // 0x0000F00B + 无效客服账号invalid_kf_account = 61452, // 0x0000F00C + 客服帐号已存在kf_account_exsited = 61453, // 0x0000F00D + /// + /// 客服帐号名长度超过限制(仅允许10个英文字符，不包括@及@后的公众号的微信号)(invalid kf_acount length) + /// + 客服帐号名长度超过限制 = 61454, // 0x0000F00E + /// + /// 客服帐号名包含非法字符(仅允许英文+数字)(illegal character in kf_account) + /// + 客服帐号名包含非法字符 = 61455, // 0x0000F00F + /// 客服帐号个数超过限制(10个客服账号)(kf_account count exceeded) + 客服帐号个数超过限制 = 61456, // 0x0000F010 + 无效头像文件类型invalid_file_type = 61457, // 0x0000F011 + 日期格式错误 = 61500, // 0x0000F03C + 日期范围错误 = 61501, // 0x0000F03D + 发送消息失败_该用户已被加入黑名单_无法向此发送消息 = 62751, // 0x0000F51F + 门店不存在 = 65115, // 0x0000FE5B + 该门店状态不允许更新 = 65118, // 0x0000FE5E + 标签格式错误 = 85006, // 0x00014C0E + 页面路径错误 = 85007, // 0x00014C0F + 类目填写错误 = 85008, // 0x00014C10 + 已经有正在审核的版本 = 85009, // 0x00014C11 + item_list有项目为空 = 85010, // 0x00014C12 + 标题填写错误 = 85011, // 0x00014C13 + 无效的审核id = 85012, // 0x00014C14 + 版本输入错误 = 85015, // 0x00014C17 + 没有审核版本 = 85019, // 0x00014C1B + 审核状态未满足发布 = 85020, // 0x00014C1C + 状态不可变 = 85021, // 0x00014C1D + action非法 = 85022, // 0x00014C1E + 审核列表填写的项目数不在1到5以内 = 85023, // 0x00014C1F + 需要补充相应资料_填写org_code和other_files参数 = 85024, // 0x00014C20 + 管理员手机登记数量已超过上限 = 85025, // 0x00014C21 + 该微信号已绑定5个管理员 = 85026, // 0x00014C22 + 管理员身份证已登记过5次 = 85027, // 0x00014C23 + 该主体登记数量已超过上限 = 85028, // 0x00014C24 + 商家名称已被占用 = 85029, // 0x00014C25 + 不能使用该名称 = 85031, // 0x00014C27 + 该名称在侵权投诉保护期 = 85032, // 0x00014C28 + 名称包含违规内容或微信等保留字 = 85033, // 0x00014C29 + 商家名称在改名15天保护期内 = 85034, // 0x00014C2A + 需与该帐号相同主体才可申请 = 85035, // 0x00014C2B + 介绍中含有虚假混淆内容 = 85036, // 0x00014C2C + 头像或者简介修改达到每个月上限 = 85049, // 0x00014C39 + 正在审核中_请勿重复提交 = 85050, // 0x00014C3A + 请先成功创建门店后再调用 = 85053, // 0x00014C3D + 临时mediaid无效 = 85056, // 0x00014C40 + 链接错误 = 85066, // 0x00014C4A + 测试链接不是子链接 = 85068, // 0x00014C4C + 校验文件失败 = 85069, // 0x00014C4D + 个人类型小程序无法设置二维码规则 = 85070, // 0x00014C4E + 已添加该链接_请勿重复添加 = 85071, // 0x00014C4F + 该链接已被占用 = 85072, // 0x00014C50 + 二维码规则已满 = 85073, // 0x00014C51 + 小程序未发布_小程序必须先发布代码才可以发布二维码跳转规则 = 85074, // 0x00014C52 + 个人类型小程序无法设置二维码规则1 = 85075, // 0x00014C53 + 小程序没有线上版本_不能进行灰度 = 85079, // 0x00014C57 + 小程序提交的审核未审核通过 = 85080, // 0x00014C58 + 无效的发布比例 = 85081, // 0x00014C59 + 当前的发布比例需要比之前设置的高 = 85082, // 0x00014C5A + 小程序提审数量已达本月上限 = 85085, // 0x00014C5D + 提交代码审核之前需提前上传代码 = 85086, // 0x00014C5E + 小程序已使用_api_navigateToMiniProgram_请声明跳转_appid_列表后再次提交 = 85087, // 0x00014C5F + 不是由第三方代小程序进行调用 = 86000, // 0x00014FF0 + 不存在第三方的已经提交的代码 = 86001, // 0x00014FF1 + 小程序还未设置昵称_头像_简介_请先设置完后再重新提交 = 86002, // 0x00014FF2 + 无效微信号 = 86004, // 0x00014FF4 + /// + /// 小程序为“签名错误”。对应公众号： 87009, “errmsg” : “reply is not exists” //该回复不存在 + /// + 签名错误 = 87009, // 0x000153E1 + 现网已经在灰度发布_不能进行版本回退 = 87011, // 0x000153E3 + 该版本不能回退_可能的原因_1_无上一个线上版用于回退_2_此版本为已回退版本_不能回退_3_此版本为回退功能上线之前的版本_不能回退 = 87012, // 0x000153E4 + 内容含有违法违规内容 = 87014, // 0x000153E6 + 没有留言权限 = 88000, // 0x000157C0 + 该图文不存在 = 88001, // 0x000157C1 + 文章存在敏感信息 = 88002, // 0x000157C2 + 精选评论数已达上限 = 88003, // 0x000157C3 + 已被用户删除_无法精选 = 88004, // 0x000157C4 + 已经回复过了 = 88005, // 0x000157C5 + 回复超过长度限制或为0 = 88007, // 0x000157C7 + 该评论不存在 = 88008, // 0x000157C8 + 获取评论数目不合法 = 88010, // 0x000157CA + 该公众号_小程序已经绑定了开放平台帐号 = 89000, // 0x00015BA8 + 业务域名无更改_无需重复设置 = 89019, // 0x00015BBB + 尚未设置小程序业务域名_请先在第三方平台中设置小程序业务域名后在调用本接口 = 89020, // 0x00015BBC + 请求保存的域名不是第三方平台中已设置的小程序业务域名或子域名 = 89021, // 0x00015BBD + 业务域名数量超过限制_最多可以添加100个业务域名 = 89029, // 0x00015BC5 + 个人小程序不支持调用_setwebviewdomain_接口 = 89231, // 0x00015C8F + 内部错误 = 89247, // 0x00015C9F + 企业代码类型无效_请选择正确类型填写 = 89248, // 0x00015CA0 + 该主体已有任务执行中_距上次任务24h后再试 = 89249, // 0x00015CA1 + 未找到该任务 = 89250, // 0x00015CA2 + 待法人人脸核身校验 = 89251, // 0x00015CA3 + 法人_企业信息一致性校验中 = 89252, // 0x00015CA4 + 缺少参数 = 89253, // 0x00015CA5 + 第三方权限集不全_补全权限集全网发布后生效 = 89254, // 0x00015CA6 + 系统不稳定_请稍后再试_如多次失败请通过社区反馈 = 89401, // 0x00015D39 + 该审核单不在待审核队列_请检查是否已提交审核或已审完 = 89402, // 0x00015D3A + 本单属于平台不支持加急种类_请等待正常审核流程 = 89403, // 0x00015D3B + 本单已加速成功_请勿重复提交 = 89404, // 0x00015D3C + 本月加急额度不足_请提升提审质量以获取更多额度 = 89405, // 0x00015D3D + 该经营资质已添加_请勿重复添加 = 92000, // 0x00016760 + 附近地点添加数量达到上线_无法继续添加 = 92002, // 0x00016762 + 地点已被其它小程序占用 = 92003, // 0x00016763 + 附近功能被封禁 = 92004, // 0x00016764 + 地点正在审核中 = 92005, // 0x00016765 + 地点正在展示小程序 = 92006, // 0x00016766 + 地点审核失败 = 92007, // 0x00016767 + 程序未展示在该地点 = 92008, // 0x00016768 + 小程序未上架或不可见 = 92009, // 0x00016769 + 地点不存在 = 93010, // 0x00016B52 + 个人类型小程序不可用 = 93011, // 0x00016B53 + 已下发的模板消息法人并未确认且已超时_24h_未进行身份证校验 = 100001, // 0x000186A1 + 已下发的模板消息法人并未确认且已超时_24h_未进行人脸识别校验 = 100002, // 0x000186A2 + 已下发的模板消息法人并未确认且已超时_24h = 100003, // 0x000186A3 + 此账号已被封禁_无法操作 = 200011, // 0x00030D4B + 私有模板数已达上限_上限_50_个 = 200012, // 0x00030D4C + 此模版已被封禁_无法选用 = 200013, // 0x00030D4D + 模版tid参数错误 = 200014, // 0x00030D4E + 关键词列表kidList参数错误 = 200020, // 0x00030D54 + 场景描述sceneDesc参数错误 = 200021, // 0x00030D55 + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Mediator/ImageMessageEventCommand.cs b/Zncy.CloudCar.WeChat.Service/Mediator/ImageMessageEventCommand.cs new file mode 100644 index 0000000..426bd51 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Mediator/ImageMessageEventCommand.cs @@ -0,0 +1,47 @@ +using MediatR; +using SKIT.FlurlHttpClient.Wechat.Api; +using SKIT.FlurlHttpClient.Wechat.Api.Events; +using Zncy.CloudCar.WeChat.Service.Models; +using Zncy.CloudCar.WeChat.Service.Services.HttpClients; +using Znyc.CloudCar.Utility.Helper; + +namespace Zncy.CloudCar.WeChat.Service.Mediator +{ + /// + /// 表示 TEXT 事件的数据 + /// + public class ImageMessageEventCommand : IRequest + { +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“EventObj”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public ImageMessageEvent EventObj { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“EventObj”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } + + public class ImageMessageEventCommandHandler : IRequestHandler + { + private readonly IWeChatApiHttpClientFactory _weChatApiHttpClientFactory; + + public ImageMessageEventCommandHandler(IWeChatApiHttpClientFactory weChatApiHttpClientFactory) + { + _weChatApiHttpClientFactory = weChatApiHttpClientFactory; + } + + public async Task Handle(ImageMessageEventCommand request, CancellationToken cancellationToken) + { + var jm = new WeChatApiCallBack() { Status = true }; + if (request.EventObj != null) + { + var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); + var replyModel = new SKIT.FlurlHttpClient.Wechat.Api.Events.TransferCustomerServiceReply() + { + ToUserName = request.EventObj.FromUserName, + FromUserName = request.EventObj.ToUserName, + CreateTimestamp = CommonHelper.GetTimeStampByTotalSeconds() + }; + var replyXml = client.SerializeEventToXml(replyModel); + jm.Data = replyXml; + } + return await Task.FromResult(jm); + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Mediator/TextMessageEventCommand.cs b/Zncy.CloudCar.WeChat.Service/Mediator/TextMessageEventCommand.cs new file mode 100644 index 0000000..6bd45bd --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Mediator/TextMessageEventCommand.cs @@ -0,0 +1,47 @@ +using MediatR; +using SKIT.FlurlHttpClient.Wechat.Api; +using SKIT.FlurlHttpClient.Wechat.Api.Events; +using Zncy.CloudCar.WeChat.Service.Models; +using Zncy.CloudCar.WeChat.Service.Services.HttpClients; +using Znyc.CloudCar.Utility.Helper; + +namespace Zncy.CloudCar.WeChat.Service.Mediator +{ + /// + /// 表示 TEXT 事件的数据 + /// + public class TextMessageEventCommand : IRequest + { +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“EventObj”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public TextMessageEvent EventObj { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“EventObj”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } + + public class TextMessageEventCommandHandler : IRequestHandler + { + private readonly IWeChatApiHttpClientFactory _weChatApiHttpClientFactory; + + public TextMessageEventCommandHandler(IWeChatApiHttpClientFactory weChatApiHttpClientFactory) + { + _weChatApiHttpClientFactory = weChatApiHttpClientFactory; + } + + public Task Handle(TextMessageEventCommand request, CancellationToken cancellationToken) + { + var jm = new WeChatApiCallBack() { Status = true }; + if (request.EventObj != null) + { + var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); + var replyModel = new TransferCustomerServiceReply() + { + ToUserName = request.EventObj.FromUserName, + FromUserName = request.EventObj.ToUserName, + CreateTimestamp = CommonHelper.GetTimeStampByTotalSeconds() + }; + var replyXml = client.SerializeEventToXml(replyModel); + jm.Data = replyXml; + } + return Task.FromResult(jm); + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Mediator/VoiceMessageEventCommand.cs b/Zncy.CloudCar.WeChat.Service/Mediator/VoiceMessageEventCommand.cs new file mode 100644 index 0000000..cb3b9dd --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Mediator/VoiceMessageEventCommand.cs @@ -0,0 +1,48 @@ + +using MediatR; +using SKIT.FlurlHttpClient.Wechat.Api; +using SKIT.FlurlHttpClient.Wechat.Api.Events; +using Zncy.CloudCar.WeChat.Service.Models; +using Zncy.CloudCar.WeChat.Service.Services.HttpClients; +using Znyc.CloudCar.Utility.Helper; + +namespace Zncy.CloudCar.WeChat.Service.Mediator +{ + /// + /// 表示 TEXT 事件的数据 + /// + public class VoiceMessageEventCommand : IRequest + { +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“EventObj”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public VoiceMessageEvent EventObj { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“EventObj”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } + + public class VoiceMessageEventCommandHandler : IRequestHandler + { + private readonly IWeChatApiHttpClientFactory _weChatApiHttpClientFactory; + + public VoiceMessageEventCommandHandler(IWeChatApiHttpClientFactory weChatApiHttpClientFactory) + { + _weChatApiHttpClientFactory = weChatApiHttpClientFactory; + } + + public async Task Handle(VoiceMessageEventCommand request, CancellationToken cancellationToken) + { + var jm = new WeChatApiCallBack() { Status = true }; + if (request.EventObj != null) + { + var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); + var replyModel = new SKIT.FlurlHttpClient.Wechat.Api.Events.TransferCustomerServiceReply() + { + ToUserName = request.EventObj.FromUserName, + FromUserName = request.EventObj.ToUserName, + CreateTimestamp = CommonHelper.GetTimeStampByTotalSeconds() + }; + var replyXml = client.SerializeEventToXml(replyModel); + jm.Data = replyXml; + } + return await Task.FromResult(jm); + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Models/CreateOrderByJsapiRequest.cs b/Zncy.CloudCar.WeChat.Service/Models/CreateOrderByJsapiRequest.cs new file mode 100644 index 0000000..81c5f6a --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Models/CreateOrderByJsapiRequest.cs @@ -0,0 +1,15 @@ +namespace Zncy.CloudCar.WeChat.Service.Models +{ + public class CreateOrderByJsapiRequest + { + public string MerchantId { get; set; } = default!; + + public string AppId { get; set; } = default!; + + public string OpenId { get; set; } = default!; + + // NOTICE: + // 单机演示时金额来源于客户端请求，生产项目请改为服务端计算生成，切勿依赖客户端提供的金额结果。 + public int Amount { get; set; } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Models/DecodedPhoneNumber.cs b/Zncy.CloudCar.WeChat.Service/Models/DecodedPhoneNumber.cs new file mode 100644 index 0000000..e7e8db0 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Models/DecodedPhoneNumber.cs @@ -0,0 +1,21 @@ +namespace Zncy.CloudCar.WeChat.Service.Models +{ + /// + /// 用户绑定手机号解密类 + /// + public class DecodedPhoneNumber : DecodeEntityBase + { + /// + /// 用户绑定的手机号（国外手机号会有区号） + /// + public string phoneNumber { get; set; } + /// + /// 没有区号的手机号 + /// + public string purePhoneNumber { get; set; } + /// + /// 区号（Senparc注：国别号） + /// + public string countryCode { get; set; } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Models/DecodedRunData.cs b/Zncy.CloudCar.WeChat.Service/Models/DecodedRunData.cs new file mode 100644 index 0000000..4ac6984 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Models/DecodedRunData.cs @@ -0,0 +1,17 @@ +namespace Zncy.CloudCar.WeChat.Service.Models +{ + [Serializable] + public class DecodedRunData : DecodeEntityBase + { +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“stepInfoList”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public List stepInfoList { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“stepInfoList”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } + + [Serializable] + public class DecodedRunData_StepModel + { + public long timestamp { get; set; } + public long step { get; set; } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Models/EncryptPostModel.cs b/Zncy.CloudCar.WeChat.Service/Models/EncryptPostModel.cs new file mode 100644 index 0000000..cac2f5e --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Models/EncryptPostModel.cs @@ -0,0 +1,48 @@ +namespace Zncy.CloudCar.WeChat.Service.Models +{ + /// 接收加密信息统一基类（同时也支持非加密信息） + public abstract class EncryptPostModel : IEncryptPostModel + { + /// 指定当前服务账号的唯一领域定义（主要为 APM 服务），例如 AppId + public abstract string DomainId { get; set; } + + /// Signature +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Signature”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Signature { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Signature”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// Msg_Signature +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Msg_Signature”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Msg_Signature { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Msg_Signature”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// Timestamp +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Timestamp”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Timestamp { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Timestamp”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// Nonce +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Nonce”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Nonce { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Nonce”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// Token +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Token”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Token { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Token”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// EncodingAESKey +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“EncodingAESKey”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string EncodingAESKey { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“EncodingAESKey”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// 设置服务器内部保密信息 + /// + /// + public virtual void SetSecretInfo(string token, string encodingAESKey) + { + Token = token; + EncodingAESKey = encodingAESKey; + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Models/IEncryptPostModel.cs b/Zncy.CloudCar.WeChat.Service/Models/IEncryptPostModel.cs new file mode 100644 index 0000000..3d5546a --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Models/IEncryptPostModel.cs @@ -0,0 +1,27 @@ +namespace Zncy.CloudCar.WeChat.Service.Models +{ + /// 接收加密信息统一接口（同时也支持非加密信息） + public interface IEncryptPostModel + { + /// 指定当前服务账号的唯一领域定义（主要为 APM 服务），例如 AppId + string DomainId { get; set; } + + /// Signature + string Signature { get; set; } + + /// Msg_Signature + string Msg_Signature { get; set; } + + /// Timestamp + string Timestamp { get; set; } + + /// Nonce + string Nonce { get; set; } + + /// Token + string Token { get; set; } + + /// EncodingAESKey + string EncodingAESKey { get; set; } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Models/PostModel.cs b/Zncy.CloudCar.WeChat.Service/Models/PostModel.cs new file mode 100644 index 0000000..56f2866 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Models/PostModel.cs @@ -0,0 +1,30 @@ +namespace Zncy.CloudCar.WeChat.Service.Models +{ + /// + /// 微信公众服务器Post过来的加密参数集合（不包括PostData） + /// 如需使用 NeuChar，需要在 MessageHandler 中提供 PostModel 并设置 AppId + /// + public class PostModel : EncryptPostModel + { + public override string DomainId + { + get => AppId; + set => AppId = value; + } + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AppId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string AppId { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AppId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// 设置服务器内部保密信息 + /// + /// + /// + public void SetSecretInfo(string token, string encodingAESKey, string appId) + { + Token = token; + EncodingAESKey = encodingAESKey; + AppId = appId; + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Models/SendWxTemplateMessage.cs b/Zncy.CloudCar.WeChat.Service/Models/SendWxTemplateMessage.cs new file mode 100644 index 0000000..05ad316 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Models/SendWxTemplateMessage.cs @@ -0,0 +1,30 @@ +using Newtonsoft.Json.Linq; + +namespace Zncy.CloudCar.WeChat.Service.Models +{ + /// + /// 处理器-微信模板消息【小程序，公众号都走这里】 + /// + public class SendWxTemplateMessage + { + /// + /// 用户序列 + /// + public int userId { get; set; } + + /// + /// 类型 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“code”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string code { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“code”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 传递数据 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“parameters”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public JObject parameters { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“parameters”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + } +} \ No newline at end of file diff --git a/Zncy.CloudCar.WeChat.Service/Models/Watermark.cs b/Zncy.CloudCar.WeChat.Service/Models/Watermark.cs new file mode 100644 index 0000000..e6036d3 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Models/Watermark.cs @@ -0,0 +1,19 @@ +using Zncy.CloudCar.WeChat.Service.Utilities; + +namespace Zncy.CloudCar.WeChat.Service.Models +{ + /// + /// 水印 + /// + [Serializable] + public class Watermark + { + public string appid { get; set; } + public long timestamp { get; set; } + + public DateTimeOffset DateTimeStamp + { + get { return DateTimeHelper.GetDateTimeFromXml(timestamp); } + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Models/WeChatApiCallBack.cs b/Zncy.CloudCar.WeChat.Service/Models/WeChatApiCallBack.cs new file mode 100644 index 0000000..a291873 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Models/WeChatApiCallBack.cs @@ -0,0 +1,30 @@ +namespace Zncy.CloudCar.WeChat.Service.Models +{ + /// + /// 微信接口回调Json实体 + /// + public class WeChatApiCallBack + { + /// + /// 提交数据 + /// +#pragma warning disable CS8625 // 无法将 null 字面量转换为非 null 的引用类型。 + public object OtherData { get; set; } = null; +#pragma warning restore CS8625 // 无法将 null 字面量转换为非 null 的引用类型。 + + /// + /// 状态码 + /// + public bool Status { get; set; } = true; + + /// + /// 信息说明。 + /// + public string Msg { get; set; } = "响应成功"; + + /// + /// 返回数据 + /// + public string Data { get; set; } = "success"; + } +} \ No newline at end of file diff --git a/Zncy.CloudCar.WeChat.Service/Models/WeChatUserInfo.cs b/Zncy.CloudCar.WeChat.Service/Models/WeChatUserInfo.cs new file mode 100644 index 0000000..83c200e --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Models/WeChatUserInfo.cs @@ -0,0 +1,85 @@ +namespace Zncy.CloudCar.WeChat.Service.Models +{ + /// + /// 微信小程序用户信息结构 + /// + public class WeChatUserInfo + + { +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“openId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string openId { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“openId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“nickName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string nickName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“nickName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + public int gender { get; set; } + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“city”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string city { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“city”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“province”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string province { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“province”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“country”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string country { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“country”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“avatarUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string avatarUrl { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“avatarUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“unionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string unionId { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“unionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“watermark”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public Watermark watermark { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“watermark”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + + } + + + [Serializable] + public class DecodeEntityBase + { +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“watermark”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public Watermark watermark { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“watermark”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } + + /// + /// 解码后的用户信息 + /// + [Serializable] + public class DecodedUserInfo : DecodeEntityBase + { +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“openId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string openId { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“openId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“nickName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string nickName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“nickName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public int gender { get; set; } +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“city”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string city { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“city”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“province”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string province { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“province”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“country”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string country { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“country”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“avatarUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string avatarUrl { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“avatarUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“unionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string unionId { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“unionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } + +} diff --git a/Zncy.CloudCar.WeChat.Service/Options/TenpayOptions.cs b/Zncy.CloudCar.WeChat.Service/Options/TenpayOptions.cs new file mode 100644 index 0000000..ae3add0 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Options/TenpayOptions.cs @@ -0,0 +1,30 @@ +using Microsoft.Extensions.Options; + +namespace Zncy.CloudCar.WeChat.Service.Options +{ + public partial class TenpayOptions : IOptions + { + TenpayOptions IOptions.Value => this; + + public Types.WechatMerchant[] Merchants { get; set; } = Array.Empty(); + + public string NotifyUrl { get; set; } = string.Empty; + + } + public partial class TenpayOptions + { + public static class Types + { + public class WechatMerchant + { + public string MerchantId { get; set; } = string.Empty; + + public string SecretV3 { get; set; } = string.Empty; + + public string CertSerialNumber { get; set; } = string.Empty; + + public string CertPrivateKey { get; set; } = string.Empty; + } + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Options/WeChatOptions.cs b/Zncy.CloudCar.WeChat.Service/Options/WeChatOptions.cs new file mode 100644 index 0000000..3aecf2d --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Options/WeChatOptions.cs @@ -0,0 +1,50 @@ + +using Microsoft.Extensions.Options; + +namespace Zncy.CloudCar.WeChat.Service.Options +{ + public class WeChatOptions : IOptions + { + WeChatOptions IOptions.Value => this; + + /// + /// 微信公众号AppId + /// + public string WeiXinAppId { get; set; } = string.Empty; + + /// + /// 微信公众号Secret + /// + public string WeiXinAppSecret { get; set; } = string.Empty; + + /// + /// 微信公众号 + /// + public string WeiXinEncodingAESKey { get; set; } = string.Empty; + + /// + /// 微信公众号token + /// + public string WeiXinToken { get; set; } = string.Empty; + + /// + /// 微信小程序AppId + /// + public string WxOpenAppId { get; set; } = string.Empty; + + /// + /// 微信小程序Secret + /// + public string WxOpenAppSecret { get; set; } = string.Empty; + + /// + /// 微信小程序token + /// + public string WxOpenToken { get; set; } = string.Empty; + + /// + /// 微信小程序 + /// + public string WxOpenEncodingAESKey { get; set; } = string.Empty; + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Services/HttpClients/IWeChatApiHttpClientFactory.cs b/Zncy.CloudCar.WeChat.Service/Services/HttpClients/IWeChatApiHttpClientFactory.cs new file mode 100644 index 0000000..e004c15 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Services/HttpClients/IWeChatApiHttpClientFactory.cs @@ -0,0 +1,20 @@ + +using SKIT.FlurlHttpClient.Wechat.Api; + +namespace Zncy.CloudCar.WeChat.Service.Services.HttpClients +{ + public interface IWeChatApiHttpClientFactory + { + /// + /// 微信公众号请求 + /// + /// + WechatApiClient CreateWeXinClient(); + + /// + /// 微信小程序请求 + /// + /// + WechatApiClient CreateWxOpenClient(); + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Services/HttpClients/IWechatTenpayCertificateManagerFactory.cs b/Zncy.CloudCar.WeChat.Service/Services/HttpClients/IWechatTenpayCertificateManagerFactory.cs new file mode 100644 index 0000000..0535c7c --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Services/HttpClients/IWechatTenpayCertificateManagerFactory.cs @@ -0,0 +1,9 @@ +using SKIT.FlurlHttpClient.Wechat.TenpayV3.Settings; + +namespace Zncy.CloudCar.WeChat.Service.Services.HttpClients +{ + public interface IWechatTenpayCertificateManagerFactory + { + CertificateManager Create(string merchantId); + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Services/HttpClients/IWechatTenpayHttpClientFactory.cs b/Zncy.CloudCar.WeChat.Service/Services/HttpClients/IWechatTenpayHttpClientFactory.cs new file mode 100644 index 0000000..77fdbeb --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Services/HttpClients/IWechatTenpayHttpClientFactory.cs @@ -0,0 +1,9 @@ +using SKIT.FlurlHttpClient.Wechat.TenpayV3; + +namespace Zncy.CloudCar.WeChat.Service.Services.HttpClients +{ + public interface IWechatTenpayHttpClientFactory + { + WechatTenpayClient Create(string merchantId); + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Services/HttpClients/WeChatApiHttpClientFactory.cs b/Zncy.CloudCar.WeChat.Service/Services/HttpClients/WeChatApiHttpClientFactory.cs new file mode 100644 index 0000000..9c0e3bc --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Services/HttpClients/WeChatApiHttpClientFactory.cs @@ -0,0 +1,95 @@ +using Flurl; +using Flurl.Http; +using Flurl.Http.Configuration; +using Microsoft.Extensions.Options; +using SKIT.FlurlHttpClient; +using SKIT.FlurlHttpClient.Wechat.Api; +using Zncy.CloudCar.WeChat.Service.Options; +using IHttpClientFactory = System.Net.Http.IHttpClientFactory; + +namespace Zncy.CloudCar.WeChat.Service.Services.HttpClients +{ + public partial class WeChatApiHttpClientFactory : IWeChatApiHttpClientFactory + { + private readonly IHttpClientFactory _httpClientFactory; + private readonly WeChatOptions _weChatOptions; + + public WeChatApiHttpClientFactory( + IHttpClientFactory httpClientFactory, + IOptions weChatOptions + ) + { + _httpClientFactory = httpClientFactory; + _weChatOptions = weChatOptions.Value; + + FlurlHttp.GlobalSettings.FlurlClientFactory = new DelegatingFlurlClientFactory(_httpClientFactory); + } + + /// + /// 微信公众号请求 + /// + /// + public WechatApiClient CreateWeXinClient() + { + if (string.IsNullOrEmpty(_weChatOptions.WeiXinAppId) || string.IsNullOrEmpty(_weChatOptions.WeiXinAppSecret)) + { + throw new Exception("未在配置项中找到微信公众号配置讯息。"); + } + var wechatApiClient = new WechatApiClient(new WechatApiClientOptions() + { + AppId = _weChatOptions.WeiXinAppId, + AppSecret = _weChatOptions.WeiXinAppSecret + }); + wechatApiClient.Configure(settings => + { + settings.JsonSerializer = new FlurlNewtonsoftJsonSerializer(); + }); + return wechatApiClient; + } + + /// + /// 微信小程序请求 + /// + /// + public WechatApiClient CreateWxOpenClient() + { + if (string.IsNullOrEmpty(_weChatOptions.WxOpenAppId) || string.IsNullOrEmpty(_weChatOptions.WxOpenAppSecret)) + { + throw new Exception("未在配置项中找到微信小程序配置讯息。"); + } + var wechatApiClient = new WechatApiClient(new WechatApiClientOptions() + { + AppId = _weChatOptions.WxOpenAppId, + AppSecret = _weChatOptions.WxOpenAppSecret + }); + wechatApiClient.Configure(settings => + { + settings.JsonSerializer = new FlurlNewtonsoftJsonSerializer(); + }); + return wechatApiClient; + } + } + + public partial class WeChatApiHttpClientFactory + { + internal class DelegatingFlurlClientFactory : IFlurlClientFactory + { + private readonly IHttpClientFactory _httpClientFactory; + + public DelegatingFlurlClientFactory(IHttpClientFactory httpClientFactory) + { + _httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory)); + } + public void Dispose() + { + // Do Nothing + } + + public IFlurlClient Get(Url url) + { + return new FlurlClient(_httpClientFactory.CreateClient(url.ToUri().Host)); + } + } + + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Services/HttpClients/WechatTenpayCertificateManagerFactory.cs b/Zncy.CloudCar.WeChat.Service/Services/HttpClients/WechatTenpayCertificateManagerFactory.cs new file mode 100644 index 0000000..557fc5b --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Services/HttpClients/WechatTenpayCertificateManagerFactory.cs @@ -0,0 +1,24 @@ +using SKIT.FlurlHttpClient.Wechat.TenpayV3.Settings; +using System.Collections.Concurrent; + +namespace Zncy.CloudCar.WeChat.Service.Services.HttpClients +{ + public class WechatTenpayCertificateManagerFactory : IWechatTenpayCertificateManagerFactory + { + private readonly ConcurrentDictionary _dict; + + public WechatTenpayCertificateManagerFactory() + { + _dict = new ConcurrentDictionary(); + } + + public CertificateManager Create(string merchantId) + { + // NOTICE: + // 这里的工厂方法是为了演示多租户而存在的，可根据商户号生成不同的证书管理器。 + // 如果你的项目只存在唯一一个租户，那么直接注入 `CertificateManager` 即可。 + + return _dict.GetOrAdd(merchantId, new InMemoryCertificateManager()); + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Services/HttpClients/WechatTenpayHttpClientFactory.cs b/Zncy.CloudCar.WeChat.Service/Services/HttpClients/WechatTenpayHttpClientFactory.cs new file mode 100644 index 0000000..c393d7f --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Services/HttpClients/WechatTenpayHttpClientFactory.cs @@ -0,0 +1,66 @@ +using Microsoft.Extensions.Options; +using SKIT.FlurlHttpClient.Wechat.TenpayV3; + +namespace Zncy.CloudCar.WeChat.Service.Services.HttpClients +{ + public partial class WechatTenpayHttpClientFactory : IWechatTenpayHttpClientFactory + { + private readonly IHttpClientFactory _httpClientFactory; + private readonly Options.TenpayOptions _tenpayOptions; + private readonly IWechatTenpayCertificateManagerFactory _tenpayCertificateManagerFactory; + + public WechatTenpayHttpClientFactory( + IHttpClientFactory httpClientFactory, + IOptions tenpayOptions, + IWechatTenpayCertificateManagerFactory tenpayCertificateManagerFactory) + { + _httpClientFactory = httpClientFactory; + _tenpayOptions = tenpayOptions.Value; + _tenpayCertificateManagerFactory = tenpayCertificateManagerFactory; + } + + public WechatTenpayClient Create(string merchantId) + { + // NOTICE: + // 这里的工厂方法是为了演示多租户而存在的，可根据商户号生成不同的 API 客户端。 + // 如果你的项目只存在唯一一个租户，那么直接注入 `WechatTenpayClient` 即可。 + + var tenpayMerchantConfig = _tenpayOptions.Merchants?.FirstOrDefault(e => string.Equals(merchantId, e.MerchantId)); + if (tenpayMerchantConfig == null) + throw new Exception("未在配置项中找到该 MerchantId 对应的微信商户号。"); + + var wechatTenpayClientOptions = new WechatTenpayClientOptions() + { + MerchantId = tenpayMerchantConfig.MerchantId, + MerchantV3Secret = tenpayMerchantConfig.SecretV3, + MerchantCertificateSerialNumber = tenpayMerchantConfig.CertSerialNumber, + MerchantCertificatePrivateKey = tenpayMerchantConfig.CertPrivateKey, + PlatformCertificateManager = _tenpayCertificateManagerFactory.Create(tenpayMerchantConfig.MerchantId), + AutoEncryptRequestSensitiveProperty = true, + AutoDecryptResponseSensitiveProperty = true + }; + var wechatTenpayClient = new WechatTenpayClient(wechatTenpayClientOptions); + wechatTenpayClient.Configure((settings) => settings.FlurlHttpClientFactory = new DelegatingFlurlClientFactory(_httpClientFactory)); + return wechatTenpayClient; + } + } + + public partial class WechatTenpayHttpClientFactory + { + public class DelegatingFlurlClientFactory : Flurl.Http.Configuration.DefaultHttpClientFactory + { + private readonly IHttpClientFactory _httpClientFactory; + + public DelegatingFlurlClientFactory(IHttpClientFactory httpClientFactory) + { + _httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory)); + } + + public override HttpClient CreateHttpClient(HttpMessageHandler handler) + { + return _httpClientFactory.CreateClient(); + } + } + } +} + diff --git a/Zncy.CloudCar.WeChat.Service/Utilities/CheckSignature.cs b/Zncy.CloudCar.WeChat.Service/Utilities/CheckSignature.cs new file mode 100644 index 0000000..074a65b --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Utilities/CheckSignature.cs @@ -0,0 +1,61 @@ + + +using System.Security.Cryptography; +using System.Text; +using Zncy.CloudCar.WeChat.Service.Models; + +namespace Zncy.CloudCar.WeChat.Service.Utilities +{ + /// + /// 签名验证类 + /// + public class CheckSignature + { + /// 在网站没有提供Token（或传入为null）的情况下的默认Token，建议在网站中进行配置。 + public const string Token = "weixin"; + + /// 检查签名是否正确 + /// + /// 需要提供：Timestamp、Nonce、Token + /// + public static bool Check(string signature, PostModel postModel) => Check(signature, postModel.Timestamp, postModel.Nonce, postModel.Token); + + /// 检查签名是否正确 + /// + /// + /// + /// + /// +#pragma warning disable CS8625 // 无法将 null 字面量转换为非 null 的引用类型。 + public static bool Check(string signature, string timestamp, string nonce, string token = null) => signature == GetSignature(timestamp, nonce, token); +#pragma warning restore CS8625 // 无法将 null 字面量转换为非 null 的引用类型。 + + /// 返回正确的签名 + /// 需要提供：Timestamp、Nonce、Token + /// + public static string GetSignature(PostModel postModel) => GetSignature(postModel.Timestamp, postModel.Nonce, postModel.Token); + + /// 返回正确的签名 + /// + /// + /// + /// +#pragma warning disable CS8625 // 无法将 null 字面量转换为非 null 的引用类型。 + public static string GetSignature(string timestamp, string nonce, string token = null) +#pragma warning restore CS8625 // 无法将 null 字面量转换为非 null 的引用类型。 + { + token = token ?? "weixin"; + string s = string.Join("", ((IEnumerable)new string[3] + { + token, + timestamp, + nonce + }).OrderBy(z => z).ToArray()); + byte[] hash = SHA1.Create().ComputeHash(Encoding.UTF8.GetBytes(s)); + StringBuilder stringBuilder = new StringBuilder(); + foreach (byte num in hash) + stringBuilder.AppendFormat("{0:x2}", num); + return stringBuilder.ToString(); + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Utilities/Cryptography.cs b/Zncy.CloudCar.WeChat.Service/Utilities/Cryptography.cs new file mode 100644 index 0000000..80ad1e7 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Utilities/Cryptography.cs @@ -0,0 +1,235 @@ +using System.Net; +using System.Security.Cryptography; +using System.Text; + +namespace Zncy.CloudCar.WeChat.Service.Utilities +{ + public class Cryptography + { + public static uint HostToNetworkOrder(uint inval) + { + uint outval = 0; + for (int i = 0; i < 4; i++) + outval = (outval << 8) + (inval >> i * 8 & 255); + return outval; + } + + public static int HostToNetworkOrder(int inval) + { + int outval = 0; + for (int i = 0; i < 4; i++) + outval = (outval << 8) + (inval >> i * 8 & 255); + return outval; + } + /// + /// 解密方法 + /// + /// 密文 + /// + /// + /// + public static string AES_decrypt(string Input, string EncodingAESKey, ref string appid) + { + byte[] Key; + Key = Convert.FromBase64String(EncodingAESKey + "="); + byte[] Iv = new byte[16]; + Array.Copy(Key, Iv, 16); + byte[] btmpMsg = AES_decrypt(Input, Iv, Key); + + int len = BitConverter.ToInt32(btmpMsg, 16); + len = IPAddress.NetworkToHostOrder(len); + + + byte[] bMsg = new byte[len]; + byte[] bAppid = new byte[btmpMsg.Length - 20 - len]; + Array.Copy(btmpMsg, 20, bMsg, 0, len); + Array.Copy(btmpMsg, 20 + len, bAppid, 0, btmpMsg.Length - 20 - len); + string oriMsg = Encoding.UTF8.GetString(bMsg); + appid = Encoding.UTF8.GetString(bAppid); + + + return oriMsg; + } + + public static string AES_encrypt(string Input, string EncodingAESKey, string appid) + { + byte[] Key; + Key = Convert.FromBase64String(EncodingAESKey + "="); + byte[] Iv = new byte[16]; + Array.Copy(Key, Iv, 16); + string Randcode = CreateRandCode(16); + byte[] bRand = Encoding.UTF8.GetBytes(Randcode); + byte[] bAppid = Encoding.UTF8.GetBytes(appid); + byte[] btmpMsg = Encoding.UTF8.GetBytes(Input); + byte[] bMsgLen = BitConverter.GetBytes(HostToNetworkOrder(btmpMsg.Length)); + byte[] bMsg = new byte[bRand.Length + bMsgLen.Length + bAppid.Length + btmpMsg.Length]; + + Array.Copy(bRand, bMsg, bRand.Length); + Array.Copy(bMsgLen, 0, bMsg, bRand.Length, bMsgLen.Length); + Array.Copy(btmpMsg, 0, bMsg, bRand.Length + bMsgLen.Length, btmpMsg.Length); + Array.Copy(bAppid, 0, bMsg, bRand.Length + bMsgLen.Length + btmpMsg.Length, bAppid.Length); + + return AES_encrypt(bMsg, Iv, Key); + + } + private static string CreateRandCode(int codeLen) + { + string codeSerial = "2,3,4,5,6,7,a,c,d,e,f,h,i,j,k,m,n,p,r,s,t,A,C,D,E,F,G,H,J,K,M,N,P,Q,R,S,U,V,W,X,Y,Z"; + if (codeLen == 0) + { + codeLen = 16; + } + string[] arr = codeSerial.Split(','); + string code = ""; + int randValue = -1; + Random rand = new Random(unchecked((int)DateTime.Now.Ticks)); + for (int i = 0; i < codeLen; i++) + { + randValue = rand.Next(0, arr.Length - 1); + code += arr[randValue]; + } + return code; + } + + private static string AES_encrypt(string Input, byte[] Iv, byte[] Key) + { + var aes = new RijndaelManaged(); + //秘钥的大小，以位为单位 + aes.KeySize = 256; + //支持的块大小 + aes.BlockSize = 128; + //填充模式 + aes.Padding = PaddingMode.PKCS7; + aes.Mode = CipherMode.CBC; + aes.Key = Key; + aes.IV = Iv; + var encrypt = aes.CreateEncryptor(aes.Key, aes.IV); +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + byte[] xBuff = null; +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + + using (var ms = new MemoryStream()) + { + using (var cs = new CryptoStream(ms, encrypt, CryptoStreamMode.Write)) + { + byte[] xXml = Encoding.UTF8.GetBytes(Input); + cs.Write(xXml, 0, xXml.Length); + } + xBuff = ms.ToArray(); + } + string Output = Convert.ToBase64String(xBuff); + return Output; + } + + private static string AES_encrypt(byte[] Input, byte[] Iv, byte[] Key) + { + var aes = new RijndaelManaged(); + //秘钥的大小，以位为单位 + aes.KeySize = 256; + //支持的块大小 + aes.BlockSize = 128; + //填充模式 + //aes.Padding = PaddingMode.PKCS7; + aes.Padding = PaddingMode.None; + aes.Mode = CipherMode.CBC; + aes.Key = Key; + aes.IV = Iv; + var encrypt = aes.CreateEncryptor(aes.Key, aes.IV); +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + byte[] xBuff = null; +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + + #region 自己进行PKCS7补位，用系统自己带的不行 + byte[] msg = new byte[Input.Length + 32 - Input.Length % 32]; + Array.Copy(Input, msg, Input.Length); + byte[] pad = KCS7Encoder(Input.Length); + Array.Copy(pad, 0, msg, Input.Length, pad.Length); + #endregion + + #region 注释的也是一种方法，效果一样 + //ICryptoTransform transform = aes.CreateEncryptor(); + //byte[] xBuff = transform.TransformFinalBlock(msg, 0, msg.Length); + #endregion + + using (var ms = new MemoryStream()) + { + using (var cs = new CryptoStream(ms, encrypt, CryptoStreamMode.Write)) + { + cs.Write(msg, 0, msg.Length); + } + xBuff = ms.ToArray(); + } + + string Output = Convert.ToBase64String(xBuff); + return Output; + } + + private static byte[] KCS7Encoder(int text_length) + { + int block_size = 32; + // 计算需要填充的位数 + int amount_to_pad = block_size - text_length % block_size; + if (amount_to_pad == 0) + { + amount_to_pad = block_size; + } + // 获得补位所用的字符 + char pad_chr = chr(amount_to_pad); + string tmp = ""; + for (int index = 0; index < amount_to_pad; index++) + { + tmp += pad_chr; + } + return Encoding.UTF8.GetBytes(tmp); + } + /** + * 将数字转化成ASCII码对应的字符，用于对明文进行补码 + * + * @param a 需要转化的数字 + * @return 转化得到的字符 + */ + static char chr(int a) + { + + byte target = (byte)(a & 0xFF); + return (char)target; + } + private static byte[] AES_decrypt(string Input, byte[] Iv, byte[] Key) + { + RijndaelManaged aes = new RijndaelManaged(); + aes.KeySize = 256; + aes.BlockSize = 128; + aes.Mode = CipherMode.CBC; + aes.Padding = PaddingMode.None; + aes.Key = Key; + aes.IV = Iv; + var decrypt = aes.CreateDecryptor(aes.Key, aes.IV); +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + byte[] xBuff = null; +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + using (var ms = new MemoryStream()) + { + using (var cs = new CryptoStream(ms, decrypt, CryptoStreamMode.Write)) + { + byte[] xXml = Convert.FromBase64String(Input); + byte[] msg = new byte[xXml.Length + 32 - xXml.Length % 32]; + Array.Copy(xXml, msg, xXml.Length); + cs.Write(xXml, 0, xXml.Length); + } + xBuff = decode2(ms.ToArray()); + } + return xBuff; + } + private static byte[] decode2(byte[] decrypted) + { + int pad = decrypted[decrypted.Length - 1]; + if (pad < 1 || pad > 32) + { + pad = 0; + } + byte[] res = new byte[decrypted.Length - pad]; + Array.Copy(decrypted, 0, res, 0, decrypted.Length - pad); + return res; + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Utilities/DateTimeHelper.cs b/Zncy.CloudCar.WeChat.Service/Utilities/DateTimeHelper.cs new file mode 100644 index 0000000..1bbe945 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Utilities/DateTimeHelper.cs @@ -0,0 +1,47 @@ +namespace Zncy.CloudCar.WeChat.Service.Utilities +{ + /// + /// 微信日期处理帮助类 + /// + public class DateTimeHelper + { + /// Unix起始时间 + public static readonly DateTimeOffset BaseTime = new DateTimeOffset(1970, 1, 1, 0, 0, 0, TimeSpan.Zero); + + /// 转换微信DateTime时间到C#时间 + /// 微信DateTime + /// + public static DateTime GetDateTimeFromXml(long dateTimeFromXml) => GetDateTimeOffsetFromXml(dateTimeFromXml).LocalDateTime; + + /// 转换微信DateTime时间到C#时间 + /// 微信DateTime + /// + public static DateTime GetDateTimeFromXml(string dateTimeFromXml) => GetDateTimeFromXml(long.Parse(dateTimeFromXml)); + + /// 转换微信DateTimeOffset时间到C#时间 + /// 微信DateTime + /// + public static DateTimeOffset GetDateTimeOffsetFromXml(long dateTimeFromXml) => BaseTime.AddSeconds(dateTimeFromXml).ToLocalTime(); + + /// 转换微信DateTimeOffset时间到C#时间 + /// 微信DateTime + /// + public static DateTimeOffset GetDateTimeOffsetFromXml(string dateTimeFromXml) => GetDateTimeFromXml(long.Parse(dateTimeFromXml)); + + /// 获取微信DateTime（UNIX时间戳） + /// 时间 + /// + [Obsolete("请使用 GetUnixDateTime(dateTime) 方法")] + public static long GetWeixinDateTime(DateTime dateTime) => GetUnixDateTime(dateTime); + + /// 获取Unix时间戳 + /// + /// + public static long GetUnixDateTime(DateTimeOffset dateTime) => (long)(dateTime - BaseTime).TotalSeconds; + + /// 获取Unix时间戳 + /// + /// + public static long GetUnixDateTime(DateTime dateTime) => (long)(dateTime.ToUniversalTime() - BaseTime).TotalSeconds; + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Utilities/DocumentExtensions.cs b/Zncy.CloudCar.WeChat.Service/Utilities/DocumentExtensions.cs new file mode 100644 index 0000000..44fd505 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Utilities/DocumentExtensions.cs @@ -0,0 +1,27 @@ +using System.Xml; +using System.Xml.Linq; + +namespace Zncy.CloudCar.WeChat.Service.Utilities +{ + public static class DocumentExtensions + { + public static XmlDocument ToXmlDocument(this XDocument xDocument) + { + var xmlDocument = new XmlDocument(); + using (var xmlReader = xDocument.CreateReader()) + { + xmlDocument.Load(xmlReader); + } + return xmlDocument; + } + + public static XDocument ToXDocument(this XmlDocument xmlDocument) + { + using (var nodeReader = new XmlNodeReader(xmlDocument)) + { + nodeReader.MoveToContent(); + return XDocument.Load(nodeReader); + } + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Utilities/EncryptHelper.cs b/Zncy.CloudCar.WeChat.Service/Utilities/EncryptHelper.cs new file mode 100644 index 0000000..2559697 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Utilities/EncryptHelper.cs @@ -0,0 +1,320 @@ + + +using Newtonsoft.Json; +using System.Security.Cryptography; +using System.Text; +using Zncy.CloudCar.WeChat.Service.Models; + +namespace Zncy.CloudCar.WeChat.Service.Utilities +{ + + /// + /// 签名及加密帮助类 + /// + public static class EncryptHelper + { + ///// + ///// SHA1加密 + ///// + ///// + ///// + //public static string EncryptToSHA1(string str) + //{ + // SHA1CryptoServiceProvider sha1 = new SHA1CryptoServiceProvider(); + // byte[] str1 = Encoding.UTF8.GetBytes(str); + // byte[] str2 = sha1.ComputeHash(str1); + // sha1.Clear(); + // (sha1 as IDisposable).Dispose(); + // return Convert.ToBase64String(str2); + //} + + #region 签名 + + + /// + /// 获得签名 + /// + /// + /// + /// + public static string GetSignature(string rawData, string sessionKey) + { + var signature = GetSha1(rawData + sessionKey); + //Senparc.Weixin.Helpers.EncryptHelper.SHA1_Encrypt(rawData + sessionKey); + return signature; + } + + /// 采用SHA-1算法加密字符串（小写） + /// 需要加密的字符串 + /// + public static string GetSha1(string encypStr) + { + byte[] hash = SHA1.Create().ComputeHash(Encoding.UTF8.GetBytes(encypStr)); + StringBuilder stringBuilder = new StringBuilder(); + foreach (byte num in hash) + stringBuilder.AppendFormat("{0:x2}", num); + return stringBuilder.ToString(); + } + + + /// + /// 比较签名是否正确 + /// + /// + /// + /// + /// 当SessionId或SessionKey无效时抛出异常 + /// + public static bool CheckSignature(string sessionKey, string rawData, string compareSignature) + { + var signature = GetSignature(rawData, sessionKey); + return signature == compareSignature; + } + + #endregion + + #region 解密 + + #region 私有方法 + + private static byte[] AES_Decrypt(string Input, byte[] Iv, byte[] Key) + { +#if NET45 + RijndaelManaged aes = new RijndaelManaged(); +#else + SymmetricAlgorithm aes = Aes.Create(); +#endif + aes.KeySize = 128;//原始：256 + aes.BlockSize = 128; + aes.Mode = CipherMode.CBC; + aes.Padding = PaddingMode.PKCS7; + aes.Key = Key; + aes.IV = Iv; + var decrypt = aes.CreateDecryptor(aes.Key, aes.IV); +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + byte[] xBuff = null; +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + + //using (ICryptoTransform decrypt = aes.CreateDecryptor(aes.Key, aes.IV) /*aes.CreateDecryptor()*/) + //{ + // var src = Convert.FromBase64String(Input); + // byte[] dest = decrypt.TransformFinalBlock(src, 0, src.Length); + // return dest; + // //return Encoding.UTF8.GetString(dest); + //} + + + try + { + using (var ms = new MemoryStream()) + { + using (var cs = new CryptoStream(ms, decrypt, CryptoStreamMode.Write)) + { + //cs.Read(decryptBytes, 0, decryptBytes.Length); + //cs.Close(); + //ms.Close(); + + //cs.FlushFinalBlock();//用于解决第二次获取小程序Session解密出错的情况 + + + byte[] xXml = Convert.FromBase64String(Input); + byte[] msg = new byte[xXml.Length + 32 - xXml.Length % 32]; + Array.Copy(xXml, msg, xXml.Length); + cs.Write(xXml, 0, xXml.Length); + } + //cs.Dispose(); + xBuff = decode2(ms.ToArray()); + } + } + catch (CryptographicException) + { + //Padding is invalid and cannot be removed. + Console.WriteLine("===== CryptographicException ====="); + + using (var ms = new MemoryStream()) + { + //cs 不自动释放，用于避免“Padding is invalid and cannot be removed”的错误 —— 2019.07.27 Jeffrey + var cs = new CryptoStream(ms, decrypt, CryptoStreamMode.Write); + { + //cs.Read(decryptBytes, 0, decryptBytes.Length); + //cs.Close(); + //ms.Close(); + + //cs.FlushFinalBlock();//用于解决第二次获取小程序Session解密出错的情况 + + byte[] xXml = Convert.FromBase64String(Input); + byte[] msg = new byte[xXml.Length + 32 - xXml.Length % 32]; + Array.Copy(xXml, msg, xXml.Length); + cs.Write(xXml, 0, xXml.Length); + } + //cs.Dispose(); + xBuff = decode2(ms.ToArray()); + } + } + return xBuff; + } + + private static byte[] decode2(byte[] decrypted) + { + int pad = decrypted[decrypted.Length - 1]; + if (pad < 1 || pad > 32) + { + pad = 0; + } + byte[] res = new byte[decrypted.Length - pad]; + Array.Copy(decrypted, 0, res, 0, decrypted.Length - pad); + return res; + } + + + #endregion + + /// + /// 解密所有消息的基础方法 + /// + /// 储存在 SessionBag 中的当前用户 会话 SessionKey + /// 接口返回数据中的 encryptedData 参数 + /// 接口返回数据中的 iv 参数，对称解密算法初始向量 + /// + public static string DecodeEncryptedData(string sessionKey, string encryptedData, string iv) + { + //var aesCipher = Convert.FromBase64String(encryptedData); + var aesKey = Convert.FromBase64String(sessionKey); + var aesIV = Convert.FromBase64String(iv); + + var result = AES_Decrypt(encryptedData, aesIV, aesKey); + var resultStr = Encoding.UTF8.GetString(result); + return resultStr; + } + + /// + /// 解密消息（通过SessionId获取） + /// + /// + /// + /// + /// 当SessionId或SessionKey无效时抛出异常 + /// + public static string DecodeEncryptedDataBySessionId(string sessionKey, string encryptedData, string iv) + { + var resultStr = DecodeEncryptedData(sessionKey, encryptedData, iv); + return resultStr; + } + + + /// + /// 检查解密消息水印 + /// + /// + /// + /// entity为null时也会返回false + public static bool CheckWatermark(this DecodeEntityBase entity, string appId) + { + if (entity == null) + { + return false; + } + return entity.watermark.appid == appId; + } + + #region 解密实例信息 + + /// + /// 解密到实例信息 + /// + /// DecodeEntityBase + /// + /// + /// + /// + public static T DecodeEncryptedDataToEntity(string sessionKey, string encryptedData, string iv) + { + var jsonStr = DecodeEncryptedDataBySessionId(sessionKey, encryptedData, iv); + + //Console.WriteLine("===== jsonStr ====="); + //Console.WriteLine(jsonStr); + //Console.WriteLine(); + + var entity = JsonConvert.DeserializeObject(jsonStr); +#pragma warning disable CS8603 // 可能返回 null 引用。 + return entity; +#pragma warning restore CS8603 // 可能返回 null 引用。 + } + /// + /// 解密到实例信息 + /// + /// DecodeEntityBase + /// + /// + /// + /// + public static T DecodeEncryptedDataToEntityEasy(string sessionKey, string encryptedData, string iv) + { + var jsonStr = DecodeEncryptedData(sessionKey, encryptedData, iv); + var entity = JsonConvert.DeserializeObject(jsonStr); +#pragma warning disable CS8603 // 可能返回 null 引用。 + return entity; +#pragma warning restore CS8603 // 可能返回 null 引用。 + } + + /// + /// 解密UserInfo消息（通过SessionId获取） + /// + /// + /// + /// + /// 当SessionId或SessionKey无效时抛出异常 + /// + public static DecodedUserInfo DecodeUserInfoBySessionId(string sessionKey, string encryptedData, string iv) + { + return DecodeEncryptedDataToEntity(sessionKey, encryptedData, iv); + } + + /// + /// 解密手机号 + /// + /// + /// + /// + /// + public static DecodedPhoneNumber DecryptPhoneNumber(string sessionKey, string encryptedData, string iv) + { + return DecodeEncryptedDataToEntity(sessionKey, encryptedData, iv); + } + /// + /// 解密手机号(根据sessionKey解密) + /// + /// + /// + /// + /// + public static DecodedPhoneNumber DecryptPhoneNumberBySessionKey(string sessionKey, string encryptedData, string iv) + { + //var resultStr = DecodeEncryptedData(sessionKey, encryptedData, iv); + + //var entity = SerializerHelper.GetObject(resultStr); + //return entity; + + return DecodeEncryptedDataToEntityEasy(sessionKey, encryptedData, iv); + } + + /// + /// 解密微信小程序运动步数 + /// 2019-04-02 + /// + /// + /// + /// + /// + public static DecodedRunData DecryptRunData(string sessionId, string encryptedData, string iv) + { + return DecodeEncryptedDataToEntity(sessionId, encryptedData, iv); + } + + + #endregion + + #endregion + } + +} diff --git a/Zncy.CloudCar.WeChat.Service/Utilities/RequestUtility.cs b/Zncy.CloudCar.WeChat.Service/Utilities/RequestUtility.cs new file mode 100644 index 0000000..58168a5 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Utilities/RequestUtility.cs @@ -0,0 +1,56 @@ + + +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using System.Text; + +namespace Zncy.CloudCar.WeChat.Service.Utilities +{ + /// + /// HTTP 请求工具类 + /// + public static class RequestUtility + { + /// 【异步方法】从 Request.Body 中读取流，并复制到一个独立的 MemoryStream 对象中 + /// + /// + /// + public static async Task GetRequestMemoryStreamAsync( + this HttpRequest request, + bool? allowSynchronousIO = true) + { + IHttpBodyControlFeature bodyControlFeature = request.HttpContext.Features.Get(); + if (bodyControlFeature != null && allowSynchronousIO.HasValue) + bodyControlFeature.AllowSynchronousIO = allowSynchronousIO.Value; + return new MemoryStream(Encoding.UTF8.GetBytes(await new StreamReader(request.Body).ReadToEndAsync())); + } + + /// 从 Request.Body 中读取流，并复制到一个独立的 MemoryStream 对象中 + /// + /// + /// + public static Stream GetRequestStream( + this HttpRequest request, + bool? allowSynchronousIO = true) + { + IHttpBodyControlFeature bodyControlFeature = request.HttpContext.Features.Get(); + if (bodyControlFeature != null && allowSynchronousIO.HasValue) + bodyControlFeature.AllowSynchronousIO = allowSynchronousIO.Value; + return new MemoryStream(Encoding.UTF8.GetBytes(new StreamReader(request.Body).ReadToEnd())); + } + + /// 从 Request.Body 中读取流，并复制到一个独立的 MemoryStream 对象中 + /// + /// + /// + public static MemoryStream GetRequestMemoryStream( + this HttpRequest request, + bool? allowSynchronousIO = true) + { + IHttpBodyControlFeature bodyControlFeature = request.HttpContext.Features.Get(); + if (bodyControlFeature != null && allowSynchronousIO.HasValue) + bodyControlFeature.AllowSynchronousIO = allowSynchronousIO.Value; + return new MemoryStream(Encoding.UTF8.GetBytes(new StreamReader(request.Body).ReadToEnd())); + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Utilities/WXBizMsgCrypt.cs b/Zncy.CloudCar.WeChat.Service/Utilities/WXBizMsgCrypt.cs new file mode 100644 index 0000000..be844f8 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Utilities/WXBizMsgCrypt.cs @@ -0,0 +1,235 @@ +using System.Collections; +//using System.Web; +using System.Security.Cryptography; +using System.Text; +using System.Xml; +//-40001 ： 签名验证错误 +//-40002 : xml解析失败 +//-40003 : sha加密生成签名失败 +//-40004 : AESKey 非法 +//-40005 : appid 校验错误 +//-40006 : AES 加密失败 +//-40007 ： AES 解密失败 +//-40008 ： 解密后得到的buffer非法 +//-40009 : base64加密异常 +//-40010 : base64解密异常 + +namespace Zncy.CloudCar.WeChat.Service.Utilities +{ + public class WXBizMsgCrypt + { + readonly string m_sToken; + readonly string m_sEncodingAESKey; + readonly string m_sAppID; + enum WXBizMsgCryptErrorCode + { + WXBizMsgCrypt_OK = 0, + WXBizMsgCrypt_ValidateSignature_Error = -40001, + WXBizMsgCrypt_ParseXml_Error = -40002, + WXBizMsgCrypt_ComputeSignature_Error = -40003, + WXBizMsgCrypt_IllegalAesKey = -40004, + WXBizMsgCrypt_ValidateAppid_Error = -40005, + WXBizMsgCrypt_EncryptAES_Error = -40006, + WXBizMsgCrypt_DecryptAES_Error = -40007, + WXBizMsgCrypt_IllegalBuffer = -40008, + WXBizMsgCrypt_EncodeBase64_Error = -40009, + WXBizMsgCrypt_DecodeBase64_Error = -40010 + }; + + //构造函数 + // @param sToken: 公众平台上，开发者设置的Token + // @param sEncodingAESKey: 公众平台上，开发者设置的EncodingAESKey + // @param sAppID: 公众帐号的appid + public WXBizMsgCrypt(string sToken, string sEncodingAESKey, string sAppID) + { + m_sToken = sToken; + m_sAppID = sAppID; + m_sEncodingAESKey = sEncodingAESKey; + } + + + // 检验消息的真实性，并且获取解密后的明文 + // @param sMsgSignature: 签名串，对应URL参数的msg_signature + // @param sTimeStamp: 时间戳，对应URL参数的timestamp + // @param sNonce: 随机串，对应URL参数的nonce + // @param sPostData: 密文，对应POST请求的数据 + // @param sMsg: 解密后的原文，当return返回0时有效 + // @return: 成功0，失败返回对应的错误码 + public int DecryptMsg(string sMsgSignature, string sTimeStamp, string sNonce, string sPostData, ref string sMsg) + { + if (m_sEncodingAESKey.Length != 43) + { + return (int)WXBizMsgCryptErrorCode.WXBizMsgCrypt_IllegalAesKey; + } + XmlDocument doc = new XmlDocument(); + XmlNode root; + string sEncryptMsg; + try + { + doc.LoadXml(sPostData); +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + root = doc.FirstChild; +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 +#pragma warning disable CS8602 // 解引用可能出现空引用。 + sEncryptMsg = root["Encrypt"].InnerText; +#pragma warning restore CS8602 // 解引用可能出现空引用。 + } + catch (Exception) + { + return (int)WXBizMsgCryptErrorCode.WXBizMsgCrypt_ParseXml_Error; + } + //verify signature + int ret = 0; + ret = VerifySignature(m_sToken, sTimeStamp, sNonce, sEncryptMsg, sMsgSignature); + if (ret != 0) + return ret; + //decrypt + string cpid = ""; + try + { + sMsg = Cryptography.AES_decrypt(sEncryptMsg, m_sEncodingAESKey, ref cpid); + } + catch (FormatException) + { + return (int)WXBizMsgCryptErrorCode.WXBizMsgCrypt_DecodeBase64_Error; + } + catch (Exception) + { + return (int)WXBizMsgCryptErrorCode.WXBizMsgCrypt_DecryptAES_Error; + } + if (cpid != m_sAppID) + return (int)WXBizMsgCryptErrorCode.WXBizMsgCrypt_ValidateAppid_Error; + return 0; + } + + //将企业号回复用户的消息加密打包 + // @param sReplyMsg: 企业号待回复用户的消息，xml格式的字符串 + // @param sTimeStamp: 时间戳，可以自己生成，也可以用URL参数的timestamp + // @param sNonce: 随机串，可以自己生成，也可以用URL参数的nonce + // @param sEncryptMsg: 加密后的可以直接回复用户的密文，包括msg_signature, timestamp, nonce, encrypt的xml格式的字符串, + // 当return返回0时有效 + // return：成功0，失败返回对应的错误码 + public int EncryptMsg(string sReplyMsg, string sTimeStamp, string sNonce, ref string sEncryptMsg) + { + if (m_sEncodingAESKey.Length != 43) + { + return (int)WXBizMsgCryptErrorCode.WXBizMsgCrypt_IllegalAesKey; + } + string raw = ""; + try + { + raw = Cryptography.AES_encrypt(sReplyMsg, m_sEncodingAESKey, m_sAppID); + } + catch (Exception) + { + return (int)WXBizMsgCryptErrorCode.WXBizMsgCrypt_EncryptAES_Error; + } + string MsgSigature = ""; + int ret = 0; + ret = GenarateSinature(m_sToken, sTimeStamp, sNonce, raw, ref MsgSigature); + if (0 != ret) + return ret; + sEncryptMsg = ""; + + string EncryptLabelHead = ""; + string MsgSigLabelHead = ""; + string TimeStampLabelHead = ""; + string NonceLabelHead = ""; + sEncryptMsg = sEncryptMsg + "" + EncryptLabelHead + raw + EncryptLabelTail; + sEncryptMsg = sEncryptMsg + MsgSigLabelHead + MsgSigature + MsgSigLabelTail; + sEncryptMsg = sEncryptMsg + TimeStampLabelHead + sTimeStamp + TimeStampLabelTail; + sEncryptMsg = sEncryptMsg + NonceLabelHead + sNonce + NonceLabelTail; + sEncryptMsg += ""; + return 0; + } + + public class DictionarySort : IComparer + { +#pragma warning disable CS8767 // “int DictionarySort.Compare(object oLeft, object oRight)”的参数“oLeft”类型中引用类型的为 Null 性与隐式实现的成员“int IComparer.Compare(object? x, object? y)”不匹配(可能是由于为 Null 性特性)。 +#pragma warning disable CS8767 // “int DictionarySort.Compare(object oLeft, object oRight)”的参数“oRight”类型中引用类型的为 Null 性与隐式实现的成员“int IComparer.Compare(object? x, object? y)”不匹配(可能是由于为 Null 性特性)。 + public int Compare(object oLeft, object oRight) +#pragma warning restore CS8767 // “int DictionarySort.Compare(object oLeft, object oRight)”的参数“oRight”类型中引用类型的为 Null 性与隐式实现的成员“int IComparer.Compare(object? x, object? y)”不匹配(可能是由于为 Null 性特性)。 +#pragma warning restore CS8767 // “int DictionarySort.Compare(object oLeft, object oRight)”的参数“oLeft”类型中引用类型的为 Null 性与隐式实现的成员“int IComparer.Compare(object? x, object? y)”不匹配(可能是由于为 Null 性特性)。 + { +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + string sLeft = oLeft as string; +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + string sRight = oRight as string; +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 +#pragma warning disable CS8602 // 解引用可能出现空引用。 + int iLeftLength = sLeft.Length; +#pragma warning restore CS8602 // 解引用可能出现空引用。 +#pragma warning disable CS8602 // 解引用可能出现空引用。 + int iRightLength = sRight.Length; +#pragma warning restore CS8602 // 解引用可能出现空引用。 + int index = 0; + while (index < iLeftLength && index < iRightLength) + { + if (sLeft[index] < sRight[index]) + return -1; + else if (sLeft[index] > sRight[index]) + return 1; + else + index++; + } + return iLeftLength - iRightLength; + + } + } + //Verify Signature + private static int VerifySignature(string sToken, string sTimeStamp, string sNonce, string sMsgEncrypt, string sSigture) + { + string hash = ""; + int ret = 0; + ret = GenarateSinature(sToken, sTimeStamp, sNonce, sMsgEncrypt, ref hash); + if (ret != 0) + return ret; + //System.Console.WriteLine(hash); + if (hash == sSigture) + return 0; + else + { + return (int)WXBizMsgCryptErrorCode.WXBizMsgCrypt_ValidateSignature_Error; + } + } + + public static int GenarateSinature(string sToken, string sTimeStamp, string sNonce, string sMsgEncrypt, ref string sMsgSignature) + { + ArrayList AL = new ArrayList(); + AL.Add(sToken); + AL.Add(sTimeStamp); + AL.Add(sNonce); + AL.Add(sMsgEncrypt); + AL.Sort(new DictionarySort()); + string raw = ""; + for (int i = 0; i < AL.Count; ++i) + { + raw += AL[i]; + } + + SHA1 sha; + ASCIIEncoding enc; + string hash = ""; + try + { + sha = new SHA1CryptoServiceProvider(); + enc = new ASCIIEncoding(); + byte[] dataToHash = enc.GetBytes(raw); + byte[] dataHashed = sha.ComputeHash(dataToHash); + hash = BitConverter.ToString(dataHashed).Replace("-", ""); + hash = hash.ToLower(); + } + catch (Exception) + { + return (int)WXBizMsgCryptErrorCode.WXBizMsgCrypt_ComputeSignature_Error; + } + sMsgSignature = hash; + return 0; + } + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Utilities/WxOfficialHelper.cs b/Zncy.CloudCar.WeChat.Service/Utilities/WxOfficialHelper.cs new file mode 100644 index 0000000..6bdb7d0 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Utilities/WxOfficialHelper.cs @@ -0,0 +1,26 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2021/7/29 12:25:49 + * Description: 暂无 + ***********************************************************************/ + +namespace Zncy.CloudCar.WeChat.Service.Utilities +{ + /// + /// 微信公众号帮助类 + /// + public static class WxOfficialHelper + { + + public static string geturl(string url, string weXinAppId, int scope = 1) + { + + return "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + weXinAppId + "&redirect_uri=" + url + "&response_type=code&scope=" + scope + "&state=jshop#wechat_redirect"; + } + + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Utilities/XmlUtility.cs b/Zncy.CloudCar.WeChat.Service/Utilities/XmlUtility.cs new file mode 100644 index 0000000..d95d379 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Utilities/XmlUtility.cs @@ -0,0 +1,101 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2021/7/29 23:21:06 + * Description: 暂无 + ***********************************************************************/ + + +using System.Xml; +using System.Xml.Linq; +using System.Xml.Serialization; + +namespace Zncy.CloudCar.WeChat.Service.Utilities +{ + /// + /// XML 工具类 + /// + public static class XmlUtility + { + /// 反序列化 + /// XML字符串 + /// + public static object Deserialize(string xml) + { + try + { + using (StringReader stringReader = new StringReader(xml)) +#pragma warning disable CS8603 // 可能返回 null 引用。 + return new XmlSerializer(typeof(T)).Deserialize(stringReader); +#pragma warning restore CS8603 // 可能返回 null 引用。 + } + catch (Exception ex) + { + Console.WriteLine(ex); +#pragma warning disable CS8603 // 可能返回 null 引用。 + return null; +#pragma warning restore CS8603 // 可能返回 null 引用。 + } + } + + /// 反序列化 + /// + /// +#pragma warning disable CS8603 // 可能返回 null 引用。 + public static object Deserialize(Stream stream) => new XmlSerializer(typeof(T)).Deserialize(stream); +#pragma warning restore CS8603 // 可能返回 null 引用。 + + /// + /// 序列化 + /// 说明：此方法序列化复杂类，如果没有声明XmlInclude等特性，可能会引发“使用 XmlInclude 或 SoapInclude 特性静态指定非已知的类型。”的错误。 + /// + /// 对象 + /// + public static string Serializer(T obj) + { + MemoryStream memoryStream = new MemoryStream(); + XmlSerializer xmlSerializer = new XmlSerializer(typeof(T)); + try + { + xmlSerializer.Serialize(memoryStream, obj); + } + catch (InvalidOperationException) + { + throw; + } + memoryStream.Position = 0L; + StreamReader streamReader = new StreamReader(memoryStream); + string end = streamReader.ReadToEnd(); + streamReader.Dispose(); + memoryStream.Dispose(); + return end; + } + + /// 序列化将流转成XML字符串 + /// + /// + public static XDocument Convert(Stream stream) + { + if (stream.CanSeek) + stream.Seek(0L, SeekOrigin.Begin); + + + using (XmlReader reader = XmlReader.Create(stream)) + return XDocument.Load(reader); + } + + /// 序列化将流转成XML字符串 + /// + /// + public static string ConvertToString(Stream stream) + { + StreamReader reader = new StreamReader(stream); + string sHtml = reader.ReadToEnd(); + return sHtml; + } + + } +} diff --git a/Zncy.CloudCar.WeChat.Service/Zncy.CloudCar.WeChat.Service.csproj b/Zncy.CloudCar.WeChat.Service/Zncy.CloudCar.WeChat.Service.csproj new file mode 100644 index 0000000..8f6d601 --- /dev/null +++ b/Zncy.CloudCar.WeChat.Service/Zncy.CloudCar.WeChat.Service.csproj @@ -0,0 +1,23 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + + + + diff --git a/Znyc.CloudCar.Auth/AccressToken/WeChatCacheAccessTokenHelper.cs b/Znyc.CloudCar.Auth/AccressToken/WeChatCacheAccessTokenHelper.cs new file mode 100644 index 0000000..e2c384a --- /dev/null +++ b/Znyc.CloudCar.Auth/AccressToken/WeChatCacheAccessTokenHelper.cs @@ -0,0 +1,31 @@ +using Znyc.CloudCar.Auth.Manual; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.Model.ViewModels.WeChat; + +namespace Znyc.CloudCar.Auth.AccressToken +{ + /// + /// 微信帮助类 + /// + public class WeChatCacheAccessTokenHelper + { + /// + /// 获取微信小程序accessToken + /// + /// + public static string GetWxOpenAccessToken() + { + var wxOpenAccessToken = ManualDataCache.Instance.Get(GlobalEnumVars.AccessTokenEnum.WxOpenAccessToken.ToString()); + return wxOpenAccessToken; + } + + public static string GetWeChatAccessToken() + { + //获取微信AccessToken + var weChatAccessToken = ManualDataCache.Instance.Get(GlobalEnumVars.AccessTokenEnum.WeiXinAccessToken.ToString()); +#pragma warning disable CS8603 // 可能返回 null 引用。 + return weChatAccessToken?.AccessToken; +#pragma warning restore CS8603 // 可能返回 null 引用。 + } + } +} diff --git a/Znyc.CloudCar.Auth/HttpContextUser/AspNetUser.cs b/Znyc.CloudCar.Auth/HttpContextUser/AspNetUser.cs new file mode 100644 index 0000000..7a6fba4 --- /dev/null +++ b/Znyc.CloudCar.Auth/HttpContextUser/AspNetUser.cs @@ -0,0 +1,125 @@ +using Microsoft.AspNetCore.Http; +using Znyc.CloudCar.Auth.Policys; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Auth.HttpContextUser +{ + public class AspNetUser : IHttpContextUser + { + + private readonly IHttpContextAccessor _accessor; + + public AspNetUser(IHttpContextAccessor accessor) + { + _accessor = accessor; + } + + /// + /// 用户Id + /// + public virtual long Id + { + get + { + + System.Security.Claims.Claim id = _accessor?.HttpContext?.User?.FindFirst(Claims.UserId); + if (id != null && id.Value.NotNull()) + { + return id.Value.ObjectToLong(); + } + + return 0; + } + } + + /// + /// 权限Id + /// + public string RoleId + { + get + { + System.Security.Claims.Claim name = _accessor?.HttpContext?.User?.FindFirst(Claims.RoleId); + + if (name != null && name.Value.NotNull()) + { + return name.Value; + } + + return ""; + } + } + + /// + /// 昵称 + /// + public string UserName + { + get + { + System.Security.Claims.Claim name = _accessor?.HttpContext?.User?.FindFirst(Claims.UserName); + + if (name != null && name.Value.NotNull()) + { + return name.Value; + } + + return ""; + } + } + + /// + /// OpenId + /// + public string OpenId + { + get + { + System.Security.Claims.Claim name = _accessor?.HttpContext?.User?.FindFirst(Claims.OpenId); + + if (name != null && name.Value.NotNull()) + { + return name.Value; + } + + return ""; + } + } + + /// + /// UnionId + /// + public string UnionId + { + get + { + System.Security.Claims.Claim name = _accessor?.HttpContext?.User?.FindFirst(Claims.UnionId); + + if (name != null && name.Value.NotNull()) + { + return name.Value; + } + + return ""; + } + } + + /// + /// SessionKey + /// + public string SessionKey + { + get + { + System.Security.Claims.Claim name = _accessor?.HttpContext?.User?.FindFirst(Claims.SessionKey); + + if (name != null && name.Value.NotNull()) + { + return name.Value; + } + + return ""; + } + } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Auth/HttpContextUser/IHttpContextUser.cs b/Znyc.CloudCar.Auth/HttpContextUser/IHttpContextUser.cs new file mode 100644 index 0000000..375513c --- /dev/null +++ b/Znyc.CloudCar.Auth/HttpContextUser/IHttpContextUser.cs @@ -0,0 +1,41 @@ + +namespace Znyc.CloudCar.Auth.HttpContextUser +{ + public interface IHttpContextUser + { + /// + /// 主键 + /// + long Id { get; } + + /// + /// 权限Id + /// + string RoleId { get; } + + /// + /// 昵称 + /// + string UserName { get; } + + /// + /// 头像 + /// + //string AvatarUrl { get; } + + /// + /// 微信唯一用户信息 + /// + string OpenId { get; } + + /// + /// SessionKey + /// + string SessionKey { get; } + + /// + /// UnionId + /// + string UnionId { get; } + } +} diff --git a/Znyc.CloudCar.Auth/Manual/IManualCacheManager.cs b/Znyc.CloudCar.Auth/Manual/IManualCacheManager.cs new file mode 100644 index 0000000..71b6ed2 --- /dev/null +++ b/Znyc.CloudCar.Auth/Manual/IManualCacheManager.cs @@ -0,0 +1,85 @@ +namespace Znyc.CloudCar.Auth.Manual +{ + /// + /// 手动缓存操作接口 + /// + public interface IManualCacheManager + { + + /// + /// 验证缓存项是否存在 + /// + /// 缓存Key + /// + bool Exists(string key); + + + /// + /// 添加缓存 + /// + /// 缓存Key + /// 缓存Value + /// 缓存时长(分钟) + /// + bool Set(string key, object value, int expiresIn = 0); + + + /// + /// 删除缓存 + /// + /// 缓存Key + /// + void Remove(string key); + + + /// + /// 批量删除缓存 + /// + /// + void RemoveAll(IEnumerable keys); + + /// + /// 获取缓存 + /// + /// 缓存Key + /// + T Get(string key); + + + /// + /// 获取缓存 + /// + /// 缓存Key + /// + object Get(string key); + + /// + /// 获取缓存集合 + /// + /// 缓存Key集合 + /// + IDictionary GetAll(IEnumerable keys); + + /// + /// 删除所有缓存 + /// + void RemoveCacheAll(); + + /// + /// 删除匹配到的缓存 + /// + /// + /// + void RemoveCacheRegex(string pattern); + + + /// + /// 搜索 匹配到的缓存 + /// + /// + /// + IList SearchCacheRegex(string pattern); + + + } +} diff --git a/Znyc.CloudCar.Auth/Manual/ManualDataCache.cs b/Znyc.CloudCar.Auth/Manual/ManualDataCache.cs new file mode 100644 index 0000000..f31d8df --- /dev/null +++ b/Znyc.CloudCar.Auth/Manual/ManualDataCache.cs @@ -0,0 +1,26 @@ +namespace Znyc.CloudCar.Auth.Manual +{ + /// + /// 手动缓存调用 + /// + public static partial class ManualDataCache + { +#pragma warning disable CS0414 // 字段“ManualDataCache._instance”已被赋值，但从未使用过它的值 +#pragma warning disable CS8625 // 无法将 null 字面量转换为非 null 的引用类型。 + private static readonly IManualCacheManager _instance = null; +#pragma warning restore CS8625 // 无法将 null 字面量转换为非 null 的引用类型。 +#pragma warning restore CS0414 // 字段“ManualDataCache._instance”已被赋值，但从未使用过它的值 + + + /// + /// 静态实例，外部可直接调用 + /// + public static IManualCacheManager Instance + { + get + { + return new RedisCacheManager(); + } + } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Auth/Manual/RedisCacheManager.cs b/Znyc.CloudCar.Auth/Manual/RedisCacheManager.cs new file mode 100644 index 0000000..2ef9fa1 --- /dev/null +++ b/Znyc.CloudCar.Auth/Manual/RedisCacheManager.cs @@ -0,0 +1,232 @@ + +using StackExchange.Redis; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Auth.Manual +{ + public class RedisCacheManager : IManualCacheManager + { + private readonly string _redisConnenctionString; + + public volatile ConnectionMultiplexer RedisConnection; + + private readonly object _redisConnectionLock = new object(); + + public RedisCacheManager() + { + string redisConfiguration = AppSettingsConstVars.RedisConfigConnectionString;//获取连接字符串 + + if (string.IsNullOrWhiteSpace(redisConfiguration)) + { + throw new ArgumentException("redis config is empty", nameof(redisConfiguration)); + } + _redisConnenctionString = redisConfiguration; + RedisConnection = GetRedisConnection(); + } + + /// + /// 核心代码，获取连接实例 + /// 通过双if 夹lock的方式，实现单例模式 + /// + /// + private ConnectionMultiplexer GetRedisConnection() + { + //如果已经连接实例，直接返回 + if (RedisConnection != null && RedisConnection.IsConnected) + { + return RedisConnection; + } + //加锁，防止异步编程中，出现单例无效的问题 + lock (_redisConnectionLock) + { + if (RedisConnection != null) + { + //释放redis连接 + RedisConnection.Dispose(); + } + try + { + RedisConnection = ConnectionMultiplexer.Connect(_redisConnenctionString); + } + catch (Exception) + { + throw new Exception("Redis服务未启用，请开启该服务，并且请注意端口号，Redis默认使用6379端口号。"); + } + } + return RedisConnection; + } + + + /// + /// 判断key是否存在 + /// + /// + /// + public bool Exists(string key) + { + return RedisConnection.GetDatabase().KeyExists(key); + } + + + + + /// + /// 添加缓存 + /// + /// + /// 缓存Key + /// 缓存Value + /// 缓存时间 + /// + public bool Set(string key, object value, int expiresIn = 0) + { + if (value != null) + { + //序列化，将object值生成RedisValue + if (expiresIn > 0) + { + return RedisConnection.GetDatabase().StringSet(key, SerializeExtensions.Serialize(value), TimeSpan.FromMinutes(expiresIn)); + } + else + { + return RedisConnection.GetDatabase().StringSet(key, SerializeExtensions.Serialize(value)); + } + } + return false; + } + + /// + /// 删除缓存 + /// + /// 缓存Key + /// + public void Remove(string key) + { + RedisConnection.GetDatabase().KeyDelete(key); + } + + /// + /// 批量删除缓存 + /// + /// 缓存Key集合 + /// + public void RemoveAll(IEnumerable keys) + { + foreach (var key in keys) + { + RedisConnection.GetDatabase().KeyDelete(key); + } + + } + + /// + /// 获取缓存对象 + /// + /// 缓存Key + /// + public T Get(string key) + { + var value = RedisConnection.GetDatabase().StringGet(key); + if (value.HasValue) + { + //需要用的反序列化，将Redis存储的Byte[]，进行反序列化 + return SerializeExtensions.Deserialize(value); + } + + + return default; + + } + + public object Get(string key) + { + return RedisConnection.GetDatabase().StringGet(key); + } + + public IDictionary GetAll(IEnumerable keys) + { + if (keys == null) + throw new ArgumentNullException(nameof(keys)); + var dict = new Dictionary(); + + keys.ToList().ForEach(item => dict.Add(item, RedisConnection.GetDatabase().StringGet(item))); + return dict; + + } + + /// + /// 删除所有缓存 + /// + public void RemoveCacheAll() + { + foreach (var endPoint in GetRedisConnection().GetEndPoints()) + { + var server = GetRedisConnection().GetServer(endPoint); + foreach (var key in server.Keys()) + { + RedisConnection.GetDatabase().KeyDelete(key); + } + } + } + + /// + /// 删除匹配到的缓存 + /// + /// + public void RemoveCacheRegex(string pattern) + { + var script = "return redis.call('keys',@pattern)"; + var prepared = LuaScript.Prepare(script); + var redisResult = RedisConnection.GetDatabase().ScriptEvaluate(prepared, new { pattern }); + if (!redisResult.IsNull) + { + RedisConnection.GetDatabase().KeyDelete((RedisKey[])redisResult); //删除一组key + } + } + + /// + /// 搜索匹配到的缓存 + /// + /// + /// + public IList SearchCacheRegex(string pattern) + { + var list = new List(); + var script = "return redis.call('keys',@pattern)"; + var prepared = LuaScript.Prepare(script); + var redisResult = RedisConnection.GetDatabase().ScriptEvaluate(prepared, new { pattern }); + if (!redisResult.IsNull) + { + foreach (var key in (RedisKey[])redisResult) + { + list.Add(RedisConnection.GetDatabase().StringGet(key)); + } + } + return list; + } + + /// + /// 添加缓存 + /// + /// 缓存key + /// 缓存Value + /// 缓存时长（分钟） + /// + public bool Set(string key, string value, int expiresIn = 0) + { + if (value != null) + { + if (expiresIn > 0) + { + return RedisConnection.GetDatabase().StringSet(key, SerializeExtensions.Serialize(value), TimeSpan.FromMinutes(expiresIn)); + } + else + { + return RedisConnection.GetDatabase().StringSet(key, SerializeExtensions.Serialize(value)); + } + } + return false; + } + } +} diff --git a/Znyc.CloudCar.Auth/OverWrite/JwtHelper.cs b/Znyc.CloudCar.Auth/OverWrite/JwtHelper.cs new file mode 100644 index 0000000..9b820fb --- /dev/null +++ b/Znyc.CloudCar.Auth/OverWrite/JwtHelper.cs @@ -0,0 +1,111 @@ +using Microsoft.IdentityModel.Tokens; +using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using System.Text; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Auth.OverWrite +{ + public class JwtHelper + { + + /// + /// 颁发JWT字符串 + /// + /// + /// + public static string IssueJwt(TokenModelJwt tokenModel) + { + string iss = AppSettingsConstVars.JwtConfigIssuer; + string aud = AppSettingsConstVars.JwtConfigAudience; + string secret = AppSettingsConstVars.JwtConfigSecretKey; + + //var claims = new Claim[] //old + var claims = new List + { + /* + * 特别重要： + 1、这里将用户的部分信息，比如 uid 存到了Claim 中，如果你想知道如何在其他地方将这个 uid从 Token 中取出来，请看下边的SerializeJwt() 方法，或者在整个解决方案，搜索这个方法，看哪里使用了！ + 2、你也可以研究下 HttpContext.User.Claims ，具体的你可以看看 Policys/PermissionHandler.cs 类中是如何使用的。 + */ + + new Claim(JwtRegisteredClaimNames.Jti, tokenModel.Uid.ToString()), + new Claim(JwtRegisteredClaimNames.Iat, $"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}"), + new Claim(JwtRegisteredClaimNames.Nbf,$"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}") , + //这个就是过期时间，目前是过期1000秒，可自定义，注意JWT有自己的缓冲过期时间 + new Claim (JwtRegisteredClaimNames.Exp,$"{new DateTimeOffset(DateTime.Now.AddSeconds(1000)).ToUnixTimeSeconds()}"), + new Claim(ClaimTypes.Expiration, DateTime.Now.AddSeconds(1000).ToString()), + new Claim(JwtRegisteredClaimNames.Iss,iss), + new Claim(JwtRegisteredClaimNames.Aud,aud) + + //new Claim(ClaimTypes.Role,tokenModel.Role),//为了解决一个用户多个角色(比如：Admin,System)，用下边的方法 + }; + + // 可以将一个用户的多个角色全部赋予； + // 作者：DX 提供技术支持； + claims.AddRange(tokenModel.Role.Split(',').Select(s => new Claim(ClaimTypes.Role, s))); + + //秘钥 (SymmetricSecurityKey 对安全性的要求，密钥的长度太短会报出异常) + var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(secret)); + var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256); + + var jwt = new JwtSecurityToken( + issuer: iss, + claims: claims, + signingCredentials: creds); + + var jwtHandler = new JwtSecurityTokenHandler(); + var encodedJwt = jwtHandler.WriteToken(jwt); + + return encodedJwt; + } + + /// + /// 解析 + /// + /// + /// + public static TokenModelJwt SerializeJwt(string jwtStr) + { + var jwtHandler = new JwtSecurityTokenHandler(); + JwtSecurityToken jwtToken = jwtHandler.ReadJwtToken(jwtStr); + object role; + try + { + jwtToken.Payload.TryGetValue(ClaimTypes.Role, out role); + } + catch (Exception e) + { + Console.WriteLine(e); + throw; + } + var tm = new TokenModelJwt + { + Uid = jwtToken.Id.ObjectToInt(), + Role = role != null ? role.ObjectToString() : "" + }; + return tm; + } + } + + /// + /// 令牌 + /// + public class TokenModelJwt + { + /// + /// Id + /// + public long Uid { get; set; } + /// + /// 角色 + /// + public string Role { get; set; } + /// + /// 职能 + /// + public string Work { get; set; } + + } +} diff --git a/Znyc.CloudCar.Auth/OverWrite/JwtTokenAuth.cs b/Znyc.CloudCar.Auth/OverWrite/JwtTokenAuth.cs new file mode 100644 index 0000000..e64f90e --- /dev/null +++ b/Znyc.CloudCar.Auth/OverWrite/JwtTokenAuth.cs @@ -0,0 +1,81 @@ +using Microsoft.AspNetCore.Http; + +namespace Znyc.CloudCar.Auth.OverWrite +{ + /// + /// 中间件 + /// 原做为自定义授权中间件 + /// 先做检查 header token的使用 + /// + public class JwtTokenAuth + { + /// + /// + /// + private readonly RequestDelegate _next; + /// + /// + /// + /// + public JwtTokenAuth(RequestDelegate next) + { + _next = next; + } + + + private void PreProceed(HttpContext next) + { + //Console.WriteLine($"{DateTime.Now} middleware invoke preproceed"); + //... + } + private void PostProceed(HttpContext next) + { + //Console.WriteLine($"{DateTime.Now} middleware invoke postproceed"); + //.... + } + + /// + /// + /// + /// + /// + public Task Invoke(HttpContext httpContext) + { + PreProceed(httpContext); + + //检测是否包含'Authorization'请求头 + if (!httpContext.Request.Headers.ContainsKey("Authorization")) + { + PostProceed(httpContext); + + return _next(httpContext); + } + //var tokenHeader = httpContext.Request.Headers["Authorization"].ToString(); + var tokenHeader = httpContext.Request.Headers["Authorization"].ToString().Replace("Bearer ", ""); + + try + { + if (tokenHeader.Length >= 128) + { + //Console.WriteLine($"{DateTime.Now} token :{tokenHeader}"); + TokenModelJwt tm = JwtHelper.SerializeJwt(tokenHeader); + //授权 + //var claimList = new List(); + //var claim = new Claim(ClaimTypes.Role, tm.Role); + //claimList.Add(claim); + //var identity = new ClaimsIdentity(claimList); + //var principal = new ClaimsPrincipal(identity); + //httpContext.User = principal; + } + } + catch (Exception e) + { + Console.WriteLine($"{DateTime.Now} middleware wrong:{e.Message}"); + } + + PostProceed(httpContext); + return _next(httpContext); + } + + } +} diff --git a/Znyc.CloudCar.Auth/Policys/ApiResponse.cs b/Znyc.CloudCar.Auth/Policys/ApiResponse.cs new file mode 100644 index 0000000..eb2a342 --- /dev/null +++ b/Znyc.CloudCar.Auth/Policys/ApiResponse.cs @@ -0,0 +1,41 @@ +namespace Znyc.CloudCar.Auth.Policys +{ + public class ApiResponse + { + public int Status { get; set; } = 404; + public object Value { get; set; } = "No Found"; + + public ApiResponse(StatusCode apiCode, object msg = null) + { + switch (apiCode) + { + case StatusCode.CODE401: + { + Status = 401; + Value = "很抱歉，您无权访问该接口，请确保已经登录!"; + } + break; + case StatusCode.CODE403: + { + Status = 403; + Value = "很抱歉，您的访问权限等级不够，联系管理员!"; + } + break; + case StatusCode.CODE500: + { + Status = 500; + Value = msg; + } + break; + } + } + } + + public enum StatusCode + { + CODE401, + CODE403, + CODE404, + CODE500 + } +} diff --git a/Znyc.CloudCar.Auth/Policys/ApiResponseHandler.cs b/Znyc.CloudCar.Auth/Policys/ApiResponseHandler.cs new file mode 100644 index 0000000..25e308d --- /dev/null +++ b/Znyc.CloudCar.Auth/Policys/ApiResponseHandler.cs @@ -0,0 +1,46 @@ +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using Newtonsoft.Json; +using System.Text.Encodings.Web; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Auth.Policys +{ + public class ApiResponseHandler : AuthenticationHandler + { + public ApiResponseHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock) + { + } + + protected override Task HandleAuthenticateAsync() + { + throw new NotImplementedException(); + } + protected override async Task HandleChallengeAsync(AuthenticationProperties properties) + { + Response.ContentType = "application/json"; + //Response.StatusCode = StatusCodes.Status403Forbidden; + var response = new ResponseOutput(); + response.Successed = false; + response.Code = 401; + response.Msg = "很抱歉，授权失效，请重新登录!"; + await Response.WriteAsync(JsonConvert.SerializeObject(response).ToLower()); + } + + protected override async Task HandleForbiddenAsync(AuthenticationProperties properties) + { + Response.ContentType = "application/json"; + //Response.StatusCode = StatusCodes.Status403Forbidden; + //await Response.WriteAsync(JsonConvert.SerializeObject(new ApiResponse(StatusCode.CODE403))); + + var response = new ResponseOutput(); + response.Successed = false; + response.Code = 401; + response.Msg = "很抱歉，授权失效，请重新登录!"; + await Response.WriteAsync(JsonConvert.SerializeObject(response).ToLower()); + } + + } +} diff --git a/Znyc.CloudCar.Auth/Policys/Claims.cs b/Znyc.CloudCar.Auth/Policys/Claims.cs new file mode 100644 index 0000000..65ed6e3 --- /dev/null +++ b/Znyc.CloudCar.Auth/Policys/Claims.cs @@ -0,0 +1,42 @@ +namespace Znyc.CloudCar.Auth.Policys +{ + /// + /// Claim属性 + /// + public static class Claims + { + /// + /// 用户Id + /// + public const string UserId = "UserId"; + + /// + /// 姓名 + /// + public const string UserName = "UserName"; + + /// + /// 刷新有效期 + /// + public const string RefreshExpires = "RefreshExpires"; + + /// + /// 微信认证Id + /// + public const string OpenId = "OpenId"; + + /// + /// 权限id + /// + public const string RoleId = "RoleId"; + + /// + /// 开放平台Id(区分用户唯一性) + /// + public const string UnionId = "UnionId"; + /// + /// SessionKey + /// + public const string SessionKey = "SessionKey"; + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Auth/Policys/JwtToken.cs b/Znyc.CloudCar.Auth/Policys/JwtToken.cs new file mode 100644 index 0000000..07989ce --- /dev/null +++ b/Znyc.CloudCar.Auth/Policys/JwtToken.cs @@ -0,0 +1,42 @@ +using Microsoft.IdentityModel.Tokens; +using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using System.Text; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.Utility.Helper; + +namespace Znyc.CloudCar.Auth.Policys +{ + + /// + /// JWTToken生成类 + /// + public class JwtToken + { + public static string Create(Claim[] claims) + { + SymmetricSecurityKey key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(AppSettingsConstVars.JwtConfigSecretKey)); + SigningCredentials signingCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256); + string timestamp = DateTime.Now.AddMinutes(AppSettingsConstVars.JwtConfigExpires).ToTimestamp() + .ToString(); + claims = claims.Append(new Claim(Claims.RefreshExpires, timestamp)).ToArray(); + + JwtSecurityToken token = new JwtSecurityToken( + AppSettingsConstVars.JwtConfigIssuer, + AppSettingsConstVars.JwtConfigAudience, + claims, + DateTime.Now, + DateTime.Now.AddMinutes(AppSettingsConstVars.JwtConfigExpires), + signingCredentials + ); + return new JwtSecurityTokenHandler().WriteToken(token); + } + + public Claim[] Decode(string jwtToken) + { + JwtSecurityTokenHandler jwtSecurityTokenHandler = new JwtSecurityTokenHandler(); + JwtSecurityToken jwtSecurityToken = jwtSecurityTokenHandler.ReadJwtToken(jwtToken); + return jwtSecurityToken?.Claims?.ToArray(); + } + } +} diff --git a/Znyc.CloudCar.Auth/Policys/PermissionHandler.cs b/Znyc.CloudCar.Auth/Policys/PermissionHandler.cs new file mode 100644 index 0000000..5feb80a --- /dev/null +++ b/Znyc.CloudCar.Auth/Policys/PermissionHandler.cs @@ -0,0 +1,156 @@ +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; +using System.Security.Claims; +using System.Text.RegularExpressions; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Auth.Policys +{ + /// + /// 权限授权处理器 + /// + public class PermissionHandler : AuthorizationHandler + { + /// + /// 验证方案提供对象 + /// + public IAuthenticationSchemeProvider _schemes { get; set; } + private readonly IHttpContextAccessor _accessor; + + /// + /// 构造函数注入 + /// + /// + /// + /// + public PermissionHandler(IAuthenticationSchemeProvider schemes, IHttpContextAccessor accessor) + { + _accessor = accessor; + _schemes = schemes; + } + + // 重写异步处理程序 + protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, PermissionRequirement requirement) + { + + var httpContext = _accessor.HttpContext; + + if (!requirement.Permissions.Any()) + { + //var data = await _navigationRepository.QueryAsync(); + //var list = (from item in data + // where item.isLock == false + // orderby item.id + // select new PermissionItem + // { + // Url = item.linkUrl, + // Role = item.identificationCode, + // }).ToList(); + //requirement.Permissions = list; + } + + //请求Url + if (httpContext != null) + { + var questUrl = httpContext.Request.Path.Value.ToLower(); + //判断请求是否停止 + var handlers = httpContext.RequestServices.GetRequiredService(); + foreach (var scheme in await _schemes.GetRequestHandlerSchemesAsync()) + { + if (await handlers.GetHandlerAsync(httpContext, scheme.Name) is IAuthenticationRequestHandler handler && await handler.HandleRequestAsync()) + { + context.Fail(); + return; + } + } + //判断请求是否拥有凭据，即有没有登录 + var defaultAuthenticate = await _schemes.GetDefaultAuthenticateSchemeAsync(); + if (defaultAuthenticate != null) + { + var result = await httpContext.AuthenticateAsync(defaultAuthenticate.Name); + //result?.Principal不为空即登录成功 + if (result?.Principal != null) + { + // 将最新的角色和接口列表更新 + + // 这里暂时把代码移动到了Login获取token的api里,这样就不用每次都请求数据库,造成压力. + // 但是这样有个问题,就是如果修改了某一个角色的菜单权限,不会立刻更新, + // 需要让用户退出重新登录,如果你想实时更新,请把下边的注释打开即可. + + //var data = await _roleModulePermissionServices.RoleModuleMaps(); + //var list = (from item in data + // where item.IsDeleted == false + // orderby item.Id + // select new PermissionItem + // { + // Url = item.Module?.LinkUrl, + // Role = item.Role?.Name, + // }).ToList(); + //requirement.Permissions = list; + + httpContext.User = result.Principal; + + //权限中是否存在请求的url + //if (requirement.Permissions.GroupBy(g => g.Url).Where(w => w.Key?.ToLower() == questUrl).Count() > 0) + //if (isMatchUrl) + if (true) + { + // 获取当前用户的角色信息 + var currentUserRoles = (from item in httpContext.User.Claims + where item.Type == requirement.ClaimType + select item.Value).ToList(); + + var isMatchRole = false; + var permisssionRoles = requirement.Permissions.Where(w => currentUserRoles.Contains(w.Role)); + foreach (var item in permisssionRoles) + { + try + { + if (Regex.Match(questUrl, item.Url?.ObjectToString().ToLower())?.Value == questUrl) + { + isMatchRole = true; + break; + } + } + catch (Exception) + { + // ignored + } + } + + //验证权限 + //if (currentUserRoles.Count <= 0 || requirement.Permissions.Where(w => currentUserRoles.Contains(w.Role) && w.Url.ToLower() == questUrl).Count() <= 0) + if (currentUserRoles.Count <= 0 || !isMatchRole) + { + context.Fail(); + return; + } + } + + //判断过期时间（这里仅仅是最坏验证原则，你可以不要这个if else的判断，因为我们使用的官方验证，Token过期后上边的result?.Principal 就为 null 了，进不到这里了，因此这里其实可以不用验证过期时间，只是做最后严谨判断） + if ((httpContext.User.Claims.SingleOrDefault(s => s.Type == ClaimTypes.Expiration)?.Value) != null && DateTime.Parse(httpContext.User.Claims.SingleOrDefault(s => s.Type == ClaimTypes.Expiration)?.Value) >= DateTime.Now) + { + context.Succeed(requirement); + } + else + { + context.Fail(); + return; + } + return; + } + } + //判断没有登录时，是否访问登录的url,并且是Post请求，并且是form表单提交类型，否则为失败 + if (!questUrl.Equals(requirement.LoginPath.ToLower(), StringComparison.Ordinal) && (!httpContext.Request.Method.Equals("POST") || !httpContext.Request.HasFormContentType)) + { + context.Fail(); + return; + } + } + + context.Succeed(requirement); + } + } +} diff --git a/Znyc.CloudCar.Auth/Policys/PermissionItem.cs b/Znyc.CloudCar.Auth/Policys/PermissionItem.cs new file mode 100644 index 0000000..d378c57 --- /dev/null +++ b/Znyc.CloudCar.Auth/Policys/PermissionItem.cs @@ -0,0 +1,25 @@ +namespace Znyc.CloudCar.Auth.Policys +{ + /// + /// 用户或角色或其他凭据实体 + /// + public class PermissionItem + { + /// + /// 用户或角色或其他凭据名称 + /// + public virtual string Role { get; set; } + /// + /// 请求Url + /// + public virtual string Url { get; set; } + /// + /// 权限标识 + /// + public virtual string Authority { get; set; } + /// + /// 路由标识Url + /// + public virtual string RouteUrl { get; set; } + } +} diff --git a/Znyc.CloudCar.Auth/Policys/PermissionRequirement.cs b/Znyc.CloudCar.Auth/Policys/PermissionRequirement.cs new file mode 100644 index 0000000..921bc2c --- /dev/null +++ b/Znyc.CloudCar.Auth/Policys/PermissionRequirement.cs @@ -0,0 +1,70 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.IdentityModel.Tokens; + +namespace Znyc.CloudCar.Auth.Policys +{ + /// + /// 必要参数类 + /// 继承 IAuthorizationRequirement，用于设计自定义权限处理器PermissionHandler + /// 因为AuthorizationHandler 中的泛型参数 TRequirement 必须继承 IAuthorizationRequirement + /// + public class PermissionRequirement : IAuthorizationRequirement + { + /// + /// 用户权限集合，一个订单包含了很多详情， + /// 同理，一个网站的认证发行中，也有很多权限详情(这里是Role和URL的关系) + /// + public List Permissions { get; set; } + /// + /// 无权限action + /// + public string DeniedAction { get; set; } + + /// + /// 认证授权类型 + /// + public string ClaimType { internal get; set; } + /// + /// 请求路径 + /// + public string LoginPath { get; set; } = "/Api/Login"; + /// + /// 发行人 + /// + public string Issuer { get; set; } + /// + /// 订阅人 + /// + public string Audience { get; set; } + /// + /// 过期时间 + /// + public TimeSpan Expiration { get; set; } + /// + /// 签名验证 + /// + public SigningCredentials SigningCredentials { get; set; } + + + /// + /// 构造 + /// + /// 拒约请求的url + /// 权限集合 + /// 声明类型 + /// 发行人 + /// 订阅人 + /// 签名验证实体 + /// 过期时间 + public PermissionRequirement(string deniedAction, List permissions, string claimType, string issuer, string audience, SigningCredentials signingCredentials, TimeSpan expiration) + { + ClaimType = claimType; + DeniedAction = deniedAction; + Permissions = permissions; + Issuer = issuer; + Audience = audience; + Expiration = expiration; + SigningCredentials = signingCredentials; + } + } +} diff --git a/Znyc.CloudCar.Auth/Znyc.CloudCar.Auth.csproj b/Znyc.CloudCar.Auth/Znyc.CloudCar.Auth.csproj new file mode 100644 index 0000000..111294d --- /dev/null +++ b/Znyc.CloudCar.Auth/Znyc.CloudCar.Auth.csproj @@ -0,0 +1,20 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + diff --git a/Znyc.CloudCar.Caching/IRedisOperationRepository.cs b/Znyc.CloudCar.Caching/IRedisOperationRepository.cs new file mode 100644 index 0000000..281e1bb --- /dev/null +++ b/Znyc.CloudCar.Caching/IRedisOperationRepository.cs @@ -0,0 +1,212 @@ +using StackExchange.Redis; + +namespace Znyc.CloudCar.Caching +{ + /// + /// 缓存接口 + /// + public interface IRedisOperationRepository + { + /// + /// 检查给定 key 是否存在 + /// + /// + /// + bool Exists(string key); + + /// + /// 检查给定 key 是否存在 + /// + /// 键 + /// + Task ExistsAsync(string key); + + /// + /// 获取指定 key 的值 + /// + /// 键 + /// + string Get(string key); + + /// + /// 获取指定 key 的值 + /// + /// byte[] 或其他类型 + /// 键 + /// + T Get(string key); + + /// + /// 获取指定 key 的值 + /// + /// 键 + /// + Task GetAsync(string key); + + /// + /// 获取指定 key 的值 + /// + /// byte[] 或其他类型 + /// 键 + /// + Task GetAsync(string key); + + /// + /// 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 + /// + /// 键 + /// 值 + /// + bool Set(string key, object value); + + /// + /// 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 + /// + /// 键 + /// 值 + /// 有效期 + /// + bool Set(string key, object value, TimeSpan expire); + + /// + /// 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 + /// + /// 键 + /// 值 + /// + Task SetAsync(string key, object value); + + /// + /// 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 + /// + /// 键 + /// 值 + /// 有效期 + /// + Task SetAsync(string key, object value, TimeSpan expire); + + /// + /// + /// + /// + /// + bool Del(string key); + + /// + /// + /// + /// + /// + Task DelAsync(string key); + + /// + /// 将 key 所储存的值加上给定的增量值（increment） + /// + /// 键 + /// + Task IncrAsync(string key); + + /// + /// 将 key 所储存的值加上给定的增量值（increment） + /// + /// 键 + /// + long Incr(string key); + + #region Hash + /// + /// 将哈希表 key 中的字段 field 的值设为 value + /// + /// 键 + /// 字段 + /// 值 + /// 如果字段是哈希表中的一个新建字段，并且值设置成功，返回true。如果哈希表中域字段已经存在且旧值已被新值覆盖，返回false。 + bool HSet(string key, string filed, object value); + + /// + /// 将哈希表 key 中的字段 field 的值设为 value + /// + /// 键 + /// 字段 + /// 值 + /// 如果字段是哈希表中的一个新建字段，并且值设置成功，返回true。如果哈希表中域字段已经存在且旧值已被新值覆盖，返回false。 + Task HSetAsync(string key, string filed, object value); + + /// + /// 获取在哈希表中指定 key 的所有字段和值 + /// + /// + /// + /// + Task> HGetAllAsync(string key); + + #endregion + + #region Redis 有序集合(sorted set) + /// + /// 向有序集合添加一个或多个成员，或者更新已存在成员的分数 + /// + /// + /// + /// + Task ZAddAsync(string key, string member, double score); + + /// + /// 用于计算集合中元素的数量 + /// + /// + /// + Task ZCardAsync(string key); + + /// + /// 有序集合中对指定成员的分数加上增量 increment + /// + /// + /// + /// + /// + Task ZIncrByAsync(string key, string member, double increment = 1); + + /// + /// 通过索引区间返回有序集合成指定区间内的成员 + /// + /// + /// + /// + /// true倒序排列，false正序排列 + /// + Task> ZRemRangeByRankAsync(string key, long start, long stop, bool sortType = true); + + /// + /// 返回有序集中的成员和分数，通过索引，分数从高到低 + /// + /// + /// + /// + /// + Task> ZRevRangeWithScoresAsync(string key); + + /// + /// 删除 + /// + /// + /// + /// + Task SortedSetRemoveAsync(string key, string member); + + /// + /// 数据转换 + /// + /// + /// + SortedSetEntry[] ConvertDictionaryToSortedSetEntry(IDictionary keyValues); + + /// + /// 数据转换字典 + /// + /// + /// + IDictionary ConvertSortedSetEntryToDictionary(SortedSetEntry[] setEntries); + #endregion + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Caching/RedisOperationRepository.cs b/Znyc.CloudCar.Caching/RedisOperationRepository.cs new file mode 100644 index 0000000..e818091 --- /dev/null +++ b/Znyc.CloudCar.Caching/RedisOperationRepository.cs @@ -0,0 +1,367 @@ +using Newtonsoft.Json; +using StackExchange.Redis; + +namespace Znyc.CloudCar.Caching +{ + public class RedisOperationRepository : IRedisOperationRepository + { + private readonly ConnectionMultiplexer _redis; + private readonly IDatabase _database; + + public RedisOperationRepository(ConnectionMultiplexer redis) + { + _redis = redis; + _database = redis.GetDatabase(); + } + + private IServer GetServer() + { + var endpoint = _redis.GetEndPoints(); + return _redis.GetServer(endpoint.First()); + } + + /// + /// + /// + /// + public async Task Clear() + { + foreach (var endPoint in _redis.GetEndPoints()) + { + var server = GetServer(); + foreach (var key in server.Keys()) + { + await _database.KeyDeleteAsync(key); + } + } + } + + /// + /// 检查给定 key 是否存在 + /// + /// + /// + public bool Exists(string key) + { + return _database.KeyExists(key); + } + + /// + /// 检查给定 key 是否存在 + /// + /// 键 + /// + public Task ExistsAsync(string key) + { + return _database.KeyExistsAsync(key); + } + + /// + /// 获取指定 key 的值 + /// + /// 键 + /// + public string Get(string key) + { + return _database.StringGet(key); + } + + /// + /// 获取指定 key 的值 + /// + /// byte[] 或其他类型 + /// 键 + /// + public T Get(string key) + { + var value = _database.StringGet(key); + if (value.HasValue) + { + return JsonConvert.DeserializeObject(value); + } + else + { + return default; + } + } + + /// + /// 获取指定 key 的值 + /// + /// 键 + /// + public async Task GetAsync(string key) + { + return await _database.StringGetAsync(key); + } + + /// + /// 获取指定 key 的值 + /// + /// byte[] 或其他类型 + /// 键 + /// + public async Task GetAsync(string key) + { + var value = await _database.StringGetAsync(key); + if (value.HasValue) + { + + return JsonConvert.DeserializeObject(value); + } + else + { + return default; + } + } + + /// + /// 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 + /// + /// 键 + /// 值 + /// + public bool Set(string key, object value) + { + return _database.StringSet(key, JsonConvert.SerializeObject(value)); + } + + /// + /// 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 + /// + /// 键 + /// 值 + /// 有效期 + /// + public bool Set(string key, object value, TimeSpan expire) + { + return _database.StringSet(key, JsonConvert.SerializeObject(value), expire); + } + + /// + /// 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 + /// + /// 键 + /// 值 + /// + public async Task SetAsync(string key, object value) + { + return await _database.StringSetAsync(key, JsonConvert.SerializeObject(value)); + } + + /// + /// 设置指定 key 的值，所有写入参数object都支持string | byte[] | 数值 | 对象 + /// + /// 键 + /// 值 + /// 有效期 + /// + public Task SetAsync(string key, object value, TimeSpan expire) + { + return _database.StringSetAsync(key, JsonConvert.SerializeObject(value), expire); + } + + /// + /// + /// + /// + /// + public bool Del(string key) + { + return _database.KeyDelete(key); + } + + /// + /// + /// + /// + /// + public Task DelAsync(string key) + { + return _database.KeyDeleteAsync(key); + } + + /// + /// 将 key 所储存的值加上给定的增量值（increment） + /// + /// 键 + /// + public async Task IncrAsync(string key) + { + return await _database.StringIncrementAsync(key); + } + + /// + /// 将 key 所储存的值加上给定的增量值（increment） + /// + /// 键 + /// + public long Incr(string key) + { + return _database.StringIncrement(key); + } + + #region Hash + /// + /// 将哈希表 key 中的字段 field 的值设为 value + /// + /// 键 + /// 字段 + /// 值 + /// 如果字段是哈希表中的一个新建字段，并且值设置成功，返回true。如果哈希表中域字段已经存在且旧值已被新值覆盖，返回false。 + public bool HSet(string key, string filed, object value) + { + return _database.HashSet(key, filed, JsonConvert.SerializeObject(value)); + } + + /// + /// 将哈希表 key 中的字段 field 的值设为 value + /// + /// 键 + /// 字段 + /// 值 + /// 如果字段是哈希表中的一个新建字段，并且值设置成功，返回true。如果哈希表中域字段已经存在且旧值已被新值覆盖，返回false。 + public Task HSetAsync(string key, string filed, object value) + { + return _database.HashSetAsync(key, filed, JsonConvert.SerializeObject(value)); + } + + /// + /// 同时将多个field-value对设置到哈希表key中 + /// + /// + /// + /// + //public Task HMSetAsync(string key, object[] value) + //{ + // return _database.HMSetAsync(key, value); + //} + + /// + /// 获取在哈希表中指定 key 的所有字段和值 + /// + /// + /// + /// + public async Task> HGetAllAsync(string key) + { + IDictionary keyValues = new Dictionary(); + var res = await _database.HashGetAllAsync(key); + foreach (var item in res) + { + keyValues.Add(item.Name, item.Value); + } + return keyValues; + } + + #endregion + + #region Redis 有序集合(sorted set) + /// + /// 向有序集合添加一个或多个成员，或者更新已存在成员的分数 + /// + /// + /// + /// + /// + public async Task ZAddAsync(string key, string member, double score) + { + return await _database.SortedSetAddAsync(key, member, score); + } + + /// + /// 用于计算集合中元素的数量 + /// + /// + /// + public async Task ZCardAsync(string key) + { + return await _database.SortedSetLengthAsync(key); + } + + /// + /// 有序集合中对指定成员的分数加上增量 increment + /// + /// + /// + /// + /// + public async Task ZIncrByAsync(string key, string member, double increment = 1) + { + return await _database.SortedSetIncrementAsync(key, member, increment); + } + + /// + /// 通过索引区间返回有序集合成指定区间内的成员 + /// + /// + /// + /// + /// true倒序排列，false正序排列 + /// + public async Task> ZRemRangeByRankAsync(string key, long start, long stop, bool sortType = true) + { + if (sortType) + { + return (await _database.SortedSetRangeByRankAsync(key, start, stop, Order.Descending)).ToStringArray().ToList(); + } + else + { + return (await _database.SortedSetRangeByRankAsync(key, start, stop, Order.Ascending)).ToStringArray().ToList(); + } + } + + /// + /// 返回有序集中的成员和分数，通过索引，分数从高到低 + /// + /// + /// + public async Task> ZRevRangeWithScoresAsync(string key) + { + return ConvertSortedSetEntryToDictionary(await _database.SortedSetRangeByScoreWithScoresAsync(key)); + } + + /// + /// 删除 + /// + /// + /// + /// + public async Task SortedSetRemoveAsync(string key, string member) + { + return await _database.SortedSetRemoveAsync(key, member); + } + + /// + /// 数据转换 + /// + /// + /// + public SortedSetEntry[] ConvertDictionaryToSortedSetEntry(IDictionary keyValues) + { + List setEntries = new List(); + foreach (var item in keyValues) + { + setEntries.Add(new SortedSetEntry(item.Key, item.Value)); + } + return setEntries.ToArray(); + } + + /// + /// 数据转换字典 + /// + /// + /// + public IDictionary ConvertSortedSetEntryToDictionary(SortedSetEntry[] setEntries) + { + IDictionary keyValues = new Dictionary(); + foreach (var item in setEntries) + { + keyValues.Add(item.Element, item.Score); + } + return keyValues; + } + + #endregion + } +} diff --git a/Znyc.CloudCar.Caching/Znyc.CloudCar.Caching.csproj b/Znyc.CloudCar.Caching/Znyc.CloudCar.Caching.csproj new file mode 100644 index 0000000..3e66ae8 --- /dev/null +++ b/Znyc.CloudCar.Caching/Znyc.CloudCar.Caching.csproj @@ -0,0 +1,18 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + diff --git a/Znyc.CloudCar.Configuration/AppSettingsConstVars.cs b/Znyc.CloudCar.Configuration/AppSettingsConstVars.cs new file mode 100644 index 0000000..5bee7c2 --- /dev/null +++ b/Znyc.CloudCar.Configuration/AppSettingsConstVars.cs @@ -0,0 +1,121 @@ +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Configuration +{ + /// + /// 配置文件格式化 + /// + public class AppSettingsConstVars + { + + #region 数据库 + + /// + /// 数据库连接字符串 + /// + public static readonly string DbSqlConnection = AppSettingsHelper.GetContent("ConnectionStrings", "SqlConnection"); + + /// + /// 监听操作 + /// + public static readonly bool SqlMonitorCommand = AppSettingsHelper.GetContent("ConnectionStrings", "SqlMonitorCommand").ObjectToBool(); + + /// + /// 监听CURD + /// + public static readonly bool SqlCurd = AppSettingsHelper.GetContent("ConnectionStrings", "SqlCurd").ObjectToBool(); + + #endregion + + #region Redis + + /// + /// 获取redis连接字符串 + /// + public static readonly string RedisConfigConnectionString = AppSettingsHelper.GetContent("RedisConfig", "ConnectionString"); + /// + /// 启用redis作为定时任务 + /// + public static readonly bool RedisUseTimedTask = AppSettingsHelper.GetContent("RedisConfig", "UseTimedTask").ObjectToBool(); + + #endregion + + #region Cors + /// + /// 跨域设置 + /// + public static readonly string CorsPolicyName = AppSettingsHelper.GetContent("Cors", "PolicyName"); + + public static readonly bool CorsEnableAllIPs = AppSettingsHelper.GetContent("Cors", "EnableAllIPs").ObjectToBool(); + + public static readonly string CorsIPs = AppSettingsHelper.GetContent("Cors", "IPs"); + #endregion + + #region Jwt授权配置================================================================================ + + public static readonly string JwtConfigSecretKey = AppSettingsHelper.GetContent("JwtConfig", "SecretKey"); + public static readonly string JwtConfigIssuer = AppSettingsHelper.GetContent("JwtConfig", "Issuer"); + public static readonly string JwtConfigAudience = AppSettingsHelper.GetContent("JwtConfig", "Audience"); + public static readonly int JwtConfigExpires = AppSettingsHelper.GetContent("JwtConfig", "Expires").ObjectToInt(); + + + #endregion + + #region Hangfire + /// + /// 登陆账号 + /// + public static readonly string HangFireLogin = AppSettingsHelper.GetContent("HangFire", "Login"); + + /// + /// 登陆密码 + /// + public static readonly string HangFirePassWord = AppSettingsHelper.GetContent("HangFire", "PassWord"); + #endregion + + #region Middleware中间件================================================================================ + /// + /// Ip限流 + /// + public static readonly bool MiddlewareIpLogEnabled = AppSettingsHelper.GetContent("Middleware", "IPLog", "Enabled").ObjectToBool(); + /// + /// 记录请求与返回数据 + /// + public static readonly bool MiddlewareRequestResponseLogEnabled = AppSettingsHelper.GetContent("Middleware", "RequestResponseLog", "Enabled").ObjectToBool(); + /// + /// 用户访问记录-是否开启 + /// + public static readonly bool MiddlewareRecordAccessLogsEnabled = AppSettingsHelper.GetContent("Middleware", "RecordAccessLogs", "Enabled").ObjectToBool(); + /// + /// 用户访问记录-过滤ip + /// + public static readonly string MiddlewareRecordAccessLogsIgnoreApis = AppSettingsHelper.GetContent("Middleware", "RecordAccessLogs", "IgnoreApis"); + + #endregion + + #region COS配置 + public static readonly string CosConfigBucket = AppSettingsHelper.GetContent("CosConfig", "bucket"); + + public static readonly string CosConfigRegion = AppSettingsHelper.GetContent("CosConfig", "region"); + + public static readonly string CosConfigAllowPrefix = AppSettingsHelper.GetContent("CosConfig", "allowPrefix"); + + public static readonly string[] CosConfigAllowActions = AppSettingsHelper.GetContent("CosConfig", "allowActions").Split(","); + + public static readonly int CosConfigDurationSeconds = AppSettingsHelper.GetContent("CosConfig", "durationSeconds").ObjectToInt(); + + public static readonly string CosConfigSecretId = AppSettingsHelper.GetContent("CosConfig", "secretId"); + + public static readonly string CosConfigSecretKey = AppSettingsHelper.GetContent("CosConfig", "secretKey"); + #endregion + + #region 百度配置 + public static readonly string AppID = AppSettingsHelper.GetContent("BaiduConfig", "AppID"); + + public static readonly string ApiKey = AppSettingsHelper.GetContent("BaiduConfig", "ApiKey"); + + public static readonly string SecretKey = AppSettingsHelper.GetContent("BaiduConfig", "SecretKey"); + + #endregion + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Configuration/AppSettingsHelper.cs b/Znyc.CloudCar.Configuration/AppSettingsHelper.cs new file mode 100644 index 0000000..0599f4c --- /dev/null +++ b/Znyc.CloudCar.Configuration/AppSettingsHelper.cs @@ -0,0 +1,45 @@ +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Configuration.Json; + +namespace Znyc.CloudCar.Configuration +{ + /// + /// 获取AppSettings配置信息 + /// + public class AppSettingsHelper + { +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Configuration”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public static IConfiguration Configuration { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Configuration”必须包含非 null 值。请考虑将 属性 声明为可以为 null。、 + + public AppSettingsHelper(string contentPath, string environmentName) + { + string Path = $"appsettings.{environmentName}.json"; + Configuration = new ConfigurationBuilder() + .SetBasePath(contentPath) + .Add(new JsonConfigurationSource { Path = Path, Optional = false, ReloadOnChange = true }) + .Build(); + } + + /// + /// 封装要操作的字符串 + /// AppSettingsHelper.GetContent(new string[] { "JwtConfig", "SecretKey" }); + /// + /// 节点配置 + /// + public static string GetContent(params string[] sections) + { + try + { + if (sections.Any()) + { + return Configuration[string.Join(":", sections)]; + } + } + catch (Exception) + { + } + return ""; + } + } +} diff --git a/Znyc.CloudCar.Configuration/GlobalCacheKeyVars.cs b/Znyc.CloudCar.Configuration/GlobalCacheKeyVars.cs new file mode 100644 index 0000000..b0acad8 --- /dev/null +++ b/Znyc.CloudCar.Configuration/GlobalCacheKeyVars.cs @@ -0,0 +1,91 @@ +using System.ComponentModel; + +namespace Znyc.CloudCar.Configuration +{ + /// + /// 缓存键 + /// + public class GlobalCacheKeyVars + { + /// + /// 设备分类信息列表 + /// + [Description("设备分类信息列表")] public const string EquipmentCategoryList = "equipment:category:list"; + + /// + /// 设备品牌列表 + /// + [Description("设备品牌列表")] public const string EquipmentBrandList = "equipment:brand:list"; + + /// + /// 数据字典 + /// + [Description("数据字典")] public const string DictionaryList = "dictionary:list"; + + /// + /// 用户信息 + /// + [Description("用户信息")] public const string User = "user:{0}"; + + /// + /// 浏览量 + /// + [Description("浏览量")] public const string PageView = "PageView"; + + /// + /// 浏览设备信息 + /// + [Description("浏览设备信息")] public const string BrowseList = "browse:{0}"; + + /// + /// 实名认证信息 + /// + [Description("实名认证信息")] public const string Certification = "certification:{0}"; + + /// + /// 用户未读信息 + /// + [Description("用户未读信息")] public const string UnreadMessage = "unread:number:{0}"; + + /// + /// 新用户昵称信息 + /// + [Description("新用户昵称信息")] public const string RegisteredUserlist = "registeredUserlist"; + + /// + /// 广告图片 + /// + [Description("广告图片")] public const string BannerList = "banner:list"; + + /// + /// 充值活动信息 + /// + [Description("充值活动信息")] public const string RechargeList = "recharge:list"; + + /// + /// 优惠卡信息 + /// + [Description("优惠卡信息")] public const string CardIntroList = "cardintro:list"; + + /// + /// 百度token + /// + [Description("百度token")] public const string BaiduAccessToken = "token:baidu:{0}"; + + /// + /// 微信token + /// + [Description("微信token")] public const string WxAccessToken = "token:weixin:{0}"; + + /// + /// 用户修改次数 + /// + [Description("用户修改次数")] public const string UserUpdateCount = "userupdate"; + + /// + /// 用户新增设备信息 + /// + [Description("用户新增设备信息")] public const string UserEquipment = "user:equipment:{0}"; + + } +} diff --git a/Znyc.CloudCar.Configuration/GlobalConstVars.cs b/Znyc.CloudCar.Configuration/GlobalConstVars.cs new file mode 100644 index 0000000..04daad5 --- /dev/null +++ b/Znyc.CloudCar.Configuration/GlobalConstVars.cs @@ -0,0 +1,358 @@ + +namespace Znyc.CloudCar.Configuration +{ + /// + /// 全局常量 + /// + public static class GlobalConstVars + { + /// + /// 数据删除成功 + /// + public const string DeleteSuccess = "数据删除成功"; + /// + /// 数据删除失败 + /// + public const string DeleteFailure = "数据删除失败"; + /// + /// 系统禁止删除此数据 + /// + public const string DeleteProhibitDelete = "系统禁止删除此数据"; + /// + /// 此数据含有子类信息，禁止删除 + /// + public const string DeleteIsHaveChildren = "此数据含有子类信息，禁止删除"; + /// + /// 数据处理异常 + /// + public const string DataHandleEx = "数据接口出现异常"; + /// + /// 数据添加成功 + /// + public const string CreateSuccess = "数据添加成功"; + /// + /// 数据添加失败 + /// + public const string CreateFailure = "数据添加失败"; + /// + /// 数据移动成功 + /// + public const string MoveSuccess = "数据移动成功"; + /// + /// 数据移动失败 + /// + public const string MoveFailure = "数据移动失败"; + /// + /// 系统禁止添加数据 + /// + public const string CreateProhibitCreate = "系统禁止添加数据"; + /// + /// 数据编辑成功 + /// + public const string EditSuccess = "数据编辑成功"; + /// + /// 数据编辑失败 + /// + public const string EditFailure = "数据编辑失败"; + /// + /// 系统禁止编辑此数据 + /// + public const string EditProhibitEdit = "系统禁止编辑此数据"; + /// + /// 数据已存在 + /// + public const string DataIsHave = "数据已存在"; + /// + /// 数据不存在 + /// + public const string DataisNo = "数据不存在"; + /// + /// 请提交必要的参数 + /// + public const string DataParameterError = "请提交必要的参数"; + /// + /// 数据插入成功 + /// + public const string InsertSuccess = "数据插入成功！"; + /// + /// 数据插入失败 + /// + public const string InsertFailure = "数据插入失败！"; + /// + /// Excel导出失败 + /// + public const string ExcelExportFailure = "Excel导出失败"; + /// + /// Excel导出成功 + /// + public const string ExcelExportSuccess = "Excel导出成功"; + /// + /// 获取数据成功 + /// + public const string GetDataSuccess = "获取数据成功！"; + /// + /// 获取数据异常 + /// + public const string GetDataException = "获取数据异常！"; + /// + /// 获取数据失败 + /// + public const string GetDataFailure = "获取数据失败！"; + /// + /// 设置数据成功 + /// + public const string SetDataSuccess = "设置数据成功！"; + /// + /// 设置数据异常 + /// + public const string SetDataException = "设置数据异常！"; + /// + /// 设置数据失败 + /// + public const string SetDataFailure = "设置数据失败！"; + + /// + /// Tools工具常量 + /// + public static class ToolsVars + { + /// + /// + /// + public const string IllegalWordsCahceName = "IllegalWordsCahce"; + + } + + + /// + /// 权限变量配置 + /// + public static class Permissions + { + public const string Name = "Permission"; + + /// + /// 当前项目是否启用IDS4权限方案 + /// true：表示启动IDS4 + /// false：表示使用JWT + public static bool IsUseIds4 = false; + } + + /// + /// 路由变量前缀配置 + /// + public static class RoutePrefix + { + /// + /// 前缀名 + /// 如果不需要，尽量留空，不要修改 + /// 除非一定要在所有的 api 前统一加上特定前缀 + /// + public const string Name = ""; + } + + + /// + /// 银行卡相关常量定义 + /// + public static class BankConst + { + public const string BankLogoUrl = "https://apimg.alipay.com/combo.png?d=cashier&t="; + } + + /// + /// RedisMqKey队列 + /// + public static class RedisMessageQueueKey + { + /// + /// 微信支付成功后推送到接口进行数据处理 + /// + public const string WeChatPayNotice = "WeChatPayNoticeQueue"; + /// + /// 微信模板消息 + /// + public const string SendWxTemplateMessage = "SendWxTemplateMessage"; + + /// + /// 订单完结后走代理或分销商提成处理 + /// + public const string OrderAgentOrDistribution = "OrderAgentOrDistributionQueue"; + /// + /// 订单完成时，结算该订单 + /// + public const string OrderFinishCommand = "OrderFinishCommandQueue"; + /// + /// 订单完成时，门店订单自动发货 + /// + public const string OrderAutomaticDelivery = "OrderAutomaticDeliveryQueue"; + /// + /// 订单完结后走打印模块 + /// + public const string OrderPrint = "OrderPrintQueue"; + /// + /// 售后审核通过后处理 + /// + public const string AfterSalesReview = "AfterSalesReview"; + + /// + /// 日志队列 + /// + public const string LogingQueue = "LogingQueue"; + /// + /// 短信发送队列 + /// + public const string SmsQueue = "SmsQueue"; + + //用户相关 + + //订单支付成功后，用户升级处理 + public const string UserUpGrade = "UserUpGradeQueue"; + + + + } + #region JWT + public class JWTClaim + { + + + /// + /// 用户Id + /// + public const string JwtUserId = "id"; + + /// + /// 姓名 + /// + public const string JwtUserName = "nn"; + + /// + /// 刷新有效期 + /// + public const string JwtRefreshExpires = "re"; + + /// + /// 微信认证Id + /// + public const string JwtOpenId = "oid"; + + /// + /// 权限id + /// + public const string JwtRoleId = "rid"; + + /// + /// 开放平台Id(区分用户唯一性) + /// + public const string JwtUnionId = "uid"; + + /// + /// 头像url + /// + public const string JwtAvatarUrl = "avatarurl"; + + /// + /// SessionKey + /// + public const string JwtSessionKey = "sessionKey"; + + } + #endregion + + #region User + + public class User + { + /// + /// 默认头像名称 + /// + public const string DefaultAvataUrl = "Default_AvatarUrl.png"; + + /// + /// 默认图片地址 + /// + public const string DefaultImagePrefix = "https://zhongnengyunche.com/cloudcar/wx/upload/avatar/"; + + /// + /// 默认头像地址 + /// + public const string Default_AvataUrl_Address = "https://zhongnengyunche.com/cloudcar/wx/upload/avatar/Default_AvatarUrl.png"; + + /// + /// 默认名称 + /// + public const string Default_UserName = "先生"; + } + #endregion + + #region 云币 + public class Currency + { + /// + /// 默认 + /// + public const int Default = 0; + + /// + /// 首次登陆 + /// + public const int FirstLogin = 10; + + /// + /// 邀新用户 + /// + public const int NewUsers = 10; + + /// + /// 每日分享 + /// + public const int DailyShare = 0; + /// + /// 实名认证 + /// + public const int RealName = 0; + + /// + /// 每日签到 + /// + public const int Signin = 0; + + /// + /// 拔打电话 + /// + public const int CallPhone = 10; + + /// + /// 设备置顶 + /// + public const int TopEquipment = 100; + + /// + /// 刷新设备信息 + /// + public const int Refresh = 10; + + /// + /// 默认临时云币 + /// + public const int Default_TemporarylCredits = 0; + } + #endregion + + #region CurrencyOperatingType + public class CurrencyOperatingType + { + public const string Add = "+"; + + public const string Reduce = "-"; + } + #endregion + + /// + /// 默认Banner地址 + /// + public const string Default_Banner_Prefix = + "https://zhongnengyunche.com/cloudcar/wx/upload/banner/"; + } +} diff --git a/Znyc.CloudCar.Configuration/GlobalEnumVars.cs b/Znyc.CloudCar.Configuration/GlobalEnumVars.cs new file mode 100644 index 0000000..c954a22 --- /dev/null +++ b/Znyc.CloudCar.Configuration/GlobalEnumVars.cs @@ -0,0 +1,399 @@ +using System.ComponentModel; + +namespace Znyc.CloudCar.Configuration +{ + /// + /// 全局枚举 + /// + public class GlobalEnumVars + { + #region 常用状态 + + public enum CommonEnum + { + [Description("封禁")] + Disable = 99, + + [Description("有效")] + Normal = 10, + } + #endregion + + #region 权限相关 + /// + /// 状态码枚举 + /// + public enum StatusCodes + { + /// + /// 操作失败 + /// + [Description("操作失败")] Status0NotOk = 0, + + /// + /// 操作成功 + /// + [Description("操作成功")] Status1Ok = 1, + + /// + /// 未登录（需要重新登录） + /// + [Description("未登录")] Status401Unauthorized = 401, + + /// + /// 权限不足 + /// + [Description("权限不足")] Status403Forbidden = 403, + + /// + /// 资源不存在 + /// + [Description("资源不存在")] Status404NotFound = 404, + + /// + /// 系统内部错误（非业务代码里显式抛出的异常，例如由于数据不正确导致空指针异常、数据库异常等等） + /// + [Description("系统内部错误")] Status500InternalServerError = 500 + } + #endregion + + #region HangFire定时任务相关 + public enum HangFireQueuesConfig + { + /// + /// 默认 + /// + [Description("默认")] + @default = 1, + /// + /// 接口 + /// + [Description("接口")] + apis = 2, + /// + /// 网站 + /// + [Description("网站")] + web = 3, + /// + /// 循环时间 + /// + [Description("循环时间")] + recurring = 4, + } + + #endregion + + #region redis缓存类型 + public enum AccessTokenEnum + { + + /// + /// 微信小程序 + /// + WxOpenAccessToken = 1, + + /// + /// 微信公众号 + /// + WeiXinAccessToken = 2, + } + #endregion + + #region 设备状态 + public enum StateEnum + { + /// + /// 未通过 + /// + [Description("未通过")] Fail = 0, + + /// + /// 审核中 + /// + [Description("审核中")] InReview = 10, + + /// + /// 出售中 + /// + [Description("出售中")] Selling = 20, + + /// + /// 已成交 + /// + [Description("已成交")] Traded = 30, + + /// + /// 已下架 + /// + [Description("已下架")] Shelved = 99, + + /// + /// 撤销审核 + /// + [Description("撤销审核")] Revocation = 50 + } + #endregion + + #region 图片类型 + public enum PictureTypeEnum + { + /// + /// 设备照片 + /// + [Description("设备照片")] Equipment = 10, + + /// + /// 行驶证或身份证 + /// + [Description("行驶证或身份证")] DriverLicense = 20, + } + #endregion + + #region 云币类型 + public enum CurrencyType + { + /// + /// 首次登陆 + /// + [Description("首次登陆")] FirstLogin = 1, + + /// + /// 邀新用户 + /// + [Description("邀新用户")] NewUsers = 2, + + /// + /// 每日分享 + /// + [Description("每日分享")] DailyShare = 3, + + /// + /// 关注公众号 + /// + [Description("关注公众号")] FocusOn = 4, + + /// + /// 购买优惠卡赠送 + /// + [Description("购买优惠卡赠送")] PreferentialCard = 5, + + /// + /// 发布设备信息 + /// + [Description("发布设备信息")] Equipment = 6, + + /// + /// 实名认证 + /// + [Description("实名认证")] RealName = 7, + + /// + /// 每日签到 + /// + [Description("每日签到")] Signin = 8, + + /// + /// 云币充值 + /// + [Description("云币充值")] BuyCurrency = 9, + + /// + /// 抽奖赚云币 + /// + [Description("抽奖赚云币")] LuckyDraw = 10, + + /// + /// 兑换奖品 + /// + [Description("兑换奖品")] Conversion = 11, + + /// + /// 拔打电话 + /// + [Description("拔打电话")] CallPhone = 12, + + /// + /// 设备信息置顶 + /// + [Description("置顶设备")] TopEquipment = 13, + + /// + /// 刷新设备信息 + /// + [Description("刷新设备")] RefreshEquipment = 14, + + /// + /// 置顶设备退还 + /// + [Description("置顶设备退还")] ReturnTopEquipment = 15, + + } + #endregion + + #region 云币操作类型 + public enum OperatingType + { + /// + /// 增加 + /// + [Description("增加")] Add = 1, + + /// + /// 减少 + /// + [Description("减少")] Reduce = 2, + + /// + /// 冻结 + /// + [Description("冻结")] Freeze = 3 + } + #endregion + + #region 用户实名状态 + public enum CertificationState + { + /// + /// 实名审核中 + /// + [Description("实名审核中")] Review = 0, + + /// + /// 实名通过 + /// + [Description("实名通过")] Pass = 1, + + /// + /// 实名失败 + /// + [Description("实名失败")] Fail = 2, + + /// + /// 未实名 + /// + [Description("未实名")] None = 3 + } + #endregion + + #region 支付类型 + public enum PaymentMethod + { + /// + /// 现金 + /// + [Description("现金")] Cash = 1, + + /// + /// 余额 + /// + [Description("余额")] Balance = 2, + + /// + /// 网银 + /// + [Description("网银")] NetSilver = 3, + + /// + /// 支付宝 + /// + [Description("支付宝")] ZFB = 4, + + /// + /// 微信 + /// + [Description("微信")] WX = 5, + + /// + /// 云币 + /// + [Description("云币")] CloudCurrency = 6 + } + #endregion + + #region 订单状态 + public enum OrderStatus + { + /// + /// 已取消 + /// + [Description("已取消")] Cancel = 0, + + /// + /// 未付款 + /// + [Description("未付款")] NotPaying = 10, + + /// + /// 已付款 + /// + [Description("已付款")] Paying = 20, + + /// + /// 已发货 + /// + [Description("已发货")] Delivery = 40, + + /// + /// 交易成功 + /// + [Description("交易成功")] Success = 50, + + /// + /// 交易关闭 + /// + [Description("交易关闭")] Close = 60 + } + #endregion + + #region 支付状态 + public enum PayStatus + { + /// + /// 已取消 + /// + [Description("已取消")] Cancel = 0, + + /// + /// 未成功 + /// + [Description("未成功")] NotPaying = 10, + + /// + /// 已成功 + /// + [Description("已成功")] Paying = 20 + } + #endregion + + #region 订单类型 + public enum OrderType + { + /// + /// 充值 + /// + [Description("充值")] BuyCurrency = 1, + + /// + /// 优惠卡 + /// + [Description("优惠卡")] PreferentialCard = 2, + } + #endregion + + #region 登陆日志来源平台 + public enum PlatformType + { + /// + /// 云车二手 + /// + [Description("人才招聘")] CloudCar = 1, + + /// + /// 后台管理系统 + /// + [Description("后台管理系统")] Management = 3 + } + #endregion + } +} diff --git a/Znyc.CloudCar.Configuration/Znyc.CloudCar.Configuration.csproj b/Znyc.CloudCar.Configuration/Znyc.CloudCar.Configuration.csproj new file mode 100644 index 0000000..e79f939 --- /dev/null +++ b/Znyc.CloudCar.Configuration/Znyc.CloudCar.Configuration.csproj @@ -0,0 +1,18 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + diff --git a/Znyc.CloudCar.Core/AutoFac/AutofacModuleRegister.cs b/Znyc.CloudCar.Core/AutoFac/AutofacModuleRegister.cs new file mode 100644 index 0000000..b4d69c0 --- /dev/null +++ b/Znyc.CloudCar.Core/AutoFac/AutofacModuleRegister.cs @@ -0,0 +1,36 @@ +using Autofac; +using System.Reflection; + +namespace Znyc.CloudCar.Core.AutoFac +{ + public class AutofacModuleRegister : Autofac.Module + { + protected override void Load(ContainerBuilder builder) + { + var basePath = AppContext.BaseDirectory; + + #region 带有接口层的服务注入 + var servicesDllFile = Path.Combine(basePath, "Znyc.CloudCar.Services.dll"); + var repositoryDllFile = Path.Combine(basePath, "Znyc.CloudCar.Repository.dll"); + + if (!(File.Exists(servicesDllFile) && File.Exists(repositoryDllFile))) + { + var msg = "Repository.dll和Services.dll 丢失，因为项目解耦了，所以需要先F6编译，再F5运行，请检查 bin 文件夹，并拷贝。"; + throw new Exception(msg); + } + + // 获取 Service.dll 程序集服务，并注册 + var assemblysServices = Assembly.LoadFrom(servicesDllFile); + //支持属性注入依赖重复 + builder.RegisterAssemblyTypes(assemblysServices).AsImplementedInterfaces().InstancePerDependency() + .PropertiesAutowired(PropertyWiringOptions.AllowCircularDependencies); + + // 获取 Repository.dll 程序集服务，并注册 + var assemblysRepository = Assembly.LoadFrom(repositoryDllFile); + //支持属性注入依赖重复 + builder.RegisterAssemblyTypes(assemblysRepository).AsImplementedInterfaces().InstancePerDependency() + .PropertiesAutowired(PropertyWiringOptions.AllowCircularDependencies); + #endregion + } + } +} diff --git a/Znyc.CloudCar.Core/Config/AuthorizationSetup.cs b/Znyc.CloudCar.Core/Config/AuthorizationSetup.cs new file mode 100644 index 0000000..9ab0327 --- /dev/null +++ b/Znyc.CloudCar.Core/Config/AuthorizationSetup.cs @@ -0,0 +1,118 @@ +using Microsoft.AspNetCore.Authentication; +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Authorization; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.IdentityModel.Tokens; +using System.IdentityModel.Tokens.Jwt; +using System.Security.Claims; +using System.Text; +using Znyc.CloudCar.Auth.Policys; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.Utility.Extensions; +using static Znyc.CloudCar.Configuration.GlobalConstVars; + +namespace Znyc.CloudCar.Core.Config +{ + public static class AuthorizationSetup + { + public static void AddAuthorizationSetup(this IServiceCollection services) + { + if (services == null) throw new ArgumentNullException(nameof(services)); + + #region 参数 + //读取配置文件 + var symmetricKeyAsBase64 = AppSettingsConstVars.JwtConfigSecretKey; + var keyByteArray = Encoding.ASCII.GetBytes(symmetricKeyAsBase64); + var signingKey = new SymmetricSecurityKey(keyByteArray); + var issuer = AppSettingsConstVars.JwtConfigIssuer; + var audience = AppSettingsConstVars.JwtConfigAudience; + + var signingCredentials = new SigningCredentials(signingKey, SecurityAlgorithms.HmacSha256); + + // 如果要数据库动态绑定，这里先留个空，后边处理器里动态赋值 + var permission = new List(); + + // 角色与接口的权限要求参数 + var permissionRequirement = new PermissionRequirement( + "/api/denied",// 拒绝授权的跳转地址（目前无用） + permission, + ClaimTypes.Role,//基于角色的授权 + issuer,//发行人 + audience,//听众 + signingCredentials,//签名凭据 + expiration: TimeSpan.FromSeconds(60 * 60 * 24)//接口的过期时间 + ); + #endregion + + // 复杂的策略授权 + services.AddAuthorization(options => + { + options.AddPolicy(Permissions.Name, policy => policy.Requirements.Add(permissionRequirement)); + }); + + + // 令牌验证参数 + var tokenValidationParameters = new TokenValidationParameters + { + ValidateIssuerSigningKey = true, //是否验证SecurityKey + IssuerSigningKey = signingKey, //拿到SecurityKey + ValidateIssuer = true, //是否验证Issuer + ValidIssuer = issuer,//发行人 + ValidateAudience = true, //是否验证Audience + ValidAudience = audience,//订阅人 + ValidateLifetime = true, //是否验证失效时间 + ClockSkew = TimeSpan.FromSeconds(60), + RequireExpirationTime = true, + }; + + // core自带官方JWT认证，开启Bearer认证 + services.AddAuthentication(o => + { + o.DefaultScheme = JwtBearerDefaults.AuthenticationScheme; + o.DefaultChallengeScheme = nameof(ApiResponseHandler); + o.DefaultForbidScheme = nameof(ApiResponseHandler); + }) + // 添加JwtBearer服务 + .AddJwtBearer(o => + { + o.TokenValidationParameters = tokenValidationParameters; + o.Events = new JwtBearerEvents + { + OnChallenge = context => + { + context.Response.Headers.Add("Token-Error", context.ErrorDescription); + return Task.CompletedTask; + }, + OnAuthenticationFailed = context => + { + var token = context.Request.Headers["Authorization"].ObjectToString().Replace("Bearer ", ""); + var jwtToken = (new JwtSecurityTokenHandler()).ReadJwtToken(token); + + if (jwtToken.Issuer != issuer) + { + context.Response.Headers.Add("Token-Error-Iss", "issuer is wrong!"); + } + + if (jwtToken.Audiences.FirstOrDefault() != audience) + { + context.Response.Headers.Add("Token-Error-Aud", "Audience is wrong!"); + } + + // 如果过期，则把<是否过期>添加到，返回头信息中 + if (context.Exception.GetType() == typeof(SecurityTokenExpiredException)) + { + context.Response.Headers.Add("Token-Expired", "true"); + } + return Task.CompletedTask; + } + }; + }) + .AddScheme(nameof(ApiResponseHandler), o => { }); + + + // 注入权限处理器 + services.AddScoped(); + services.AddSingleton(permissionRequirement); + } + } +} diff --git a/Znyc.CloudCar.Core/Config/CoreSetup.cs b/Znyc.CloudCar.Core/Config/CoreSetup.cs new file mode 100644 index 0000000..044876f --- /dev/null +++ b/Znyc.CloudCar.Core/Config/CoreSetup.cs @@ -0,0 +1,41 @@ +using Microsoft.Extensions.DependencyInjection; +using Znyc.CloudCar.Configuration; + +namespace Znyc.CloudCar.Core.Config +{ + public static class CoreSetup + { + + public static void AddCoresSetup(this IServiceCollection services) + { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + services.AddCors(c => + { + if (!AppSettingsConstVars.CorsEnableAllIPs) + { + c.AddPolicy(AppSettingsConstVars.CorsPolicyName, policy => + { + policy.WithOrigins(AppSettingsConstVars.CorsIPs.Split(',')); + policy.AllowAnyHeader(); + policy.AllowAnyMethod(); + policy.AllowCredentials(); + }); + } + else + { + //允许任意跨域请求 + c.AddPolicy(AppSettingsConstVars.CorsPolicyName, policy => + { + policy.SetIsOriginAllowed((host) => true) + .AllowAnyHeader() + .AllowAnyMethod() + .AllowCredentials(); + }); + } + }); + } + } +} diff --git a/Znyc.CloudCar.Core/Config/FreeSqlSetup.cs b/Znyc.CloudCar.Core/Config/FreeSqlSetup.cs new file mode 100644 index 0000000..6f252cc --- /dev/null +++ b/Znyc.CloudCar.Core/Config/FreeSqlSetup.cs @@ -0,0 +1,45 @@ +using FreeSql; +using Microsoft.Extensions.DependencyInjection; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.Core.Db; + +namespace Znyc.CloudCar.Core.Config +{ + /// + /// FreeSql + /// + public static class FreeSqlSetup + { + public static void AddFreeSqlSetup(this IServiceCollection services) + { + var freeSqlBuiler = new FreeSqlBuilder() + .UseConnectionString(DataType.MySql, AppSettingsConstVars.DbSqlConnection) + .UseLazyLoading(false) + .UseNoneCommandParameter(true); + //监听所有命令 + if (AppSettingsConstVars.SqlMonitorCommand) + { + freeSqlBuiler.UseMonitorCommand(cmd => { }, + (cmd, traceLog) => { Console.WriteLine($"{cmd.CommandText}\r\n"); }); + } + var fsql = freeSqlBuiler.Build(); + services.AddScoped(); + services.AddSingleton(fsql); + + //监听所有sql语句 + if (AppSettingsConstVars.SqlCurd) + { + fsql.Aop.CurdAfter += (s, e) => + { + Console.WriteLine($"{e.Sql}\r\n"); + Console.WriteLine($"耗时:{e.ElapsedMilliseconds}ms\r\n"); + }; + } + + //审计数据 + var user = services.BuildServiceProvider().GetService(); + fsql.Aop.AuditValue += (s, e) => { DbHelper.AuditValue(e, user); }; + } + } +} diff --git a/Znyc.CloudCar.Core/Config/HangFireSetup.cs b/Znyc.CloudCar.Core/Config/HangFireSetup.cs new file mode 100644 index 0000000..0428ac7 --- /dev/null +++ b/Znyc.CloudCar.Core/Config/HangFireSetup.cs @@ -0,0 +1,31 @@ +using Hangfire; +using Microsoft.Extensions.DependencyInjection; +using Znyc.CloudCar.Configuration; + +namespace Znyc.CloudCar.Core.Config +{ + /// + /// HangFire配置 + /// + public static class HangFireSetup + { + public static void AddHangFireSetup(this IServiceCollection services) + { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + + services.AddHangfire(x => x.UseRedisStorage(AppSettingsConstVars.RedisConfigConnectionString)); + + services.AddHangfireServer(options => + { + options.Queues = new[] { GlobalEnumVars.HangFireQueuesConfig.@default.ToString(), GlobalEnumVars.HangFireQueuesConfig.apis.ToString(), GlobalEnumVars.HangFireQueuesConfig.web.ToString(), GlobalEnumVars.HangFireQueuesConfig.recurring.ToString() }; + options.ServerTimeout = TimeSpan.FromMinutes(4); + options.SchedulePollingInterval = TimeSpan.FromSeconds(15);//秒级任务需要配置短点，一般任务可以配置默认时间，默认15秒 + options.ShutdownTimeout = TimeSpan.FromMinutes(30); //超时时间 + options.WorkerCount = Math.Max(Environment.ProcessorCount, 20); //工作线程数，当前允许的最大线程，默认20 + }); + } + } +} diff --git a/Znyc.CloudCar.Core/Config/HttpContextSetup.cs b/Znyc.CloudCar.Core/Config/HttpContextSetup.cs new file mode 100644 index 0000000..2c28879 --- /dev/null +++ b/Znyc.CloudCar.Core/Config/HttpContextSetup.cs @@ -0,0 +1,20 @@ + +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; +using Znyc.CloudCar.Auth.HttpContextUser; + +namespace Znyc.CloudCar.Core.Config +{ + /// + /// 上下文启动 + /// + public static class HttpContextSetup + { + public static void AddHttpContextSetup(this IServiceCollection services) + { + if (services == null) throw new AbandonedMutexException(nameof(services)); + services.AddSingleton(); + services.AddScoped(); + } + } +} diff --git a/Znyc.CloudCar.Core/Config/MapsterSetup.cs b/Znyc.CloudCar.Core/Config/MapsterSetup.cs new file mode 100644 index 0000000..6e65886 --- /dev/null +++ b/Znyc.CloudCar.Core/Config/MapsterSetup.cs @@ -0,0 +1,27 @@ +using Mapster; +using MapsterMapper; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyModel; +using System.Reflection; + +namespace Znyc.CloudCar.Core.Config +{ + /// + /// Mapster + /// + public static class MapsterSetup + { + public static void AddMapsterSetup(this IServiceCollection services) + { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + Assembly[] assemblies = DependencyContext.Default.RuntimeLibraries + .Where(x => x.Name.StartsWith("Znyc.CloudCar")) + .Select(x => Assembly.Load(new AssemblyName(x.Name))).ToArray(); + services.AddScoped(sp => new Mapper()); + TypeAdapterConfig.GlobalSettings.Scan(assemblies); + } + } +} diff --git a/Znyc.CloudCar.Core/Config/RedisCacheSetup.cs b/Znyc.CloudCar.Core/Config/RedisCacheSetup.cs new file mode 100644 index 0000000..7f77123 --- /dev/null +++ b/Znyc.CloudCar.Core/Config/RedisCacheSetup.cs @@ -0,0 +1,29 @@ +using Microsoft.Extensions.DependencyInjection; +using StackExchange.Redis; +using Znyc.CloudCar.Caching; +using Znyc.CloudCar.Configuration; + +namespace Znyc.CloudCar.Core.Config +{ + /// + /// Redis缓存，启动服务 + /// + public static class RedisCacheSetup + { + public static void AddRedisCacheSetup(this IServiceCollection services) + { + if (services == null) + { + throw new ArgumentException(nameof(services)); + } + services.AddSingleton(sp => + { + string redisConfiguration = AppSettingsConstVars.RedisConfigConnectionString; + var configuration = ConfigurationOptions.Parse(redisConfiguration, true); + configuration.ResolveDns = true; + return ConnectionMultiplexer.Connect(configuration); + }); + services.AddTransient(); + } + } +} diff --git a/Znyc.CloudCar.Core/Config/RedisMessageQueueSetup.cs b/Znyc.CloudCar.Core/Config/RedisMessageQueueSetup.cs new file mode 100644 index 0000000..108789a --- /dev/null +++ b/Znyc.CloudCar.Core/Config/RedisMessageQueueSetup.cs @@ -0,0 +1,33 @@ + +using Microsoft.Extensions.DependencyInjection; + +namespace Znyc.CloudCar.Core.Config +{ + /// + /// Redis 消息队列 启动服务 + /// + public static class RedisMessageQueueSetup + { + public static void AddRedisMessageQueueSetup(this IServiceCollection services) + { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + //services.AddInitQ(m => + //{ + // //时间间隔 + // m.SuspendTime = 1000; + // //redis服务器地址 + // m.ConnectionString = AppSettingsConstVars.RedisConfigConnectionString; + // //对应的订阅者类，需要new一个实例对象，当然你也可以传参，比如日志对象 + // m.ListSubscribe = new List() + // { + // typeof(LogingSubscribe) + // }; + // //显示日志 + // m.ShowLog = false; + //}); + } + } +} diff --git a/Znyc.CloudCar.Core/Config/SwaggerSetup.cs b/Znyc.CloudCar.Core/Config/SwaggerSetup.cs new file mode 100644 index 0000000..578a6c4 --- /dev/null +++ b/Znyc.CloudCar.Core/Config/SwaggerSetup.cs @@ -0,0 +1,65 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.OpenApi.Models; +using Swashbuckle.AspNetCore.Filters; +using Znyc.CloudCar.Swagger; + +namespace Znyc.CloudCar.Core.Config +{ + /// + /// swagger + /// + public static class SwaggerSetup + { + /// + /// + /// + public static void AddSwaggerSetup(this IServiceCollection services) + { + if (services == null) + { + throw new ArgumentNullException(nameof(services)); + } + var apiName = "云车二手小程序API"; + services.AddSwaggerGen(s => + { + //遍历出全部的版本，做文档信息展示 + typeof(CustomApiVersion.ApiVersion).GetEnumNames().ToList().ForEach(version => + { + s.SwaggerDoc(version, new OpenApiInfo + { + Version = version, + Title = $"{apiName} 接口文档", + Description = $"{apiName} HTTP API " + version, + Contact = new OpenApiContact { Name = apiName, Email = "faker@znyc.com", Url = new Uri("https://Znyc.com") }, + }); + s.OrderActionsBy(o => o.RelativePath); + }); + try + { + //生成API XML文档 + var basePath = AppContext.BaseDirectory; + var xmlPath = Path.Combine(basePath, "doc.xml"); + s.IncludeXmlComments(xmlPath); + } + catch (Exception) + { + } + // 开启加权小锁 + s.OperationFilter(); + s.OperationFilter(); + + // 在header中添加token，传递到后台 + s.OperationFilter(); + + // 必须是 oauth2 + s.AddSecurityDefinition("oauth2", new OpenApiSecurityScheme + { + Description = "JWT授权(数据将在请求头中进行传输) 直接在下框中输入Bearer {token}（注意两者之间是一个空格）\"", + Name = "Authorization",//jwt默认的参数名称 + In = ParameterLocation.Header,//jwt默认存放Authorization信息的位置(请求头中) + Type = SecuritySchemeType.ApiKey + }); + }); + } + } +} diff --git a/Znyc.CloudCar.Core/Db/DbHelper.cs b/Znyc.CloudCar.Core/Db/DbHelper.cs new file mode 100644 index 0000000..a98d7dc --- /dev/null +++ b/Znyc.CloudCar.Core/Db/DbHelper.cs @@ -0,0 +1,61 @@ +using FreeSql.Aop; +using System.Reflection; +using Yitter.IdGenerator; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.Model; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Core.Db +{ + public class DbHelper + { + /// + /// 审计数据 + /// + /// + /// + public static void AuditValue(AuditValueEventArgs e, IHttpContextUser httpContextUser) + { + if (e.Column.CsType == typeof(long) + && e.Property.GetCustomAttribute(false) != null + && (e.Value.IsNull() || (long)e.Value == default || (long?)e.Value == default)) + { + e.Value = YitIdHelper.NextId(); + } + + if (httpContextUser.IsNull() || httpContextUser.Id <= 0) + { + return; + } + + if (e.AuditValueType == AuditValueType.Insert) + { + switch (e.Property.Name) + { + case "CreatedUserId": + if (e.Value.IsNull() || (long)e.Value == default || (long?)e.Value == default) + { + e.Value = httpContextUser.Id; + } + + break; + case "CreatedTime": + e.Value = DateTime.Now; + break; + } + } + else if (e.AuditValueType == AuditValueType.Update) + { + switch (e.Property.Name) + { + case "ModifiedUserId": + e.Value = httpContextUser.Id; + break; + case "ModifiedTime": + e.Value = DateTime.Now; + break; + } + } + } + } +} diff --git a/Znyc.CloudCar.Core/Znyc.CloudCar.Core.csproj b/Znyc.CloudCar.Core/Znyc.CloudCar.Core.csproj new file mode 100644 index 0000000..69a7a2d --- /dev/null +++ b/Znyc.CloudCar.Core/Znyc.CloudCar.Core.csproj @@ -0,0 +1,29 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Znyc.CloudCar.Filter/ExceptionFilter.cs b/Znyc.CloudCar.Filter/ExceptionFilter.cs new file mode 100644 index 0000000..8fa3c1e --- /dev/null +++ b/Znyc.CloudCar.Filter/ExceptionFilter.cs @@ -0,0 +1,50 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; +using Microsoft.Extensions.Logging; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Filter +{ + /// + /// 异常错误过滤 + /// + public class ExceptionFilter : IExceptionFilter, IAsyncExceptionFilter + { + private readonly ILogger _logger; + + public ExceptionFilter(ILogger logger) + { + _logger = logger; + } + public void OnException(ExceptionContext context) + { + + Console.WriteLine(context.Exception); + Console.WriteLine(context.Exception.InnerException); + _logger.LogError(context.Exception, context.Exception.Message); + ResponseOutput response = new() + { + Successed = false, + Msg = "系统内部错误" + }; + context.Result = new InternalServerErrorResult(response); + } + + public Task OnExceptionAsync(ExceptionContext context) + { + OnException(context); + return Task.CompletedTask; + } + + + } + + public class InternalServerErrorResult : ObjectResult + { + public InternalServerErrorResult(object value) : base(value) + { + StatusCode = Microsoft.AspNetCore.Http.StatusCodes.Status500InternalServerError; + } + } + +} \ No newline at end of file diff --git a/Znyc.CloudCar.Filter/RequiredError.cs b/Znyc.CloudCar.Filter/RequiredError.cs new file mode 100644 index 0000000..1ce9653 --- /dev/null +++ b/Znyc.CloudCar.Filter/RequiredError.cs @@ -0,0 +1,48 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Filters; +using Newtonsoft.Json; +using Znyc.CloudCar.Model.ViewModels.Basics; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Filter +{ + /// + /// 请求验证错误处理 + /// + [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true)] + public class RequiredError : ResultFilterAttribute + { + public override void OnResultExecuting(ResultExecutingContext context) + { + var modelState = context.ModelState; + List errors = new List(); + if (!modelState.IsValid) + { + var baseResult = new ResponseOutput() + { + Successed = false, + Msg = "请提交必要的参数", + }; + foreach (var key in modelState.Keys) + { + var state = modelState[key]; + if (state.Errors.Any()) + { + ErrorView errorView = new ErrorView(); + errorView.ErrorName = key; + errorView.Error = state.Errors.First().ErrorMessage; + errors.Add(errorView); + } + } + ResponseOutput response = new ResponseOutput(); + response.Data = errors; + response.Successed = false; + context.Result = new ContentResult() + { + Content = JsonConvert.SerializeObject(response), + ContentType = "application/json" + }; + } + } + } +} diff --git a/Znyc.CloudCar.Filter/SnowflakeAttribute.cs b/Znyc.CloudCar.Filter/SnowflakeAttribute.cs new file mode 100644 index 0000000..4a875c1 --- /dev/null +++ b/Znyc.CloudCar.Filter/SnowflakeAttribute.cs @@ -0,0 +1,7 @@ +namespace Znyc.CloudCar.Filter +{ + [AttributeUsage(AttributeTargets.Field)] + public class SnowflakeAttribute : Attribute + { + } +} diff --git a/Znyc.CloudCar.Filter/Znyc.CloudCar.Filter.csproj b/Znyc.CloudCar.Filter/Znyc.CloudCar.Filter.csproj new file mode 100644 index 0000000..0068199 --- /dev/null +++ b/Znyc.CloudCar.Filter/Znyc.CloudCar.Filter.csproj @@ -0,0 +1,17 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + diff --git a/Znyc.CloudCar.FreeSql/Znyc.CloudCar.FreeSql.csproj b/Znyc.CloudCar.FreeSql/Znyc.CloudCar.FreeSql.csproj new file mode 100644 index 0000000..b290b4c --- /dev/null +++ b/Znyc.CloudCar.FreeSql/Znyc.CloudCar.FreeSql.csproj @@ -0,0 +1,15 @@ + + + + net6.0 + enable + enable + + + + + + + + + diff --git a/Znyc.CloudCar.Hangfire/Znyc.CloudCar.Hangfire.csproj b/Znyc.CloudCar.Hangfire/Znyc.CloudCar.Hangfire.csproj new file mode 100644 index 0000000..6d349ec --- /dev/null +++ b/Znyc.CloudCar.Hangfire/Znyc.CloudCar.Hangfire.csproj @@ -0,0 +1,16 @@ + + + + net6.0 + enable + enable + + + + + + + + + + diff --git a/Znyc.CloudCar.IRepository/Audit/IAuditRepository.cs b/Znyc.CloudCar.IRepository/Audit/IAuditRepository.cs new file mode 100644 index 0000000..caf6e4b --- /dev/null +++ b/Znyc.CloudCar.IRepository/Audit/IAuditRepository.cs @@ -0,0 +1,9 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Audit +{ + public interface IAuditRepository : IRepositoryBase + { + Task> GetAuditFailListAsync(long userId); + } +} diff --git a/Znyc.CloudCar.IRepository/Banner/IBannerRepository.cs b/Znyc.CloudCar.IRepository/Banner/IBannerRepository.cs new file mode 100644 index 0000000..6dc47f8 --- /dev/null +++ b/Znyc.CloudCar.IRepository/Banner/IBannerRepository.cs @@ -0,0 +1,9 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Banner +{ + public interface IBannerRepository : IRepositoryBase + { + + } +} diff --git a/Znyc.CloudCar.IRepository/CardIntro/ICardIntroRepository.cs b/Znyc.CloudCar.IRepository/CardIntro/ICardIntroRepository.cs new file mode 100644 index 0000000..4ce53c1 --- /dev/null +++ b/Znyc.CloudCar.IRepository/CardIntro/ICardIntroRepository.cs @@ -0,0 +1,8 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.CardIntro +{ + public interface ICardIntroRepository : IRepositoryBase + { + } +} diff --git a/Znyc.CloudCar.IRepository/Certification/ICertificationRepository.cs b/Znyc.CloudCar.IRepository/Certification/ICertificationRepository.cs new file mode 100644 index 0000000..1032475 --- /dev/null +++ b/Znyc.CloudCar.IRepository/Certification/ICertificationRepository.cs @@ -0,0 +1,8 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Certification +{ + public interface ICertificationRepository : IRepositoryBase + { + } +} diff --git a/Znyc.CloudCar.IRepository/Collection/ICollectionRepository.cs b/Znyc.CloudCar.IRepository/Collection/ICollectionRepository.cs new file mode 100644 index 0000000..1fa750e --- /dev/null +++ b/Znyc.CloudCar.IRepository/Collection/ICollectionRepository.cs @@ -0,0 +1,12 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Collection +{ + /// + /// 收藏仓储接口 + /// + public interface ICollectionRepository : IRepositoryBase + { + + } +} diff --git a/Znyc.CloudCar.IRepository/Currency/ICurrencyRecordRepository.cs b/Znyc.CloudCar.IRepository/Currency/ICurrencyRecordRepository.cs new file mode 100644 index 0000000..de8eb32 --- /dev/null +++ b/Znyc.CloudCar.IRepository/Currency/ICurrencyRecordRepository.cs @@ -0,0 +1,19 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Currency +{ + public interface ICurrencyRecordRepository : IRepositoryBase + { + ///// + ///// 获取邀请排行榜 + ///// + ///// + //Task> GetInviteTopAsync(); + + ///// + ///// 获取用户获取电话数据 + ///// + ///// + //Task> GetCallPhoneAsync(); + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.IRepository/Currency/ICurrencyRepository.cs b/Znyc.CloudCar.IRepository/Currency/ICurrencyRepository.cs new file mode 100644 index 0000000..4fa2001 --- /dev/null +++ b/Znyc.CloudCar.IRepository/Currency/ICurrencyRepository.cs @@ -0,0 +1,8 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Currency +{ + public interface ICurrencyRepository : IRepositoryBase + { + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.IRepository/Dictionary/IDictionaryRepository.cs b/Znyc.CloudCar.IRepository/Dictionary/IDictionaryRepository.cs new file mode 100644 index 0000000..5146d6d --- /dev/null +++ b/Znyc.CloudCar.IRepository/Dictionary/IDictionaryRepository.cs @@ -0,0 +1,8 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Dictionary +{ + public interface IDictionaryRepository : IRepositoryBase + { + } +} diff --git a/Znyc.CloudCar.IRepository/Equipment/IEquipmentRepository.cs b/Znyc.CloudCar.IRepository/Equipment/IEquipmentRepository.cs new file mode 100644 index 0000000..2579a29 --- /dev/null +++ b/Znyc.CloudCar.IRepository/Equipment/IEquipmentRepository.cs @@ -0,0 +1,15 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Equipment +{ + public interface IEquipmentRepository : IRepositoryBase + { + /// + /// 同步浏览量 + /// + /// + /// + /// + Task UpdatePageView(long id, int pageview); + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.IRepository/EquipmentPicture/IEquipmentPictureRepository.cs b/Znyc.CloudCar.IRepository/EquipmentPicture/IEquipmentPictureRepository.cs new file mode 100644 index 0000000..28ff202 --- /dev/null +++ b/Znyc.CloudCar.IRepository/EquipmentPicture/IEquipmentPictureRepository.cs @@ -0,0 +1,9 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.EquipmentPicture +{ + public interface IEquipmentPictureRepository : IRepositoryBase + { + + } +} diff --git a/Znyc.CloudCar.IRepository/Feedback/IFeedbackPicRepository .cs b/Znyc.CloudCar.IRepository/Feedback/IFeedbackPicRepository .cs new file mode 100644 index 0000000..bf29e12 --- /dev/null +++ b/Znyc.CloudCar.IRepository/Feedback/IFeedbackPicRepository .cs @@ -0,0 +1,9 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Feedback +{ + public interface IFeedbackPicRepository : IRepositoryBase + { + + } +} diff --git a/Znyc.CloudCar.IRepository/Feedback/IFeedbackRepository.cs b/Znyc.CloudCar.IRepository/Feedback/IFeedbackRepository.cs new file mode 100644 index 0000000..5229fcf --- /dev/null +++ b/Znyc.CloudCar.IRepository/Feedback/IFeedbackRepository.cs @@ -0,0 +1,9 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Feedback +{ + public interface IFeedbackRepository : IRepositoryBase + { + + } +} diff --git a/Znyc.CloudCar.IRepository/IRepositoryBase.cs b/Znyc.CloudCar.IRepository/IRepositoryBase.cs new file mode 100644 index 0000000..dd9e373 --- /dev/null +++ b/Znyc.CloudCar.IRepository/IRepositoryBase.cs @@ -0,0 +1,48 @@ +using FreeSql; +using System.Linq.Expressions; + +namespace Znyc.CloudCar.IRepository +{ + public interface IRepositoryBase : IBaseRepository where TEntity : class + { + /// + /// 获得Dto + /// + /// + /// + /// + Task GetAsync(TKey id); + + /// + /// 根据条件获取实体 + /// + /// + /// + Task GetAsync(Expression> exp); + + /// + /// 根据条件获取Dto + /// + /// + /// + /// + Task GetAsync(Expression> exp); + + /// + /// 软删除 + /// + /// + /// + Task SoftDeleteAsync(TKey id); + + /// + /// 批量软删除 + /// + /// + /// + Task SoftDeleteAsync(TKey[] ids); + } + public interface IRepositoryBase : IRepositoryBase where TEntity : class + { + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.IRepository/LoginLogs/ILoginLogsRepository.cs b/Znyc.CloudCar.IRepository/LoginLogs/ILoginLogsRepository.cs new file mode 100644 index 0000000..468ea2e --- /dev/null +++ b/Znyc.CloudCar.IRepository/LoginLogs/ILoginLogsRepository.cs @@ -0,0 +1,8 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.LoginLogs +{ + public interface ILoginLogsRepository : IRepositoryBase + { + } +} diff --git a/Znyc.CloudCar.IRepository/Message/IMessageLogRepository .cs b/Znyc.CloudCar.IRepository/Message/IMessageLogRepository .cs new file mode 100644 index 0000000..f02a4be --- /dev/null +++ b/Znyc.CloudCar.IRepository/Message/IMessageLogRepository .cs @@ -0,0 +1,9 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Message +{ + public interface IMessageLogRepository : IRepositoryBase + { + + } +} diff --git a/Znyc.CloudCar.IRepository/Message/IMessageLogsRepository.cs b/Znyc.CloudCar.IRepository/Message/IMessageLogsRepository.cs new file mode 100644 index 0000000..08f0764 --- /dev/null +++ b/Znyc.CloudCar.IRepository/Message/IMessageLogsRepository.cs @@ -0,0 +1,9 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Message +{ + public interface IMessageLogsRepository : IRepositoryBase + { + + } +} diff --git a/Znyc.CloudCar.IRepository/Message/IMessageRepository.cs b/Znyc.CloudCar.IRepository/Message/IMessageRepository.cs new file mode 100644 index 0000000..5556009 --- /dev/null +++ b/Znyc.CloudCar.IRepository/Message/IMessageRepository.cs @@ -0,0 +1,9 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Message +{ + public interface IMessageRepository : IRepositoryBase + { + + } +} diff --git a/Znyc.CloudCar.IRepository/Order/IOrderDetailRepository.cs b/Znyc.CloudCar.IRepository/Order/IOrderDetailRepository.cs new file mode 100644 index 0000000..95f3de2 --- /dev/null +++ b/Znyc.CloudCar.IRepository/Order/IOrderDetailRepository.cs @@ -0,0 +1,8 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Order +{ + public interface IOrderDetailRepository : IRepositoryBase + { + } +} diff --git a/Znyc.CloudCar.IRepository/Order/IOrderRepository.cs b/Znyc.CloudCar.IRepository/Order/IOrderRepository.cs new file mode 100644 index 0000000..f99531d --- /dev/null +++ b/Znyc.CloudCar.IRepository/Order/IOrderRepository.cs @@ -0,0 +1,8 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Order +{ + public interface IOrderRepository : IRepositoryBase + { + } +} diff --git a/Znyc.CloudCar.IRepository/PaymentRecord/IPaymentRecordRepository.cs b/Znyc.CloudCar.IRepository/PaymentRecord/IPaymentRecordRepository.cs new file mode 100644 index 0000000..c2ab0a3 --- /dev/null +++ b/Znyc.CloudCar.IRepository/PaymentRecord/IPaymentRecordRepository.cs @@ -0,0 +1,8 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.PaymentRecord +{ + public interface IPaymentRecordRepository : IRepositoryBase + { + } +} diff --git a/Znyc.CloudCar.IRepository/Recharge/IRechargeIntroRepository.cs b/Znyc.CloudCar.IRepository/Recharge/IRechargeIntroRepository.cs new file mode 100644 index 0000000..8ceb199 --- /dev/null +++ b/Znyc.CloudCar.IRepository/Recharge/IRechargeIntroRepository.cs @@ -0,0 +1,8 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Recharge +{ + public interface IRechargeIntroRepository : IRepositoryBase + { + } +} diff --git a/Znyc.CloudCar.IRepository/Recharge/IRechargeRepository.cs b/Znyc.CloudCar.IRepository/Recharge/IRechargeRepository.cs new file mode 100644 index 0000000..ee69b7c --- /dev/null +++ b/Znyc.CloudCar.IRepository/Recharge/IRechargeRepository.cs @@ -0,0 +1,8 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.Recharge +{ + public interface IRechargeRepository : IRepositoryBase + { + } +} diff --git a/Znyc.CloudCar.IRepository/User/IUserCardRepository.cs b/Znyc.CloudCar.IRepository/User/IUserCardRepository.cs new file mode 100644 index 0000000..9bb4041 --- /dev/null +++ b/Znyc.CloudCar.IRepository/User/IUserCardRepository.cs @@ -0,0 +1,9 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.User +{ + public interface IUserCardRepository : IRepositoryBase + { + + } +} diff --git a/Znyc.CloudCar.IRepository/User/IUserRepository.cs b/Znyc.CloudCar.IRepository/User/IUserRepository.cs new file mode 100644 index 0000000..fc3d483 --- /dev/null +++ b/Znyc.CloudCar.IRepository/User/IUserRepository.cs @@ -0,0 +1,8 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.User +{ + public interface IUserRepository : IRepositoryBase + { + } +} diff --git a/Znyc.CloudCar.IRepository/User/IWxUnifyUserRepository.cs b/Znyc.CloudCar.IRepository/User/IWxUnifyUserRepository.cs new file mode 100644 index 0000000..fd51785 --- /dev/null +++ b/Znyc.CloudCar.IRepository/User/IWxUnifyUserRepository.cs @@ -0,0 +1,8 @@ +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IRepository.User +{ + public interface IWxUnifyUserRepository : IRepositoryBase + { + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.IRepository/Znyc.CloudCar.IRepository.csproj b/Znyc.CloudCar.IRepository/Znyc.CloudCar.IRepository.csproj new file mode 100644 index 0000000..e7b3eb4 --- /dev/null +++ b/Znyc.CloudCar.IRepository/Znyc.CloudCar.IRepository.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/Znyc.CloudCar.IServices/Auth/IAuthService.cs b/Znyc.CloudCar.IServices/Auth/IAuthService.cs new file mode 100644 index 0000000..86d6b4b --- /dev/null +++ b/Znyc.CloudCar.IServices/Auth/IAuthService.cs @@ -0,0 +1,43 @@ +using Znyc.CloudCar.Model.Dtos.Auth; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Auth +{ + public interface IAuthService + { + /// + /// 获取百度AccessToken + /// + /// + ResponseOutput GetAccessTokenAsync(); + + /// + /// 微信支付 + /// + /// + /// + /// + Task WxPay(long productId, int type); + + /// + /// 微信小程序支付回调 + /// + /// + Task NotifyUrl(string content); + + /// + /// 获取微信access_token + /// + /// + WxAccessTokenOutput GetWxAccessTokenAsync(); + + /// + /// 获取小程序 + /// + /// + ResponseOutput GetUnlimitedAsync(); + + + ResponseOutput GetQrCodeAsync(long id); + } +} diff --git a/Znyc.CloudCar.IServices/Banner/IBannerService.cs b/Znyc.CloudCar.IServices/Banner/IBannerService.cs new file mode 100644 index 0000000..4afa54c --- /dev/null +++ b/Znyc.CloudCar.IServices/Banner/IBannerService.cs @@ -0,0 +1,16 @@ +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Banner +{ + /// + /// Banner服务接口 + /// + public interface IBannerService + { + /// + /// 查询Banner缓存 + /// + /// + Task GetBannerListAsync(); + } +} diff --git a/Znyc.CloudCar.IServices/Browse/IBrowseService.cs b/Znyc.CloudCar.IServices/Browse/IBrowseService.cs new file mode 100644 index 0000000..2d82cf1 --- /dev/null +++ b/Znyc.CloudCar.IServices/Browse/IBrowseService.cs @@ -0,0 +1,18 @@ +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Browse +{ + /// + /// 浏览记录服务接口 + /// + public interface IBrowseService + { + /// + /// 分页查询浏览记录列表 + /// + /// + /// + /// + Task PageAsync(int currentPage, int pageSize); + } +} diff --git a/Znyc.CloudCar.IServices/CaChe/ICacheService.cs b/Znyc.CloudCar.IServices/CaChe/ICacheService.cs new file mode 100644 index 0000000..056f9a6 --- /dev/null +++ b/Znyc.CloudCar.IServices/CaChe/ICacheService.cs @@ -0,0 +1,305 @@ +using Znyc.CloudCar.Model.Dtos.Banner; +using Znyc.CloudCar.Model.Dtos.CardIntro; +using Znyc.CloudCar.Model.Dtos.Certification; +using Znyc.CloudCar.Model.Dtos.Dictionary; +using Znyc.CloudCar.Model.Dtos.Recharge; +using Znyc.CloudCar.Model.Dtos.User; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.IServices.CaChe +{ + public interface ICacheService + { + #region Dictionary + /// + /// 设置数据字典缓存 + /// + /// + /// + Task SetDictionaryAsync(List output); + + /// + /// 获取数据字典缓存 + /// + /// + Task> GetDictionaryAsync(); + + /// + /// 删除数据字典缓存 + /// + /// + Task RemoveDictionaryAsync(); + #endregion + + #region User + + /// + /// 设置用户缓存 + /// + /// + /// + /// + Task SetUserAsync(long userId, UserOutput user); + + /// + /// 删除用户缓存 + /// + /// + /// + Task RemoveUserAsync(long userId); + + /// + /// 获取用户缓存 + /// + /// + /// + Task GetUserAsync(long userId); + #endregion User + + #region PageView + + /// + /// 同步浏览量缓存 + /// + /// + /// + /// + Task SetPageViewAsync(string member, double score); + + /// + /// 浏览量自增 + /// + /// + /// + Task SetIncrPageViewAsync(long productId); + + /// + /// 删除浏览量缓存 + /// + /// + Task RemovePageViewAsync(); + + /// + /// 获取浏览量缓存 + /// + /// + /// + /// + Task> GetPageViewAsync(); + + /// + /// 获取浏览量总条数缓存 + /// + /// + Task GetPageViewCountAsync(); + + #endregion PageView + + #region Browse + /// + /// 获取浏览记录总条数缓存 + /// + /// + /// + Task GetBrowseCountAsync(long userId); + + /// + /// 设置浏览记录缓存 + /// + /// + /// + /// + /// + Task SetBrowseAsync(long userId, string member, double score); + + /// + /// 获取浏览记录缓存 + /// + /// + /// + /// + /// + Task> GetBrowseAsync(long userId); + #endregion + + #region 实名认证 + /// + /// 设置实名认证缓存 + /// + /// + /// + /// + Task SetCertificationAsync(long userId, CertificationOutput certificationOutput); + + /// + /// 删除实名认证缓存 + /// + /// + /// + Task RemoveCertificationAsync(long userId); + + /// + /// 获取实名认证缓存 + /// + /// + /// + Task GetCertificationAsync(long userId); + + #endregion Certification + + #region UnreadMessage + + /// + /// 同步未读信息缓存 + /// + /// + /// + /// + Task SetUnreadMessageAsync(long userId, IDictionary list); + + /// + /// 修改未读信息缓存 + /// + /// + /// + /// + /// + Task UpdateUnreadMessageAsync(long userId, string filed, string value); + + /// + /// 删除未读信息缓存 + /// + /// + /// + Task RemoveUnreadMessageAsync(long userId); + + /// + /// 获取未读信息缓存 + /// + /// + Task> GetUnreadMessageAsync(long userId); + + #endregion UnreadMessage + + #region 用户注册信息滚动提示 + + /// + /// 设置注册用户list + /// + /// + /// + Task SetRegistUserListAsync(string member, double score); + + /// + /// 获取注册用户list + /// + /// + Task> GetRegistUserListAsync(long start, long stop); + #endregion + + #region Banner + + /// + /// 设置广告缓存 + /// + /// + /// + Task SetBannerListAsync(List list); + + /// + /// 获取广告缓存 + /// + /// + Task> GetBannerListAsync(); + + /// + /// 删除广告缓存 + /// + /// + Task RemoveBannerListAsync(); + #endregion + + #region Recharge充值活动 + + /// + /// 设置充值活动缓存 + /// + /// + /// + Task SetRechargeAsync(RechargeOutput output); + + /// + /// 获取充值活动缓存 + /// + /// + Task GetRechargeAsync(); + + /// + /// 删除充值活动缓存 + /// + /// + Task RemoveRechargeAsync(); + + #endregion Recharge充值活动 + + #region 优惠卡信息 + + /// + /// 设置优惠卡信息缓存 + /// + /// + /// + Task SetCardIntroListAsync(List list); + + /// + /// 获取优惠卡信息缓存 + /// + /// + Task> GetCardIntroListAsync(); + + /// + /// 删除优惠卡信息缓存 + /// + /// + Task RemoveCardIntroListAsync(); + #endregion + + #region 用户修改次数 + + /// + /// 同步用户修改次数缓存 + /// + /// + /// + Task SetUserUpdateCountAsync(string member, double score); + + /// + /// 用户修改次数自增 + /// + /// + /// + Task SetIncrUserUpdateCountAsync(long userId); + + /// + /// 删除用户修改次数缓存 + /// + /// + Task RemoveUserUpdateCountAsync(); + + /// + /// 获取用户修改次数缓存 + /// + /// + Task> GetUserUpdateCountAsync(); + #endregion UserUpdateCount + + + #region 设备管理 + + Task SetEquipmentAsync(EquipmentEntity equipment, long userId); + + + Task GetEquipmentAsync(long userId); + #endregion + } +} diff --git a/Znyc.CloudCar.IServices/CardIntro/ICardIntroService.cs b/Znyc.CloudCar.IServices/CardIntro/ICardIntroService.cs new file mode 100644 index 0000000..c1f9148 --- /dev/null +++ b/Znyc.CloudCar.IServices/CardIntro/ICardIntroService.cs @@ -0,0 +1,13 @@ +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.CardIntro +{ + public interface ICardIntroService + { + /// + /// 查询优惠卡缓存 + /// + /// + Task GetCardIntroListAsync(); + } +} diff --git a/Znyc.CloudCar.IServices/Certification/ICertificationService.cs b/Znyc.CloudCar.IServices/Certification/ICertificationService.cs new file mode 100644 index 0000000..420d50a --- /dev/null +++ b/Znyc.CloudCar.IServices/Certification/ICertificationService.cs @@ -0,0 +1,28 @@ +using Znyc.CloudCar.Model.Dtos.Certification; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Certification +{ + public interface ICertificationService + { + /// + /// 查询实名认证信息 + /// + /// + Task GetAsync(); + + /// + /// 新增实名认证信息 + /// + /// + /// + Task AddAsync(CertificationAddInput certificationAddInput); + + /// + /// 更新实名认证信息 + /// + /// + /// + Task UpdateAsync(CertificationUpdateInput certificationUpdateInput); + } +} diff --git a/Znyc.CloudCar.IServices/Collection/ICollectionService.cs b/Znyc.CloudCar.IServices/Collection/ICollectionService.cs new file mode 100644 index 0000000..66ed8a3 --- /dev/null +++ b/Znyc.CloudCar.IServices/Collection/ICollectionService.cs @@ -0,0 +1,40 @@ +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Collection +{ + /// + /// 收藏服务接口 + /// + public interface ICollectionService + { + + /// + /// 分页查询收藏记录列表 + /// + /// + /// + /// + Task PageAsync(int currentPage, int pageSize); + + /// + /// 添加收藏 + /// + /// + /// + Task AddAsync(long equipmentId); + + /// + /// 取消收藏 + /// + /// + /// + Task CancelAsync(long equipmentId); + + /// + /// 是否收藏 + /// + /// + /// + Task IsCollection(long equipmentId); + } +} diff --git a/Znyc.CloudCar.IServices/Currency/ICurrencyRecordService.cs b/Znyc.CloudCar.IServices/Currency/ICurrencyRecordService.cs new file mode 100644 index 0000000..9658138 --- /dev/null +++ b/Znyc.CloudCar.IServices/Currency/ICurrencyRecordService.cs @@ -0,0 +1,24 @@ +using Znyc.CloudCar.Configuration; + +namespace Znyc.CloudCar.IServices.Currency +{ + /// + /// 用户云币记录服务 + /// + public interface ICurrencyRecordService + { + /// + /// 是否获取过手机号 + /// + /// 云币来源类型 + /// 产品id + /// + Task IsGetPhone(GlobalEnumVars.CurrencyType operatingType, long id); + + /// + /// 是否存在云币记录 + /// + /// + Task IsExistCurrencyRecord(long userId, int operatingType); + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.IServices/Currency/ICurrencyService.cs b/Znyc.CloudCar.IServices/Currency/ICurrencyService.cs new file mode 100644 index 0000000..865a57a --- /dev/null +++ b/Znyc.CloudCar.IServices/Currency/ICurrencyService.cs @@ -0,0 +1,87 @@ +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Currency +{ + /// + /// 用户云币服务 + /// + public interface ICurrencyService + { + /// + /// 总云币 + /// + /// + Task GetAsync(); + + /// + /// 云币账单 + /// + /// 0全部/1收入/2支出 + /// + /// + /// + Task PageAsync(int currencyType, int currentPage, int pageSize); + + /// + /// 首次登录加云币 + /// + /// + /// + Task AddCurrencyForFirstLogin(long userId); + + /// + /// 充值加云币 + /// + /// + /// + /// + /// + Task AddCurrencyByCharge(long userId, long orderId, int credits); + + /// + /// 邀请新用户加云币 + /// + /// + /// + /// + Task AddCurrencyForNewUsers(long userId, long receiveUserId); + + #region 设备 + /// + /// 刷新扣除云币 + /// + /// + /// + Task RefreshDeduct(long equipmentId); + + /// + /// 置顶扣除云币 + /// + /// + /// + Task TopDeduct(long equipmentId); + + /// + /// 获取电话扣除云币 + /// + /// + /// + Task GetPhoneDeduct(long equipmentId, int sellingPrice); + #endregion + + /// + /// 购买优惠卡赠送云币 + /// + /// + /// + /// + /// + Task AddCurrencyByBuyCard(long userId, long orderId, int credits); + + + Task ShareAsync(string shareType, long userId); + + + + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.IServices/Dictionary/IDictionaryService.cs b/Znyc.CloudCar.IServices/Dictionary/IDictionaryService.cs new file mode 100644 index 0000000..a240ceb --- /dev/null +++ b/Znyc.CloudCar.IServices/Dictionary/IDictionaryService.cs @@ -0,0 +1,31 @@ +using Znyc.CloudCar.Model.Dtos.Dictionary; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Dictionary +{ + public interface IDictionaryService + { + /// + /// 根据Id获取字典 + /// + /// + /// + Task GetByIdAsync(long id); + + /// + /// 根据ParentId查询数据字典列表 + /// + /// + /// + Task GetListByParentIdAsync(long pid); + + + + /// + /// 根据ParentId,Code查询数据字典列表 + /// + /// + /// + Task GetListByCodeAsync(long parentId, string code); + } +} diff --git a/Znyc.CloudCar.IServices/Document/IDocumentService.cs b/Znyc.CloudCar.IServices/Document/IDocumentService.cs new file mode 100644 index 0000000..7fd0098 --- /dev/null +++ b/Znyc.CloudCar.IServices/Document/IDocumentService.cs @@ -0,0 +1,14 @@ +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Document +{ + public interface IDocumentService + { + + /// + /// 上传图片 + /// + /// + ResponseOutput UploadImageAsync(); + } +} diff --git a/Znyc.CloudCar.IServices/Equipment/IEquipmentService.cs b/Znyc.CloudCar.IServices/Equipment/IEquipmentService.cs new file mode 100644 index 0000000..a01753c --- /dev/null +++ b/Znyc.CloudCar.IServices/Equipment/IEquipmentService.cs @@ -0,0 +1,116 @@ +using Znyc.CloudCar.Model.Dtos.Equipment; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Equipment +{ + /// + /// 设备信息服务 + /// + public interface IEquipmentService + { + /// + /// 新增设备信息 + /// + /// + /// + Task AddAsync(EquipmentAddInput input); + + /// + /// 编辑设备信息 + /// + /// + /// + Task UpdateAsync(EquipmentUpdateInput input); + + /// + /// 根据Id获取设备信息 + /// + /// + /// + Task GetAsync(long id); + + /// + /// 分页查询设备列表 + /// + /// + /// + /// + /// + /// + /// + /// + Task PageAsync(string? key, long categoryId, + long brandId, long yearId, int currentPage, int pageSize); + + /// + /// 刷新设备信息 + /// + /// + /// + Task RefreshAsync(long id); + + /// + /// 置顶设备信息 + /// + /// + /// + Task TopAsync(long id); + + /// + /// 取消置顶设备信息 + /// + /// + Task CancelTopAsync(); + + /// + /// 更改设备信息状态 + /// + /// + /// 招聘状态 + /// + Task UpdateStateAsync(long id, int state); + + /// + /// 是否公开设备信息 + /// + /// + /// + /// + Task IsPublicAsync(long id, bool isPublic); + + /// + /// 获取手机号码 + /// + /// + /// + Task GetPhoneAsync(long id); + + /// + /// 同步浏览量 + /// + /// + Task PageViewAsync(); + + /// + /// 我的设备信息 + /// + /// + /// + /// + /// + Task MyEquipmentPageAsync( + int state, int currentPage, int pageSize); + + /// + /// 根据UserId查询设备信息 + /// + /// + /// + /// + /// + Task GetEquipmentByUserIdAsync(long userId, int currentPage, int pageSize); + + + Task GetLastEquipmentAsync(); + } +} diff --git a/Znyc.CloudCar.IServices/EquipmentPicture/IEquipmentPictureService.cs b/Znyc.CloudCar.IServices/EquipmentPicture/IEquipmentPictureService.cs new file mode 100644 index 0000000..8523289 --- /dev/null +++ b/Znyc.CloudCar.IServices/EquipmentPicture/IEquipmentPictureService.cs @@ -0,0 +1,17 @@ +using Znyc.CloudCar.Model.Dtos.EquipmentPicture; + +namespace Znyc.CloudCar.IServices.EquipmentPicture +{ + /// + /// 设备信息图片服务 + /// + public interface IEquipmentPictureService + { + /// + /// 查询设备图片 + /// + /// + /// + Task> GetListAsync(long id); + } +} diff --git a/Znyc.CloudCar.IServices/Feedback/IFeedbackService.cs b/Znyc.CloudCar.IServices/Feedback/IFeedbackService.cs new file mode 100644 index 0000000..c8bf9d7 --- /dev/null +++ b/Znyc.CloudCar.IServices/Feedback/IFeedbackService.cs @@ -0,0 +1,15 @@ +using Znyc.CloudCar.Model.Dtos.Feedback; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Feedback +{ + public interface IFeedbackService + { + /// + /// 新增意见反馈 + /// + /// + /// + Task AddFeedbackAsync(FeedbackAddInput input); + } +} diff --git a/Znyc.CloudCar.IServices/Login/ILoginLogsService.cs b/Znyc.CloudCar.IServices/Login/ILoginLogsService.cs new file mode 100644 index 0000000..51a195b --- /dev/null +++ b/Znyc.CloudCar.IServices/Login/ILoginLogsService.cs @@ -0,0 +1,9 @@ +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Login +{ + public interface ILoginLogsService + { + Task AddAsync(string userName, bool status, string result, string city, long userId); + } +} diff --git a/Znyc.CloudCar.IServices/Login/ILoginService.cs b/Znyc.CloudCar.IServices/Login/ILoginService.cs new file mode 100644 index 0000000..2d95106 --- /dev/null +++ b/Znyc.CloudCar.IServices/Login/ILoginService.cs @@ -0,0 +1,15 @@ +using Znyc.CloudCar.Model.Dtos.Login; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Login +{ + public interface ILoginService + { + /// + /// 登陆 + /// + /// + /// + Task LoginAsync(LoginInput loginInput); + } +} diff --git a/Znyc.CloudCar.IServices/Message/IMessageLogService.cs b/Znyc.CloudCar.IServices/Message/IMessageLogService.cs new file mode 100644 index 0000000..b867b86 --- /dev/null +++ b/Znyc.CloudCar.IServices/Message/IMessageLogService.cs @@ -0,0 +1,6 @@ +namespace Znyc.CloudCar.IServices.Message +{ + public interface IMessageLogService + { + } +} diff --git a/Znyc.CloudCar.IServices/Message/IMessageService.cs b/Znyc.CloudCar.IServices/Message/IMessageService.cs new file mode 100644 index 0000000..40fb447 --- /dev/null +++ b/Znyc.CloudCar.IServices/Message/IMessageService.cs @@ -0,0 +1,33 @@ +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Message +{ + public interface IMessageService + { + /// + /// 查询消息通知列表 + /// + /// + /// + /// + Task PageAsync(int currentPage, int pageSize); + + /// + /// 已读消息记录 + /// + /// + Task UpdateAsync(); + + /// + /// 未读提示 + /// + /// + Task UnreadMessage(); + + /// + /// 获取新用户滚动播放列表 + /// + /// + Task GetRegistUserListAsync(); + } +} diff --git a/Znyc.CloudCar.IServices/Order/IOrderDetailService.cs b/Znyc.CloudCar.IServices/Order/IOrderDetailService.cs new file mode 100644 index 0000000..61798f0 --- /dev/null +++ b/Znyc.CloudCar.IServices/Order/IOrderDetailService.cs @@ -0,0 +1,6 @@ +namespace Znyc.CloudCar.IServices.Order +{ + public interface IOrderDetailService + { + } +} diff --git a/Znyc.CloudCar.IServices/Order/IOrderService.cs b/Znyc.CloudCar.IServices/Order/IOrderService.cs new file mode 100644 index 0000000..0064f63 --- /dev/null +++ b/Znyc.CloudCar.IServices/Order/IOrderService.cs @@ -0,0 +1,6 @@ +namespace Znyc.CloudCar.IServices.Order +{ + public interface IOrderService + { + } +} diff --git a/Znyc.CloudCar.IServices/PaymentRecord/IPaymentRecordService.cs b/Znyc.CloudCar.IServices/PaymentRecord/IPaymentRecordService.cs new file mode 100644 index 0000000..3e4294c --- /dev/null +++ b/Znyc.CloudCar.IServices/PaymentRecord/IPaymentRecordService.cs @@ -0,0 +1,6 @@ +namespace Znyc.CloudCar.IServices.PaymentRecord +{ + public interface IPaymentRecordService + { + } +} diff --git a/Znyc.CloudCar.IServices/Recharge/IRechargeService.cs b/Znyc.CloudCar.IServices/Recharge/IRechargeService.cs new file mode 100644 index 0000000..5ca5958 --- /dev/null +++ b/Znyc.CloudCar.IServices/Recharge/IRechargeService.cs @@ -0,0 +1,13 @@ +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.Recharge +{ + public interface IRechargeService + { + /// + /// 查询充值活动详情 + /// + /// + Task GetAsync(); + } +} diff --git a/Znyc.CloudCar.IServices/User/IUserCardService.cs b/Znyc.CloudCar.IServices/User/IUserCardService.cs new file mode 100644 index 0000000..82c439c --- /dev/null +++ b/Znyc.CloudCar.IServices/User/IUserCardService.cs @@ -0,0 +1,22 @@ +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.User +{ + public interface IUserCardService + { + /// + /// 新增信息 + /// + /// + /// + /// + /// + Task AddUserCardAsync(long userId, long cardId, int time); + + /// + /// 优惠卡到期禁用 + /// + /// + Task UpdateUserCardAsync(); + } +} diff --git a/Znyc.CloudCar.IServices/User/IUserService.cs b/Znyc.CloudCar.IServices/User/IUserService.cs new file mode 100644 index 0000000..a638e42 --- /dev/null +++ b/Znyc.CloudCar.IServices/User/IUserService.cs @@ -0,0 +1,42 @@ +using Znyc.CloudCar.Model.Dtos.User; +using Znyc.CloudCar.Model.Entities; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.IServices.User +{ + public interface IUserService + { + /// + /// 新增用户 + /// + /// + /// + /// + Task AddUserAsync(WxUnifyUserAddInput wxUnifyUserAddInput, string openId, string unionId); + + + /// + /// 根据Id获取用户信息 + /// + /// + Task GetUserAsync(); + + Task GetUserByIdAsync(long id); + + + + /// + /// 修改用户信息 + /// + /// + /// + Task UpdateAsync(UserUpdateInput userUpdateInput); + + /// + /// 获取当前用户信息 + /// + /// + Task GetUserInfoAsync(); + + } +} diff --git a/Znyc.CloudCar.IServices/User/IWxUnifyUserService.cs b/Znyc.CloudCar.IServices/User/IWxUnifyUserService.cs new file mode 100644 index 0000000..7ad9ff3 --- /dev/null +++ b/Znyc.CloudCar.IServices/User/IWxUnifyUserService.cs @@ -0,0 +1,9 @@ +using Znyc.CloudCar.Model.Dtos.User; + +namespace Znyc.CloudCar.IServices.User +{ + public interface IWxUnifyUserService + { + Task AddOrUpdateAsync(WxUnifyUserAddInput input, string unionId); + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.IServices/Znyc.CloudCar.IServices.csproj b/Znyc.CloudCar.IServices/Znyc.CloudCar.IServices.csproj new file mode 100644 index 0000000..398e10e --- /dev/null +++ b/Znyc.CloudCar.IServices/Znyc.CloudCar.IServices.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/Znyc.CloudCar.Loging/Znyc.CloudCar.Loging.csproj b/Znyc.CloudCar.Loging/Znyc.CloudCar.Loging.csproj new file mode 100644 index 0000000..ff689a2 --- /dev/null +++ b/Znyc.CloudCar.Loging/Znyc.CloudCar.Loging.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/Znyc.CloudCar.Mapster/Znyc.CloudCar.Mapster.csproj b/Znyc.CloudCar.Mapster/Znyc.CloudCar.Mapster.csproj new file mode 100644 index 0000000..8e93c15 --- /dev/null +++ b/Znyc.CloudCar.Mapster/Znyc.CloudCar.Mapster.csproj @@ -0,0 +1,13 @@ + + + + net6.0 + enable + enable + + + + + + + diff --git a/Znyc.CloudCar.Middlewares/ExceptionHandlerMid.cs b/Znyc.CloudCar.Middlewares/ExceptionHandlerMid.cs new file mode 100644 index 0000000..c8d6d75 --- /dev/null +++ b/Znyc.CloudCar.Middlewares/ExceptionHandlerMid.cs @@ -0,0 +1,56 @@ +using Microsoft.AspNetCore.Http; +using Newtonsoft.Json; +using System.Net; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Middlewares +{ + /// + /// 异常错误统一返回记录 + /// + public class ExceptionHandlerMid + { + private readonly RequestDelegate _next; + + + public ExceptionHandlerMid(RequestDelegate next) + { + _next = next; + } + + public async Task Invoke(HttpContext context) + { + try + { + await _next(context); + } + catch (Exception ex) + { + await HandleExceptionAsync(context, ex); + } + } + + private async Task HandleExceptionAsync(HttpContext context, Exception ex) + { + if (ex == null) return; + + + await WriteExceptionAsync(context, ex).ConfigureAwait(false); + } + + private static async Task WriteExceptionAsync(HttpContext context, Exception e) + { + if (e is UnauthorizedAccessException) + context.Response.StatusCode = (int)HttpStatusCode.Unauthorized; + else if (e is Exception) + context.Response.StatusCode = (int)HttpStatusCode.BadRequest; + + context.Response.ContentType = "application/json"; + var ro = new ResponseOutput(); + ro.Successed = false; + ro.Data = e; + ro.Msg = "全局数据异常"; + await context.Response.WriteAsync(JsonConvert.SerializeObject(ro)).ConfigureAwait(false); + } + } +} diff --git a/Znyc.CloudCar.Middlewares/IPLogMildd.cs b/Znyc.CloudCar.Middlewares/IPLogMildd.cs new file mode 100644 index 0000000..03dffd3 --- /dev/null +++ b/Znyc.CloudCar.Middlewares/IPLogMildd.cs @@ -0,0 +1,87 @@ +using Microsoft.AspNetCore.Http; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Middlewares +{ + /// + /// 中间件 + /// 记录IP请求数据 + /// + public class IPLogMildd + { + /// + /// + /// + private readonly RequestDelegate _next; + /// + /// + /// + /// + public IPLogMildd(RequestDelegate next) + { + _next = next; + } + + public async Task InvokeAsync(HttpContext context) + { + if (AppSettingsConstVars.MiddlewareIpLogEnabled) + { + // 过滤，只有接口 + if (context.Request.Path.Value != null && (context.Request.Path.Value.Contains("api") || context.Request.Path.Value.Contains("Api"))) + { + context.Request.EnableBuffering(); + try + { + // 存储请求数据 + var dt = DateTime.Now; + var request = context.Request; + //var requestInfo = JsonConvert.SerializeObject(new RequestInfo() + //{ + // Ip = GetClientIp(context), + // Url = request.Path.ObjectToString().TrimEnd('/').ToLower(), + // Datetime = dt.ToString("yyyy-MM-dd HH:mm:ss"), + // Date = dt.ToString("yyyy-MM-dd"), + // Week = CommonHelper.GetWeek(), + //}); + + //if (!string.IsNullOrEmpty(requestInfo)) + //{ + // Parallel.For(0, 1, e => + // { + // LogLockHelper.OutSql2Log("RequestIpInfoLog", "RequestIpInfoLog" + dt.ToString("yyyy-MM-dd-HH"), new string[] { requestInfo + "," }, false); + // }); + // request.Body.Position = 0; + //} + await _next(context); + } + catch (Exception) + { + } + } + else + { + await _next(context); + } + } + else + { + await _next(context); + } + } + + public static string GetClientIp(HttpContext context) + { + var ip = context.Request.Headers["X-Forwarded-For"].ObjectToString(); + if (string.IsNullOrEmpty(ip)) + { + if (context.Connection.RemoteIpAddress != null) + { + ip = context.Connection.RemoteIpAddress.MapToIPv4().ObjectToString(); + } + } + return ip; + } + + } +} diff --git a/Znyc.CloudCar.Middlewares/MiddlewareHelpers.cs b/Znyc.CloudCar.Middlewares/MiddlewareHelpers.cs new file mode 100644 index 0000000..5808790 --- /dev/null +++ b/Znyc.CloudCar.Middlewares/MiddlewareHelpers.cs @@ -0,0 +1,76 @@ + +using Microsoft.AspNetCore.Builder; + +namespace Znyc.CloudCar.Middlewares +{ + /// + /// 中间件 + /// + public static class MiddlewareHelpers + { + /// + /// 请求响应中间件 + /// + /// + /// + public static IApplicationBuilder UseRequestResponseLog(this IApplicationBuilder app) + { + return app.UseMiddleware(); + } + + + /// + /// 异常处理中间件（后端模式） + /// + /// + /// + public static IApplicationBuilder UseExceptionHandlerMiddForAdmin(this IApplicationBuilder app) + { + return app.UseMiddleware(); + } + + /// + /// 异常处理中间件（客户端） + /// + /// + /// + public static IApplicationBuilder UseExceptionHandlerMiddForClent(this IApplicationBuilder app) + { + return app.UseMiddleware(); + } + + /// + /// SignalR中间件 + /// + /// + /// + public static IApplicationBuilder UseSignalRSendMildd(this IApplicationBuilder app) + { + return app.UseMiddleware(); + } + + + + /// + /// IP请求中间件 + /// + /// + /// + public static IApplicationBuilder UseIpLogMildd(this IApplicationBuilder app) + { + return app.UseMiddleware(); + } + + + /// + /// 用户访问接口日志中间件 + /// + /// + /// + public static IApplicationBuilder UseRecordAccessLogsMildd(this IApplicationBuilder app) + { + return app.UseMiddleware(); + } + + } +} diff --git a/Znyc.CloudCar.Middlewares/RecordAccessLogsMildd.cs b/Znyc.CloudCar.Middlewares/RecordAccessLogsMildd.cs new file mode 100644 index 0000000..274b023 --- /dev/null +++ b/Znyc.CloudCar.Middlewares/RecordAccessLogsMildd.cs @@ -0,0 +1,158 @@ + +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using System.Diagnostics; +using System.Text; +using System.Web; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Middlewares +{ + /// + /// 中间件 + /// 记录用户方访问数据 + /// + public class RecordAccessLogsMildd + { + /// + /// + /// + private readonly RequestDelegate _next; + private readonly IHttpContextUser _user; + + private readonly ILogger _logger; + private readonly Stopwatch _stopwatch; + + /// + /// 构造 + /// + /// + /// + /// + public RecordAccessLogsMildd(RequestDelegate next, IHttpContextUser user, ILogger logger) + { + _next = next; + _user = user; + _logger = logger; + _stopwatch = new Stopwatch(); + } + + public async Task InvokeAsync(HttpContext context) + { + if (AppSettingsConstVars.MiddlewareRecordAccessLogsEnabled) + { + var api = context.Request.Path.ObjectToString().TrimEnd('/').ToLower(); + var ignoreApis = AppSettingsConstVars.MiddlewareRecordAccessLogsIgnoreApis; + + // 过滤，只有接口 + if (api.Contains("api") && !ignoreApis.Contains(api)) + { + _stopwatch.Restart(); + var userAccessModel = new UserAccessModel(); + + HttpRequest request = context.Request; + + userAccessModel.API = api; + userAccessModel.User = _user.UserName; + userAccessModel.IP = IPLogMildd.GetClientIp(context); + userAccessModel.BeginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + userAccessModel.RequestMethod = request.Method; + userAccessModel.Agent = request.Headers["User-Agent"].ObjectToString(); + + + // 获取请求body内容 + if (request.Method.ToLower().Equals("post") || request.Method.ToLower().Equals("put")) + { + // 启用倒带功能，就可以让 Request.Body 可以再次读取 + request.EnableBuffering(); + + Stream stream = request.Body; + byte[] buffer = new byte[request.ContentLength.Value]; + stream.Read(buffer, 0, buffer.Length); + userAccessModel.RequestData = Encoding.UTF8.GetString(buffer); + + request.Body.Position = 0; + } + else if (request.Method.ToLower().Equals("get") || request.Method.ToLower().Equals("delete")) + { + userAccessModel.RequestData = HttpUtility.UrlDecode(request.QueryString.ObjectToString(), Encoding.UTF8); + } + + // 获取Response.Body内容 + var originalBodyStream = context.Response.Body; + using (var responseBody = new MemoryStream()) + { + context.Response.Body = responseBody; + + await _next(context); + + var responseBodyData = await GetResponse(context.Response); + + await responseBody.CopyToAsync(originalBodyStream); + } + + + var dt = DateTime.Now; + + // 响应完成记录时间和存入日志 + context.Response.OnCompleted(() => + { + _stopwatch.Stop(); + + userAccessModel.OPTime = _stopwatch.ElapsedMilliseconds + "ms"; + + // 自定义log输出 + var requestInfo = JsonConvert.SerializeObject(userAccessModel); + Parallel.For(0, 1, e => + { + // LogLockHelper.OutSql2Log("RecordAccessLogs", "RecordAccessLogs" + dt.ToString("yyyy-MM-dd-HH"), new string[] { requestInfo + "," }, false); + }); + + return Task.CompletedTask; + }); + + } + else + { + await _next(context); + } + } + else + { + await _next(context); + } + } + + + /// + /// 获取响应内容 + /// + /// + /// + public async Task GetResponse(HttpResponse response) + { + response.Body.Seek(0, SeekOrigin.Begin); + var text = await new StreamReader(response.Body).ReadToEndAsync(); + response.Body.Seek(0, SeekOrigin.Begin); + return text; + } + } + + public class UserAccessModel + { + public string User { get; set; } + public string IP { get; set; } + public string API { get; set; } + public string BeginTime { get; set; } + public string OPTime { get; set; } + public string RequestMethod { get; set; } + public string RequestData { get; set; } + public string Agent { get; set; } + + } + +} + diff --git a/Znyc.CloudCar.Middlewares/RequRespLogMildd.cs b/Znyc.CloudCar.Middlewares/RequRespLogMildd.cs new file mode 100644 index 0000000..d824d06 --- /dev/null +++ b/Znyc.CloudCar.Middlewares/RequRespLogMildd.cs @@ -0,0 +1,109 @@ +using Microsoft.AspNetCore.Http; +using System.Text.RegularExpressions; +using Znyc.CloudCar.Configuration; + +namespace Znyc.CloudCar.Middlewares +{ + /// + /// 中间件 + /// 记录请求和响应数据 + /// + public class RequRespLogMildd + { + /// + /// + /// + private readonly RequestDelegate _next; + /// + /// + /// + /// + public RequRespLogMildd(RequestDelegate next) + { + _next = next; + } + + public async Task InvokeAsync(HttpContext context) + { + if (AppSettingsConstVars.MiddlewareRequestResponseLogEnabled) + { + // 过滤，只有接口 + if (context.Request.Path.Value.Contains("api") || context.Request.Path.Value.Contains("Api")) + { + context.Request.EnableBuffering(); + Stream originalBody = context.Response.Body; + try + { + // 存储请求数据 + await RequestDataLog(context); + + using (var ms = new MemoryStream()) + { + context.Response.Body = ms; + + await _next(context); + + // 存储响应数据 + ResponseDataLog(context.Response, ms); + + ms.Position = 0; + await ms.CopyToAsync(originalBody); + } + } + catch (Exception) + { + // 记录异常 + //ErrorLogData(context.Response, ex); + } + finally + { + context.Response.Body = originalBody; + } + } + else + { + await _next(context); + } + } + else + { + await _next(context); + } + } + + private async Task RequestDataLog(HttpContext context) + { + var request = context.Request; + var sr = new StreamReader(request.Body); + + var content = $" QueryData:{request.Path + request.QueryString}\r\n BodyData:{await sr.ReadToEndAsync()}"; + + if (!string.IsNullOrEmpty(content)) + { + Parallel.For(0, 1, e => + { + // LogLockHelper.OutSql2Log("RequestResponseLog", "RequestResponseLog" + DateTime.Now.ToString("yyyy-MM-dd-HH"), new string[] { "Request Data:", content }); + + }); + + request.Body.Position = 0; + } + } + + private void ResponseDataLog(HttpResponse response, MemoryStream ms) + { + ms.Position = 0; + var ResponseBody = new StreamReader(ms).ReadToEnd(); + // 去除 Html + var reg = "<[^>]+>"; + var isHtml = Regex.IsMatch(ResponseBody, reg); + if (!string.IsNullOrEmpty(ResponseBody)) + { + Parallel.For(0, 1, e => + { + //LogLockHelper.OutSql2Log("RequestResponseLog", "RequestResponseLog" + DateTime.Now.ToString("yyyy-MM-dd-HH"), new string[] { "Response Data:", ResponseBody }); + }); + } + } + } +} diff --git a/Znyc.CloudCar.Middlewares/SignalRSendMildd.cs b/Znyc.CloudCar.Middlewares/SignalRSendMildd.cs new file mode 100644 index 0000000..6a924df --- /dev/null +++ b/Znyc.CloudCar.Middlewares/SignalRSendMildd.cs @@ -0,0 +1,39 @@ +using Microsoft.AspNetCore.Http; + +namespace Znyc.CloudCar.Middlewares +{ + /// + /// 中间件 + /// SignalR发送数据 + /// + public class SignalRSendMildd + { + /// + /// + /// + private readonly RequestDelegate _next; + // private readonly IHubContext _hubContext; + + /// + /// + /// + /// + /// + public SignalRSendMildd(RequestDelegate next) + { + _next = next; + } + + + + public async Task InvokeAsync(HttpContext context) + { + + + + + await _next(context); + } + + } +} diff --git a/Znyc.CloudCar.Middlewares/Znyc.CloudCar.Middlewares.csproj b/Znyc.CloudCar.Middlewares/Znyc.CloudCar.Middlewares.csproj new file mode 100644 index 0000000..1236d5b --- /dev/null +++ b/Znyc.CloudCar.Middlewares/Znyc.CloudCar.Middlewares.csproj @@ -0,0 +1,21 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + + diff --git a/Znyc.CloudCar.Model/Dtos/Auth/BaiduAccessTokenOutput.cs b/Znyc.CloudCar.Model/Dtos/Auth/BaiduAccessTokenOutput.cs new file mode 100644 index 0000000..9891db7 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Auth/BaiduAccessTokenOutput.cs @@ -0,0 +1,18 @@ +namespace Znyc.CloudCar.Model.Dtos.Auth +{ + /// + /// 百度token + /// + public class BaiduAccessTokenOutput + { + public string refresh_token { get; set; } + + public string expires_in { get; set; } + + public string session_key { get; set; } + + public string access_token { get; set; } + + public string scope { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Auth/WxAccessTokenOutput.cs b/Znyc.CloudCar.Model/Dtos/Auth/WxAccessTokenOutput.cs new file mode 100644 index 0000000..04b9e26 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Auth/WxAccessTokenOutput.cs @@ -0,0 +1,13 @@ +namespace Znyc.CloudCar.Model.Dtos.Auth +{ + public class WxAccessTokenOutput + { + public string access_token { get; set; } + + public string expires_in { get; set; } + + public string errcode { get; set; } + + public string errmsg { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Banner/BannerListOutput.cs b/Znyc.CloudCar.Model/Dtos/Banner/BannerListOutput.cs new file mode 100644 index 0000000..ca7f0b7 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Banner/BannerListOutput.cs @@ -0,0 +1,30 @@ +namespace Znyc.CloudCar.Model.Dtos.Banner +{ + public class BannerListOutput + { + /// + /// 图片URL + /// + public string PicUrl { get; set; } + + /// + /// 排序 + /// + public int Sort { get; set; } + + /// + /// 跳转页面 + /// + public string PageUrl { get; set; } + + /// + /// Banner类型 + /// + public int Type { get; set; } + + /// + /// 电话 + /// + public string Phone { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Browse/BrowseListOutput.cs b/Znyc.CloudCar.Model/Dtos/Browse/BrowseListOutput.cs new file mode 100644 index 0000000..8d92e30 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Browse/BrowseListOutput.cs @@ -0,0 +1,64 @@ +using Znyc.CloudCar.Model.Dtos.EquipmentPicture; + +namespace Znyc.CloudCar.Model.Dtos.Browse +{ + public class BrowseListOutput + { + public long Id { get; set; } + + public long UserId { get; set; } + + /// + /// 标题 + /// + public string Title { get; set; } + + /// + /// 设备介绍 + /// + public string Introduction { get; set; } + + /// + /// 出售价格 + /// + public decimal SellingPrice { get; set; } + + /// + /// 车辆位置 + /// + public string AutomobileLocation { get; set; } + + + /// + /// 联系电话 + /// + public string ContactPhone { get; set; } + + /// + /// 姓名 + /// + public string UserName { get; set; } + + /// + /// 头像 + /// + public string AvatarUrl { get; set; } + + /// + /// 是否获取电话 + /// + public bool IsGetPhone { get; set; } + + /// + /// 车辆图片 + /// + public List EquipmentPictures { get; set; } + + /// + /// 获取电话云币 + /// + public int CallPhoneCurrency { get; set; } + + public int State { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/CardIntro/CardIntroOutput.cs b/Znyc.CloudCar.Model/Dtos/CardIntro/CardIntroOutput.cs new file mode 100644 index 0000000..98da015 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/CardIntro/CardIntroOutput.cs @@ -0,0 +1,65 @@ +namespace Znyc.CloudCar.Model.Dtos.CardIntro +{ + public class CardIntroOutput + { + public long Id { get; set; } + + /// + /// 卡名称 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“ApiUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string CardName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“ApiUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 卡价值 + /// + public int CardValue { get; set; } + + /// + /// 赠送价值 + /// + public int SendValue { get; set; } + + /// + /// 时效 + /// + public int Aging { get; set; } + + /// + /// 时效描述 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthKey”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string AgingDesc { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthKey”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 免费次数 + /// + public int FreeNumber { get; set; } + + /// + /// 卡描述 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthValue”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Description { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthValue”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 赠送描述 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthValue”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string SendDesc { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthValue”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 排序 + /// + public int Sort { get; set; } + + /// + /// 状态 + /// + public int State { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Certification/CertificationAddInput.cs b/Znyc.CloudCar.Model/Dtos/Certification/CertificationAddInput.cs new file mode 100644 index 0000000..24b7caa --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Certification/CertificationAddInput.cs @@ -0,0 +1,46 @@ +using System.ComponentModel.DataAnnotations; + +namespace Znyc.CloudCar.Model.Dtos.Certification +{ + /// + /// 实名认证信息输入实体 + /// + public class CertificationAddInput + { + /// + /// 姓名 + /// + [Required(ErrorMessage = "姓名")] + public string Name { get; set; } + + /// + /// 性别 + /// + [Required(ErrorMessage = "性别")] + public string Gender { get; set; } + + /// + /// 身份证号码 + /// + [Required(ErrorMessage = "身份证号码")] + public string IdCard { get; set; } + + /// + /// 签发地址 + /// + [Required(ErrorMessage = "签发地址")] + public string IssuedAddress { get; set; } + + /// + /// 身份证正面照片 + /// + [Required(ErrorMessage = "请上传身份证正/反面照片")] + public string PositivePhoto { get; set; } + + /// + /// 身份证反面照片 + /// + [Required(ErrorMessage = "请上传身份证正/反面照片")] + public string ReversePhoto { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Certification/CertificationOutput.cs b/Znyc.CloudCar.Model/Dtos/Certification/CertificationOutput.cs new file mode 100644 index 0000000..afd9239 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Certification/CertificationOutput.cs @@ -0,0 +1,48 @@ +namespace Znyc.CloudCar.Model.Dtos.Certification +{ + /// + /// 实名认证输出实体 + /// + public class CertificationOutput + { + /// + /// Id + /// + public long Id { get; set; } + + /// + /// 用户姓名 + /// + public string Name { get; set; } + + /// + /// 性别 + /// + public string Gender { get; set; } + + /// + /// 证件号 + /// + public string IdCard { get; set; } + + /// + /// 签发地址 + /// + public string IssuedAddress { get; set; } + + /// + /// 身份证正面照片 + /// + public string PositivePhoto { get; set; } + + /// + /// 身份证反面照片 + /// + public string ReversePhoto { get; set; } + + /// + /// 状态 + /// + public int state { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Certification/CertificationUpdateInput.cs b/Znyc.CloudCar.Model/Dtos/Certification/CertificationUpdateInput.cs new file mode 100644 index 0000000..d81b73b --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Certification/CertificationUpdateInput.cs @@ -0,0 +1,11 @@ + +namespace Znyc.CloudCar.Model.Dtos.Certification +{ + /// + /// 修改实名认证信息输入实体 + /// + public class CertificationUpdateInput : CertificationAddInput + { + public long Id { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Collection/CollectionListOutput.cs b/Znyc.CloudCar.Model/Dtos/Collection/CollectionListOutput.cs new file mode 100644 index 0000000..7da7cc7 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Collection/CollectionListOutput.cs @@ -0,0 +1,63 @@ +using Znyc.CloudCar.Model.Dtos.EquipmentPicture; + +namespace Znyc.CloudCar.Model.Dtos.Collection +{ + public class CollectionListOutput + { + public long Id { get; set; } + + public long UserId { get; set; } + + /// + /// 标题 + /// + public string Title { get; set; } + + /// + /// 设备介绍 + /// + public string Introduction { get; set; } + + /// + /// 出售价格 + /// + public decimal SellingPrice { get; set; } + + /// + /// 车辆位置 + /// + public string AutomobileLocation { get; set; } + + /// + /// 联系电话 + /// + public string ContactPhone { get; set; } + + /// + /// 姓名 + /// + public string UserName { get; set; } + + /// + /// 头像 + /// + public string AvatarUrl { get; set; } + + /// + /// 是否获取电话 + /// + public bool IsGetPhone { get; set; } + + /// + /// 车辆图片 + /// + public List EquipmentPictures { get; set; } + + /// + /// 获取电话云币 + /// + public int CallPhoneCurrency { get; set; } + + public int State { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Currency/CurrencyAddInput.cs b/Znyc.CloudCar.Model/Dtos/Currency/CurrencyAddInput.cs new file mode 100644 index 0000000..780f1b7 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Currency/CurrencyAddInput.cs @@ -0,0 +1,28 @@ +namespace Znyc.CloudCar.Model.Dtos.Currency +{ + /// + /// 新增云币输入实体 + /// + public class CurrencyAddInput + { + /// + /// 用户Id + /// + public long UserId { get; set; } + + /// + /// 可用云币 + /// + public int AvailableCurrency { get; set; } + + /// + /// 正式云币 + /// + public int OfficialCurrency { get; set; } + + /// + /// 临时云币 + /// + public int TemporarylCurrency { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Dtos/Currency/CurrencyOutput.cs b/Znyc.CloudCar.Model/Dtos/Currency/CurrencyOutput.cs new file mode 100644 index 0000000..3497c1f --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Currency/CurrencyOutput.cs @@ -0,0 +1,30 @@ +namespace Znyc.CloudCar.Model.Dtos.Currency +{ + /// + /// 云币输出实体 + /// + public class CurrencyOutput + { + //public long Id { get; set; } + + /// + /// 用户Id + /// + public long UserId { get; set; } + + /// + /// 可用云币 + /// + public int AvailableCurrency { get; set; } + + /// + /// 正式云币 + /// + public int OfficialCurrency { get; set; } + + /// + /// 临时云币 + /// + public int TemporarylCurrency { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Dtos/Currency/CurrencyRecordListOutput.cs b/Znyc.CloudCar.Model/Dtos/Currency/CurrencyRecordListOutput.cs new file mode 100644 index 0000000..2e62455 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Currency/CurrencyRecordListOutput.cs @@ -0,0 +1,43 @@ +namespace Znyc.CloudCar.Model.Dtos.Currency +{ + public class CurrencyRecordListOutput + { + public string Month { get; set; } + + public List List { get; set; } + } + + public class CurrencyRecordOutput + { + public string Title { get; set; } + public string ScoreDescription { get; set; } + + public string ShortTime { get; set; } + + /// + /// 操作类型 + /// 1=增加/2=减少/99=冻结/ + /// + public int OperatingType { get; set; } + + /// + /// 云币来源类型 + /// + public int CurrencyType { get; set; } + + /// + /// 云币来源 + /// + public long CurrencySoureObjectId { get; set; } + + /// + /// 云币获取/消耗时间 + /// + public DateTime CreatedTime { get; set; } + + /// + /// 操作云币 + /// + public decimal OperatingCurrency { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Dtos/Currency/CurrencyUpdateInput.cs b/Znyc.CloudCar.Model/Dtos/Currency/CurrencyUpdateInput.cs new file mode 100644 index 0000000..69e9bab --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Currency/CurrencyUpdateInput.cs @@ -0,0 +1,10 @@ +namespace Znyc.CloudCar.Model.Dtos.Currency +{ + /// + /// 修改云币输入实体 + /// + public class CurrencyUpdateInput : CurrencyAddInput + { + public long Id { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Dtos/Currency/CurrenyListOutput.cs b/Znyc.CloudCar.Model/Dtos/Currency/CurrenyListOutput.cs new file mode 100644 index 0000000..1f8f51d --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Currency/CurrenyListOutput.cs @@ -0,0 +1,16 @@ +namespace Znyc.CloudCar.Model.Dtos.Currency +{ + public class CurrenyListOutput + { + public long UserId { get; set; } + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“UnionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string UnionId { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“UnionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 可用云币 + /// + public decimal AvailableCurrency { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Dictionary/DictionaryOutput.cs b/Znyc.CloudCar.Model/Dtos/Dictionary/DictionaryOutput.cs new file mode 100644 index 0000000..bec07b0 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Dictionary/DictionaryOutput.cs @@ -0,0 +1,27 @@ +namespace Znyc.CloudCar.Model.Dtos.Dictionary +{ + public class DictionaryOutput + { + public long Id { get; set; } + + /// + /// 父级Id + /// + public long ParentId { get; set; } + + /// + /// 字典编码 + /// + public string Code { get; set; } + + /// + /// 字典值 + /// + public string Value { get; set; } + + /// + /// 字典名称 + /// + public string Name { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Document/ImageOutput.cs b/Znyc.CloudCar.Model/Dtos/Document/ImageOutput.cs new file mode 100644 index 0000000..405262b --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Document/ImageOutput.cs @@ -0,0 +1,24 @@ +namespace Znyc.CloudCar.Model.Dtos.Document +{ + public class ImageOutput + { + public Credentials Credentials { get; set; } + + public string Expiration { get; set; } + + public int ExpiredTime { get; set; } + + public string RequestId { get; set; } + + public int StartTime { get; set; } + } + + public class Credentials + { + public string TmpSecretId { get; set; } + + public string TmpSecretKey { get; set; } + + public string Token { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Equipment/EquipmentAddInput.cs b/Znyc.CloudCar.Model/Dtos/Equipment/EquipmentAddInput.cs new file mode 100644 index 0000000..b840ba7 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Equipment/EquipmentAddInput.cs @@ -0,0 +1,113 @@ +using Znyc.CloudCar.Model.Dtos.EquipmentPicture; + +namespace Znyc.CloudCar.Model.Dtos.Equipment +{ + public class EquipmentAddInput + { + /// + /// 标题 + /// + public string Title { get; set; } + + /// + /// 设备类型 + /// + public long EquipmentType { get; set; } + + /// + /// 设备品牌 + /// + public long EquipmentBrand { get; set; } + + /// + /// 汽车底盘 + /// + public long AutomobileChassis { get; set; } + + /// + /// 臂架长度 + /// + public long BoomLength { get; set; } + + /// + /// 装载方量 + /// + public long ReprintVolume { get; set; } + + /// + /// 最大输送量 + /// + public long MaxTransportation { get; set; } + + /// + /// 设备型号 + /// + public string EquipmentModel { get; set; } + + /// + /// 设备吨位 + /// + public int EquipmentTonnage { get; set; } + + /// + /// 斗容 + /// + public int Capacity { get; set; } + + /// + /// 功率 + /// + public string Power { get; set; } + + /// + /// 设备介绍 + /// + public string Introduction { get; set; } + + /// + /// 出厂年份 + /// + public int AppearanceDate { get; set; } + + /// + /// 出售价格 + /// + public decimal SellingPrice { get; set; } + + /// + /// 车辆位置 + /// + public string AutomobileLocation { get; set; } + + /// + /// 联系人 + /// + public string Contact { get; set; } + + /// + /// 联系人电话 + /// + + public string ContactPhone { get; set; } + + + /// + /// 设备图片 + /// + public List EquipmentPictures { get; set; } + + + /// + /// 省 + /// + public long ProvinceId { get; set; } + + + + /// + /// 省 + /// + public long CityId { get; set; } + + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Equipment/EquipmentListOutput.cs b/Znyc.CloudCar.Model/Dtos/Equipment/EquipmentListOutput.cs new file mode 100644 index 0000000..16a78c2 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Equipment/EquipmentListOutput.cs @@ -0,0 +1,98 @@ +using Znyc.CloudCar.Model.Dtos.EquipmentPicture; + +namespace Znyc.CloudCar.Model.Dtos.Equipment +{ + public class EquipmentListOutput + { + public long Id { get; set; } + + /// + /// 标题 + /// + + public string Title { get; set; } + + + /// + /// 设备介绍 + /// + + public string Introduction { get; set; } + + + /// + /// 出售价格 + /// + public decimal SellingPrice { get; set; } + + /// + /// 车辆位置 + /// + + public string AutomobileLocation { get; set; } + + + /// + /// 联系人 + /// + + public string Contact { get; set; } + + + /// + /// 联系人电话 + /// + + public string ContactPhone { get; set; } + + + /// + /// 状态,10=出售中,11=审核中,30=未通过,40=已成交,99=未通过 + /// + public int State { get; set; } + + /// + /// 是否置顶 + /// + public bool IsTop { get; set; } + + /// + /// UserId + /// + public long UserId { get; set; } + + /// + /// 头像 + /// + + public string AvatarUrl { get; set; } + + + /// + /// 姓名 + /// + + public string UserName { get; set; } + + + public bool IsGetPhone { get; set; } + + /// + /// 设备图片 + /// + public List EquipmentPictures { get; set; } + + /// + /// 获取电话云币 + /// + public int CallPhoneCurrency { get; set; } + + + /// + /// 出厂时间 + /// + public int AppearanceDate { get; set; } + + + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Equipment/EquipmentOutput.cs b/Znyc.CloudCar.Model/Dtos/Equipment/EquipmentOutput.cs new file mode 100644 index 0000000..61de6c0 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Equipment/EquipmentOutput.cs @@ -0,0 +1,169 @@ +using Znyc.CloudCar.Model.Dtos.EquipmentPicture; + +namespace Znyc.CloudCar.Model.Dtos.Equipment +{ + public class EquipmentOutput : EquipmentListOutput + { + /// + /// 设备编号 + /// + public long EquipmentNumber { get; set; } + + /// + /// 设备类型 + /// + public long EquipmentType { get; set; } + + /// + /// 设备类型名称 + /// + + public string CategoryName { get; set; } + + + /// + /// 设备品牌 + /// + public long EquipmentBrand { get; set; } + + /// + /// 设备品牌名称 + /// + + public string BrandName { get; set; } + + + /// + /// 汽车底盘 + /// + public long AutomobileChassis { get; set; } + + /// + /// 汽车底盘名称 + /// + + public string AutomobileChassisName { get; set; } + + + /// + /// 臂架长度 + /// + public long BoomLength { get; set; } + + /// + /// 臂架长度 + /// + public string BoomLengthName { get; set; } + + /// + /// 装载方量 + /// + public long ReprintVolume { get; set; } + + /// + /// 装载方量 + /// + + public string ReprintVolumeName { get; set; } + + + /// + /// 最大输送量 + /// + public long MaxTransportation { get; set; } + + /// + /// 最大输送量 + /// + public string MaxTransportationName { get; set; } + + /// + /// 设备型号 + /// + + public string EquipmentModel { get; set; } + + + /// + /// 设备吨位 + /// + public int EquipmentTonnage { get; set; } + + /// + /// 斗容 + /// + public int Capacity { get; set; } + + /// + /// 功率 + /// + public string Power { get; set; } + + /// + /// 出厂年份 + /// + public long AppearanceDate { get; set; } + + + /// + /// 发布时间 + /// + public DateTime CreatedTime { get; set; } + + /// + /// 是否公开 + /// + public bool IsPublic { get; set; } + + /// + /// 浏览量 + /// + public int PageView { get; set; } + + /// + /// 设备信息图片 + /// + + public List equipmentPictures { get; set; } + + + /// + /// 行驶证图片 + /// + public List DriverLicense { get; set; } + + /// + /// 是否收藏 + /// + public bool IsCollection { get; set; } + + /// + /// 是否获取过手机号 + /// + public bool IsGetPhone { get; set; } + + /// + /// 发布日期 + /// + + public string ReleaseDate { get; set; } + + + /// + /// 驾驶证信息图片 + /// + + public List DriverLicensePictures { get; set; } + + /// + /// 省 + /// + public long ProvinceId { get; set; } + + + /// + /// 市 + /// + public long CityId { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Equipment/EquipmentUpdateInput.cs b/Znyc.CloudCar.Model/Dtos/Equipment/EquipmentUpdateInput.cs new file mode 100644 index 0000000..a5361af --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Equipment/EquipmentUpdateInput.cs @@ -0,0 +1,7 @@ +namespace Znyc.CloudCar.Model.Dtos.Equipment +{ + public class EquipmentUpdateInput : EquipmentAddInput + { + public long Id { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Equipment/MyEquipmentListOutput.cs b/Znyc.CloudCar.Model/Dtos/Equipment/MyEquipmentListOutput.cs new file mode 100644 index 0000000..ee95161 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Equipment/MyEquipmentListOutput.cs @@ -0,0 +1,79 @@ +using Znyc.CloudCar.Model.Dtos.EquipmentPicture; + +namespace Znyc.CloudCar.Model.Dtos.Equipment +{ + public class MyEquipmentListOutput + { + public long Id { get; set; } + + /// + /// 状态 + /// + public int state { get; set; } + + /// + /// 标题 + /// + public string Title { get; set; } + + /// + /// 设备介绍 + /// + public string Introduction { get; set; } + + /// + /// 出售价格 + /// + public double SellingPrice { get; set; } + + /// + /// 车辆位置 + /// + public string AutomobileLocation { get; set; } + + /// + /// 设备图片 + /// + public List EquipmentPictures { get; set; } + + /// + /// 刷新时间 + /// + public DateTime RefreshDate { get; set; } + + /// + /// 是否置顶 + /// + public bool IsTop { get; set; } + + /// + /// 是否公开 + /// + public bool IsPublic { get; set; } + + /// + /// 审核结果 + /// + public string Note { get; set; } + + /// + /// 审核时间 + /// + public DateTime AuditTime { get; set; } + + + /// + /// 出厂年份 + /// + public int AppearanceDate { get; set; } + + + + /// + /// 臂架长度 + /// + public long BoomLength { get; set; } + + + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Equipment/SellerEquipmentOutput.cs b/Znyc.CloudCar.Model/Dtos/Equipment/SellerEquipmentOutput.cs new file mode 100644 index 0000000..237ae1d --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Equipment/SellerEquipmentOutput.cs @@ -0,0 +1,81 @@ +using Znyc.CloudCar.Model.Dtos.EquipmentPicture; + +namespace Znyc.CloudCar.Model.Dtos.Equipment +{ + /// + /// 卖家主页输出实体 + /// + public class SellerEquipmentOutput + { + public SellerOutput Seller { get; set; } + + public List SellerEquipmentList { get; set; } + + public long Total { get; set; } + } + + public class SellerOutput + { + /// + /// 姓名 + /// + public string UserName { get; set; } + + /// + /// 头像 + /// + public string AvatarUrl { get; set; } + + /// + /// 是否是会员 + /// + public bool IsMember { get; set; } + } + + public class SellerEquipmentListOutput + { + public long Id { get; set; } + + public long UserId { get; set; } + + /// + /// 状态 + /// + public int state { get; set; } + + /// + /// 标题 + /// + public string Title { get; set; } + + /// + /// 设备介绍 + /// + public string Introduction { get; set; } + + /// + /// 出售价格 + /// + public double SellingPrice { get; set; } + + /// + /// 车辆位置 + /// + public string AutomobileLocation { get; set; } + + /// + /// 设备图片 + /// + public List EquipmentPictures { get; set; } + + /// + /// 刷新时间 + /// + public DateTime RefreshDate { get; set; } + + /// + /// 刷新时间 + /// + public string RefreshDateTime { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/EquipmentPicture/EquipmentPictureAddInput.cs b/Znyc.CloudCar.Model/Dtos/EquipmentPicture/EquipmentPictureAddInput.cs new file mode 100644 index 0000000..3ac0baa --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/EquipmentPicture/EquipmentPictureAddInput.cs @@ -0,0 +1,19 @@ +namespace Znyc.CloudCar.Model.Dtos.EquipmentPicture +{ + public class EquipmentPictureAddInput + { + //public long EquipmentId { get; set; } + + /// + /// 图片类型，10=设备照片，20=行驶证或身份证 + /// + public int PictureType { get; set; } + + /// + /// 图片地址 + /// + + public string PictureLink { get; set; } + + } +} diff --git a/Znyc.CloudCar.Model/Dtos/EquipmentPicture/EquipmentPictureOutput.cs b/Znyc.CloudCar.Model/Dtos/EquipmentPicture/EquipmentPictureOutput.cs new file mode 100644 index 0000000..89ec19d --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/EquipmentPicture/EquipmentPictureOutput.cs @@ -0,0 +1,19 @@ +namespace Znyc.CloudCar.Model.Dtos.EquipmentPicture +{ + public class EquipmentPictureOutput + { + public long EquipmentId { get; set; } + + /// + /// 图片类型，10=设备照片，20=行驶证或身份证 + /// + public int PictureType { get; set; } + + /// + /// 图片地址 + /// + + public string PictureLink { get; set; } + + } +} diff --git a/Znyc.CloudCar.Model/Dtos/EquipmentPicture/EquipmentPictureUpdateInput.cs b/Znyc.CloudCar.Model/Dtos/EquipmentPicture/EquipmentPictureUpdateInput.cs new file mode 100644 index 0000000..ae62458 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/EquipmentPicture/EquipmentPictureUpdateInput.cs @@ -0,0 +1,7 @@ +namespace Znyc.CloudCar.Model.Dtos.EquipmentPicture +{ + public class EquipmentPictureUpdateInput : EquipmentPictureAddInput + { + public long Id { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Feedback/FeedbackAddInput.cs b/Znyc.CloudCar.Model/Dtos/Feedback/FeedbackAddInput.cs new file mode 100644 index 0000000..486c51e --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Feedback/FeedbackAddInput.cs @@ -0,0 +1,15 @@ +namespace Znyc.CloudCar.Model.Dtos.Feedback +{ + public class FeedbackAddInput + { + /// + /// 反馈内容 + /// + public string Content { get; set; } + + /// + /// 反馈图片 + /// + public List FeedbackPic { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Login/LoginInput.cs b/Znyc.CloudCar.Model/Dtos/Login/LoginInput.cs new file mode 100644 index 0000000..90ee86f --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Login/LoginInput.cs @@ -0,0 +1,23 @@ +using System.ComponentModel.DataAnnotations; +using Znyc.CloudCar.Model.Dtos.User; + +namespace Znyc.CloudCar.Model.Dtos.Login +{ + /// + /// 登录信息 + /// + public class LoginInput + { + /// + /// jscode + /// + [Required(ErrorMessage = "JsCode不存在,请检查是否传递！")] + public string JsCode { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“JsCode”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 微信用户信息 + /// + [Required(ErrorMessage = "用户信息不能为空！")] public WxUnifyUserAddInput WxUnifyUserAddInput { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Login/LoginLogsAddInput.cs b/Znyc.CloudCar.Model/Dtos/Login/LoginLogsAddInput.cs new file mode 100644 index 0000000..420c696 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Login/LoginLogsAddInput.cs @@ -0,0 +1,55 @@ +namespace Znyc.CloudCar.Model.Dtos.Login +{ + public class LoginLogsAddInput + { + /// + /// 昵称 + /// + public string UserName { get; set; } + + /// + /// 来源平台 + /// + public int PlatformType { get; set; } + + /// + /// IP + /// + public string IP { get; set; } + + /// + /// 浏览器 + /// + public string Browser { get; set; } + + /// + /// 操作系统 + /// + public string OS { get; set; } + + /// + /// 操作状态 + /// + public bool? Status { get; set; } + + /// + /// 操作结果 + /// + public string Result { get; set; } + + /// + /// 操作系统 + /// + public string UserAgent { get; set; } + + /// + /// 城市 + /// + public string City { get; set; } + + /// + /// 创建人 + /// + public long CreatedUserId { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Message/MessageListOutput.cs b/Znyc.CloudCar.Model/Dtos/Message/MessageListOutput.cs new file mode 100644 index 0000000..9e3baed --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Message/MessageListOutput.cs @@ -0,0 +1,44 @@ +namespace Znyc.CloudCar.Model.Dtos.Message +{ + /// + /// 消息通知列表输出实体 + /// + public class MessageListOutput + { + /// + /// 发送时间 + /// + public DateTime SendTime { get; set; } + + /// + /// 设备Id + /// + public long EquipmentId { get; set; } + + /// + /// 设备标题 + /// + public string EquipmentTitle { get; set; } + + /// + /// 消息标题 + /// + public string MessageTitle { get; set; } + + /// + /// 接收者Id + /// + public long ReceiverId { get; set; } + + /// + /// 消息Id + /// + public long Id { get; set; } + + /// + /// 状态 + /// + public int State { get; set; } + + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Recharge/RechargeIntroOutput.cs b/Znyc.CloudCar.Model/Dtos/Recharge/RechargeIntroOutput.cs new file mode 100644 index 0000000..8a4ec22 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Recharge/RechargeIntroOutput.cs @@ -0,0 +1,43 @@ +namespace Znyc.CloudCar.Model.Dtos.Recharge +{ + /// + /// 充值活动详情输出实体 + /// + public class RechargeIntroOutput + { + /// + /// 主键 + /// + public long Id { get; set; } + + /// + /// 商品名称 + /// + public string ProductName { get; set; } + + /// + /// 商品价值 + /// + public int ProductValue { get; set; } + + /// + /// 赠送价值 + /// + public int SendValue { get; set; } + + /// + /// 商品总价值 + /// + public int AllValue { get; set; } + + /// + /// 商品销售价 + /// + public decimal Price { get; set; } + + /// + /// 商品描述 + /// + public string Description { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/Recharge/RechargeOutput.cs b/Znyc.CloudCar.Model/Dtos/Recharge/RechargeOutput.cs new file mode 100644 index 0000000..d4d0816 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/Recharge/RechargeOutput.cs @@ -0,0 +1,17 @@ +namespace Znyc.CloudCar.Model.Dtos.Recharge +{ + /// + /// 充值活动输出实体 + /// + public class RechargeOutput + { + public long Id { get; set; } + + /// + /// 活动名称 + /// + public string Name { get; set; } + + public List introOutputs { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/User/UserOutput.cs b/Znyc.CloudCar.Model/Dtos/User/UserOutput.cs new file mode 100644 index 0000000..8b3db93 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/User/UserOutput.cs @@ -0,0 +1,49 @@ +namespace Znyc.CloudCar.Model.Dtos.User +{ + /// + /// 用户信息输出实体 + /// + public class UserOutput + { + /// + /// Id + /// + public long Id { get; set; } + + /// + /// 用户昵称 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“UserName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string UserName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“UserName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 用户头像 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AvatarUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string AvatarUrl { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AvatarUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 手机号 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Phone”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Phone { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Phone”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 状态 + /// + public int State { get; set; } + + /// + /// 实名状态 + /// + public bool IsRealAuthentication { get; set; } + + /// + /// 优惠卡类型 + /// + public long CardType { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Dtos/User/UserUpdateInput.cs b/Znyc.CloudCar.Model/Dtos/User/UserUpdateInput.cs new file mode 100644 index 0000000..b90165b --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/User/UserUpdateInput.cs @@ -0,0 +1,25 @@ +using System.ComponentModel.DataAnnotations; + +namespace Znyc.CloudCar.Model.Dtos.User +{ + public class UserUpdateInput + { + /// + /// 昵称 + /// + [Required(ErrorMessage = "请输入名称")] + public string UserName { get; set; } + + /// + /// 头像 + /// + [Required(ErrorMessage = "请选择头像")] + public string AvatarUrl { get; set; } + + /// + /// 手机号码 + /// + [Required(ErrorMessage = "请输入手机号码")] + public string Phone { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Dtos/User/WxUnifyUserAddInput.cs b/Znyc.CloudCar.Model/Dtos/User/WxUnifyUserAddInput.cs new file mode 100644 index 0000000..0d84553 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/User/WxUnifyUserAddInput.cs @@ -0,0 +1,62 @@ +namespace Znyc.CloudCar.Model.Dtos.User +{ + /// + /// 添加微信用户信息输入实体 + /// + public class WxUnifyUserAddInput + { + /// + /// 昵称 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“NickName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string NickName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“NickName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 头像 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AvatarUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string AvatarUrl { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AvatarUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 手机号 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Phone”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Phone { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Phone”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 性别(0-男/1-女) + /// + public int Gender { get; set; } + + /// + /// 国家 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Country”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Country { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Country”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 省份 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Province”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Province { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Province”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 城市 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“City”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string City { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“City”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 语种 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Language”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Language { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Language”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Dtos/User/WxUnifyUserOutput.cs b/Znyc.CloudCar.Model/Dtos/User/WxUnifyUserOutput.cs new file mode 100644 index 0000000..ed67e4c --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/User/WxUnifyUserOutput.cs @@ -0,0 +1,23 @@ +namespace Znyc.CloudCar.Model.Dtos.User +{ + public class WxUnifyUserOutput + { +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“UnionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string UnionId { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“UnionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 昵称 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“NickName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string NickName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“NickName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 创建时间 + /// + public DateTime CreatedTime { get; set; } + + + } +} diff --git a/Znyc.CloudCar.Model/Dtos/User/WxUnifyUserUpdateInput.cs b/Znyc.CloudCar.Model/Dtos/User/WxUnifyUserUpdateInput.cs new file mode 100644 index 0000000..af8bf54 --- /dev/null +++ b/Znyc.CloudCar.Model/Dtos/User/WxUnifyUserUpdateInput.cs @@ -0,0 +1,13 @@ +namespace Znyc.CloudCar.Model.Dtos.User +{ + /// + /// 修改用户信息输入实体 + /// + public class WxUnifyUserUpdateInput : WxUnifyUserAddInput + { + /// + /// 主键Id + /// + public long Id { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/ApiEntity.cs b/Znyc.CloudCar.Model/Entities/ApiEntity.cs new file mode 100644 index 0000000..8e566f6 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/ApiEntity.cs @@ -0,0 +1,20 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + [Table(Name = "sys_api")] + public class ApiEntity : EntityBase + { +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“ApiUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + [Column(StringLength = 25)] public string ApiUrl { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“ApiUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthKey”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + [Column(StringLength = 15)] public string AuthKey { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthKey”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthValue”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + [Column(StringLength = 155)] public string AuthValue { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthValue”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/AuditEntity.cs b/Znyc.CloudCar.Model/Entities/AuditEntity.cs new file mode 100644 index 0000000..6ea4dd5 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/AuditEntity.cs @@ -0,0 +1,42 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 审核记录表 + /// + [Table(Name = "audit")] + public class AuditEntity : EntityBase + { + /// + /// 设备ID + /// + public long EquipmentId { get; set; } + + /// + /// 产品标题 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“ProductTitle”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string EquipmentTitle { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“ProductTitle”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 审核人 + /// + public long AuditUserId { get; set; } + + /// + /// 审核状态0-未通过/1-已通过 + /// + /// + public int HandleStatus { get; set; } + + /// + /// 审核结果 + /// + [Column(StringLength = 150)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Note”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Note { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Note”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/BannerEntity.cs b/Znyc.CloudCar.Model/Entities/BannerEntity.cs new file mode 100644 index 0000000..87c7a15 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/BannerEntity.cs @@ -0,0 +1,66 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 用户收藏信息表 + /// + [Table(Name = "banner")] + public class BannerEntity : EntityBase + { + /// + /// Banner名称 + /// + public string Name { get; set; } + + /// + /// 图片URL + /// + public string PicUrl { get; set; } + + /// + /// 是否主图 + /// + public bool IsMaster { get; set; } + + /// + /// 图片排序 + /// + public int Sort { get; set; } = 1; + + /// + /// Banner类型 + /// + public int Type { get; set; } + + /// + /// 跳转页面 + /// + public string PageUrl { get; set; } + + /// + /// 电话 + /// + public string Phone { get; set; } + + /// + /// 文字描述 + /// + public string TextDesc { get; set; } + + /// + /// 开始时间 + /// + public DateTime StartTime { get; set; } + + /// + /// 结束时间 + /// + public DateTime EndTime { get; set; } + + /// + /// 状态0-起开始/1-进行中/2-已结束 + /// + public int State { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/BrowseEntity.cs b/Znyc.CloudCar.Model/Entities/BrowseEntity.cs new file mode 100644 index 0000000..eb45720 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/BrowseEntity.cs @@ -0,0 +1,36 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 用户浏览信息表 + /// + [Table(Name = "browse")] + public class BrowseEntity : EntityBase + { + /// + /// 用户Id + /// + public long UserId { get; set; } + + /// + /// 产品Id + /// + public long ProductId { get; set; } + + /// + /// 产品类型 + /// + public int ProductType { get; set; } + + /// + /// 状态 + /// + public int Status { get; set; } = 1; + + /// + /// 浏览时间 + /// + public DateTime BrowseTime { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/CallFeedbackEntity.cs b/Znyc.CloudCar.Model/Entities/CallFeedbackEntity.cs new file mode 100644 index 0000000..7c353e6 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/CallFeedbackEntity.cs @@ -0,0 +1,29 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 意见反馈表 + /// + [Table(Name = "rm_call_feedback")] + public class CallFeedbackEntity : EntityBase + { + public long UserId { get; set; } + + /// + /// 产品Id + /// + public long ProductId { get; set; } + + /// + /// 状态 + /// + public int Status { get; set; } + + /// + /// 产品类型 + /// + public int ProductType { get; set; } + + } +} diff --git a/Znyc.CloudCar.Model/Entities/CardIntroEntity.cs b/Znyc.CloudCar.Model/Entities/CardIntroEntity.cs new file mode 100644 index 0000000..1e1e0b4 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/CardIntroEntity.cs @@ -0,0 +1,66 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + [Table(Name = "card_intro")] + public class CardIntroEntity : EntityBase + { + /// + /// 卡名称 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“ApiUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + [Column(StringLength = 15)] public string CardName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“ApiUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 卡价值 + /// + public int CardValue { get; set; } + + /// + /// 赠送价值 + /// + public int SendValue { get; set; } + + /// + /// 时效 + /// + public int Aging { get; set; } + + /// + /// 时效描述 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthKey”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + [Column(StringLength = 55)] public string AgingDesc { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthKey”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 免费次数 + /// + public int FreeNumber { get; set; } + + /// + /// 卡描述 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthValue”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + [Column(StringLength = 55)] public string Description { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthValue”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 赠送描述 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthValue”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + [Column(StringLength = 55)] public string SendDesc { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AuthValue”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 排序 + /// + public int Sort { get; set; } + + /// + /// 状态 + /// + public int State { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/CertificationEntity.cs b/Znyc.CloudCar.Model/Entities/CertificationEntity.cs new file mode 100644 index 0000000..c172858 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/CertificationEntity.cs @@ -0,0 +1,67 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 用户实名认证表 + /// + [Table(Name = "user_certification")] + public class CertificationEntity : EntityBase + { + /// + /// UnionId + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“UnionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public long UserId { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“UnionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 姓名 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Name”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Name { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Name”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 性别 + /// + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Gender”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Gender { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Gender”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 身份证号码 + /// + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“IdCard”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string IdCard { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“IdCard”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 签发地址 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“IssuedAddress”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string IssuedAddress { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“IssuedAddress”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 身份证正面照片 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“PositivePhoto”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string PositivePhoto { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“PositivePhoto”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 身份证反面照片 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“ReversePhoto”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string ReversePhoto { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“ReversePhoto”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 实名状态 + /// + public int State { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/CollectionEntity.cs b/Znyc.CloudCar.Model/Entities/CollectionEntity.cs new file mode 100644 index 0000000..c1902a5 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/CollectionEntity.cs @@ -0,0 +1,32 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 用户收藏信息表 + /// + [Table(Name = "collection")] + public class CollectionEntity : EntityBase + { + /// + /// 用户Id + /// + public long UserId { get; set; } + + /// + /// 产品Id + /// + public long EquipmentId { get; set; } + + /// + /// 状态 + /// + public int State { get; set; } + + /// + /// 收藏时间 + /// + [Column(Position = -1, ServerTime = DateTimeKind.Local)] + public DateTime CollectionTime { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/CurrencyEntity.cs b/Znyc.CloudCar.Model/Entities/CurrencyEntity.cs new file mode 100644 index 0000000..6916858 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/CurrencyEntity.cs @@ -0,0 +1,35 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 云币表 + /// + [Table(Name = "currency")] + public class CurrencyEntity : EntityBase + { + /// + /// 用户Id + /// + public long UserId { get; set; } + + /// + /// 可用云币 + /// + public int AvailableCurrency { get; set; } + + /// + /// 正式云币 + /// + public int OfficialCurrency { get; set; } + + /// + /// 临时云币 + /// + public int TemporarylCurrency { get; set; } + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“CurrencyRecord”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public CurrencyRecordEntity CurrencyRecord { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“CurrencyRecord”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/CurrencyIntroEntity.cs b/Znyc.CloudCar.Model/Entities/CurrencyIntroEntity.cs new file mode 100644 index 0000000..35cefc8 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/CurrencyIntroEntity.cs @@ -0,0 +1,62 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 云币来源 + /// + [Table(Name = "rm_currency_intro")] + public class CurrencyIntroEntity : EntityBase + { +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Code”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + [Column(StringLength = 15)] public string Code { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Code”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 标题 + /// + [Column(StringLength = 12)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Title”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Title { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Title”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 按钮文字 + /// + [Column(StringLength = 3)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“ButtonText”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string ButtonText { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“ButtonText”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 内容 + /// + [Column(StringLength = 20)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Content”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Content { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Content”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 图标 + /// + [Column(StringLength = 90)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Icon”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Icon { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Icon”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 积分数 + /// + public decimal Score { get; set; } + + /// + /// 是否可点 + /// + public bool IsClick { get; set; } + + /// + /// 排序 + /// + public int Sort { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/CurrencyRecordEntity.cs b/Znyc.CloudCar.Model/Entities/CurrencyRecordEntity.cs new file mode 100644 index 0000000..f6a49a5 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/CurrencyRecordEntity.cs @@ -0,0 +1,36 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 云币记录表 + /// + [Table(Name = "currency_record")] + public class CurrencyRecordEntity : EntityBase + { + /// + /// 用户id + /// + public long UserId { get; set; } + + /// + /// 操作云币 + /// + public int OperatingCurrency { get; set; } + + /// + /// 操作类型 + /// + public int OperatingType { get; set; } + + /// + /// 云币类型 + /// + public int CurrencyType { get; set; } + + /// + /// 云币来源 + /// + public long CurrencySoureObjectId { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/DbLogsEntity.cs b/Znyc.CloudCar.Model/Entities/DbLogsEntity.cs new file mode 100644 index 0000000..593fdf0 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/DbLogsEntity.cs @@ -0,0 +1,33 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 数据库日志表 + /// + [Table(Name = "rm_db_logs")] + public class DbLogsEntity : EntityBase + { + /// + /// 所属用户 + /// + [Column(StringLength = 15)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“UserName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string UserName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“UserName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// SQL语句 + /// + [Column(StringLength = 255)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“SQL”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string SQL { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“SQL”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 执行时间 + /// + + public int ExecuteDate { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/DictionaryEntity.cs b/Znyc.CloudCar.Model/Entities/DictionaryEntity.cs new file mode 100644 index 0000000..402d4bc --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/DictionaryEntity.cs @@ -0,0 +1,53 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 数据字典表 + /// + [Table(Name = "sys_dictionary")] + public class DictionaryEntity : EntityBase + { + /// + /// 字典父级 + /// + public long ParentId { get; set; } + + /// + /// 字典编码 + /// + [Column(StringLength = 50)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Code”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Code { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Code”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 字典值 + /// + [Column(StringLength = 50)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Value”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Value { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Value”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 描述 + /// + [Column(StringLength = 500)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Description”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Description { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Description”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 字典名称 + /// + [Column(StringLength = 50)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Name”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Name { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Name”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 排序 + /// + public int Sort { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/EntityBase.cs b/Znyc.CloudCar.Model/Entities/EntityBase.cs new file mode 100644 index 0000000..acd7cdd --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/EntityBase.cs @@ -0,0 +1,66 @@ +using FreeSql.DataAnnotations; +using System.ComponentModel; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 实体审计 + /// + public class EntityBase + { + + /// + /// 编号 + /// + [Description("主键Id")] + [SnowflakeAttribute] + [Column(Position = 1, IsIdentity = false, IsPrimary = true)] + public virtual long Id { get; set; } + + + /// + /// 创建者Id + /// + [Description("创建者Id")] + [Column(Position = -1, CanUpdate = false)] + public long CreatedUserId { get; set; } + + /// + /// 创建时间 + /// + [Description("创建时间")] + [Column(Position = -2, CanUpdate = false, ServerTime = DateTimeKind.Local)] + public DateTime CreatedTime { get; set; } + + + /// + /// 修改者Id + /// + [Description("修改者Id")] + [Column(Position = -3, CanInsert = false)] + public long ModifiedUserId { get; set; } + + /// + /// 修改时间 + /// + [Description("修改时间")] + [Column(Position = -4, CanInsert = false, ServerTime = DateTimeKind.Local)] + public DateTime ModifiedTime { get; set; } + + /// + /// 是否启用 + /// + [Description("是否启用")] + public bool IsEnabled { get; set; } = true; + + /// + /// 是否删除 + /// + [Description("是否删除")] + [Column(Position = -5)] + public bool IsDeleted { get; set; } = false; + + + } + +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/EquipmentEntity.cs b/Znyc.CloudCar.Model/Entities/EquipmentEntity.cs new file mode 100644 index 0000000..e7642e3 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/EquipmentEntity.cs @@ -0,0 +1,155 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 设备信息表 + /// + [Table(Name = "equipment")] + public class EquipmentEntity : EntityBase + { + /// + /// 用户Id + /// + public long UserId { get; set; } + + /// + /// 标题 + /// + [Column(StringLength = 25)] + public string Title { get; set; } + + + /// + /// 设备编号 + /// + public long EquipmentNumber { get; set; } + + /// + /// 设备类型 + /// + public long EquipmentType { get; set; } + + /// + /// 设备品牌 + /// + public long EquipmentBrand { get; set; } + + /// + /// 汽车底盘 + /// + public long AutomobileChassis { get; set; } + + /// + /// 臂架长度 + /// + public long BoomLength { get; set; } + + /// + /// 装载方量 + /// + public long ReprintVolume { get; set; } + + /// + /// 最大输送量 + /// + public long MaxTransportation { get; set; } + + /// + /// 设备型号 + /// + [Column(StringLength = 15)] + public string EquipmentModel { get; set; } + + /// + /// 设备吨位 + /// + public int EquipmentTonnage { get; set; } + + /// + /// 斗容 + /// + public int Capacity { get; set; } + + /// + /// 功率 + /// + public string Power { get; set; } + + /// + /// 设备介绍 + /// + [Column(StringLength = 500)] + public string Introduction { get; set; } + + /// + /// 出厂年限 + /// + public int AppearanceDate { get; set; } + + /// + /// 出售价格 + /// + public decimal SellingPrice { get; set; } + + /// + /// 车辆位置 + /// + [Column(StringLength = 35)] + public string AutomobileLocation { get; set; } + + /// + /// 联系人 + /// + [Column(StringLength = 8)] + public string Contact { get; set; } + + /// + /// 联系人电话 + /// + [Column(StringLength = 11)] + public string ContactPhone { get; set; } + + /// + /// 状态,10=出售中,11=审核中,30=未通过,40=已成交,99=未通过 + /// + public int State { get; set; } + + /// + /// 是否置顶 + /// + public bool IsTop { get; set; } + + /// + /// 置顶到期时间 + /// + public DateTime TopExpireDate { get; set; } + + /// + /// 刷新时间 + /// + public DateTime RefreshDate { get; set; } + + /// + /// 是否公开 + /// + public bool IsPublic { get; set; } + + /// + /// 浏览量 + /// + public int PageView { get; set; } + + /// + /// 省 + /// + public long ProvinceId { get; set; } + + + /// + /// 省 + /// + public long CityId { get; set; } + + } +} diff --git a/Znyc.CloudCar.Model/Entities/EquipmentPictureEntity.cs b/Znyc.CloudCar.Model/Entities/EquipmentPictureEntity.cs new file mode 100644 index 0000000..d09474c --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/EquipmentPictureEntity.cs @@ -0,0 +1,27 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 设备信息图片表 + /// + [Table(Name = "equipment_picture")] + public class EquipmentPictureEntity : EntityBase + { + public long EquipmentId { get; set; } + + /// + /// 图片类型，10=设备照片，20=行驶证或身份证 + /// + public int PictureType { get; set; } + + /// + /// 图片地址 + /// + [Column(StringLength = 35)] + + public string PictureLink { get; set; } + + + } +} diff --git a/Znyc.CloudCar.Model/Entities/FeedbackEntity.cs b/Znyc.CloudCar.Model/Entities/FeedbackEntity.cs new file mode 100644 index 0000000..9ff82fc --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/FeedbackEntity.cs @@ -0,0 +1,42 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 意见反馈表 + /// + [Table(Name = "feedback")] + public class FeedbackEntity : EntityBase + { + public long UserId { get; set; } + + /// + /// 反馈内容 + /// + [Column(StringLength = 500)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Content”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Content { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Content”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 状态 + /// + public int State { get; set; } + + /// + /// 处理结果 + /// + [Column(StringLength = 250)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Result”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Result { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Result”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 备注 + /// + [Column(StringLength = 250)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Note”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Note { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Note”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } +} diff --git a/Znyc.CloudCar.Model/Entities/FeedbackPicEntity.cs b/Znyc.CloudCar.Model/Entities/FeedbackPicEntity.cs new file mode 100644 index 0000000..41ec25a --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/FeedbackPicEntity.cs @@ -0,0 +1,29 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 意见反馈图片表 + /// + [Table(Name = "feedback_picture")] + public class FeedbackPicEntity : EntityBase + { + /// + /// 意见反馈Id + /// + public long FeedbackId { get; set; } + + /// + /// 图片URL + /// + [Column(StringLength = 125)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“PicUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string PicUrl { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“PicUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 排序 + /// + public int Sort { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Entities/LoginLogsEntity.cs b/Znyc.CloudCar.Model/Entities/LoginLogsEntity.cs new file mode 100644 index 0000000..a049642 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/LoginLogsEntity.cs @@ -0,0 +1,78 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 登录日志表 + /// + [Table(Name = "login_logs")] + public class LoginLogsEntity : EntityBase + { + /// + /// 用户名 + /// + [Column(StringLength = 12)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“UserName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string UserName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“UserName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 来源平台 + /// + public int PlatformType { get; set; } + + /// + /// 登录时间 + /// + [Column(Position = -1, CanUpdate = false, ServerTime = DateTimeKind.Local)] + public DateTime LoginTime { get; set; } + + /// + /// IP + /// + [Column(StringLength = 20)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“IP”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string IP { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“IP”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 主机 + /// + [Column(StringLength = 20)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“OS”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string OS { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“OS”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 客户端 + /// + [Column(StringLength = 50)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Browser”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Browser { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Browser”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 城市 + /// + [Column(StringLength = 10)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“City”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string City { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“City”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 登陆结果 + /// + [Column(StringLength = 10)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Result”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Result { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Result”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 操作系统 + /// + [Column(StringLength = 15)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“UserAgent”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string UserAgent { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“UserAgent”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/MessageEntity.cs b/Znyc.CloudCar.Model/Entities/MessageEntity.cs new file mode 100644 index 0000000..4cfd0d4 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/MessageEntity.cs @@ -0,0 +1,54 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 站内消息表 + /// + [Table(Name = "message")] + public class MessageEntity : EntityBase + { + /// + /// 发送者Id + /// + public long SendId { get; set; } + + /// + /// 组Id（不涉及组消息可不用） + /// + public long GroupId { get; set; } + + /// + /// 消息内容 + /// + [Column(StringLength = 255)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Content”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Content { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Content”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 发送时间 + /// + [Column(Position = -1, ServerTime = DateTimeKind.Local)] + public DateTime SendTime { get; set; } + + /// + /// 设备Id + /// + public long EquipmentId { get; set; } + + /// + /// 设备标题 + /// + public string EquipmentTitle { get; set; } + + /// + /// 消息标题 + /// + [Column(StringLength = 15)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“MessageTitle”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string MessageTitle { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“MessageTitle”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/MessageLogsEntity.cs b/Znyc.CloudCar.Model/Entities/MessageLogsEntity.cs new file mode 100644 index 0000000..45bf8b3 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/MessageLogsEntity.cs @@ -0,0 +1,32 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 消息记录表 + /// + [Table(Name = "message_logs")] + public class MessageLogsEntity : EntityBase + { + /// + /// 接收者Id + /// + public long ReceiverId { get; set; } + + /// + /// 消息Id + /// + public long MessageId { get; set; } + + /// + /// 状态 + /// + public int State { get; set; } + + /// + /// 站内消息 + /// + public MessageEntity MessageEntity { get; set; } + + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/OrderDetailEntity.cs b/Znyc.CloudCar.Model/Entities/OrderDetailEntity.cs new file mode 100644 index 0000000..2b1ed93 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/OrderDetailEntity.cs @@ -0,0 +1,39 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 订单明细表 + /// + [Table(Name = "order_detail")] + public class OrderDetailEntity : EntityBase + { + /// + /// 订单表ID + /// + public long OrderId { get; set; } + + /// + /// 订单商品ID + /// + public long ProductId { get; set; } + + /// + /// 商品名称 + /// + [Column(StringLength = 25)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“ProductName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string ProductName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“ProductName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 购买商品数量 + /// + public int ProductCnt { get; set; } + + /// + /// 购买商品单价 + /// + public decimal ProductPrice { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/OrderEntity.cs b/Znyc.CloudCar.Model/Entities/OrderEntity.cs new file mode 100644 index 0000000..2bb40d0 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/OrderEntity.cs @@ -0,0 +1,80 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 订单主表 + /// + [Table(Name = "order")] + public class OrderEntity : EntityBase + { + /// + /// 订单编号 + /// + [Column(StringLength = 12)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“OrderSn”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string OrderSn { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“OrderSn”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 下单人ID + /// + public long UserId { get; set; } + + /// + /// 支付方式:1现金,2余额,3网银,4支付宝,5微信.6云币 + /// + public int PaymentMethod { get; set; } + + /// + /// 订单金额 + /// + public decimal OrderMoney { get; set; } + + /// + /// 优惠金额 + /// + public decimal DistrictMoney { get; set; } + + /// + /// 支付金额 + /// + public decimal PaymentMoney { get; set; } + + /// + /// 快递公司名称 + /// + [Column(StringLength = 8)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“ShippingCompName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string ShippingCompName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“ShippingCompName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 快递单号 + /// + [Column(StringLength = 15)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“ShippingSn”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string ShippingSn { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“ShippingSn”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 支付时间 + /// + public DateTime PayTime { get; set; } + + /// + /// 订单状态:0-已取消-10-未付款，20-已付款，40-已发货，50-交易成功，60-交易关闭 + /// + public int OrderStatus { get; set; } + + /// + /// 订单云币 + /// + public decimal OrderCurrency { get; set; } + + /// + /// 订单类型 1-充值/2-优惠卡 + /// + public int OrderType { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/PaymentRecordEntity.cs b/Znyc.CloudCar.Model/Entities/PaymentRecordEntity.cs new file mode 100644 index 0000000..6b40519 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/PaymentRecordEntity.cs @@ -0,0 +1,45 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 支付记录表 + /// + [Table(Name = "payment_record")] + public class PaymentRecordEntity : EntityBase + { + /// + /// 用户Id + /// + + public long UserId { get; set; } + + /// + /// 订单表ID + /// + public long OrderId { get; set; } + + /// + /// 支付流水号 yyyymmddnnnnnnnn + /// + [Column(StringLength = 12)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“PaySn”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string PaySn { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“PaySn”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 支付状态:0-已取消-10-未成功，20-已成功 + /// + public int PayStatus { get; set; } + + /// + /// 支付平台:1-Wx,2支付宝 + /// + public int PayPlatform { get; set; } + + /// + /// 支付金额 + /// + public decimal PaymentMoney { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/PermissionEntity.cs b/Znyc.CloudCar.Model/Entities/PermissionEntity.cs new file mode 100644 index 0000000..4f9ddf3 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/PermissionEntity.cs @@ -0,0 +1,53 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 权限表 + /// + [Table(Name = "rm_permission")] + public class PermissionEntity : EntityBase + { + /// + /// 父级Id + /// + public long ParentId { get; set; } + + /// + /// 权限唯一CODE代码 + /// + [Column(StringLength = 15)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Code”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Code { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Code”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 权限名称 + /// + [Column(StringLength = 15)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Name”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Name { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Name”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 权限介绍 + /// + [Column(StringLength = 25)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Intro”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Intro { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Intro”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 权限类别 + /// + public int Category { get; set; } + + /// + /// url规则 + /// + [Column(StringLength = 30)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Url”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Url { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Url”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/ProductBrandEntity.cs b/Znyc.CloudCar.Model/Entities/ProductBrandEntity.cs new file mode 100644 index 0000000..6124c0b --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/ProductBrandEntity.cs @@ -0,0 +1,53 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 商品品牌表 + /// + [Table(Name = "rm_product_brand")] + public class ProductBrandEntity : EntityBase + { + /// + /// 品牌名称 + /// + [Column(StringLength = 15)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Name”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Name { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Name”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 品牌logo + /// + [Column(StringLength = 50)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Logo”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Logo { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Logo”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 品牌说明 + /// + [Column(StringLength = 50)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Description”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Description { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Description”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 联系电话 + /// + [Column(StringLength = 11)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Telephone”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Telephone { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Telephone”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 状态 + /// + public int Status { get; set; } + + /// + /// 排序 + /// + public int Sort { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/ProductCategoryEntity.cs b/Znyc.CloudCar.Model/Entities/ProductCategoryEntity.cs new file mode 100644 index 0000000..39d9648 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/ProductCategoryEntity.cs @@ -0,0 +1,47 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 商品分类表 + /// + [Table(Name = "rm_product_category")] + public class ProductCategoryEntity : EntityBase + { + /// + /// 分类编码 + /// + [Column(StringLength = 10)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Code”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Code { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Code”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 分类名称 + /// + [Column(StringLength = 10)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Name”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Name { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Name”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 父分类ID + /// + public long ParentId { get; set; } + + /// + /// 分类层级 + /// + public long Level { get; set; } + + /// + /// 分类状态 + /// + public int Status { get; set; } + + /// + /// 排序 + /// + public int Sort { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/ProductInfoEntity.cs b/Znyc.CloudCar.Model/Entities/ProductInfoEntity.cs new file mode 100644 index 0000000..8feed70 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/ProductInfoEntity.cs @@ -0,0 +1,90 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 商品信息实体 + /// + [Table(Name = "rm_product_info")] + public class ProductInfoEntity : EntityBase + { + /// + /// 商品编码 + /// + [Column(StringLength = 11)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“ProductCode”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string ProductCode { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“ProductCode”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 商品名称 + /// + [Column(StringLength = 25)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“ProductName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string ProductName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“ProductName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 品牌表的ID + /// + public long BrandId { get; set; } + + /// + /// 分类ID + /// + public long CategoryId { get; set; } + + /// + /// 商品销售价 + /// + public decimal Price { get; set; } + + /// + /// 商品价值 + /// + public int ProductValue { get; set; } + + /// + /// 上下架状态:0下架1上架 + /// + public int PublishStatus { get; set; } + + /// + /// 审核状态:0未审核,1已审核 + /// + public int AuditStatus { get; set; } + + /// + /// 重量 + /// + public float Weight { get; set; } + + /// + /// 长度 + /// + public float Length { get; set; } + + /// + /// 高度 + /// + public float Height { get; set; } + + /// + /// 宽度 + /// + public float Width { get; set; } + + /// + /// 商品描述 + /// + [Column(StringLength = 55)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Description”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Description { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Description”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 录入时间 + /// + public DateTime InDate { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/ProductPicEntity.cs b/Znyc.CloudCar.Model/Entities/ProductPicEntity.cs new file mode 100644 index 0000000..06bf0da --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/ProductPicEntity.cs @@ -0,0 +1,48 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 商品图片实体 + /// + [Table(Name = "rm_product_pic")] + public class ProductPicEntity : EntityBase + { + /// + /// 产品Id + /// + + public long ProductId { get; set; } + + /// + /// 图片描述 + /// + [Column(StringLength = 50)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“PicDesc”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string PicDesc { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“PicDesc”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 图片url + /// + [Column(StringLength = 125)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“PicUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string PicUrl { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“PicUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 是否主图:0.非主图1.主图 + /// + public bool IsMaster { get; set; } + + /// + /// 图片排序 + /// + public int Sort { get; set; } + + /// + /// 图片是否有效:0无效 1有效 + /// + public int PicStatus { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/ProudctWarehouseEntity.cs b/Znyc.CloudCar.Model/Entities/ProudctWarehouseEntity.cs new file mode 100644 index 0000000..789f1be --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/ProudctWarehouseEntity.cs @@ -0,0 +1,27 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 商品库存 + /// + [Table(Name = "rm_proudct_warehouse")] + public class ProudctWarehouseEntity : EntityBase + { + /// + /// 商品Id + /// + + public long ProductId { get; set; } + + /// + /// 当前商品数量 + /// + public int CurrnetCnt { get; set; } + + /// + /// 当前占用数据 + /// + public int LockCnt { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/RechargeEntity.cs b/Znyc.CloudCar.Model/Entities/RechargeEntity.cs new file mode 100644 index 0000000..f87dd51 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/RechargeEntity.cs @@ -0,0 +1,34 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 充值活动表 + /// + [Table(Name = "recharge")] + public class RechargeEntity : EntityBase + { + /// + /// 活动名称 + /// + [Column(StringLength = 20)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Name”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Name { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Name”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 开始时间 + /// + public DateTime StartTime { get; set; } + + /// + /// 结束时间 + /// + public DateTime EndTime { get; set; } + + /// + /// 状态 + /// + public int State { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/RechargeIntroEntity.cs b/Znyc.CloudCar.Model/Entities/RechargeIntroEntity.cs new file mode 100644 index 0000000..1ccac2b --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/RechargeIntroEntity.cs @@ -0,0 +1,52 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 充值活动表 + /// + [Table(Name = "recharge_intro")] + public class RechargeIntroEntity : EntityBase + { + /// + /// 父级ID + /// + public long ParentId { get; set; } + + /// + /// 商品名称 + /// + [Column(StringLength = 20)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“ProductName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string ProductName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“ProductName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 商品价值 + /// + public int ProductValue { get; set; } + + /// + /// 赠送价值 + /// + public int SendValue { get; set; } + + /// + /// 商品总价值 + /// + public int AllValue { get; set; } + + /// + /// 商品销售价 + /// + public decimal Price { get; set; } + + /// + /// 商品描述 + /// + [Column(StringLength = 55)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Description”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Description { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Description”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/SignConfigEntity.cs b/Znyc.CloudCar.Model/Entities/SignConfigEntity.cs new file mode 100644 index 0000000..d89c42c --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/SignConfigEntity.cs @@ -0,0 +1,26 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 用户签到奖励配置表 + /// + [Table(Name = "rm_sign_config")] + public class SignConfigEntity : EntityBase + { + /// + /// 签到天数 + /// + public int SignDay { get; set; } + + /// + /// 奖励类型(1=积分/2=礼品/3/4/5=后续天降) + /// + public int RewardType { get; set; } + + /// + /// 奖励云币 + /// + public decimal SignReward { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/SignEntity.cs b/Znyc.CloudCar.Model/Entities/SignEntity.cs new file mode 100644 index 0000000..a6a8c3b --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/SignEntity.cs @@ -0,0 +1,31 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 用户签到表 + /// + [Table(Name = "rm_sign")] + public class SignEntity : EntityBase + { + /// + /// 用户Id + /// + public long UserId { get; set; } + + /// + /// 累计签到天数 + /// + public int TotalSeriesDays { get; set; } + + /// + /// 月签到天数 + /// + public int MonthSeriesDays { get; set; } + + /// + /// 最后一次签到时间 + /// + public DateTime LastSignTime { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/SignRecordEntity.cs b/Znyc.CloudCar.Model/Entities/SignRecordEntity.cs new file mode 100644 index 0000000..c764631 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/SignRecordEntity.cs @@ -0,0 +1,37 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 用户签到记录表 + /// + [Table(Name = "rm_sign_record")] + public class SignRecordEntity : EntityBase + { + /// + /// 主表ID + /// + public long SignId { get; set; } + + /// + /// 用户Id + /// + public long UserId { get; set; } + + /// + /// 签到奖励内容 + /// + public decimal SignReward { get; set; } + + /// + /// 签到时间 + /// + [Column(Position = -1, CanUpdate = false, ServerTime = DateTimeKind.Local)] + public DateTime SignTime { get; set; } + + /// + /// 签到类型 + /// + public int SignType { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/StatisticalEntity.cs b/Znyc.CloudCar.Model/Entities/StatisticalEntity.cs new file mode 100644 index 0000000..0259d9d --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/StatisticalEntity.cs @@ -0,0 +1,63 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 数据统计表 + /// + [Table(Name = "sys_statistical")] + public class StatisticalEntity : EntityBase + { + /// + /// 时间 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Time”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Time { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Time”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 今日新增用户 + /// + public int UserAddTotal { get; set; } + + /// + /// 用户总数 + /// + public int UserSumTotal { get; set; } + + /// + /// 今日求职发布数 + /// + public int ApplyJobsAddTotal { get; set; } + + /// + /// 今日招聘发布数 + /// + public int RecruitmentAddTotal { get; set; } + + /// + /// 本日活跃用户数 + /// + public int ActiveUserTotal { get; set; } + + /// + /// 总收入 + /// + public decimal Income { get; set; } + + /// + /// 日收入 + /// + public decimal TodayIncome { get; set; } + + /// + /// 今日收入百分比 + /// + public decimal TodayIncomePercent { get; set; } + + /// + /// 今日用户增长百分比 + /// + public decimal UserAddTotalPercent { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/UserCardEntity.cs b/Znyc.CloudCar.Model/Entities/UserCardEntity.cs new file mode 100644 index 0000000..e5e3a72 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/UserCardEntity.cs @@ -0,0 +1,30 @@ + +using System.ComponentModel.DataAnnotations.Schema; + + +namespace Znyc.CloudCar.Model.Entities +{ + [Table("user_card")] + public class UserCardEntity : EntityBase + { + /// + /// + /// + public long UserId { get; set; } + + /// + /// + /// + public long CardId { get; set; } + + /// + /// 开始时间 + /// + public DateTime StartTime { get; set; } + + /// + /// 结束时间 + /// + public DateTime EndTime { get; set; } + } +} diff --git a/Znyc.CloudCar.Model/Entities/UserEntity.cs b/Znyc.CloudCar.Model/Entities/UserEntity.cs new file mode 100644 index 0000000..4e5efa5 --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/UserEntity.cs @@ -0,0 +1,61 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 用户表 + /// + [Table(Name = "user")] + public class UserEntity : EntityBase + { + /// + /// OpenId + /// + [Column(StringLength = 32)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“OpenId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string OpenId { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“OpenId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// UnionId + /// + [Column(StringLength = 32)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“UnionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string UnionId { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“UnionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 用户昵称 + /// + [Column(StringLength = 12)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“UserName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string UserName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“UserName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 用户头像 + /// + [Column(StringLength = 155)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AvatarUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string AvatarUrl { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AvatarUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 手机号 + /// + [Column(StringLength = 11)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Phone”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Phone { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Phone”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 状态 + /// + public int State { get; set; } + + /// + /// 是否实名认证 + /// + public bool IsRealAuthentication { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Entities/WxUnifyUserEntity.cs b/Znyc.CloudCar.Model/Entities/WxUnifyUserEntity.cs new file mode 100644 index 0000000..987365c --- /dev/null +++ b/Znyc.CloudCar.Model/Entities/WxUnifyUserEntity.cs @@ -0,0 +1,80 @@ +using FreeSql.DataAnnotations; + +namespace Znyc.CloudCar.Model.Entities +{ + /// + /// 云平台统一用户表用户表 + /// + [Table(Name = "wxunifyuser")] + public class WxUnifyUserEntity : EntityBase + { + /// + /// UnionId + /// + [Column(StringLength = 32)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“UnionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string UnionId { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“UnionId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 用户昵称 + /// + [Column(StringLength = 25)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“NickName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string NickName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“NickName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 用户头像 + /// + [Column(StringLength = 100)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AvatarUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string AvatarUrl { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AvatarUrl”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 手机号 + /// + [Column(StringLength = 11)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Phone”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Phone { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Phone”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 性别(0-男/1-女) + /// + public int Gender { get; set; } + + /// + /// 国家 + /// + [Column(StringLength = 20)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Country”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Country { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Country”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 省份 + /// + [Column(StringLength = 20)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Province”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Province { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Province”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 城市 + /// + [Column(StringLength = 20)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“City”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string City { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“City”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 语种 + /// + [Column(StringLength = 20)] +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Language”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Language { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Language”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/SnowflakeAttribute.cs b/Znyc.CloudCar.Model/SnowflakeAttribute.cs new file mode 100644 index 0000000..375671f --- /dev/null +++ b/Znyc.CloudCar.Model/SnowflakeAttribute.cs @@ -0,0 +1,7 @@ +namespace Znyc.CloudCar.Model +{ + [AttributeUsage(AttributeTargets.Property)] + public class SnowflakeAttribute : Attribute + { + } +} diff --git a/Znyc.CloudCar.Model/ViewModels/Basics/ErrorViewModel.cs b/Znyc.CloudCar.Model/ViewModels/Basics/ErrorViewModel.cs new file mode 100644 index 0000000..7cf5a92 --- /dev/null +++ b/Znyc.CloudCar.Model/ViewModels/Basics/ErrorViewModel.cs @@ -0,0 +1,24 @@ +namespace Znyc.CloudCar.Model.ViewModels.Basics +{ + /// + /// 验证错误信息视图模型 + /// + public class ErrorView + { + /// + /// 错误字段 + /// + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“ErrorName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string ErrorName { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“ErrorName”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 错误内容ErrorMessage + /// + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“Error”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string Error { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“Error”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/ViewModels/Enum/EnumEntity.cs b/Znyc.CloudCar.Model/ViewModels/Enum/EnumEntity.cs new file mode 100644 index 0000000..022f1c3 --- /dev/null +++ b/Znyc.CloudCar.Model/ViewModels/Enum/EnumEntity.cs @@ -0,0 +1,27 @@ +namespace Znyc.CloudCar.Model.ViewModels.Enum +{ + /// + /// 枚举实体 + /// + public class EnumEntity + { + /// + /// 枚举的描述 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“description”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string description { set; get; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“description”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 枚举名称 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“title”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string title { set; get; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“title”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 枚举对象的值 + /// + public int value { set; get; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/ViewModels/ReportsCallBack/IResponseOutput.cs b/Znyc.CloudCar.Model/ViewModels/ReportsCallBack/IResponseOutput.cs new file mode 100644 index 0000000..0fa3843 --- /dev/null +++ b/Znyc.CloudCar.Model/ViewModels/ReportsCallBack/IResponseOutput.cs @@ -0,0 +1,33 @@ +using System.Text.Json.Serialization; + +namespace Znyc.CloudCar.Model.ViewModels.ReportsCallBack +{ + /// + /// 响应数据输出接口 + /// + public interface IResponseOutput + { + /// + /// 是否成功 + /// + [JsonIgnore] + bool Successed { get; } + + /// + /// 消息 + /// + public string Msg { get; } + } + + /// + /// 响应数据输出泛型接口 + /// + /// + public interface IResponseOutput : IResponseOutput + { + /// + /// 返回数据 + /// + T Data { get; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/ViewModels/ReportsCallBack/PageOutput.cs b/Znyc.CloudCar.Model/ViewModels/ReportsCallBack/PageOutput.cs new file mode 100644 index 0000000..e93fdab --- /dev/null +++ b/Znyc.CloudCar.Model/ViewModels/ReportsCallBack/PageOutput.cs @@ -0,0 +1,21 @@ +namespace Znyc.CloudCar.Model.ViewModels.ReportsCallBack +{ + /// + /// 分页信息输出 + /// + public class PageOutput + { + /// + /// 数据总数 + /// + public long Total { get; set; } = 0; + + /// + /// 数据 + /// +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“List”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public IList List { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“List”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/ViewModels/ReportsCallBack/ResponseOutput.cs b/Znyc.CloudCar.Model/ViewModels/ReportsCallBack/ResponseOutput.cs new file mode 100644 index 0000000..7763491 --- /dev/null +++ b/Znyc.CloudCar.Model/ViewModels/ReportsCallBack/ResponseOutput.cs @@ -0,0 +1,29 @@ +namespace Znyc.CloudCar.Model.ViewModels.ReportsCallBack +{ + /// + /// 响应数据输出 + /// + public class ResponseOutput + { + /// + /// 状态码 + /// + public int Code { get; set; } + + /// + /// 是否成功标记 + /// + public bool Successed { get; set; } + + /// + /// 消息 + /// + public string Msg { get; set; } + + /// + /// 数据 + /// + public object Data { get; set; } + + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/ViewModels/WeChat/WeChatAccessToken.cs b/Znyc.CloudCar.Model/ViewModels/WeChat/WeChatAccessToken.cs new file mode 100644 index 0000000..4d2babe --- /dev/null +++ b/Znyc.CloudCar.Model/ViewModels/WeChat/WeChatAccessToken.cs @@ -0,0 +1,48 @@ +namespace Znyc.CloudCar.Model.ViewModels.WeChat +{ + /// + /// 微信授权交互 + /// + public class WeChatAccessToken + { + /// + /// 类型1小程序2公众号 + /// + + public int AppType { get; set; } + + /// + /// 微信appId + /// + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AppId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string AppId { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AppId”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 微信accessToken + /// + +#pragma warning disable CS8618 // 在退出构造函数时，不可为 null 的 属性“AccessToken”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + public string AccessToken { get; set; } +#pragma warning restore CS8618 // 在退出构造函数时，不可为 null 的 属性“AccessToken”必须包含非 null 值。请考虑将 属性 声明为可以为 null。 + + /// + /// 截止时间 + /// + + public long ExpireTimestamp { get; set; } + + /// + /// 更新时间 + /// + + public long UpdateTimestamp { get; set; } + + /// + /// 创建时间 + /// + + public long CreateTimestamp { get; set; } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Model/Znyc.CloudCar.Model.csproj b/Znyc.CloudCar.Model/Znyc.CloudCar.Model.csproj new file mode 100644 index 0000000..1e033d4 --- /dev/null +++ b/Znyc.CloudCar.Model/Znyc.CloudCar.Model.csproj @@ -0,0 +1,13 @@ + + + + net6.0 + enable + enable + + + + + + + diff --git a/Znyc.CloudCar.RedisMQ/Subscribe/LogingSubscribe.cs b/Znyc.CloudCar.RedisMQ/Subscribe/LogingSubscribe.cs new file mode 100644 index 0000000..db11531 --- /dev/null +++ b/Znyc.CloudCar.RedisMQ/Subscribe/LogingSubscribe.cs @@ -0,0 +1,30 @@ + +using Microsoft.Extensions.Logging; +using static Znyc.CloudCar.Configuration.GlobalConstVars; + +namespace Znyc.CloudCar.RedisMQ.Subscribe +{ + public class LogingSubscribe + { + private readonly ILogger _logger; + public LogingSubscribe(ILogger logger) + { + _logger = logger; + } + + // [Subscribe(RedisMessageQueueKey.LogingQueue)] + private async Task SubRedisOrder2(string msg) + { + _logger.LogDebug("消息队列", $"接口端订阅从队列{RedisMessageQueueKey.LogingQueue} 接受到 消息:{msg}"); + await Task.CompletedTask; + } + + + //[Subscribe(RedisMessageQueueKey.SmsQueue)] + private async Task SubSmsQueue1(string msg) + { + _logger.LogDebug("消息队列", $"接口端订阅从队列{RedisMessageQueueKey.LogingQueue} 接受到 消息:{msg}"); + await Task.CompletedTask; + } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.RedisMQ/Znyc.CloudCar.RedisMQ.csproj b/Znyc.CloudCar.RedisMQ/Znyc.CloudCar.RedisMQ.csproj new file mode 100644 index 0000000..17a840a --- /dev/null +++ b/Znyc.CloudCar.RedisMQ/Znyc.CloudCar.RedisMQ.csproj @@ -0,0 +1,17 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + diff --git a/Znyc.CloudCar.Repository/Audit/AuditRepository.cs b/Znyc.CloudCar.Repository/Audit/AuditRepository.cs new file mode 100644 index 0000000..5ea9dd0 --- /dev/null +++ b/Znyc.CloudCar.Repository/Audit/AuditRepository.cs @@ -0,0 +1,27 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Audit; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Audit +{ + public class AuditRepository : RepositoryBase, IAuditRepository + { + public AuditRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + + /// + /// 审核失败列表 + /// + /// + /// + public async Task> GetAuditFailListAsync(long userId) + { + return await Orm.Ado.QueryAsync(@"SELECT t.EquipmentId,t.EquipmentTitle,t.HandleStatus,t.Note,t.ModifiedTime,t.CreatedTime FROM + (SELECT EquipmentId,max(CreatedTime) as CreatedTime FROM audit WHERE HandleStatus = 4 AND (EquipmentId in + (SELECT Id FROM equipment WHERE UserId =?userId AND `State`= 30 AND IsDeleted = 0)) GROUP BY EquipmentId) a + INNER JOIN audit t ON t.EquipmentId = a.EquipmentId AND t.CreatedTime = a.CreatedTime", new { userId }); + } + } +} diff --git a/Znyc.CloudCar.Repository/Banner/BannerRepository.cs b/Znyc.CloudCar.Repository/Banner/BannerRepository.cs new file mode 100644 index 0000000..ad458b6 --- /dev/null +++ b/Znyc.CloudCar.Repository/Banner/BannerRepository.cs @@ -0,0 +1,15 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Banner; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Banner +{ + public class BannerRepository : RepositoryBase, IBannerRepository + { + public BannerRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + + } +} diff --git a/Znyc.CloudCar.Repository/CardIntro/CardIntroRepository.cs b/Znyc.CloudCar.Repository/CardIntro/CardIntroRepository.cs new file mode 100644 index 0000000..b79fa2a --- /dev/null +++ b/Znyc.CloudCar.Repository/CardIntro/CardIntroRepository.cs @@ -0,0 +1,14 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.CardIntro; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.CardIntro +{ + public class CardIntroRepository : RepositoryBase, ICardIntroRepository + { + public CardIntroRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} diff --git a/Znyc.CloudCar.Repository/Certification/CertificationRepository.cs b/Znyc.CloudCar.Repository/Certification/CertificationRepository.cs new file mode 100644 index 0000000..0bd5093 --- /dev/null +++ b/Znyc.CloudCar.Repository/Certification/CertificationRepository.cs @@ -0,0 +1,14 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Certification; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Certification +{ + public class CertificationRepository : RepositoryBase, ICertificationRepository + { + public CertificationRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} diff --git a/Znyc.CloudCar.Repository/Collection/CollectionRepository.cs b/Znyc.CloudCar.Repository/Collection/CollectionRepository.cs new file mode 100644 index 0000000..e4319ea --- /dev/null +++ b/Znyc.CloudCar.Repository/Collection/CollectionRepository.cs @@ -0,0 +1,17 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Collection; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Collection +{ + /// + /// 收藏仓储 + /// + public class CollectionRepository : RepositoryBase, ICollectionRepository + { + public CollectionRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} diff --git a/Znyc.CloudCar.Repository/Currency/CurrencyRecordRepository.cs b/Znyc.CloudCar.Repository/Currency/CurrencyRecordRepository.cs new file mode 100644 index 0000000..b37d0b0 --- /dev/null +++ b/Znyc.CloudCar.Repository/Currency/CurrencyRecordRepository.cs @@ -0,0 +1,17 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Currency; +using Znyc.CloudCar.Model.Entities; + + +namespace Znyc.CloudCar.Repository.Currency +{ + public class CurrencyRecordRepository : RepositoryBase, ICurrencyRecordRepository + { + public CurrencyRecordRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + + + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Repository/Currency/CurrencyRepository.cs b/Znyc.CloudCar.Repository/Currency/CurrencyRepository.cs new file mode 100644 index 0000000..9510f8a --- /dev/null +++ b/Znyc.CloudCar.Repository/Currency/CurrencyRepository.cs @@ -0,0 +1,14 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Currency; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Currency +{ + public class CurrencyRepository : RepositoryBase, ICurrencyRepository + { + public CurrencyRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Repository/Dictionary/DictionaryRepository.cs b/Znyc.CloudCar.Repository/Dictionary/DictionaryRepository.cs new file mode 100644 index 0000000..9826fa0 --- /dev/null +++ b/Znyc.CloudCar.Repository/Dictionary/DictionaryRepository.cs @@ -0,0 +1,14 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Dictionary; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Dictionary +{ + public class DictionaryRepository : RepositoryBase, IDictionaryRepository + { + public DictionaryRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} diff --git a/Znyc.CloudCar.Repository/Equipment/EquipmentRepository.cs b/Znyc.CloudCar.Repository/Equipment/EquipmentRepository.cs new file mode 100644 index 0000000..2b70c77 --- /dev/null +++ b/Znyc.CloudCar.Repository/Equipment/EquipmentRepository.cs @@ -0,0 +1,26 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Equipment; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Equipment +{ + public class EquipmentRepository : RepositoryBase, IEquipmentRepository + { + public EquipmentRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + + /// + /// 同步浏览量 + /// + /// + /// + /// + public async Task UpdatePageView(long id, int pageview) + { + string sql = string.Format($"UPDATE equipment SET PageView= {pageview} WHERE Id = {id};"); + return await Orm.Ado.ExecuteNonQueryAsync(sql); + } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Repository/EquipmentPicture/EquipmentPictureRepository.cs b/Znyc.CloudCar.Repository/EquipmentPicture/EquipmentPictureRepository.cs new file mode 100644 index 0000000..5f6da5c --- /dev/null +++ b/Znyc.CloudCar.Repository/EquipmentPicture/EquipmentPictureRepository.cs @@ -0,0 +1,14 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.EquipmentPicture; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.EquipmentPicture +{ + public class EquipmentPictureRepository : RepositoryBase, IEquipmentPictureRepository + { + public EquipmentPictureRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} diff --git a/Znyc.CloudCar.Repository/Feedback/FeedbackPicRepository.cs b/Znyc.CloudCar.Repository/Feedback/FeedbackPicRepository.cs new file mode 100644 index 0000000..675b4aa --- /dev/null +++ b/Znyc.CloudCar.Repository/Feedback/FeedbackPicRepository.cs @@ -0,0 +1,17 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Feedback; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Feedback +{ + /// + /// 意见反馈仓储 + /// + public class FeedbackPicRepository : RepositoryBase, IFeedbackPicRepository + { + public FeedbackPicRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} diff --git a/Znyc.CloudCar.Repository/Feedback/FeedbackRepository.cs b/Znyc.CloudCar.Repository/Feedback/FeedbackRepository.cs new file mode 100644 index 0000000..b74eb09 --- /dev/null +++ b/Znyc.CloudCar.Repository/Feedback/FeedbackRepository.cs @@ -0,0 +1,17 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Feedback; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Feedback +{ + /// + /// 意见反馈仓储 + /// + public class FeedbackRepository : RepositoryBase, IFeedbackRepository + { + public FeedbackRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} diff --git a/Znyc.CloudCar.Repository/LoginLogs/LoginLogsRepository.cs b/Znyc.CloudCar.Repository/LoginLogs/LoginLogsRepository.cs new file mode 100644 index 0000000..a350163 --- /dev/null +++ b/Znyc.CloudCar.Repository/LoginLogs/LoginLogsRepository.cs @@ -0,0 +1,14 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.LoginLogs; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.LoginLogs +{ + public class LoginLogsRepository : RepositoryBase, ILoginLogsRepository + { + public LoginLogsRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} diff --git a/Znyc.CloudCar.Repository/Message/MessageLogRepository.cs b/Znyc.CloudCar.Repository/Message/MessageLogRepository.cs new file mode 100644 index 0000000..d9d5ff7 --- /dev/null +++ b/Znyc.CloudCar.Repository/Message/MessageLogRepository.cs @@ -0,0 +1,17 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Message; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Message +{ + /// + /// 消息通知仓储 + /// + public class MessageLogRepository : RepositoryBase, IMessageLogRepository + { + public MessageLogRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} diff --git a/Znyc.CloudCar.Repository/Message/MessageLogsRepository.cs b/Znyc.CloudCar.Repository/Message/MessageLogsRepository.cs new file mode 100644 index 0000000..5ce8f37 --- /dev/null +++ b/Znyc.CloudCar.Repository/Message/MessageLogsRepository.cs @@ -0,0 +1,17 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Message; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Message +{ + /// + /// 消息通知仓储 + /// + public class MessageLogsRepository : RepositoryBase, IMessageLogsRepository + { + public MessageLogsRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} diff --git a/Znyc.CloudCar.Repository/Message/MessageRepository.cs b/Znyc.CloudCar.Repository/Message/MessageRepository.cs new file mode 100644 index 0000000..2ea3656 --- /dev/null +++ b/Znyc.CloudCar.Repository/Message/MessageRepository.cs @@ -0,0 +1,17 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Message; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Message +{ + /// + /// 消息通知仓储 + /// + public class MessageRepository : RepositoryBase, IMessageRepository + { + public MessageRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} diff --git a/Znyc.CloudCar.Repository/Order/OrderDetailRepository.cs b/Znyc.CloudCar.Repository/Order/OrderDetailRepository.cs new file mode 100644 index 0000000..ca37cf9 --- /dev/null +++ b/Znyc.CloudCar.Repository/Order/OrderDetailRepository.cs @@ -0,0 +1,15 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Order; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Order +{ + public class OrderDetailRepository : RepositoryBase, IOrderDetailRepository + { + public OrderDetailRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + + } + } +} diff --git a/Znyc.CloudCar.Repository/Order/OrderRepository.cs b/Znyc.CloudCar.Repository/Order/OrderRepository.cs new file mode 100644 index 0000000..3951715 --- /dev/null +++ b/Znyc.CloudCar.Repository/Order/OrderRepository.cs @@ -0,0 +1,15 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Order; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Order +{ + public class OrderRepository : RepositoryBase, IOrderRepository + { + public OrderRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + + } + } +} diff --git a/Znyc.CloudCar.Repository/PaymentRecord/PaymentRecordRepository.cs b/Znyc.CloudCar.Repository/PaymentRecord/PaymentRecordRepository.cs new file mode 100644 index 0000000..a2d8cb3 --- /dev/null +++ b/Znyc.CloudCar.Repository/PaymentRecord/PaymentRecordRepository.cs @@ -0,0 +1,15 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.PaymentRecord; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.PaymentRecord +{ + public class PaymentRecordRepository : RepositoryBase, IPaymentRecordRepository + { + public PaymentRecordRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + + } + } +} diff --git a/Znyc.CloudCar.Repository/Recharge/RechargeIntroRepository.cs b/Znyc.CloudCar.Repository/Recharge/RechargeIntroRepository.cs new file mode 100644 index 0000000..90a1b0f --- /dev/null +++ b/Znyc.CloudCar.Repository/Recharge/RechargeIntroRepository.cs @@ -0,0 +1,16 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Recharge; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Recharge +{ + public class RechargeIntroRepository : RepositoryBase, IRechargeIntroRepository + { + + public RechargeIntroRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + + } + } +} diff --git a/Znyc.CloudCar.Repository/Recharge/RechargeRepository.cs b/Znyc.CloudCar.Repository/Recharge/RechargeRepository.cs new file mode 100644 index 0000000..dc035cd --- /dev/null +++ b/Znyc.CloudCar.Repository/Recharge/RechargeRepository.cs @@ -0,0 +1,16 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Recharge; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.Recharge +{ + public class RechargeRepository : RepositoryBase, IRechargeRepository + { + + public RechargeRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + + } + } +} diff --git a/Znyc.CloudCar.Repository/RepositoryBase.cs b/Znyc.CloudCar.Repository/RepositoryBase.cs new file mode 100644 index 0000000..fee6ae5 --- /dev/null +++ b/Znyc.CloudCar.Repository/RepositoryBase.cs @@ -0,0 +1,91 @@ +using FreeSql; +using System.Linq.Expressions; +using Znyc.CloudCar.Auth.HttpContextUser; + +namespace Znyc.CloudCar.Repository +{ + public abstract class RepositoryBase : BaseRepository where TEntity : class, new() + { + private readonly IHttpContextUser _user; + + protected RepositoryBase(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm.Orm, null) + { + uowm.Binding(this); + _user = user; + } + + /// + /// 获取Dto + /// + /// + /// + /// + public virtual Task GetAsync(TKey id) + { + return Select.WhereDynamic(id).ToOneAsync(); + } + + /// + /// 根据条件获取实体 + /// + /// + /// + public virtual Task GetAsync(Expression> exp) + { + return Select.Where(exp).ToOneAsync(); + } + + /// + /// 根据条件获取Dto + /// + /// + /// + /// + public virtual Task GetAsync(Expression> exp) + { + return Select.Where(exp).ToOneAsync(); + } + + /// + /// 软删除 + /// + /// + /// + public virtual async Task SoftDeleteAsync(TKey id) + { + await UpdateDiy + .SetDto(new + { + IsDeleted = true, + ModifiedUserId = _user.Id + }) + .WhereDynamic(id) + .ExecuteAffrowsAsync(); + return true; + } + + /// + /// 批量软删除 + /// + /// + /// + public virtual async Task SoftDeleteAsync(TKey[] ids) + { + await UpdateDiy + .SetDto(new + { + IsDeleted = true, + ModifiedUserId = _user.Id + }) + .WhereDynamic(ids) + .ExecuteAffrowsAsync(); + return true; + } + } + public abstract class RepositoryBase : RepositoryBase where TEntity : class, new() + { + protected RepositoryBase(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Repository/User/UserCardRepository.cs b/Znyc.CloudCar.Repository/User/UserCardRepository.cs new file mode 100644 index 0000000..472d954 --- /dev/null +++ b/Znyc.CloudCar.Repository/User/UserCardRepository.cs @@ -0,0 +1,14 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.User; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.User +{ + public class UserCardRepository : RepositoryBase, IUserCardRepository + { + public UserCardRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} diff --git a/Znyc.CloudCar.Repository/User/UserRepository.cs b/Znyc.CloudCar.Repository/User/UserRepository.cs new file mode 100644 index 0000000..0bd9641 --- /dev/null +++ b/Znyc.CloudCar.Repository/User/UserRepository.cs @@ -0,0 +1,14 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.User; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.User +{ + public class UserRepository : RepositoryBase, IUserRepository + { + public UserRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} diff --git a/Znyc.CloudCar.Repository/User/WxUnifyUserRepository.cs b/Znyc.CloudCar.Repository/User/WxUnifyUserRepository.cs new file mode 100644 index 0000000..7f08031 --- /dev/null +++ b/Znyc.CloudCar.Repository/User/WxUnifyUserRepository.cs @@ -0,0 +1,14 @@ +using FreeSql; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.User; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Repository.User +{ + public class WxUnifyUserRepository : RepositoryBase, IWxUnifyUserRepository + { + public WxUnifyUserRepository(UnitOfWorkManager uowm, IHttpContextUser user) : base(uowm, user) + { + } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Repository/Znyc.CloudCar.Repository.csproj b/Znyc.CloudCar.Repository/Znyc.CloudCar.Repository.csproj new file mode 100644 index 0000000..bc9d5d8 --- /dev/null +++ b/Znyc.CloudCar.Repository/Znyc.CloudCar.Repository.csproj @@ -0,0 +1,15 @@ + + + + net6.0 + enable + enable + + + + + + + + + diff --git a/Znyc.CloudCar.Services/Auth/AuthService.cs b/Znyc.CloudCar.Services/Auth/AuthService.cs new file mode 100644 index 0000000..43c980a --- /dev/null +++ b/Znyc.CloudCar.Services/Auth/AuthService.cs @@ -0,0 +1,494 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using Newtonsoft.Json; +using SKIT.FlurlHttpClient.Wechat.TenpayV3; +using SKIT.FlurlHttpClient.Wechat.TenpayV3.Events; +using SKIT.FlurlHttpClient.Wechat.TenpayV3.Models; +using SKIT.FlurlHttpClient.Wechat.TenpayV3.Settings; +using System.Text; +using Zncy.CloudCar.WeChat.Service.Options; +using Zncy.CloudCar.WeChat.Service.Services.HttpClients; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.Caching; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.IRepository.CardIntro; +using Znyc.CloudCar.IRepository.Order; +using Znyc.CloudCar.IRepository.PaymentRecord; +using Znyc.CloudCar.IRepository.Recharge; +using Znyc.CloudCar.IServices.Auth; +using Znyc.CloudCar.IServices.Currency; +using Znyc.CloudCar.IServices.User; +using Znyc.CloudCar.Model.Dtos.Auth; +using Znyc.CloudCar.Model.Entities; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Attributes; +using Znyc.CloudCar.Utility.Extensions; +using Znyc.CloudCar.Utility.Helper; + +namespace Znyc.CloudCar.Services.Auth +{ + public class AuthService : IAuthService + { + private readonly IRedisOperationRepository _redisCache; + private readonly IHttpContextUser _httpContextUser; + private readonly IRechargeIntroRepository _rechargeIntroRepository; + private readonly IOrderRepository _orderRepository; + private readonly IOrderDetailRepository _orderDetailRepository; + private readonly IPaymentRecordRepository _paymentRecordRepository; + private readonly ILogger _logger; + private readonly IHttpContextAccessor _httpContextAccessor; + private readonly ICurrencyService _currencyService; + private readonly IUserCardService _userCardService; + private readonly ICardIntroRepository _cardIntroRepository; + //private readonly IRedisOperationRepository _redisOperationRepository; + //private readonly IWeChatApiHttpClientFactory _weChatApiHttpClientFactory; + private readonly WeChatOptions _weChatOptions; + private readonly TenpayOptions _tenpayOptions; + private readonly IWechatTenpayHttpClientFactory _tenpayHttpClientFactory; + + public AuthService( + IRedisOperationRepository redisCache, + IHttpContextUser httpContextUser, + IRechargeIntroRepository rechargeIntroRepository, + IOrderRepository orderRepository, + IOrderDetailRepository orderDetailRepository, + IPaymentRecordRepository paymentRecordRepository, + ILogger logger, + IHttpContextAccessor httpContextAccessor, + ICurrencyService currencyService, + IUserCardService userCardService, + ICardIntroRepository cardIntroRepository, + //IRedisOperationRepository redisOperationRepository, + //IWeChatApiHttpClientFactory weChatApiHttpClientFactory, + IOptions weChatOptions, + IOptions tenpayOptions, + IWechatTenpayHttpClientFactory tenpayHttpClientFactory + ) + { + _redisCache = redisCache; + _httpContextUser = httpContextUser; + _rechargeIntroRepository = rechargeIntroRepository; + _orderRepository = orderRepository; + _orderDetailRepository = orderDetailRepository; + _paymentRecordRepository = paymentRecordRepository; + _logger = logger; + _httpContextAccessor = httpContextAccessor; + _currencyService = currencyService; + _userCardService = userCardService; + _cardIntroRepository = cardIntroRepository; + // _redisOperationRepository = redisOperationRepository; + //_weChatApiHttpClientFactory = weChatApiHttpClientFactory; + _weChatOptions = weChatOptions.Value; + _tenpayOptions = tenpayOptions.Value; + _tenpayHttpClientFactory = tenpayHttpClientFactory; + } + + /// + /// 获取百度AccessToken + /// + /// + public ResponseOutput GetAccessTokenAsync() + { + string key = string.Format(GlobalCacheKeyVars.BaiduAccessToken, AppSettingsConstVars.ApiKey); + BaiduAccessTokenOutput baiduAccessToken = _redisCache.Get(key); + if (baiduAccessToken.IsNull()) + { + string authHost = + $"https://aip.baidubce.com/oauth/2.0/token?grant_type=client_credentials&client_id={ AppSettingsConstVars.ApiKey }&client_secret={ AppSettingsConstVars.SecretKey }&"; + HttpClient client = new HttpClient(); + HttpResponseMessage response = client.GetAsync(authHost).Result; + baiduAccessToken = + JsonConvert.DeserializeObject(response.Content.ReadAsStringAsync().Result); + _redisCache.SetAsync(key, baiduAccessToken, TimeSpan.FromDays(30)); + } + ResponseOutput output = new ResponseOutput() + { + Data = baiduAccessToken, + Successed = true, + Code = 1 + }; + return output; + } + + /// + /// 微信支付 + /// + /// + /// + /// + [Transaction] + public async Task WxPay(long productId, int type) + { + if (type == (int)GlobalEnumVars.OrderType.BuyCurrency) + { + RechargeIntroEntity entity = await _rechargeIntroRepository.GetAsync(productId); + if (entity.IsNotNull()) + { + //订单信息 + OrderEntity order = await _orderRepository.InsertAsync(new OrderEntity + { + OrderSn = CommonHelper.GetOrderSn(productId), + UserId = _httpContextUser.Id, + PaymentMethod = (int)GlobalEnumVars.PaymentMethod.WX, + OrderMoney = entity.Price, + DistrictMoney = 0, + PaymentMoney = entity.Price, + ShippingCompName = "", + ShippingSn = "", + PayTime = DateTime.Now, + OrderStatus = (int)GlobalEnumVars.OrderStatus.NotPaying, + OrderCurrency = entity.ProductValue, + OrderType = type + }); + //明细 + await _orderDetailRepository.InsertAsync(new OrderDetailEntity + { + OrderId = order.Id, + ProductId = productId, + ProductName = entity.ProductName, + ProductPrice = entity.Price + }); + //付款记录 + PaymentRecordEntity paymentRecord = await _paymentRecordRepository.InsertAsync(new PaymentRecordEntity + { + UserId = _httpContextUser.Id, + OrderId = order.Id, + PaySn = "", + PayStatus = (int)GlobalEnumVars.OrderStatus.NotPaying, + PayPlatform = (int)GlobalEnumVars.PaymentMethod.WX, + PaymentMoney = order.PaymentMoney + }); + + return await CreateOrderByJsapi(_httpContextUser.OpenId, entity.ProductName, order.PaymentMoney.ObjectToInt(), + paymentRecord.Id); + } + return new ResponseOutput() + { + Successed = false, + Msg = "商品信息不存在", + Code = 0 + }; + } + else + { + CardIntroEntity entity = await _cardIntroRepository.GetAsync(x => x.Id == productId); + if (entity.IsNotNull()) + { + //订单信息 + OrderEntity order = await _orderRepository.InsertAsync(new OrderEntity + { + OrderSn = CommonHelper.GetOrderSn(productId), + UserId = _httpContextUser.Id, + PaymentMethod = (int)GlobalEnumVars.PaymentMethod.WX, + OrderMoney = entity.CardValue, + DistrictMoney = 0, + PaymentMoney = entity.CardValue, + ShippingCompName = "", + ShippingSn = "", + PayTime = DateTime.Now, + OrderStatus = (int)GlobalEnumVars.OrderStatus.NotPaying, + OrderCurrency = entity.SendValue, + OrderType = type + }); + //明细 + await _orderDetailRepository.InsertAsync(new OrderDetailEntity + { + OrderId = order.Id, + ProductId = productId, + ProductName = entity.CardName, + ProductPrice = entity.CardValue + }); + //付款记录 + PaymentRecordEntity paymentRecord = await _paymentRecordRepository.InsertAsync(new PaymentRecordEntity + { + UserId = _httpContextUser.Id, + OrderId = order.Id, + PaySn = "", + PayStatus = (int)GlobalEnumVars.OrderStatus.NotPaying, + PayPlatform = (int)GlobalEnumVars.PaymentMethod.WX, + PaymentMoney = order.PaymentMoney + }); + + return await CreateOrderByJsapi(_httpContextUser.OpenId, entity.CardName, order.PaymentMoney.ObjectToInt(), + paymentRecord.Id); + } + return new ResponseOutput() + { + Successed = false, + Msg = "商品信息不存在", + Code = 0 + }; + } + + } + + + /// + /// 微信小程序支付回调 + /// + /// + [Transaction] + public async Task NotifyUrl(string content) + { + try + { + _logger.LogError("NotifyUrl"); + var client = _tenpayHttpClientFactory.Create(_tenpayOptions.Merchants[0].MerchantId); + var callbackModel = client.DeserializeEvent(content); + if ("TRANSACTION.SUCCESS".Equals(callbackModel.EventType)) + { + var callbackResource = client.DecryptEventResource(callbackModel); + //attach + string paymentId = callbackResource.Attachment; + //业务处理 + PaymentRecordEntity paymentRecord = await _paymentRecordRepository.GetAsync(Convert.ToInt64(paymentId)); + if (paymentRecord.IsNotNull()) + { + paymentRecord.PayStatus = (int)GlobalEnumVars.PayStatus.Paying; + await _paymentRecordRepository.UpdateAsync(paymentRecord); + //order + OrderEntity order = await _orderRepository.GetAsync(paymentRecord.OrderId); + if (order.IsNotNull()) + { + + //积分操作 + var orderDetail = await _orderDetailRepository.Select.Where(x => x.OrderId == order.Id) + .ToOneAsync(); + if (order.OrderStatus != (int)GlobalEnumVars.OrderStatus.Paying) + { + if (order.OrderType == (int)GlobalEnumVars.OrderType.BuyCurrency) + { + RechargeIntroEntity entity = await _rechargeIntroRepository.GetAsync(orderDetail.ProductId); + await _currencyService.AddCurrencyByCharge(order.UserId, order.Id, entity.AllValue); + } + if (order.OrderType == (int)GlobalEnumVars.OrderType.PreferentialCard) + { + CardIntroEntity entity = await _cardIntroRepository.GetAsync(x => x.Id == orderDetail.ProductId); + await _currencyService.AddCurrencyByBuyCard(order.UserId, order.Id, entity.SendValue); + await _userCardService.AddUserCardAsync(order.UserId, entity.Id, entity.Aging); + } + } + order.OrderStatus = (int)GlobalEnumVars.OrderStatus.Paying; + await _orderRepository.UpdateAsync(order); + } + } + } + + string xml = "" + + "SUCCESS" + + "OK" + + ""; + return xml; + } + catch (Exception ex) + { + _logger.LogError(ex, ex.Message); + + string xml = "" + + "FAIL" + + "支付通知失败" + + ""; + return xml; + } + } + + /// + /// 获取微信access_token + /// + /// + public WxAccessTokenOutput GetWxAccessTokenAsync() + { + //var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); + //var request = new CgibinTokenRequest(); + //var response = await client.ExecuteCgibinTokenAsync(request); + //await _redisOperationRepository.SetAsync( + // GlobalEnumVars.AccessTokenEnum.WxOpenAccessToken.ToString(), response.AccessToken, TimeSpan.FromDays(30)); + //var accessToken = await _redisOperationRepository.GetAsync(GlobalEnumVars.AccessTokenEnum.WxOpenAccessToken.ToString()); + //return accessToken; + string key = string.Format(GlobalCacheKeyVars.WxAccessToken, _weChatOptions.WxOpenAppId); + WxAccessTokenOutput wxAccessToken = _redisCache.Get(key); + if (wxAccessToken.IsNull()) + { + string authHost = + $"https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={_weChatOptions.WxOpenAppId}&secret={_weChatOptions.WxOpenAppSecret}"; + HttpClient client = new HttpClient(); + HttpResponseMessage response = client.GetAsync(authHost).Result; + wxAccessToken = + JsonConvert.DeserializeObject(response.Content.ReadAsStringAsync().Result); + _redisCache.SetAsync(key, wxAccessToken, TimeSpan.FromHours(1.5)); + } + return wxAccessToken; + } + + /// + /// 获取小程序 + /// + /// + public ResponseOutput GetUnlimitedAsync() + { + //var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken(); + string key = string.Format(GlobalCacheKeyVars.WxAccessToken, _weChatOptions.WxOpenAppId); + WxAccessTokenOutput wxAccessToken = _redisCache.Get(key); + if (wxAccessToken.IsNull()) + { + wxAccessToken = GetWxAccessTokenAsync(); + } + string authHost = + $"https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token={wxAccessToken.access_token}"; + + System.Net.HttpWebRequest request; + request = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(authHost); + request.Method = "POST"; + request.ContentType = "application/json;charset=UTF-8"; + string scene = $"Id={_httpContextUser.Id}"; + string options = "{\"scene\":\"" + scene + "\",\"page\":\"pages/index/index\"}"; + byte[] payload = Encoding.UTF8.GetBytes(options); + request.ContentLength = payload.Length; + + Stream writer = request.GetRequestStream(); + writer.Write(payload, 0, payload.Length); + writer.Close(); + + System.Net.HttpWebResponse response = (System.Net.HttpWebResponse)request.GetResponse(); + Stream s = response.GetResponseStream(); + List bytes = new List(); + int temp = s.ReadByte(); + while (temp != -1) + { + bytes.Add((byte)temp); + temp = s.ReadByte(); + } + byte[] result = bytes.ToArray(); + string base64 = Convert.ToBase64String(result);//将byte[]转为base64 + return new ResponseOutput() + { + Data = "{\"errcode\":0,\"errmsg\":\"获取成功\",\"buffer\":\"" + base64 + "\"}", + Successed = true, + Code = 1 + }; + } + + /// + /// 获取小程序 + /// + /// + public ResponseOutput GetQrCodeAsync(long id) + { + //var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken(); + string key = string.Format(GlobalCacheKeyVars.WxAccessToken, _weChatOptions.WxOpenAppId); + WxAccessTokenOutput wxAccessToken = _redisCache.Get(key); + if (wxAccessToken.IsNull()) + { + wxAccessToken = GetWxAccessTokenAsync(); + } + string authHost = + $"https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token={wxAccessToken.access_token}"; + + System.Net.HttpWebRequest request; + request = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(authHost); + request.Method = "POST"; + request.ContentType = "application/json;charset=UTF-8"; + string scene = $"{id},{_httpContextUser.Id}"; + string options = "{\"scene\":\"" + scene + "\",\"page\":\"pages/detail/detail\"}"; + byte[] payload = Encoding.UTF8.GetBytes(options); + request.ContentLength = payload.Length; + + Stream writer = request.GetRequestStream(); + writer.Write(payload, 0, payload.Length); + writer.Close(); + + System.Net.HttpWebResponse response = (System.Net.HttpWebResponse)request.GetResponse(); + Stream s = response.GetResponseStream(); + List bytes = new List(); + int temp = s.ReadByte(); + while (temp != -1) + { + bytes.Add((byte)temp); + temp = s.ReadByte(); + } + byte[] result = bytes.ToArray(); + string base64 = Convert.ToBase64String(result);//将byte[]转为base64 + return new ResponseOutput() + { + Data = "{\"errcode\":0,\"errmsg\":\"获取成功\",\"buffer\":\"" + base64 + "\"}", + Successed = true, + Code = 1 + }; + } + + + + /// + /// JSAPI下单支付 + /// + /// + /// + /// + /// + /// + public async Task CreateOrderByJsapi(string openId, string body, int price, long paymentId) + { + var manager = new InMemoryCertificateManager(); + var options = new WechatTenpayClientOptions() + { + MerchantId = _tenpayOptions.Merchants[0].MerchantId, + MerchantV3Secret = _tenpayOptions.Merchants[0].SecretV3, + MerchantCertificateSerialNumber = _tenpayOptions.Merchants[0].CertSerialNumber, + MerchantCertificatePrivateKey = @"-----BEGIN PRIVATE KEY----- + MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDF+wWe6XTe/o1K + 8Ri2lXMRJFgtjZYjxX9E8GZt7rirZRMlsgpqBjymJt/7P2LAxqafUbM9bMOlo6Ec + ppjyw8yrSGTaHqSzWhoP7NuxpCw9Y4x8QOCIjsp0+UV6aE/AVw/+jfhkn7dBfAqP + kIrpRlLjTYti0GSLwPVYCHDHKyYKo2pXbAlCpLjZY0c5Q4cAajPYLUrtAd9Jwzo1 + vt8aTcIsgPVK8nXJM00BYsvT9NVlV15eWgU/cXg1tzJN6ZT6t75c4iTu9aoGTp2b + x0Zd6OsK0FZ4NwfvcQIKHxzShbjeTuK3SMkNd3asvUXsUpus6dJbryEg2d3Emura + SaVcg5tLAgMBAAECggEASOTt4t7OOzS6TTeMA93u6gbZuJwDBdS30Wg6LovQzrp+ + XEi7cOIu/nYdzeI+t//sZYitWBZtytT+gxAMDIZvGzmieHUD601nfymUkkmCSHAY + z78LbPw2Ku+E11cE1iq4Jt+a72GnFaNYOBfeLZnI9wwcIBveiV5YdztUWuDWNt/i + JO8+cQol/y9gZqZeZSkE+ksM6SvQzhfEuGzQDXjYyOiIgja+M2mMLw2GQnqryDky + giBmJkqpCFXMw9GQa8lnM5Tw7WRsGoJm/NzMsUuyIT3kwSeUOPlkLd0mzJTcDmmR + HRKV6D5lQEH+sxYrCdJ+AgBLOKdg9GALfjdSK/c8IQKBgQDw0kBMDdUwgvJ6JOT1 + uxlnsXz1BLh1NcS9LzM04h+Bt80omAzwt8jeXW9OgqwvOenWoi58Du4I8RsxnoFC + tktqaBqW3a8e47b4UJ1LHr15OukxM24Kkulg7+2/MexMTmN2AYVskqI5Y8ebcQnt + WrYkar2VeedEANFZx5GF4NlMSQKBgQDSdYSmmw5Oi7oHuhkhOKz3/uH+vWWM2yTX + tgFml+iWy8+k8uYxw1BAwoeqNzJNqH/7goKSIudhZt5G/Fz3i1ZAFdYVix5XCLjF + 3ySz6NPyLGo2MJpWSCoLPqHGFp6jFHmXzDySUsT4YcWeCT88yBM3lGgqJL7Eq8dc + gysJqCqi8wKBgQDhL5lUBLNPM4NNV+aJKTUuUzdHXeymHWskhFhboP5ZK+e5h8TB + 6vj3hWMphONBHeRdATZ6ZvOKhPoqwc6Y9SE8FLCYVh8EwWY8eBU9QzdlfwLDMRY6 + 6Pk13eTwndwZ1ksG85Ex30O2amkiHudrfSFImE9C0MTCQAmC7CxVhdVrkQKBgAbx + XYjpgJVSwrZSi1WvOvWLcQUoVltJN3PuSymJRWEEJDt6z+FAYjtgr30MCRrKvj4b + 1hbgE+YAsMCCvsZj0FqY3dEkH8IbRY0xiVJuEd/hWzeibtT92HU6gbe5M06J9GDv + mefx1xGimBRYlb95kji5Kp6JS8nNKOyCXz8YTx/FAoGBAKKMZgPpN+4Qd1ZuvALm + couRMQf6EWuCB7u9VuzJW/aaAIEGEXCC4HLEIYpROBwNrG313yseGVzPT2txoxw6 + u2XjfkdEkhLU3W54TSw4EJedWE5d+TGGqf9eMRdUbhCXylPzTlxmnFwGb0Z31eh7 + MndPWjaUAjvKQ5xFYg4gUezL + -----END PRIVATE KEY-----", + PlatformCertificateManager = manager // 证书管理器的具体用法请参阅下文的高级技巧与加密、验签有关的章节 + }; + var client = new WechatTenpayClient(options); + //var client = _tenpayHttpClientFactory.Create(_tenpayOptions.Merchants[0].MerchantId); + var request = new CreatePayTransactionJsapiRequest() + { + OutTradeNumber = $"{_tenpayOptions.Merchants[0].MerchantId}" + DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff"), + AppId = _weChatOptions.WxOpenAppId, + Description = body, + ExpireTime = DateTimeOffset.Now.AddMinutes(15), + NotifyUrl = _tenpayOptions.NotifyUrl, + Amount = new CreatePayTransactionJsapiRequest.Types.Amount() { Total = price * 100 }, + Payer = new CreatePayTransactionJsapiRequest.Types.Payer() { OpenId = openId }, + Attachment = paymentId.ToString() + }; + var response = await client.ExecuteCreatePayTransactionJsapiAsync(request); + if (!response.IsSuccessful()) + { + _logger.LogWarning( + "JSAPI 下单失败（状态码：{0}，错误代码：{1}，错误描述：{2}）。", + response.RawStatus, response.ErrorCode, response.ErrorMessage + ); + } + var paramMap = client.GenerateParametersForJsapiPayRequest(request.AppId, response.PrepayId); + return new ResponseOutput() { Data = paramMap, Successed = true, Code = 1 }; + } + + } +} diff --git a/Znyc.CloudCar.Services/Banner/BannerService.cs b/Znyc.CloudCar.Services/Banner/BannerService.cs new file mode 100644 index 0000000..9c3b1ed --- /dev/null +++ b/Znyc.CloudCar.Services/Banner/BannerService.cs @@ -0,0 +1,55 @@ +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.IRepository.Banner; +using Znyc.CloudCar.IServices.Banner; +using Znyc.CloudCar.IServices.CaChe; +using Znyc.CloudCar.Model.Dtos.Banner; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Services.Banner +{ + /// + /// Banner服务 + /// + public class BannerService : IBannerService + { + private readonly IBannerRepository _bannerRepository; + private readonly ICacheService _cacheService; + + public BannerService( + IBannerRepository bannerRepository, + ICacheService cacheService + ) + { + _bannerRepository = bannerRepository; + _cacheService = cacheService; + } + + /// + /// 查询Banner缓存 + /// + /// + public async Task GetBannerListAsync() + { + var banners = await _cacheService.GetBannerListAsync(); + if (banners.IsNull()) + { + banners = await _bannerRepository + .Where(x => x.State == 1 && x.IsDeleted == false) + .OrderBy(x => x.Sort) + .ToListAsync(x => new BannerListOutput + { + PicUrl = GlobalConstVars.Default_Banner_Prefix + x.PicUrl + }); + + await _cacheService.SetBannerListAsync(banners); + } + return new ResponseOutput() + { + Data = banners, + Successed = true, + Code = 1 + }; + } + } +} diff --git a/Znyc.CloudCar.Services/Browse/BrowseService.cs b/Znyc.CloudCar.Services/Browse/BrowseService.cs new file mode 100644 index 0000000..0cda4e8 --- /dev/null +++ b/Znyc.CloudCar.Services/Browse/BrowseService.cs @@ -0,0 +1,107 @@ +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.IRepository.Currency; +using Znyc.CloudCar.IRepository.Equipment; +using Znyc.CloudCar.IRepository.EquipmentPicture; +using Znyc.CloudCar.IRepository.User; +using Znyc.CloudCar.IServices.Browse; +using Znyc.CloudCar.IServices.CaChe; +using Znyc.CloudCar.Model.Dtos.Browse; +using Znyc.CloudCar.Model.Dtos.EquipmentPicture; +using Znyc.CloudCar.Model.Entities; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Helper; +using static Znyc.CloudCar.Configuration.GlobalEnumVars; + +namespace Znyc.CloudCar.Services.Browse +{ + /// + /// 浏览记录服务 + /// + public class BrowseService : IBrowseService + { + private readonly ICacheService _cacheService; + private readonly IHttpContextUser _httpContextUser; + private readonly IEquipmentRepository _equipmentRepository; + private readonly ICurrencyRecordRepository _currencyRecordRepository; + private readonly IUserRepository _userRepository; + private readonly IEquipmentPictureRepository _equipmentPictureRepository; + + public BrowseService( + ICacheService cacheService, + IHttpContextUser httpContextUser, + IEquipmentRepository equipmentRepository, + ICurrencyRecordRepository currencyRecordRepository, + IUserRepository userRepository, + IEquipmentPictureRepository equipmentPictureRepository + ) + { + _cacheService = cacheService; + _httpContextUser = httpContextUser; + _equipmentRepository = equipmentRepository; + _currencyRecordRepository = currencyRecordRepository; + _userRepository = userRepository; + _equipmentPictureRepository = equipmentPictureRepository; + } + + /// + /// 分页查询浏览记录列表 + /// + /// + /// + /// + public async Task PageAsync(int currentPage, int pageSize) + { + long total = await _cacheService.GetBrowseCountAsync(_httpContextUser.Id); + var list = (await _cacheService.GetBrowseAsync(_httpContextUser.Id)).Skip((currentPage - 1) * pageSize).Take(pageSize).ToList(); + List equipmentIds = list.ConvertAll(s => long.Parse(s.Key)); + List browseList = await _equipmentRepository.Select + .Where(x => equipmentIds.Contains(x.Id)) + .OrderByDescending(x => x.IsTop) + .OrderByDescending(true, x => x.RefreshDate) + .Page(currentPage, pageSize) + .ToListAsync(); + //积分记录 + List currencyRecordList = new List(); + if (_httpContextUser.Id > 0) + { + long[] cIds = browseList.Select(x => x.Id).Distinct().ToArray(); + currencyRecordList = await _currencyRecordRepository.Where(x => + cIds.Contains(x.CurrencySoureObjectId) && + x.CurrencyType == (int)CurrencyType.CallPhone).ToListAsync(); + } + long[] uIds = browseList.Select(x => x.UserId).Distinct().ToArray(); + List users = await _userRepository.Select.Where(x => uIds.Contains(x.Id)).ToListAsync(); + //设备图片 + long[] eIds = browseList.Select(x => x.Id).Distinct().ToArray(); + List equipmentPictures = await _equipmentPictureRepository.Select + .Where(x => x.IsDeleted == false && eIds.Contains(x.EquipmentId) && x.PictureType == (int)PictureTypeEnum.Equipment) + .ToListAsync(); + foreach (var item in browseList) + { + item.EquipmentPictures = equipmentPictures.FindAll(x => x.EquipmentId == item.Id); + UserEntity user = users.FirstOrDefault(x => x.Id == item.UserId); + item.UserName = user?.UserName ?? GlobalConstVars.User.Default_UserName; + item.AvatarUrl = GlobalConstVars.User.DefaultImagePrefix + (user?.AvatarUrl ?? GlobalConstVars.User.DefaultAvataUrl); + item.IsGetPhone = item.UserId == _httpContextUser.Id ? true : currencyRecordList.Exists(x => x.UserId == _httpContextUser.Id && x.CurrencySoureObjectId == item.Id); + item.ContactPhone = !item.IsGetPhone ? CommonHelper.ToHiddenPhone(item.ContactPhone) : item.ContactPhone; + item.CallPhoneCurrency = CommonHelper.GetCallPhoneCurrency(Convert.ToInt32(item.SellingPrice)); + item.SellingPrice = item.SellingPrice / 10000; + + } + PageOutput data = new PageOutput + { + List = browseList, + Total = total + }; + ResponseOutput response = new ResponseOutput() + { + Data = data, + Successed = true, + Code = 1 + }; + return response; + } + + } +} diff --git a/Znyc.CloudCar.Services/Cache/CacheService.cs b/Znyc.CloudCar.Services/Cache/CacheService.cs new file mode 100644 index 0000000..f14b08b --- /dev/null +++ b/Znyc.CloudCar.Services/Cache/CacheService.cs @@ -0,0 +1,458 @@ +using Znyc.CloudCar.Caching; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.IServices.CaChe; +using Znyc.CloudCar.Model.Dtos.Banner; +using Znyc.CloudCar.Model.Dtos.CardIntro; +using Znyc.CloudCar.Model.Dtos.Certification; +using Znyc.CloudCar.Model.Dtos.Dictionary; +using Znyc.CloudCar.Model.Dtos.Recharge; +using Znyc.CloudCar.Model.Dtos.User; +using Znyc.CloudCar.Model.Entities; + +namespace Znyc.CloudCar.Services.Cache +{ + public class CacheService : ICacheService + { + private readonly IRedisOperationRepository _redisCache; + + public CacheService( + IRedisOperationRepository redisCache) + { + _redisCache = redisCache; + } + + #region Dictionary + /// + /// 设置数据字典缓存 + /// + /// + /// + public async Task SetDictionaryAsync(List output) + { + await _redisCache.SetAsync(GlobalCacheKeyVars.DictionaryList, output); + + } + + /// + /// 获取数据字典缓存 + /// + /// + public async Task> GetDictionaryAsync() + { + + return await _redisCache.GetAsync>(GlobalCacheKeyVars.DictionaryList); + + } + + /// + /// 删除数据字典缓存 + /// + /// + public async Task RemoveDictionaryAsync() + { + await _redisCache.DelAsync(GlobalCacheKeyVars.DictionaryList); + } + #endregion + + #region User + + /// + /// 设置用户缓存 + /// + /// + /// + /// + public async Task SetUserAsync(long userId, UserOutput user) + { + string key = string.Format(GlobalCacheKeyVars.User, userId); + await _redisCache.SetAsync(key, user); + } + + /// + /// 删除用户缓存 + /// + /// + /// + public async Task RemoveUserAsync(long userId) + { + string key = string.Format(GlobalCacheKeyVars.User, userId); + await _redisCache.DelAsync(key); + } + + /// + /// 获取用户缓存 + /// + /// + /// + public async Task GetUserAsync(long userId) + { + string key = string.Format(GlobalCacheKeyVars.User, userId); + return await _redisCache.GetAsync(key); + } + + #endregion User + + #region PageView + + /// + /// 同步浏览量缓存 + /// + /// + /// + public async Task SetPageViewAsync(string member, double score) + { + return await _redisCache.ZAddAsync(GlobalCacheKeyVars.PageView, member, score); + } + + /// + /// 浏览量自增 + /// + /// + /// + public async Task SetIncrPageViewAsync(long productId) + { + return await _redisCache.ZIncrByAsync(GlobalCacheKeyVars.PageView, productId.ToString()); + } + + /// + /// 删除浏览量缓存 + /// + /// + public async Task RemovePageViewAsync() + { + await _redisCache.DelAsync(GlobalCacheKeyVars.PageView); + } + + /// + /// 获取浏览量缓存 + /// + /// + /// + /// + public async Task> GetPageViewAsync() + { + return await _redisCache.ZRevRangeWithScoresAsync(GlobalCacheKeyVars.PageView); + } + + /// + /// 获取浏览量总条数缓存 + /// + /// + public async Task GetPageViewCountAsync() + { + return await _redisCache.ZCardAsync(GlobalCacheKeyVars.PageView); + } + + #endregion PageView + + #region Browse + /// + /// 获取浏览记录总条数缓存 + /// + /// + /// + public async Task GetBrowseCountAsync(long userId) + { + string key = string.Format(GlobalCacheKeyVars.BrowseList, userId); + return await _redisCache.ZCardAsync(key); + } + + /// + /// 设置浏览记录缓存 + /// + /// + /// + /// + /// + public async Task SetBrowseAsync(long userId, string member, double score) + { + string key = string.Format(GlobalCacheKeyVars.BrowseList, userId); + return await _redisCache.ZAddAsync(key, member, score); + } + + /// + /// 获取浏览记录缓存 + /// + /// + /// + /// + /// + public async Task> GetBrowseAsync(long userId) + { + string key = string.Format(GlobalCacheKeyVars.BrowseList, userId); + return await _redisCache.ZRevRangeWithScoresAsync(key); + } + #endregion + + #region 实名认证 + + /// + /// 设置实名认证缓存 + /// + /// + /// + /// + public async Task SetCertificationAsync(long userId, CertificationOutput certificationOutput) + { + string key = string.Format(GlobalCacheKeyVars.Certification, userId); + await _redisCache.SetAsync(key, certificationOutput); + + } + + /// + /// 删除实名认证缓存 + /// + /// + /// + public async Task RemoveCertificationAsync(long userId) + { + string key = string.Format(GlobalCacheKeyVars.Certification, userId); + await _redisCache.DelAsync(key); + + } + + /// + /// 获取实名认证缓存 + /// + /// + /// + public async Task GetCertificationAsync(long userId) + { + string key = string.Format(GlobalCacheKeyVars.Certification, userId); + return await _redisCache.GetAsync(key); + + } + + #endregion Certification + + #region UnreadMessage + + /// + /// 同步未读信息缓存 + /// + /// + /// + /// + public async Task SetUnreadMessageAsync(long userId, IDictionary list) + { + string key = string.Format(GlobalCacheKeyVars.UnreadMessage, userId); + foreach (var item in list) + { + await _redisCache.HSetAsync(key, item.Key, item.Value); + } + } + + /// + /// 修改未读信息缓存 + /// + /// + /// + /// + /// + public async Task UpdateUnreadMessageAsync(long userId, string filed, string value) + { + string key = string.Format(GlobalCacheKeyVars.UnreadMessage, userId); + await _redisCache.HSetAsync(key, filed, value); + } + + /// + /// 删除未读信息缓存 + /// + /// + /// + public async Task RemoveUnreadMessageAsync(long userId) + { + string key = string.Format(GlobalCacheKeyVars.UnreadMessage, userId); + await _redisCache.DelAsync(key); + } + + /// + /// 获取未读信息缓存 + /// + /// + public async Task> GetUnreadMessageAsync(long userId) + { + string key = string.Format(GlobalCacheKeyVars.UnreadMessage, userId); + return await _redisCache.HGetAllAsync(key); + } + + #endregion UnreadMessage + + #region 用户注册信息滚动提示 + + /// + /// 设置注册用户list + /// + /// + /// + public async Task SetRegistUserListAsync(string member, double score) + { + await _redisCache.ZAddAsync(GlobalCacheKeyVars.RegisteredUserlist, member, score); + } + + /// + /// 获取注册用户list + /// + /// + public async Task> GetRegistUserListAsync(long start, long stop) + { + return await _redisCache.ZRemRangeByRankAsync(GlobalCacheKeyVars.RegisteredUserlist, start, stop); + } + #endregion + + #region Banner + + /// + /// 设置广告缓存 + /// + /// + /// + public async Task SetBannerListAsync(List list) + { + await _redisCache.SetAsync(GlobalCacheKeyVars.BannerList, list, TimeSpan.FromDays(31)); + } + + /// + /// 获取广告缓存 + /// + /// + public async Task> GetBannerListAsync() + { + return await _redisCache.GetAsync>(GlobalCacheKeyVars.BannerList); + } + + /// + /// 删除广告缓存 + /// + /// + public async Task RemoveBannerListAsync() + { + await _redisCache.DelAsync(GlobalCacheKeyVars.BannerList); + } + #endregion + + #region Recharge充值活动 + + /// + /// 设置充值活动缓存 + /// + /// + /// + public async Task SetRechargeAsync(RechargeOutput output) + { + await _redisCache.SetAsync(GlobalCacheKeyVars.RechargeList, output); + } + + /// + /// 获取充值活动缓存 + /// + /// + public async Task GetRechargeAsync() + { + return await _redisCache.GetAsync(GlobalCacheKeyVars.RechargeList); + } + + /// + /// 删除充值活动缓存 + /// + /// + public async Task RemoveRechargeAsync() + { + await _redisCache.DelAsync(GlobalCacheKeyVars.RechargeList); + + } + + #endregion ProductInfo + + #region 优惠卡信息 + + /// + /// 设置优惠卡信息缓存 + /// + /// + /// + public async Task SetCardIntroListAsync(List list) + { + await _redisCache.SetAsync(GlobalCacheKeyVars.CardIntroList, list, TimeSpan.FromDays(31)); + } + + /// + /// 获取优惠卡信息缓存 + /// + /// + public async Task> GetCardIntroListAsync() + { + return await _redisCache.GetAsync>(GlobalCacheKeyVars.CardIntroList); + } + + /// + /// 删除优惠卡信息缓存 + /// + /// + public async Task RemoveCardIntroListAsync() + { + await _redisCache.DelAsync(GlobalCacheKeyVars.CardIntroList); + } + #endregion + + + #region 用户修改次数 + + /// + /// 同步用户修改次数缓存 + /// + /// + /// + public async Task SetUserUpdateCountAsync(string member, double score) + { + return await _redisCache.ZAddAsync(GlobalCacheKeyVars.UserUpdateCount, member, score); + } + + /// + /// 用户修改次数自增 + /// + /// + /// + public async Task SetIncrUserUpdateCountAsync(long userId) + { + return await _redisCache.ZIncrByAsync(GlobalCacheKeyVars.UserUpdateCount, userId.ToString()); + } + + /// + /// 删除用户修改次数缓存 + /// + /// + public async Task RemoveUserUpdateCountAsync() + { + await _redisCache.DelAsync(GlobalCacheKeyVars.UserUpdateCount); + } + + /// + /// 获取用户修改次数缓存 + /// + /// + public async Task> GetUserUpdateCountAsync() + { + return await _redisCache.ZRevRangeWithScoresAsync(GlobalCacheKeyVars.UserUpdateCount); + } + #endregion UserUpdateCount + + + #region 设备管理 + + public async Task SetEquipmentAsync(EquipmentEntity equipment, long userId) + { + string key = string.Format(GlobalCacheKeyVars.UserEquipment, userId); + await _redisCache.SetAsync(key, equipment); + } + + + public async Task GetEquipmentAsync(long userId) + { + string key = string.Format(GlobalCacheKeyVars.UserEquipment, userId); + return await _redisCache.GetAsync(key); + } + + #endregion + } +} diff --git a/Znyc.CloudCar.Services/CardIntro/CardIntroService.cs b/Znyc.CloudCar.Services/CardIntro/CardIntroService.cs new file mode 100644 index 0000000..70d1fbf --- /dev/null +++ b/Znyc.CloudCar.Services/CardIntro/CardIntroService.cs @@ -0,0 +1,48 @@ +using Znyc.CloudCar.IRepository.CardIntro; +using Znyc.CloudCar.IServices.CaChe; +using Znyc.CloudCar.IServices.CardIntro; +using Znyc.CloudCar.Model.Dtos.CardIntro; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Services.CardIntro +{ + public class CardIntroService : ICardIntroService + { + private readonly ICardIntroRepository _cardIntroRepository; + private readonly ICacheService _cacheService; + + public CardIntroService( + ICardIntroRepository cardIntroRepository, + ICacheService cacheService + ) + { + _cardIntroRepository = cardIntroRepository; + _cacheService = cacheService; + } + + /// + /// 查询优惠卡缓存 + /// + /// + public async Task GetCardIntroListAsync() + { + var cardIntroes = await _cacheService.GetCardIntroListAsync(); + if (cardIntroes.IsNull()) + { + cardIntroes = await _cardIntroRepository + .Where(x => x.State == 10 && x.IsEnabled == true && x.IsDeleted == false) + .OrderBy(x => x.Sort) + .ToListAsync(); + + await _cacheService.SetCardIntroListAsync(cardIntroes); + } + return new ResponseOutput() + { + Data = cardIntroes, + Successed = true, + Code = 1 + }; + } + } +} diff --git a/Znyc.CloudCar.Services/Certification/CertificationService.cs b/Znyc.CloudCar.Services/Certification/CertificationService.cs new file mode 100644 index 0000000..bac3c7d --- /dev/null +++ b/Znyc.CloudCar.Services/Certification/CertificationService.cs @@ -0,0 +1,128 @@ +using Mapster; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.IRepository.Certification; +using Znyc.CloudCar.IServices.CaChe; +using Znyc.CloudCar.IServices.Certification; +using Znyc.CloudCar.Model.Dtos.Certification; +using Znyc.CloudCar.Model.Entities; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Extensions; +using Znyc.CloudCar.Utility.Helper; + +namespace Znyc.CloudCar.Services.Certification +{ + /// + /// 用户实名认证服务 + /// + public class CertificationService : ICertificationService + { + private readonly ICacheService _cacheService; + private readonly ICertificationRepository _certificationRepository; + private readonly IHttpContextUser _httpContextUser; + + + public CertificationService( + ICertificationRepository certificationRepository, + ICacheService cacheService, + IHttpContextUser httpContextUser + ) + { + _certificationRepository = certificationRepository; + _httpContextUser = httpContextUser; + _cacheService = cacheService; + } + + + /// + /// 查询实名认证信息 + /// + /// + public async Task GetAsync() + { + ResponseOutput response = new ResponseOutput(); + CertificationOutput certificationOutput = await _cacheService.GetCertificationAsync(_httpContextUser.Id); + if (certificationOutput.IsNull()) + { + certificationOutput = + await _certificationRepository.GetAsync(x => x.UserId == _httpContextUser.Id); + if (certificationOutput.IsNull()) + { + response.Msg = "实名信息认证不存在"; + response.Successed = false; + response.Code = 0; + return response; + } + + //身份证脱敏处理 + certificationOutput.IdCard = CommonHelper.ConvertIdCard(certificationOutput.IdCard); + await _cacheService.SetCertificationAsync(_httpContextUser.Id, certificationOutput); + await _cacheService.RemoveUserAsync(_httpContextUser.Id); + } + response.Data = certificationOutput; + response.Successed = true; + response.Code = 1; + return response; + } + + /// + /// 新增实名认证信息 + /// + /// + /// + public async Task AddAsync(CertificationAddInput certificationAddInput) + { + ResponseOutput response = new ResponseOutput(); + CertificationEntity certification = await _certificationRepository.GetAsync(x => x.UserId == _httpContextUser.Id); + if (certification.IsNull()) + { + CertificationEntity entity = certificationAddInput.Adapt(); + entity.UserId = _httpContextUser.Id; + entity.State = (int)GlobalEnumVars.CertificationState.Review; + entity.PositivePhoto = entity.PositivePhoto.Substring(entity.PositivePhoto.LastIndexOf("/") + 1); + entity.ReversePhoto = entity.ReversePhoto.Substring(entity.ReversePhoto.LastIndexOf("/") + 1); + await _certificationRepository.InsertAsync(entity); + await _cacheService.RemoveCertificationAsync(_httpContextUser.Id); + await _cacheService.RemoveUserAsync(_httpContextUser.Id); + } + else + { + response.Msg = "您已经实名！"; + response.Successed = false; + response.Code = 0; + return response; + } + response.Successed = true; + response.Code = 1; + return response; + } + + /// + /// 更新实名认证信息 + /// + /// + /// + public async Task UpdateAsync(CertificationUpdateInput certificationUpdateInput) + { + ResponseOutput response = new ResponseOutput(); + CertificationEntity entity = await _certificationRepository.GetAsync(certificationUpdateInput.Id); + if (!(entity?.Id > 0)) + { + response.Msg = "实名认证信息不存在！"; + response.Successed = false; + response.Code = 0; + return response; + } + certificationUpdateInput.Adapt(entity); + entity.State = (int)GlobalEnumVars.CertificationState.Review; + entity.PositivePhoto = entity.PositivePhoto.Substring(entity.PositivePhoto.LastIndexOf("/") + 1); + entity.ReversePhoto = entity.ReversePhoto.Substring(entity.ReversePhoto.LastIndexOf("/") + 1); + await _certificationRepository.UpdateAsync(entity); + await _cacheService.RemoveCertificationAsync(_httpContextUser.Id); + await _cacheService.RemoveUserAsync(_httpContextUser.Id); + response.Successed = true; + response.Code = 1; + return response; + } + } +} diff --git a/Znyc.CloudCar.Services/Collection/CollectionService.cs b/Znyc.CloudCar.Services/Collection/CollectionService.cs new file mode 100644 index 0000000..e80c90e --- /dev/null +++ b/Znyc.CloudCar.Services/Collection/CollectionService.cs @@ -0,0 +1,182 @@ +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.IRepository.Collection; +using Znyc.CloudCar.IRepository.Currency; +using Znyc.CloudCar.IRepository.Equipment; +using Znyc.CloudCar.IRepository.EquipmentPicture; +using Znyc.CloudCar.IRepository.User; +using Znyc.CloudCar.IServices.Collection; +using Znyc.CloudCar.Model.Dtos.Collection; +using Znyc.CloudCar.Model.Dtos.EquipmentPicture; +using Znyc.CloudCar.Model.Entities; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Extensions; +using Znyc.CloudCar.Utility.Helper; +using static Znyc.CloudCar.Configuration.GlobalEnumVars; + +namespace Znyc.CloudCar.Services.Collection +{ + /// + /// 收藏服务 + /// + public class CollectionService : ICollectionService + { + private readonly ICollectionRepository _collectionRepository; + private readonly IHttpContextUser _httpContextUser; + private readonly IEquipmentRepository _equipmentRepository; + private readonly ICurrencyRecordRepository _currencyRecordRepository; + private readonly IUserRepository _userRepository; + private readonly IEquipmentPictureRepository _equipmentPictureRepository; + + public CollectionService( + ICollectionRepository collectionRepository, + IHttpContextUser httpContextUser, + IEquipmentRepository equipmentRepository, + ICurrencyRecordRepository currencyRecordRepository, + IUserRepository userRepository, + IEquipmentPictureRepository equipmentPictureRepository + ) + { + _collectionRepository = collectionRepository; + _httpContextUser = httpContextUser; + _equipmentRepository = equipmentRepository; + _currencyRecordRepository = currencyRecordRepository; + _userRepository = userRepository; + _equipmentPictureRepository = equipmentPictureRepository; + } + + /// + /// 分页查询收藏记录列表 + /// + /// + /// + /// + public async Task PageAsync(int currentPage, int pageSize) + { + //收藏记录 + List collection = await _collectionRepository.Select + .Where(x => x.UserId == _httpContextUser.Id && x.State == 0) + .ToListAsync(x => x.EquipmentId); + long[] equipmentIds = collection.Distinct().ToArray(); + List collectionList = await _equipmentRepository.Select + .Where(x => equipmentIds.Contains(x.Id)) + .Count(out long total) + .OrderByDescending(x => x.IsTop) + .OrderByDescending(x => x.RefreshDate) + .Page(currentPage, pageSize) + .ToListAsync(); + //积分记录 + List currencyRecordList = new List(); + if (_httpContextUser.Id > 0) + { + long[] cIds = collectionList.Select(x => x.Id).Distinct().ToArray(); + currencyRecordList = await _currencyRecordRepository.Where(x => + cIds.Contains(x.CurrencySoureObjectId) && + x.CurrencyType == (int)CurrencyType.CallPhone).ToListAsync(); + } + long[] uIds = collectionList.Select(x => x.UserId).Distinct().ToArray(); + List users = await _userRepository.Select.Where(x => uIds.Contains(x.Id)).ToListAsync(); + //设备图片 + long[] eIds = collectionList.Select(x => x.Id).Distinct().ToArray(); + List equipmentPictures = await _equipmentPictureRepository.Select + .Where(x => x.IsDeleted == false && eIds.Contains(x.EquipmentId) && x.PictureType == (int)PictureTypeEnum.Equipment) + .ToListAsync(); + foreach (var item in collectionList) + { + item.EquipmentPictures = equipmentPictures.FindAll(x => x.EquipmentId == item.Id); + UserEntity user = users.FirstOrDefault(x => x.Id == item.UserId); + item.UserName = user?.UserName ?? GlobalConstVars.User.Default_UserName; + item.AvatarUrl = GlobalConstVars.User.DefaultImagePrefix + (user?.AvatarUrl ?? GlobalConstVars.User.DefaultAvataUrl); + item.IsGetPhone = item.UserId == _httpContextUser.Id ? true : currencyRecordList.Exists(x => x.UserId == _httpContextUser.Id && x.CurrencySoureObjectId == item.Id); + item.ContactPhone = !item.IsGetPhone ? CommonHelper.ToHiddenPhone(item.ContactPhone) : item.ContactPhone; + item.CallPhoneCurrency = CommonHelper.GetCallPhoneCurrency(Convert.ToInt32(item.SellingPrice)); + item.SellingPrice = item.SellingPrice / 10000; + } + PageOutput data = new PageOutput + { + List = collectionList, + Total = total + }; + ResponseOutput response = new ResponseOutput() + { + Data = data, + Successed = true, + Code = 1 + }; + return response; + } + + /// + /// 添加收藏 + /// + /// + /// + public async Task AddAsync(long equipmentId) + { + var collection = await _collectionRepository.Where(x => + x.UserId == _httpContextUser.Id && + x.EquipmentId == equipmentId && x.IsDeleted == false) + .OrderByDescending(x => x.ModifiedTime) + .FirstAsync(); + if (collection.IsNull()) + { + collection = await _collectionRepository.InsertAsync(new CollectionEntity() + { + UserId = _httpContextUser.Id, + EquipmentId = equipmentId, + State = 0 + }); + } + collection.ModifiedTime = DateTime.Now; + collection.State = 0; + await _collectionRepository.UpdateAsync(collection); + ResponseOutput response = new ResponseOutput() + { + Successed = true, + Msg = "收藏成功", + Code = 1 + }; + return response; + } + + /// + /// 取消收藏 + /// + /// + /// + public async Task CancelAsync(long equipmentId) + { + ResponseOutput response = new ResponseOutput(); + var collection = await _collectionRepository.GetAsync(x => + x.EquipmentId == equipmentId && + x.UserId == _httpContextUser.Id && x.IsDeleted == false); + if (collection.IsNull()) + { + response.Successed = false; + response.Msg = "信息不存在！"; + response.Code = 0; + return response; + } + collection.State = 1; + await _collectionRepository.UpdateAsync(collection); + response.Successed = true; + response.Msg = "取消收藏成功"; + response.Code = 1; + return response; + } + + /// + /// 是否收藏 + /// + /// + /// + public async Task IsCollection(long equipmentId) + { + CollectionEntity entity = + await _collectionRepository.GetAsync( + x => x.EquipmentId == equipmentId && x.UserId == _httpContextUser.Id && + x.State == 0 && x.IsDeleted == false); + return entity?.Id > 0; + } + } +} diff --git a/Znyc.CloudCar.Services/Currency/CurrencyRecordService.cs b/Znyc.CloudCar.Services/Currency/CurrencyRecordService.cs new file mode 100644 index 0000000..7e2dacd --- /dev/null +++ b/Znyc.CloudCar.Services/Currency/CurrencyRecordService.cs @@ -0,0 +1,58 @@ +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.IRepository.Currency; +using Znyc.CloudCar.IServices.Currency; +using Znyc.CloudCar.Model.Entities; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Services.Currency +{ + public class CurrencyRecordService : ICurrencyRecordService + { + private readonly ICurrencyRecordRepository _currencyRecordRepository; + private readonly IHttpContextUser _httpContextUser; + + public CurrencyRecordService( + ICurrencyRecordRepository currencyRecordRepository, + IHttpContextUser httpContextUser + ) + { + _currencyRecordRepository = currencyRecordRepository; + _httpContextUser = httpContextUser; + } + + /// + /// 是否获取过手机号 + /// + /// 云币来源类型 + /// 产品id + /// + public async Task IsGetPhone(GlobalEnumVars.CurrencyType operatingType, long id) + { + CurrencyRecordEntity currency = await _currencyRecordRepository.GetAsync(x => + x.UserId == _httpContextUser.Id && x.CurrencyType == (int)operatingType && x.CurrencySoureObjectId == id); + if (currency.IsNull()) + { + return false; + } + + return true; + } + + /// + /// 是否存在云币记录 + /// + /// + public async Task IsExistCurrencyRecord(long userId, int operatingType) + { + CurrencyRecordEntity currencyRecord = await _currencyRecordRepository.GetAsync(x => + x.UserId == userId && x.CurrencyType == operatingType); + if (currencyRecord.IsNull()) + { + return false; + } + + return true; + } + } +} diff --git a/Znyc.CloudCar.Services/Currency/CurrencyService.cs b/Znyc.CloudCar.Services/Currency/CurrencyService.cs new file mode 100644 index 0000000..1896ad4 --- /dev/null +++ b/Znyc.CloudCar.Services/Currency/CurrencyService.cs @@ -0,0 +1,383 @@ +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.IRepository.Currency; +using Znyc.CloudCar.IRepository.User; +using Znyc.CloudCar.IServices.Currency; +using Znyc.CloudCar.Model.Dtos.Currency; +using Znyc.CloudCar.Model.Entities; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Extensions; +using Znyc.CloudCar.Utility.Helper; +using EnumExtensions = Znyc.CloudCar.Utility.Extensions.EnumExtensions; + +namespace Znyc.CloudCar.Services.Currency +{ + /// + /// 用户云币服务 + /// + public class CurrencyService : ICurrencyService + { + + private readonly ICurrencyRepository _currencyRepository; + private readonly ICurrencyRecordRepository _currencyRecordRepository; + private readonly IHttpContextUser _httpContextUser; + private readonly IUserRepository _userRepository; + public CurrencyService( + ICurrencyRepository currencyRepository, + ICurrencyRecordRepository currencyRecordRepository, + IHttpContextUser httpContextUser, + IUserRepository userRepository + ) + { + _currencyRepository = currencyRepository; + _currencyRecordRepository = currencyRecordRepository; + _httpContextUser = httpContextUser; + _userRepository = userRepository; + } + + /// + /// 总云币 + /// + /// + public async Task GetAsync() + { + CurrencyOutput currency = await _currencyRepository.GetAsync(x => x.UserId == _httpContextUser.Id); + ResponseOutput response = new ResponseOutput() + { + Data = currency, + Successed = true, + Code = 1 + }; + return response; + } + + /// + /// 云币账单 + /// + /// 0全部/1收入/2支出 + /// + /// + /// + public async Task PageAsync(int currencyType, int currentPage, int pageSize) + { + List list = await _currencyRecordRepository.Select + .Where(x => x.UserId == _httpContextUser.Id) + .WhereIf(currencyType > 0, x => x.OperatingType == currencyType) + .Count(out long total) + .OrderByDescending(x => x.CreatedTime) + .Page(currentPage, pageSize) + .ToListAsync(); + + foreach (CurrencyRecordOutput item in list) + { + item.Title = EnumExtensions + .ParseEnum(typeof(GlobalEnumVars.CurrencyType), item.CurrencyType.ToString()).ToDescription(); + item.ScoreDescription = item.OperatingType == 1 + ? GlobalConstVars.CurrencyOperatingType.Add + item.OperatingCurrency + : GlobalConstVars.CurrencyOperatingType.Reduce + item.OperatingCurrency; + } + + List currencyRecordListOutput = list + .GroupBy(x => x.CreatedTime.ToString("yyyy-MM")) + .Select(grp => new CurrencyRecordListOutput + { + Month = grp.Key.ToString(), + List = grp.ToList() + }) + .ToList(); + PageOutput data = new PageOutput + { + List = currencyRecordListOutput, + Total = total + }; + ResponseOutput response = new ResponseOutput() + { + Data = data, + Successed = true, + Code = 1 + }; + return response; + } + + /// + /// 首次登录加云币 + /// + /// + public async Task AddCurrencyForFirstLogin(long userId) + { + var currencyRecord = await _currencyRecordRepository.GetAsync(x => x.CurrencySoureObjectId == userId && x.CurrencyType == (int)GlobalEnumVars.CurrencyType.FirstLogin); + //不存在此记录 + if (currencyRecord == null) + { + var currency = await _currencyRepository.GetAsync(x => x.UserId == userId); + if (currency == null) + { + await _currencyRepository.InsertAsync(new CurrencyEntity + { + UserId = userId, + OfficialCurrency = GlobalConstVars.Currency.FirstLogin, + AvailableCurrency = GlobalConstVars.Currency.FirstLogin + }); + await _currencyRecordRepository.InsertAsync(new CurrencyRecordEntity + { + UserId = userId, + OperatingCurrency = GlobalConstVars.Currency.FirstLogin, + OperatingType = (int)GlobalEnumVars.OperatingType.Add, + CurrencyType = (int)GlobalEnumVars.CurrencyType.FirstLogin, + CurrencySoureObjectId = userId + }); + } + } + } + + /// + /// 充值加云币 + /// + /// + /// + /// + /// + public async Task AddCurrencyByCharge(long userId, long orderId, int credits) + { + CurrencyRecordEntity currencyRecord = await _currencyRecordRepository.GetAsync(x => + x.CurrencySoureObjectId == orderId && x.CurrencyType == (int)GlobalEnumVars.CurrencyType.BuyCurrency); + //不存在此记录 + if (currencyRecord.IsNull()) + { + CurrencyEntity currency = await _currencyRepository.GetAsync(x => x.UserId == userId); + currency.OfficialCurrency += credits; + currency.AvailableCurrency += credits; + + await _currencyRepository.UpdateAsync(currency); + await _currencyRecordRepository.InsertAsync(new CurrencyRecordEntity + { + UserId = userId, + OperatingCurrency = credits, + OperatingType = (int)GlobalEnumVars.OperatingType.Add, + CurrencyType = (int)GlobalEnumVars.CurrencyType.BuyCurrency, + CurrencySoureObjectId = orderId + }); + } + } + + /// + /// 邀请新用户加云币 + /// + /// + /// + /// + public async Task AddCurrencyForNewUsers(long userId, long receiveUserId) + { + //判断是否多次被邀请 + CurrencyRecordEntity currencyRecord = await _currencyRecordRepository.GetAsync(x => + x.CurrencySoureObjectId == receiveUserId && x.CurrencyType == (int)GlobalEnumVars.CurrencyType.NewUsers); + if (currencyRecord.IsNull()) + { + CurrencyEntity currency = await _currencyRepository.GetAsync(x => x.UserId == userId); + if (currency.IsNotNull()) + { + currency.OfficialCurrency += GlobalConstVars.Currency.NewUsers; + currency.AvailableCurrency += GlobalConstVars.Currency.NewUsers; + await _currencyRepository.UpdateAsync(currency); + + await _currencyRecordRepository.InsertAsync(new CurrencyRecordEntity + { + UserId = userId, + OperatingCurrency = GlobalConstVars.Currency.NewUsers, + OperatingType = (int)GlobalEnumVars.OperatingType.Add, + CurrencyType = (int)GlobalEnumVars.CurrencyType.NewUsers, + CurrencySoureObjectId = receiveUserId + }); + } + } + } + + #region 设备 + + /// + /// 刷新扣除云币 + /// + /// + /// + public async Task RefreshDeduct(long equipmentId) + { + ResponseOutput response = new ResponseOutput(); + CurrencyEntity currency = await _currencyRepository.GetAsync(x => x.UserId == _httpContextUser.Id); + if (currency.AvailableCurrency < GlobalConstVars.Currency.Refresh) + { + response.Msg = $"您当前的云币不足,刷新需要消耗{GlobalConstVars.Currency.Refresh}云币,是否前往获取云币?"; + response.Successed = false; + response.Code = 2; + return response; + } + + //临时云币足够时优先扣除临时云币 + if (currency.TemporarylCurrency >= GlobalConstVars.Currency.Refresh) + { + currency.TemporarylCurrency -= GlobalConstVars.Currency.Refresh; + } + //不够时组合扣除积分 + else + { + currency.OfficialCurrency -= GlobalConstVars.Currency.Refresh - currency.TemporarylCurrency; + currency.TemporarylCurrency = GlobalConstVars.Currency.Default_TemporarylCredits; + } + + currency.AvailableCurrency -= GlobalConstVars.Currency.Refresh; + await _currencyRepository.UpdateAsync(currency); + await _currencyRecordRepository.InsertAsync(new CurrencyRecordEntity + { + UserId = _httpContextUser.Id, + OperatingCurrency = GlobalConstVars.Currency.Refresh, + OperatingType = (int)GlobalEnumVars.OperatingType.Reduce, + CurrencyType = (int)GlobalEnumVars.CurrencyType.RefreshEquipment, + CurrencySoureObjectId = equipmentId + }); + response.Successed = true; + response.Code = 1; + return response; + } + + /// + /// 置顶扣除云币 + /// + /// + /// + public async Task TopDeduct(long equipmentId) + { + ResponseOutput response = new ResponseOutput(); + CurrencyEntity currency = await _currencyRepository.GetAsync(x => x.UserId == _httpContextUser.Id); + if (currency.OfficialCurrency < GlobalConstVars.Currency.TopEquipment) + { + response.Msg = $"您当前的正式云币不足,置顶需要消耗{GlobalConstVars.Currency.TopEquipment}云币,是否前往获取云币?"; + response.Successed = false; + response.Code = 2; + return response; + } + + currency.OfficialCurrency -= GlobalConstVars.Currency.TopEquipment; + currency.AvailableCurrency -= GlobalConstVars.Currency.TopEquipment; + await _currencyRepository.UpdateAsync(currency); + await _currencyRecordRepository.InsertAsync(new CurrencyRecordEntity + { + UserId = _httpContextUser.Id, + OperatingCurrency = GlobalConstVars.Currency.TopEquipment, + OperatingType = (int)GlobalEnumVars.OperatingType.Reduce, + CurrencyType = (int)GlobalEnumVars.CurrencyType.TopEquipment, + CurrencySoureObjectId = equipmentId + }); + + response.Successed = true; + response.Code = 1; + return response; + } + + /// + /// 获取电话扣除云币 + /// + /// + /// + public async Task GetPhoneDeduct(long equipmentId, int sellingPrice) + { + ResponseOutput response = new ResponseOutput(); + int callPhoneCurrency = CommonHelper.GetCallPhoneCurrency(sellingPrice); + CurrencyEntity currency = await _currencyRepository.GetAsync(x => x.UserId == _httpContextUser.Id); + if (currency.AvailableCurrency < callPhoneCurrency) + { + response.Msg = $"您当前的云币不足,获取电话需要消耗{callPhoneCurrency}云币,是否前往获取云币?"; + response.Successed = false; + response.Code = 2; + return response; + } + + //临时云币足够时优先扣除临时云币 + if (currency.TemporarylCurrency >= callPhoneCurrency) + { + currency.TemporarylCurrency -= callPhoneCurrency; + } + //不够时组合扣除积分 + else + { + currency.OfficialCurrency -= callPhoneCurrency - currency.TemporarylCurrency; + currency.TemporarylCurrency = GlobalConstVars.Currency.Default_TemporarylCredits; + } + + currency.AvailableCurrency -= callPhoneCurrency; + await _currencyRepository.UpdateAsync(currency); + await _currencyRecordRepository.InsertAsync(new CurrencyRecordEntity + { + UserId = _httpContextUser.Id, + OperatingCurrency = callPhoneCurrency, + OperatingType = (int)GlobalEnumVars.OperatingType.Reduce, + CurrencyType = (int)GlobalEnumVars.CurrencyType.CallPhone, + CurrencySoureObjectId = equipmentId + }); + response.Successed = true; + response.Code = 1; + return response; + } + #endregion + + /// + /// 购买优惠卡赠送云币 + /// + /// + /// + /// + /// + public async Task AddCurrencyByBuyCard(long userId, long orderId, int credits) + { + CurrencyRecordEntity currencyRecord = await _currencyRecordRepository.GetAsync(x => + x.CurrencySoureObjectId == orderId && x.CurrencyType == (int)GlobalEnumVars.CurrencyType.BuyCurrency); + //不存在此记录 + if (currencyRecord.IsNull()) + { + CurrencyEntity currency = await _currencyRepository.GetAsync(x => x.UserId == userId); + currency.OfficialCurrency += credits; + currency.AvailableCurrency += credits; + + await _currencyRepository.UpdateAsync(currency); + await _currencyRecordRepository.InsertAsync(new CurrencyRecordEntity + { + UserId = userId, + OperatingCurrency = credits, + OperatingType = (int)GlobalEnumVars.OperatingType.Add, + CurrencyType = (int)GlobalEnumVars.CurrencyType.PreferentialCard, + CurrencySoureObjectId = orderId + }); + } + } /// + /// 分享 + /// + /// + /// + /// + public async Task ShareAsync(string shareType, long userId) + { + ResponseOutput response = new ResponseOutput(); + var user = _userRepository.GetAsync(userId); + if (user.IsNotNull()) + { + switch (shareType.ToLower()) + { + //邀请新用户 + case "newusers": + await AddCurrencyForNewUsers(userId, _httpContextUser.Id); + break; + ////每日分享 + //case "dailyshare": + // await AddCurrencyForDailyShare(_user.Id); + // break; + + default: + await AddCurrencyForNewUsers(userId, _httpContextUser.Id); + break; + } + } + + response.Successed = true; + response.Code = 1; + return response; + } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Services/Dictionary/DictionaryService.cs b/Znyc.CloudCar.Services/Dictionary/DictionaryService.cs new file mode 100644 index 0000000..e592904 --- /dev/null +++ b/Znyc.CloudCar.Services/Dictionary/DictionaryService.cs @@ -0,0 +1,92 @@ +using Znyc.CloudCar.IRepository.Dictionary; +using Znyc.CloudCar.IServices.CaChe; +using Znyc.CloudCar.IServices.Dictionary; +using Znyc.CloudCar.Model.Dtos.Dictionary; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Services.Dictionary +{ + public class DictionaryService : IDictionaryService + { + private readonly ICacheService _cacheService; + private readonly IDictionaryRepository _dictionaryRepository; + + public DictionaryService( + IDictionaryRepository dictionaryRepository, + ICacheService cacheService) + { + _dictionaryRepository = dictionaryRepository; + _cacheService = cacheService; + } + + /// + /// 根据Id获取字典 + /// + /// + /// + public async Task GetByIdAsync(long id) + { + List list = await _cacheService.GetDictionaryAsync(); + if (list.IsNull()) + { + list = await _dictionaryRepository.Select + .Where(x => x.IsEnabled) + .OrderBy(true, + c => c.Sort) + .ToListAsync(); + await _cacheService.SetDictionaryAsync(list); + } + DictionaryOutput dictionary = list.Find(x => x.Id == id); + return dictionary; + } + + + + /// + /// 根据ParentId查询数据字典列表 + /// + /// + /// + public async Task GetListByParentIdAsync(long pid) + { + var dictionarys = await _cacheService.GetDictionaryAsync(); + if (dictionarys.IsNull()) + { + dictionarys = await _dictionaryRepository.Select + .Where(x => x.IsEnabled) + .OrderBy(true, x => x.Sort) + .ToListAsync(); + await _cacheService.SetDictionaryAsync(dictionarys); + } + ResponseOutput response = new ResponseOutput() + { + Data = dictionarys.Where(x => x.ParentId == pid).ToList(), + Successed = true, + Code = 1 + }; + return response; + } + + /// + /// 根据ParentId,Code查询数据字典列表 + /// + /// + /// + /// + public async Task GetListByCodeAsync(long parentId, string code) + { + + var dictionarys = await _dictionaryRepository + .Where(x => x.ParentId == parentId && x.Code == code.ToUpper()) + .OrderBy(x => x.Sort) + .ToListAsync(); + + var response = new ResponseOutput(); + response.Data = dictionarys; + response.Successed = true; + response.Code = 1; + return response; + } + } +} diff --git a/Znyc.CloudCar.Services/Document/DocumentService.cs b/Znyc.CloudCar.Services/Document/DocumentService.cs new file mode 100644 index 0000000..def2098 --- /dev/null +++ b/Znyc.CloudCar.Services/Document/DocumentService.cs @@ -0,0 +1,37 @@ +using COSSTS; +using Newtonsoft.Json; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.IServices.Document; +using Znyc.CloudCar.Model.Dtos.Document; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Services.Document +{ + public class DocumentService : IDocumentService + { + /// + /// 上传图片 + /// + /// + public ResponseOutput UploadImageAsync() + { + Dictionary values = new() + { + ["bucket"] = AppSettingsConstVars.CosConfigBucket, + ["region"] = AppSettingsConstVars.CosConfigRegion, + ["allowPrefix"] = AppSettingsConstVars.CosConfigAllowPrefix, + ["allowActions"] = AppSettingsConstVars.CosConfigAllowActions, + ["durationSeconds"] = AppSettingsConstVars.CosConfigDurationSeconds, + ["secretId"] = AppSettingsConstVars.CosConfigSecretId, + ["secretKey"] = AppSettingsConstVars.CosConfigSecretKey + }; + Dictionary credential = STSClient.genCredential(values); + return new ResponseOutput() + { + Data = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(credential)), + Successed = true, + Code = 1 + }; + } + } +} diff --git a/Znyc.CloudCar.Services/Equipment/EquipmentService.cs b/Znyc.CloudCar.Services/Equipment/EquipmentService.cs new file mode 100644 index 0000000..66738a8 --- /dev/null +++ b/Znyc.CloudCar.Services/Equipment/EquipmentService.cs @@ -0,0 +1,756 @@ +using Mapster; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.IRepository.Audit; +using Znyc.CloudCar.IRepository.Currency; +using Znyc.CloudCar.IRepository.Equipment; +using Znyc.CloudCar.IRepository.EquipmentPicture; +using Znyc.CloudCar.IRepository.User; +using Znyc.CloudCar.IServices.CaChe; +using Znyc.CloudCar.IServices.Collection; +using Znyc.CloudCar.IServices.Currency; +using Znyc.CloudCar.IServices.Dictionary; +using Znyc.CloudCar.IServices.Equipment; +using Znyc.CloudCar.IServices.EquipmentPicture; +using Znyc.CloudCar.IServices.User; +using Znyc.CloudCar.Model.Dtos.Equipment; +using Znyc.CloudCar.Model.Dtos.EquipmentPicture; +using Znyc.CloudCar.Model.Dtos.User; +using Znyc.CloudCar.Model.Entities; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Attributes; +using Znyc.CloudCar.Utility.Extensions; +using Znyc.CloudCar.Utility.Helper; +using static Znyc.CloudCar.Configuration.GlobalEnumVars; +using static Znyc.CloudCar.Utility.Helper.DateHelper; + +namespace Znyc.CloudCar.Services.Equipment +{ + /// + /// 设备信息服务 + /// + public class EquipmentService : IEquipmentService + { + private readonly IEquipmentRepository _equipmentRepository; + private readonly IHttpContextUser _httpContextUser; + private readonly IUserService _userService; + private readonly IEquipmentPictureService _equipmentPictureSevice; + private readonly IDictionaryService _dictionaryService; + private readonly ICacheService _cacheService; + private readonly IEquipmentPictureRepository _equipmentPictureRepository; + private readonly ICurrencyService _currencyService; + private readonly ICurrencyRecordService _currencyRecordService; + private readonly ICollectionService _collectionService; + private readonly ICurrencyRecordRepository _currencyRecordRepository; + private readonly IUserRepository _userRepository; + private readonly IAuditRepository _auditRepository; + private readonly IUserCardRepository _userCardRepository; + + public EquipmentService( + IEquipmentRepository equipmentRepository, + IHttpContextUser httpContextUser, + IUserService userService, + IEquipmentPictureService equipmentPictureService, + IDictionaryService dictionaryService, + ICacheService cacheService, + IEquipmentPictureRepository equipmentPictureRepository, + ICurrencyService currencyService, + ICurrencyRecordService currencyRecordService, + ICollectionService collectionService, + ICurrencyRecordRepository currencyRecordRepository, + IUserRepository userRepository, + IAuditRepository auditRepository, + IUserCardRepository userCardRepository + ) + { + _equipmentRepository = equipmentRepository; + _httpContextUser = httpContextUser; + _userService = userService; + _equipmentPictureSevice = equipmentPictureService; + _dictionaryService = dictionaryService; + _cacheService = cacheService; + _equipmentPictureRepository = equipmentPictureRepository; + _currencyService = currencyService; + _currencyRecordService = currencyRecordService; + _collectionService = collectionService; + _currencyRecordRepository = currencyRecordRepository; + _userRepository = userRepository; + _auditRepository = auditRepository; + _userCardRepository = userCardRepository; + } + + /// + /// 新增设备信息 + /// + /// + /// + [Transaction] + public async Task AddAsync(EquipmentAddInput input) + { + ResponseOutput response = new ResponseOutput(); + IDictionary userUpdateCount = await _cacheService.GetUserUpdateCountAsync(); + double count = 0; + if (userUpdateCount.Count() > 0 && userUpdateCount.ContainsKey($"{_httpContextUser.Id}")) + { + count = userUpdateCount[$"{_httpContextUser.Id}"]; + } + //是否购买优惠卡 + var usercars = await _userCardRepository.Where(x => x.UserId == _httpContextUser.Id && x.IsEnabled == true && x.EndTime > DateTime.Now).ToListAsync(); + int freeNumber = 0; + var carinfos = await _cacheService.GetCardIntroListAsync(); + foreach (var usercar in usercars) + { + freeNumber += carinfos.Find(x => x.Id == usercar.CardId).FreeNumber; + } + Console.WriteLine($"{_httpContextUser.Id}|{freeNumber}|{count}"); + if (count > freeNumber + 4) + { + response.Msg = "本月免费发布次数已用完"; + response.Successed = false; + response.Code = 0; + return response; + } + EquipmentEntity entity = input.Adapt(); + #region 拼接标题 + string categoryName = (await _dictionaryService.GetByIdAsync(input.EquipmentType))?.Name; + string brandName = (await _dictionaryService.GetByIdAsync(input.EquipmentBrand))?.Name; + entity.Title = $"转让{brandName}{input.AppearanceDate}年"; + if (input.AutomobileChassis > 0) + { + string automobileChassisName = (await _dictionaryService.GetByIdAsync(input.AutomobileChassis))?.Name; + entity.Title += $"{automobileChassisName}"; + } + if (input.BoomLength > 0) + { + string boomLengthName = (await _dictionaryService.GetByIdAsync(input.BoomLength))?.Name; + entity.Title += $"{boomLengthName}"; + } + if (input.ReprintVolume > 0) + { + string reprintVolumeName = (await _dictionaryService.GetByIdAsync(input.ReprintVolume))?.Name; + entity.Title += $"{reprintVolumeName}方"; + } + if (input.MaxTransportation > 0) + { + string maxTransportationName = (await _dictionaryService.GetByIdAsync(input.MaxTransportation))?.Name; + entity.Title += $"{maxTransportationName}"; + } + if (input.EquipmentModel.IsNotNull()) + { + entity.Title += $"{input.EquipmentModel}"; + } + if (input.EquipmentTonnage > 0) + { + entity.Title += $"{input.EquipmentTonnage}吨"; + } + if (input.Capacity > 0) + { + entity.Title += $"{input.Capacity}升"; + } + if (input.Power.IsNotNull()) + { + entity.Title += $"{input.Power}"; + } + entity.Title += $"{categoryName}"; + #endregion + entity.UserId = _httpContextUser.Id; + entity.EquipmentNumber = Convert.ToInt64(CommonHelper.GetEquipmentNumber()); + entity.State = (int)StateEnum.InReview; + entity.IsPublic = true; + entity.RefreshDate = DateTime.Now; + entity.SellingPrice = input.SellingPrice * 10000; + long id = (await _equipmentRepository.InsertAsync(entity)).Id; + foreach (var item in input.EquipmentPictures) + { + var equipmentPicture = item.Adapt(); + equipmentPicture.EquipmentId = id; + //equipmentPicture.PictureLink = equipmentPicture.PictureLink[(equipmentPicture.PictureLink.LastIndexOf("/") + 1)..]; + await _equipmentPictureRepository.InsertAsync(equipmentPicture); + } + //用户修改次数自增 + await _cacheService.SetIncrUserUpdateCountAsync(entity.UserId); + //记录用户保存联系人，联系电话 + await _cacheService.SetEquipmentAsync(entity, _httpContextUser.Id); + response.Data = id; + response.Successed = true; + response.Code = 1; + return response; + } + + /// + /// 编辑设备信息 + /// + /// + /// + public async Task UpdateAsync(EquipmentUpdateInput input) + { + ResponseOutput response = new ResponseOutput(); + EquipmentEntity entity = await _equipmentRepository.GetAsync(input.Id); + if (entity.IsNull()) + { + response.Successed = false; + response.Msg = "信息不存在!"; + response.Code = 0; + return response; + } + + IDictionary userUpdateCount = await _cacheService.GetUserUpdateCountAsync(); + double count = 0; + if (userUpdateCount.Count() > 0 && userUpdateCount.ContainsKey($"{_httpContextUser.Id}")) + { + count = userUpdateCount[$"{_httpContextUser.Id}"]; + } + //是否购买优惠卡 + var usercars = await _userCardRepository.Where(x => x.UserId == _httpContextUser.Id && x.IsEnabled == true && x.EndTime > DateTime.Now).ToListAsync(); + int freeNumber = 0; + var carinfos = await _cacheService.GetCardIntroListAsync(); + foreach (var usercar in usercars) + { + freeNumber += carinfos.Find(x => x.Id == usercar.CardId).FreeNumber; + } + Console.WriteLine($"{_httpContextUser.Id}|{freeNumber}|{count}"); + + if (count > freeNumber + 4) + { + response.Msg = "本月免费发布次数已用完"; + response.Successed = false; + response.Code = 0; + return response; + } + #region 更新设备图片 + var oldEquipmentPictures = await _equipmentPictureRepository.Select + .Where(x => x.EquipmentId == input.Id && x.IsDeleted == false) + .ToListAsync(); + var oldEquipmentPictureLinks = oldEquipmentPictures.Select(x => x.PictureLink).ToArray(); + var newEquipmentPictureLinks = input.EquipmentPictures.Select(x => x.PictureLink).ToArray(); + var deleteProjectPersonLinks = oldEquipmentPictureLinks.Except(newEquipmentPictureLinks).ToArray(); + if (deleteProjectPersonLinks.Length > 0) + { + for (int i = 0; i < deleteProjectPersonLinks.Length; i++) + { + var equipmentPicture = oldEquipmentPictures.FirstOrDefault(x => x.PictureLink == deleteProjectPersonLinks[i]); + equipmentPicture.IsDeleted = true; + await _equipmentPictureRepository.UpdateAsync(equipmentPicture); + } + } + foreach (var item in input.EquipmentPictures) + { + var equipmentPicture = oldEquipmentPictures.Find(x => x.PictureLink == item.PictureLink); + if (equipmentPicture == null) + { + var picture = item.Adapt(); + picture.EquipmentId = input.Id; + await _equipmentPictureRepository.InsertAsync(picture); + } + } + #endregion + input.Adapt(entity); + entity.State = (int)StateEnum.InReview; + #region 拼接标题 + string categoryName = (await _dictionaryService.GetByIdAsync(input.EquipmentType))?.Name; + string brandName = (await _dictionaryService.GetByIdAsync(input.EquipmentBrand))?.Name; + entity.Title = $"转让{brandName}{input.AppearanceDate}年"; + if (input.AutomobileChassis > 0) + { + string automobileChassisName = (await _dictionaryService.GetByIdAsync(input.AutomobileChassis))?.Name; + entity.Title += $"{automobileChassisName}"; + } + if (input.BoomLength > 0) + { + string boomLengthName = (await _dictionaryService.GetByIdAsync(input.BoomLength))?.Name; + entity.Title += $"{boomLengthName}"; + } + if (input.ReprintVolume > 0) + { + string reprintVolumeName = (await _dictionaryService.GetByIdAsync(input.ReprintVolume))?.Name; + entity.Title += $"{reprintVolumeName}方"; + } + if (input.MaxTransportation > 0) + { + string maxTransportationName = (await _dictionaryService.GetByIdAsync(input.MaxTransportation))?.Name; + entity.Title += $"{maxTransportationName}"; + } + if (input.EquipmentModel.IsNotNull()) + { + entity.Title += $"{input.EquipmentModel}"; + } + if (input.EquipmentTonnage > 0) + { + entity.Title += $"{input.EquipmentTonnage}吨"; + } + if (input.Capacity > 0) + { + entity.Title += $"{input.Capacity}升"; + } + if (input.Power.IsNotNull()) + { + entity.Title += $"{input.Power}"; + } + entity.Title += $"{categoryName}"; + + entity.SellingPrice = entity.SellingPrice * 10000; + #endregion + response.Data = await _equipmentRepository.UpdateAsync(entity); + //用户修改次数自增 + await _cacheService.SetIncrUserUpdateCountAsync(entity.UserId); + + //记录用户保存联系人，联系电话 + await _cacheService.SetEquipmentAsync(entity, entity.UserId); + response.Successed = true; + response.Code = 1; + return response; + } + + /// + /// 根据Id获取设备信息 + /// + /// + /// + public async Task GetAsync(long id) + { + ResponseOutput response = new ResponseOutput(); + EquipmentOutput equipment = await _equipmentRepository.GetAsync(id); + if (equipment.IsNull()) + { + response.Successed = false; + response.Msg = "信息不存在!"; + response.Code = 0; + return response; + } + UserOutput user = await _userService.GetUserByIdAsync(equipment.UserId); + equipment.UserName = user?.UserName ?? GlobalConstVars.User.Default_UserName; + equipment.AvatarUrl = user?.AvatarUrl ?? GlobalConstVars.User.Default_AvataUrl_Address; + equipment.CategoryName = (await _dictionaryService.GetByIdAsync(equipment.EquipmentType))?.Name; + equipment.BrandName = (await _dictionaryService.GetByIdAsync(equipment.EquipmentBrand))?.Name; + equipment.AutomobileChassisName = (await _dictionaryService.GetByIdAsync(equipment.AutomobileChassis))?.Name; + equipment.BoomLengthName = (await _dictionaryService.GetByIdAsync(equipment.BoomLength))?.Name; + equipment.ReprintVolumeName = (await _dictionaryService.GetByIdAsync(equipment.ReprintVolume))?.Name; + equipment.MaxTransportationName = (await _dictionaryService.GetByIdAsync(equipment.MaxTransportation))?.Name; + equipment.CallPhoneCurrency = CommonHelper.GetCallPhoneCurrency(Convert.ToInt32(equipment.SellingPrice)); + equipment.IsCollection = false; + equipment.IsGetPhone = false; + string phone = equipment.ContactPhone; + equipment.ContactPhone = CommonHelper.ToHiddenPhone(equipment.ContactPhone); + if (_httpContextUser.Id > 0) + { + //是否收藏 + equipment.IsCollection = await _collectionService.IsCollection(id); + //是否获取电话 + equipment.IsGetPhone = await _currencyRecordService.IsGetPhone(CurrencyType.CallPhone, equipment.Id) || equipment.UserId == _httpContextUser.Id; + equipment.ContactPhone = equipment.IsGetPhone ? phone : CommonHelper.ToHiddenPhone(equipment.ContactPhone); + //插入足迹 + await _cacheService.SetBrowseAsync(_httpContextUser.Id, equipment.Id.ToString(), DateTime.Now.ToTimestamp()); + + } + equipment.equipmentPictures = (await _equipmentPictureSevice.GetListAsync(id)).Where(x => x.PictureType == (int)PictureTypeEnum.Equipment).ToList(); + equipment.DriverLicensePictures = await _equipmentPictureRepository.Where(x => x.EquipmentId == id && x.PictureType == (int)PictureTypeEnum.DriverLicense).ToListAsync(); + equipment.SellingPrice = equipment.SellingPrice / 10000; + + //浏览量自增 + await _cacheService.SetIncrPageViewAsync(equipment.Id); + response.Successed = true; + response.Data = equipment; + response.Code = 1; + return response; + } + + /// + /// 分页查询设备列表 + /// + /// + /// + /// + /// + /// + /// + /// + public async Task PageAsync(string? key, long categoryId, + long brandId, long yearId, int currentPage, int pageSize) + { + + int currentYear = DateTime.Now.Year; + List equipmentList = await _equipmentRepository.Select + .Where(x => new[] { (int)StateEnum.Selling, (int)StateEnum.Traded }.Contains(x.State) && + x.IsPublic) + .WhereIf(categoryId > 0, x => x.EquipmentType == categoryId) + .WhereIf(brandId > 0, x => x.EquipmentBrand == brandId) + .WhereIf(yearId == 8001, x => x.AppearanceDate > currentYear - 3) + .WhereIf(yearId == 8002, x => x.AppearanceDate > currentYear - 5 && x.AppearanceDate <= currentYear - 3) + .WhereIf(yearId == 8003, x => x.AppearanceDate > currentYear - 8 && x.AppearanceDate <= currentYear - 5) + .WhereIf(yearId == 8004, x => x.AppearanceDate > currentYear - 12 && x.AppearanceDate <= currentYear - 8) + .WhereIf(yearId == 8005, x => x.AppearanceDate < currentYear - 12) + .WhereIf(key.IsNotNull(), + x => x.Introduction.Contains(key) || x.Title.Contains(key)) + .Count(out long total) + .OrderByDescending(x => x.IsTop) + .OrderByDescending(x => x.TopExpireDate) + .OrderByDescending(x => x.RefreshDate) + .Page(currentPage, pageSize) + .ToListAsync(); + //积分记录 + List currencyRecordList = new List(); + if (_httpContextUser.Id > 0) + { + long[] cIds = equipmentList.Select(x => x.Id).Distinct().ToArray(); + currencyRecordList = await _currencyRecordRepository.Where(x => + cIds.Contains(x.CurrencySoureObjectId) && + x.CurrencyType == (int)CurrencyType.CallPhone).ToListAsync(); + } + long[] uIds = equipmentList.Select(x => x.UserId).Distinct().ToArray(); + List users = await _userRepository.Select.Where(x => uIds.Contains(x.Id)).ToListAsync(); + long[] eIds = equipmentList.Select(x => x.Id).Distinct().ToArray(); + List equipmentPictures = await _equipmentPictureRepository.Select + .Where(x => x.IsDeleted == false && eIds.Contains(x.EquipmentId) && x.PictureType == (int)PictureTypeEnum.Equipment) + .ToListAsync(); + foreach (var item in equipmentList) + { + item.EquipmentPictures = equipmentPictures.FindAll(x => x.EquipmentId == item.Id); + UserEntity user = users.FirstOrDefault(x => x.Id == item.UserId); + item.UserName = user?.UserName ?? GlobalConstVars.User.Default_UserName; + item.AvatarUrl = user?.AvatarUrl; + item.IsGetPhone = item.UserId == _httpContextUser.Id ? true : currencyRecordList.Exists(x => x.UserId == _httpContextUser.Id && x.CurrencySoureObjectId == item.Id); + item.ContactPhone = !item.IsGetPhone ? CommonHelper.ToHiddenPhone(item.ContactPhone) : item.ContactPhone; + item.SellingPrice = item.SellingPrice / 10000; + + } + PageOutput data = new PageOutput + { + List = equipmentList, + Total = total + }; + ResponseOutput response = new ResponseOutput() + { + Data = data, + Successed = true, + Code = 1 + }; + return response; + } + + /// + /// 刷新设备信息 + /// + /// + /// + [Transaction] + public async Task RefreshAsync(long id) + { + ResponseOutput response = new ResponseOutput(); + var entity = await _equipmentRepository.GetAsync(id); + if (entity.IsNull()) + { + response.Successed = false; + response.Msg = "设备信息不存在！"; + response.Code = 0; + return response; + } + + response = await _currencyService.RefreshDeduct(id); + if (response.Successed) + { + entity.RefreshDate = DateTime.Now; + await _equipmentRepository.UpdateAsync(entity); + response.Successed = true; + response.Code = 1; + return response; + } + + return response; + } + + /// + /// 置顶设备信息 + /// + /// + /// + [Transaction] + public async Task TopAsync(long id) + { + ResponseOutput response = new ResponseOutput(); + var entity = await _equipmentRepository.GetAsync(id); + if (!(entity?.Id > 0)) + { + response.Successed = false; + response.Msg = "设备信息不存在！"; + response.Code = 0; + return response; + } + + if (entity.IsTop) + { + response.Successed = false; + response.Msg = "请勿重复置顶！"; + response.Code = 3; + return response; + } + + response = await _currencyService.TopDeduct(id); + if (response.Successed) + { + entity.IsTop = true; + entity.TopExpireDate = DateTime.Now.AddDays(1); + await _equipmentRepository.UpdateAsync(entity); + response.Successed = true; + response.Code = 1; + response.Msg = "置顶成功！"; + } + return response; + } + + /// + /// 取消置顶设备信息 + /// + /// + public async Task CancelTopAsync() + { + int id = await _equipmentRepository.Select + .Where(x => x.IsTop && x.TopExpireDate <= DateTime.Now && x.State != (int)StateEnum.InReview) + .ToUpdate() + .Set(x => x.IsTop, false) + .Set(x => x.TopExpireDate, Convert.ToDateTime("0001-01-01 00:00:00")) + .ExecuteAffrowsAsync(); + ResponseOutput response = new ResponseOutput() + { + Successed = true, + Msg = "取消置顶成功", + Code = 1 + }; + return response; + } + + /// + /// 更改设备信息状态 + /// + /// + /// 设备状态 + /// + public async Task UpdateStateAsync(long id, int state) + { + ResponseOutput response = new ResponseOutput(); + var entity = await _equipmentRepository.GetAsync(id); + if (!(entity?.Id > 0)) + { + response.Successed = false; + response.Msg = "设备信息不存在！"; + response.Code = 0; + return response; + } + + entity.State = state; + await _equipmentRepository.UpdateAsync(entity); + response.Successed = true; + response.Code = 1; + response.Msg = "修改成功"; + return response; + } + + /// + /// 是否公开设备信息 + /// + /// + /// + /// + public async Task IsPublicAsync(long id, bool isPublic) + { + ResponseOutput response = new ResponseOutput(); + var entity = await _equipmentRepository.GetAsync(id); + if (!(entity?.Id > 0)) + { + response.Successed = false; + response.Msg = "设备信息不存在！"; + response.Code = 0; + return response; + } + + entity.IsPublic = isPublic; + await _equipmentRepository.UpdateAsync(entity); + response.Successed = true; + response.Msg = "修改成功"; + response.Code = 1; + return response; + } + + /// + /// 获取手机号码 + /// + /// + /// + [Transaction] + public async Task GetPhoneAsync(long id) + { + ResponseOutput response = new ResponseOutput(); + var entity = await _equipmentRepository.GetAsync(id); + if (entity.IsNull()) + { + response.Successed = false; + response.Msg = "设备信息不存在！"; + response.Code = 0; + return response; + } + + bool isGetPhone = await _currencyRecordService.IsGetPhone(CurrencyType.CallPhone, id); + if (isGetPhone) + { + response.Successed = false; + response.Msg = "请勿重复获取手机号"; + response.Code = 3; + return response; + } + + response = await _currencyService.GetPhoneDeduct(id, Convert.ToInt32(entity.SellingPrice)); + if (response.Successed) + { + response.Successed = true; + response.Msg = "获取成功"; + response.Code = 1; + response.Data = entity.ContactPhone; + } + + return response; + } + + /// + /// 同步浏览量 + /// + /// + public async Task PageViewAsync() + { + IDictionary pageView = await _cacheService.GetPageViewAsync(); + if (pageView.Count() <= 0) + { + List list = await _equipmentRepository.Select.Where(x => x.PageView > 0).ToListAsync(); + foreach (EquipmentEntity item in list) + { + await _cacheService.SetPageViewAsync(item.Id.ToString(), item.PageView); + } + + pageView = await _cacheService.GetPageViewAsync(); + } + + foreach (var item in pageView) + { + long key = Convert.ToInt64(item.Key); + int value = Convert.ToInt32(item.Value); + await _equipmentRepository.UpdatePageView(key, value); + } + ResponseOutput response = new ResponseOutput() + { + Successed = true, + Msg = "同步浏览量成功", + Code = 1 + }; + return response; + } + + /// + /// 我的设备信息 + /// + /// 全部-1/审核中10/出售中20/已成交30/审核失败0 + /// + /// + /// + public async Task MyEquipmentPageAsync( + int state, int currentPage, int pageSize) + { + List equipmentList = await _equipmentRepository.Select + .WhereIf(state < 0, x => x.State != (int)StateEnum.Revocation) + .WhereIf(state >= 0, x => x.State == state) + .Where(x => x.UserId == _httpContextUser.Id) + .Count(out long total) + .OrderByDescending(x => x.RefreshDate) + .Page(currentPage, pageSize) + .ToListAsync(); + long[] eIds = equipmentList.Select(x => x.Id).Distinct().ToArray(); + List auditList = await _auditRepository.Select + .Where(x => eIds.Contains(x.EquipmentId)) + .OrderByDescending(true, x => x.CreatedTime) + .ToListAsync(); + //设备图片 + List equipmentPictures = await _equipmentPictureRepository.Select + .Where(x => x.IsDeleted == false && eIds.Contains(x.EquipmentId) && x.PictureType == (int)PictureTypeEnum.Equipment) + .ToListAsync(); + equipmentList.ForEach(item => + { + AuditEntity audit = auditList.FirstOrDefault(x => x.EquipmentId == item.Id); + item.Note = audit.IsNotNull() ? audit.Note : ""; + item.AuditTime = audit.IsNotNull() ? audit.ModifiedTime : Convert.ToDateTime("0001-01-01 00:00:00"); + item.EquipmentPictures = equipmentPictures.FindAll(x => x.EquipmentId == item.Id); + item.SellingPrice = item.SellingPrice / 10000; + }); + + PageOutput data = new PageOutput + { + List = equipmentList, + Total = total + }; + ResponseOutput response = new ResponseOutput() + { + Data = data, + Successed = true, + Code = 1 + }; + return response; + } + + /// + /// 根据UserId查询设备信息 + /// + /// + /// + /// + /// + public async Task GetEquipmentByUserIdAsync(long userId, int currentPage, int pageSize) + { + SellerOutput seller = (await _userService.GetUserByIdAsync(userId)).Adapt(); + //是否购买优惠卡 + var usercar = await _userCardRepository.GetAsync(x => x.UserId == _httpContextUser.Id && x.IsEnabled == true && x.EndTime > DateTime.Now); + seller.IsMember = usercar.IsNotNull() ? true : false; + List equipmentList = await _equipmentRepository.Select + .Where(x => x.UserId == userId && x.State == (int)StateEnum.Selling) + .Count(out long total) + .OrderByDescending(x => x.RefreshDate) + .Page(currentPage, pageSize) + .ToListAsync(); + //设备图片 + long[] eIds = equipmentList.Select(x => x.Id).Distinct().ToArray(); + List equipmentPictures = await _equipmentPictureRepository.Select + .Where(x => x.IsDeleted == false && eIds.Contains(x.EquipmentId) && x.PictureType == (int)PictureTypeEnum.Equipment) + .ToListAsync(); + equipmentList.ForEach(item => + { + item.EquipmentPictures = equipmentPictures.FindAll(x => x.EquipmentId == item.Id); + item.SellingPrice = item.SellingPrice / 10000; + }); + SellerEquipmentOutput data = new SellerEquipmentOutput + { + Seller = seller, + SellerEquipmentList = equipmentList, + Total = total + }; + var response = new ResponseOutput() + { + Data = data, + Successed = true, + Code = 1 + }; + return response; + } + + + /// + /// 获取上次保存信息 + /// + /// + public async Task GetLastEquipmentAsync() + { + var response = new ResponseOutput() + { + Data =await _cacheService.GetEquipmentAsync(_httpContextUser.Id), + Successed = true, + Code = 1 + }; + return response; + + } + } +} diff --git a/Znyc.CloudCar.Services/EquipmentPicture/EquipmentCategoryService.cs b/Znyc.CloudCar.Services/EquipmentPicture/EquipmentCategoryService.cs new file mode 100644 index 0000000..49c378f --- /dev/null +++ b/Znyc.CloudCar.Services/EquipmentPicture/EquipmentCategoryService.cs @@ -0,0 +1,31 @@ +using Znyc.CloudCar.IRepository.EquipmentPicture; +using Znyc.CloudCar.IServices.EquipmentPicture; +using Znyc.CloudCar.Model.Dtos.EquipmentPicture; + +namespace Znyc.CloudCar.Services.EquipmentPicture +{ + public class EquipmentPictureService : IEquipmentPictureService + { + private readonly IEquipmentPictureRepository _equipmentPictureRepository; + + public EquipmentPictureService( + IEquipmentPictureRepository equipmentPictureRepository + ) + { + _equipmentPictureRepository = equipmentPictureRepository; + } + + /// + /// 查询设备图片 + /// + /// + /// + public async Task> GetListAsync(long id) + { + List list = await _equipmentPictureRepository.Select + .Where(x => x.IsEnabled && x.EquipmentId == id && x.IsDeleted == false) + .ToListAsync(); + return list; + } + } +} diff --git a/Znyc.CloudCar.Services/Feedback/FeedbackService.cs b/Znyc.CloudCar.Services/Feedback/FeedbackService.cs new file mode 100644 index 0000000..e30234d --- /dev/null +++ b/Znyc.CloudCar.Services/Feedback/FeedbackService.cs @@ -0,0 +1,64 @@ +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Feedback; +using Znyc.CloudCar.IServices.Feedback; +using Znyc.CloudCar.Model.Dtos.Feedback; +using Znyc.CloudCar.Model.Entities; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Services.Feedback +{ + public class FeedbackService : IFeedbackService + { + private readonly IFeedbackRepository _feedbackRepository; + private readonly IHttpContextUser _httpContextUser; + private readonly IFeedbackPicRepository _feedbackPicRepository; + + public FeedbackService( + IFeedbackRepository feedbackRepository, + IHttpContextUser httpContextUser, + IFeedbackPicRepository feedbackPicRepository + ) + { + _feedbackRepository = feedbackRepository; + _httpContextUser = httpContextUser; + _feedbackPicRepository = feedbackPicRepository; + _feedbackPicRepository = feedbackPicRepository; + } + + /// + /// 新增意见反馈 + /// + /// + /// + public async Task AddFeedbackAsync(FeedbackAddInput input) + { + FeedbackEntity entity = new FeedbackEntity + { + UserId = _httpContextUser.Id, + Content = input.Content, + State = 0, + Result = "", + Note = "" + }; + entity = await _feedbackRepository.InsertAsync(entity); + for (int i = 0; i < input.FeedbackPic.Count; i++) + { + FeedbackPicEntity feedbackPicEntity = new FeedbackPicEntity + { + FeedbackId = entity.Id, + PicUrl = input.FeedbackPic[i], + Sort = i + 1, + IsEnabled = true, + }; + await _feedbackPicRepository.InsertAsync(feedbackPicEntity); + } + ResponseOutput response = new ResponseOutput() + { + Msg = "反馈成功！", + Successed = true, + Code = 1 + }; + return response; + } + } +} diff --git a/Znyc.CloudCar.Services/Login/LoginLogsService.cs b/Znyc.CloudCar.Services/Login/LoginLogsService.cs new file mode 100644 index 0000000..660519f --- /dev/null +++ b/Znyc.CloudCar.Services/Login/LoginLogsService.cs @@ -0,0 +1,62 @@ +using Mapster; +using Microsoft.AspNetCore.Http; +using UAParser; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.IRepository.LoginLogs; +using Znyc.CloudCar.IServices.Login; +using Znyc.CloudCar.Model.Dtos.Login; +using Znyc.CloudCar.Model.Entities; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Extensions; +using Znyc.CloudCar.Utility.Helper; + +namespace Znyc.CloudCar.Services.Login +{ + public class LoginLogsService : ILoginLogsService + { + private readonly ILoginLogsRepository _loginLogsRepository; + private readonly IHttpContextAccessor _httpContextAccessor; + + public LoginLogsService( + ILoginLogsRepository loginLogsRepository, + IHttpContextAccessor httpContextAccessor + ) + { + _loginLogsRepository = loginLogsRepository; + _httpContextAccessor = httpContextAccessor; + } + + public async Task AddAsync(string userName, bool status, string result, string city, + long userId) + { + ResponseOutput response = new ResponseOutput(); + LoginLogsAddInput input = new LoginLogsAddInput + { + UserName = userName, + PlatformType = (int)GlobalEnumVars.PlatformType.CloudCar, + Status = status, + Result = result, + IP = IPHelper.GetIP(_httpContextAccessor?.HttpContext?.Request), + City = city, + CreatedUserId = userId + }; + string ua = _httpContextAccessor.HttpContext.Request.Headers["User-Agent"]; + if (ua.NotNull()) + { + ClientInfo client = Parser.GetDefault().Parse(ua); + string device = client.Device.Family; + device = device.ToLower() == "other" ? "" : device; + input.Browser = client.UA.Family; + input.OS = client.OS.Family; + input.UserAgent = device; + } + + LoginLogsEntity entity = input.Adapt(); + long id = (await _loginLogsRepository.InsertAsync(entity)).Id; + response.Data = id; + response.Successed = true; + response.Code = 1; + return response; + } + } +} diff --git a/Znyc.CloudCar.Services/Login/LoginService.cs b/Znyc.CloudCar.Services/Login/LoginService.cs new file mode 100644 index 0000000..8bcadbe --- /dev/null +++ b/Znyc.CloudCar.Services/Login/LoginService.cs @@ -0,0 +1,105 @@ +using Mapster; +using Nito.AsyncEx; +using SKIT.FlurlHttpClient.Wechat.Api; +using SKIT.FlurlHttpClient.Wechat.Api.Models; +using System.Security.Claims; +using Zncy.CloudCar.WeChat.Service.Enums; +using Zncy.CloudCar.WeChat.Service.Services.HttpClients; +using Znyc.CloudCar.Auth.AccressToken; +using Znyc.CloudCar.Auth.Policys; +using Znyc.CloudCar.IRepository.User; +using Znyc.CloudCar.IServices.CaChe; +using Znyc.CloudCar.IServices.Currency; +using Znyc.CloudCar.IServices.Login; +using Znyc.CloudCar.IServices.User; +using Znyc.CloudCar.Model.Dtos.Login; +using Znyc.CloudCar.Model.Dtos.User; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Attributes; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Services.Login +{ + public class LoginService : ILoginService + { + private readonly AsyncLock _mutex = new AsyncLock(); + private readonly IUserService _userService; + private readonly ICurrencyService _currencyService; + private readonly IWxUnifyUserService _wxUnifyUserService; + private readonly IWeChatApiHttpClientFactory _weChatApiHttpClientFactory; + private readonly ICacheService _cacheService; + private readonly IUserCardRepository _userCardRepository; + private readonly ILoginLogsService _loginLogsService; + + public LoginService( + IUserService userService, + ICurrencyService currencyService, + IWxUnifyUserService wxUnifyUserService, + ICacheService cacheService, + IUserCardRepository userCardRepository, + ILoginLogsService loginLogsService, + IWeChatApiHttpClientFactory weChatApiHttpClientFactory) + { + _userService = userService; + _currencyService = currencyService; + _wxUnifyUserService = wxUnifyUserService; + _weChatApiHttpClientFactory = weChatApiHttpClientFactory; + _cacheService = cacheService; + _userCardRepository = userCardRepository; + _loginLogsService = loginLogsService; + } + + /// + /// 登陆 + /// + /// + /// + [Transaction] + public async Task LoginAsync(LoginInput loginInput) + { + ResponseOutput result = new ResponseOutput(); + var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); + var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken(); + var request = new SnsJsCode2SessionRequest(); + request.JsCode = loginInput.JsCode; + request.AccessToken = accessToken; + var response = await client.ExecuteSnsJsCode2SessionAsync(request); + if (response.ErrorCode == (int)WeChatReturnCode.ReturnCode.请求成功) + { + using (await _mutex.LockAsync()) + { + await _wxUnifyUserService.AddOrUpdateAsync(loginInput.WxUnifyUserAddInput, response.UnionId); + + var user = await _userService.AddUserAsync(loginInput.WxUnifyUserAddInput, response.OpenId, response.UnionId); + + //云币 + await _currencyService.AddCurrencyForFirstLogin(user.Id); + + string token = JwtToken.Create(new[] + { + new Claim(Claims.UserId, user.Id.ToString()), + new Claim(Claims.OpenId, response.OpenId), + new Claim(Claims.UnionId, response.UnionId), + new Claim(Claims.SessionKey, response.SessionKey) + }); + var userOutput = user.Adapt(); + var usercar = await _userCardRepository.GetAsync(x => x.UserId == userOutput.Id && x.IsEnabled == true && x.EndTime > DateTime.Now); + userOutput.CardType = usercar.IsNotNull() ? usercar.CardId : 0; + result.Data = new + { + IsFirstLogin = false, + Token = token, + User = userOutput + }; + result.Successed = true; + result.Code = 1; + + //登陆日志 + await _loginLogsService.AddAsync(user.UserName, token.IsNull(), "登陆成功", + loginInput.WxUnifyUserAddInput.City, user.Id); + } + } + return result; + } + } +} diff --git a/Znyc.CloudCar.Services/Message/MessageLogService.cs b/Znyc.CloudCar.Services/Message/MessageLogService.cs new file mode 100644 index 0000000..d3e6ecc --- /dev/null +++ b/Znyc.CloudCar.Services/Message/MessageLogService.cs @@ -0,0 +1,19 @@ +using Znyc.CloudCar.IRepository.Message; +using Znyc.CloudCar.IServices.Message; + +namespace Znyc.CloudCar.Services.Message +{ + /// + /// 消息记录服务 + /// + public class MessageLogService : IMessageLogService + { + private readonly IMessageLogRepository _messageLogRepository; + + public MessageLogService(IMessageLogRepository messageLogsRepository) + { + + } + + } +} diff --git a/Znyc.CloudCar.Services/Message/MessageService.cs b/Znyc.CloudCar.Services/Message/MessageService.cs new file mode 100644 index 0000000..79598ce --- /dev/null +++ b/Znyc.CloudCar.Services/Message/MessageService.cs @@ -0,0 +1,136 @@ +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.IRepository.Audit; +using Znyc.CloudCar.IRepository.Message; +using Znyc.CloudCar.IServices.CaChe; +using Znyc.CloudCar.IServices.Message; +using Znyc.CloudCar.Model.Dtos.Message; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Services.Message +{ + /// + /// 消息通知服务 + /// + public class MessageService : IMessageService + { + private readonly IMessageRepository _messageRepository; + private readonly IHttpContextUser _httpContextUser; + private readonly ICacheService _cacheService; + private readonly IAuditRepository _auditRepository; + private readonly IMessageLogRepository _messageLogRepository; + + public MessageService( + IMessageRepository messageRepository, + IHttpContextUser httpContextUser, + ICacheService cacheService, + IAuditRepository auditRepository, + IMessageLogRepository messageLogRepository + ) + { + _messageRepository = messageRepository; + _httpContextUser = httpContextUser; + _cacheService = cacheService; + _auditRepository = auditRepository; + _messageLogRepository = messageLogRepository; + } + + /// + /// 查询消息通知列表 + /// + /// + /// + /// + public async Task PageAsync(int currentPage, int pageSize) + { + var messageLogs = await _messageLogRepository.Select + .Where(x => x.ReceiverId == _httpContextUser.Id) + .ToListAsync(x => x.MessageId); + var messageList = await _messageRepository.Select + .Where(x => messageLogs.Contains(x.Id)) + .Count(out long total) + .OrderByDescending(x => x.CreatedTime) + .Page(currentPage, pageSize) + .ToListAsync(); + + var data = new PageOutput + { + List = messageList, + Total = total + }; + ResponseOutput response = new ResponseOutput() + { + Successed = true, + Data = data + }; + return response; + } + + /// + /// 已读消息记录 + /// + /// + public async Task UpdateAsync() + { + await _messageLogRepository.Select + .InnerJoin(x => x.MessageId == x.MessageEntity.Id) + .Where(x => x.State == 0 && x.ReceiverId == _httpContextUser.Id) + .ToUpdate() + .Set(x => x.State, 1) + .ExecuteAffrowsAsync(); + await _cacheService.RemoveUnreadMessageAsync(_httpContextUser.Id); + ResponseOutput response = new ResponseOutput() + { + Successed = true + }; + return response; + } + + /// + /// 未读提示 + /// + /// + public async Task UnreadMessage() + { + var unreadMessageDictionary = await _cacheService.GetUnreadMessageAsync(245971643547717); + if (unreadMessageDictionary.Count == 0) + { + //消息列表 + List messages = await _messageLogRepository.Select + .InnerJoin(x => x.MessageId == x.MessageEntity.Id) + .Where(x => x.ReceiverId == _httpContextUser.Id && x.State == 0) + .ToListAsync(); + + //审核失败 + int auditFailCount = (await _auditRepository.GetAuditFailListAsync(_httpContextUser.Id)).Count; + unreadMessageDictionary.Add("MessageCount", messages.Count()); + unreadMessageDictionary.Add("AuditFailCount", auditFailCount); + await _cacheService.SetUnreadMessageAsync(_httpContextUser.Id, unreadMessageDictionary); + } + // unreadMessageOutput = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(unreadMessageDictionary)); + ResponseOutput response = new ResponseOutput() + { + Data = unreadMessageDictionary, + Successed = true, + Code = 1 + }; + return response; + } + + + /// + /// 获取新用户滚动播放列表 + /// + /// + public async Task GetRegistUserListAsync() + { + List list = await _cacheService.GetRegistUserListAsync(0, 15); + ResponseOutput response = new ResponseOutput() + { + Data = list, + Successed = true, + Code = 1 + }; + return response; + } + } +} diff --git a/Znyc.CloudCar.Services/Order/OrderDetailService.cs b/Znyc.CloudCar.Services/Order/OrderDetailService.cs new file mode 100644 index 0000000..8d70510 --- /dev/null +++ b/Znyc.CloudCar.Services/Order/OrderDetailService.cs @@ -0,0 +1,14 @@ +using Znyc.CloudCar.IRepository.Order; + +namespace Znyc.CloudCar.Services.Order +{ + public class OrderDetailService + { + private readonly IOrderDetailRepository _orderDetailRepository; + + public OrderDetailService(IOrderDetailRepository orderDetailRepository) + { + _orderDetailRepository = orderDetailRepository; + } + } +} diff --git a/Znyc.CloudCar.Services/Order/OrderService.cs b/Znyc.CloudCar.Services/Order/OrderService.cs new file mode 100644 index 0000000..ec0210c --- /dev/null +++ b/Znyc.CloudCar.Services/Order/OrderService.cs @@ -0,0 +1,14 @@ +using Znyc.CloudCar.IServices.Order; + +namespace Znyc.CloudCar.Services.Order +{ + public class OrderService : IOrderService + { + private readonly IOrderService _orderService; + + public OrderService(IOrderService orderService) + { + _orderService = orderService; + } + } +} diff --git a/Znyc.CloudCar.Services/PaymentRecord/PaymentRecordService.cs b/Znyc.CloudCar.Services/PaymentRecord/PaymentRecordService.cs new file mode 100644 index 0000000..b02a0b1 --- /dev/null +++ b/Znyc.CloudCar.Services/PaymentRecord/PaymentRecordService.cs @@ -0,0 +1,13 @@ +using Znyc.CloudCar.IRepository.PaymentRecord; + +namespace Znyc.CloudCar.Services.PaymentRecord +{ + public class PaymentRecordService + { + private readonly IPaymentRecordRepository _paymentRecordRepository; + public PaymentRecordService(IPaymentRecordRepository paymentRecordRepository) + { + _paymentRecordRepository = paymentRecordRepository; + } + } +} diff --git a/Znyc.CloudCar.Services/Recharge/RechargeService.cs b/Znyc.CloudCar.Services/Recharge/RechargeService.cs new file mode 100644 index 0000000..778da6d --- /dev/null +++ b/Znyc.CloudCar.Services/Recharge/RechargeService.cs @@ -0,0 +1,54 @@ +using Znyc.CloudCar.IRepository.Recharge; +using Znyc.CloudCar.IServices.CaChe; +using Znyc.CloudCar.IServices.Recharge; +using Znyc.CloudCar.Model.Dtos.Recharge; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Services.Recharge +{ + /// + /// 充值活动服务 + /// + public class RechargeService : IRechargeService + { + private readonly IRechargeRepository _rechargeRepository; + private readonly IRechargeIntroRepository _rechargeIntroRepository; + private readonly ICacheService _cacheService; + + + public RechargeService( + IRechargeRepository rechargeRepository, + IRechargeIntroRepository rechargeIntroRepository, + ICacheService cacheService + ) + { + _rechargeRepository = rechargeRepository; + _rechargeIntroRepository = rechargeIntroRepository; + _cacheService = cacheService; + } + + /// + /// 查询充值活动详情 + /// + /// + public async Task GetAsync() + { + RechargeOutput Rrecharge = await _cacheService.GetRechargeAsync(); + if (Rrecharge.IsNull()) + { + Rrecharge = await _rechargeRepository.Select.Where(x => x.State == 1).FirstAsync(); + + Rrecharge.introOutputs = await _rechargeIntroRepository.Select.Where(x => x.ParentId == Rrecharge.Id) + .ToListAsync(); + await _cacheService.SetRechargeAsync(Rrecharge); + } + return new ResponseOutput() + { + Data = Rrecharge, + Successed = true, + Code = 1 + }; + } + } +} diff --git a/Znyc.CloudCar.Services/User/UserCardService.cs b/Znyc.CloudCar.Services/User/UserCardService.cs new file mode 100644 index 0000000..abd31aa --- /dev/null +++ b/Znyc.CloudCar.Services/User/UserCardService.cs @@ -0,0 +1,59 @@ +using Znyc.CloudCar.IRepository.User; +using Znyc.CloudCar.IServices.User; +using Znyc.CloudCar.Model.Entities; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Services.User +{ + public class UserCardService : IUserCardService + { + private readonly IUserCardRepository _userCardRepository; + + public UserCardService(IUserCardRepository userCardRepository) + { + _userCardRepository = userCardRepository; + } + + /// + /// 新增信息 + /// + /// + /// + /// + /// + public async Task AddUserCardAsync(long userId, long cardId, int time) + { + + Console.WriteLine($"{userId}|{cardId}|{time}"); + var userCard = await _userCardRepository.GetAsync(x => x.UserId == userId && x.IsEnabled == true); + await _userCardRepository.InsertAsync(new UserCardEntity + { + UserId = userId, + CardId = cardId, + StartTime = DateTime.Now, + EndTime = DateTime.Now.AddMonths(time) + }); + } + + /// + /// 优惠卡到期禁用 + /// + /// + public async Task UpdateUserCardAsync() + { + int id = await _userCardRepository.Select + .Where(x => x.IsEnabled && x.EndTime <= DateTime.Now) + .ToUpdate() + .Set(x => x.IsEnabled, false) + .ExecuteAffrowsAsync(); + ResponseOutput response = new ResponseOutput() + { + Successed = true, + Msg = "优惠卡到期禁用成功", + Code = 1 + }; + return response; + } + } +} diff --git a/Znyc.CloudCar.Services/User/UserService.cs b/Znyc.CloudCar.Services/User/UserService.cs new file mode 100644 index 0000000..68ff01c --- /dev/null +++ b/Znyc.CloudCar.Services/User/UserService.cs @@ -0,0 +1,155 @@ +using Mapster; +using Znyc.CloudCar.Auth.HttpContextUser; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.IRepository.User; +using Znyc.CloudCar.IServices.CaChe; +using Znyc.CloudCar.IServices.User; +using Znyc.CloudCar.Model.Dtos.User; +using Znyc.CloudCar.Model.Entities; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Services.User +{ + public class UserService : IUserService + { + private readonly IUserRepository _userRepository; + private readonly ICacheService _cacheService; + private readonly IHttpContextUser _httpContextUser; + private readonly IUserCardRepository _userCardRepository; + + public UserService( + IUserRepository userRepository, + ICacheService cacheService, + IHttpContextUser httpContextUser, + IUserCardRepository userCardRepository) + { + _userRepository = userRepository; + _cacheService = cacheService; + _httpContextUser = httpContextUser; + _userCardRepository = userCardRepository; + } + + /// + /// 新增用户 + /// + /// + /// + /// + public async Task AddUserAsync(WxUnifyUserAddInput wxUnifyUserAddInput, string openId, string unionId) + { + var user = await _userRepository.GetAsync(x => x.OpenId == openId && x.IsDeleted == false); + if (user == null) + { + user = await _userRepository.InsertAsync(new UserEntity + { + UserName = GlobalConstVars.User.Default_UserName, + OpenId = openId, + AvatarUrl = GlobalConstVars.User.DefaultImagePrefix + GlobalConstVars.User.DefaultAvataUrl, + Phone = "", + UnionId = unionId, + State = (int)GlobalEnumVars.CommonEnum.Normal, + }); + } + return user; + } + + /// + /// 根据Id获取用户信息 + /// + /// + public async Task GetUserAsync() + { + + UserOutput userOutput = await _cacheService.GetUserAsync(_httpContextUser.Id); + if (userOutput.IsNull()) + { + userOutput = await _userRepository.GetAsync(_httpContextUser.Id); + if (userOutput.IsNull()) + { + return userOutput; + } + userOutput.AvatarUrl = userOutput.AvatarUrl; + await _cacheService.SetUserAsync(userOutput.Id, userOutput); + } + return userOutput; + } + + + public async Task GetUserByIdAsync(long id) + { + + UserOutput userOutput = await _cacheService.GetUserAsync(id); + if (userOutput.IsNull()) + { + userOutput = await _userRepository.GetAsync(id); + if (userOutput.IsNull()) + { + return userOutput; + } + userOutput.AvatarUrl = userOutput.AvatarUrl; + await _cacheService.SetUserAsync(userOutput.Id, userOutput); + } + return userOutput; + } + + + /// + /// 修改用户信息 + /// + /// + /// + public async Task UpdateAsync(UserUpdateInput userUpdateInput) + { + ResponseOutput response = new ResponseOutput(); + UserEntity entity = await _userRepository.GetAsync(_httpContextUser.Id); + if (entity.IsNull()) + { + response.Successed = false; + response.Msg = "用户不存在!"; + return response; + } + entity.UserName = userUpdateInput.UserName; + entity.AvatarUrl = GlobalConstVars.User.DefaultImagePrefix+ userUpdateInput.AvatarUrl.Substring(userUpdateInput.AvatarUrl.LastIndexOf("/") + 1); + entity.Phone = userUpdateInput.Phone; + await _userRepository.UpdateAsync(entity); + await _cacheService.RemoveUserAsync(_httpContextUser.Id); + var userOutput = entity.Adapt(); + userOutput.AvatarUrl = userOutput.AvatarUrl; + var usercar = await _userCardRepository.GetAsync(x => x.UserId == _httpContextUser.Id && x.IsEnabled == true && x.EndTime > DateTime.Now); + userOutput.CardType = usercar.IsNotNull() ? usercar.CardId : 0; + response.Successed = true; + response.Data = userOutput; + response.Code = 1; + return response; + } + + /// + /// 获取当前用户信息 + /// + /// + public async Task GetUserInfoAsync() + { + ResponseOutput response = new ResponseOutput(); + UserOutput userOutput = await _cacheService.GetUserAsync(_httpContextUser.Id); + if (userOutput.IsNull()) + { + userOutput = await _userRepository.GetAsync(_httpContextUser.Id); + if (userOutput.IsNull()) + { + response.Successed = false; + response.Msg = "当前用户不存在"; + return response; + } + userOutput.AvatarUrl = userOutput.AvatarUrl; + await _cacheService.SetUserAsync(userOutput.Id, userOutput); + } + var usercar = await _userCardRepository.Where(x => x.UserId == _httpContextUser.Id && x.IsEnabled == true && x.EndTime > DateTime.Now).OrderByDescending(x=>x.CardId).FirstAsync(); + userOutput.CardType = usercar.IsNotNull() ? usercar.CardId : 0; + response.Successed = true; + response.Data = userOutput; + response.Code = 1; + return response; + } + } +} diff --git a/Znyc.CloudCar.Services/User/WxUnifyUserService.cs b/Znyc.CloudCar.Services/User/WxUnifyUserService.cs new file mode 100644 index 0000000..e60b5e0 --- /dev/null +++ b/Znyc.CloudCar.Services/User/WxUnifyUserService.cs @@ -0,0 +1,75 @@ +using Znyc.CloudCar.IRepository.Currency; +using Znyc.CloudCar.IRepository.User; +using Znyc.CloudCar.IServices.CaChe; +using Znyc.CloudCar.IServices.User; +using Znyc.CloudCar.Model.Dtos.User; +using Znyc.CloudCar.Model.Entities; +using Znyc.CloudCar.Utility.Extensions; +using Znyc.CloudCar.Utility.Helper; + +namespace Znyc.CloudCar.Services.User +{ + /// + /// 用户服务 + /// + public class WxUnifyUserService : IWxUnifyUserService + { + private readonly IWxUnifyUserRepository _wxUnifyUserRepository; + private readonly ICurrencyRecordRepository _currencyRecordRepository; + private readonly IUserRepository _userRepository; + private readonly ICacheService _cacheService; + + public WxUnifyUserService( + IWxUnifyUserRepository wxUnifyUserRepository, + ICurrencyRecordRepository currencyRecordRepository, + IUserRepository userRepository, + ICacheService cacheService + ) + { + _wxUnifyUserRepository = wxUnifyUserRepository; + _currencyRecordRepository = currencyRecordRepository; + _userRepository = userRepository; + _cacheService = cacheService; + } + + public async Task AddOrUpdateAsync(WxUnifyUserAddInput wxUnifyUser, string unionId) + { + var wxUser = await _wxUnifyUserRepository.GetAsync(x => x.UnionId == unionId && x.IsDeleted == false); ; + if (wxUser == null) + { + WxUnifyUserEntity entity = new WxUnifyUserEntity + { + UnionId = unionId, + NickName = wxUnifyUser.NickName, + AvatarUrl = wxUnifyUser.AvatarUrl, + Phone = wxUnifyUser.Phone.NotNull() ? wxUnifyUser.Phone : "", + Gender = wxUnifyUser.Gender, + Country = wxUnifyUser.City.NotNull() ? wxUnifyUser.City : "", + Province = wxUnifyUser.Province.NotNull() ? wxUnifyUser.Province : "", + City = wxUnifyUser.City.NotNull() ? wxUnifyUser.City : "", + Language = wxUnifyUser.Language + }; + await _wxUnifyUserRepository.InsertAsync(entity); + WxUnifyUserOutput wxUnifyUserOutput = new WxUnifyUserOutput() + { + UnionId = unionId, + NickName = wxUnifyUser.NickName, + CreatedTime = DateTime.Now + }; + //新用户信息添加进Redis缓存 + await _cacheService.SetRegistUserListAsync(wxUnifyUser.NickName, DateTime.Now.ToTimestamp()); + } + else + { + wxUser.NickName = wxUnifyUser.NickName; + wxUser.AvatarUrl = wxUnifyUser.AvatarUrl; + wxUser.Phone = wxUnifyUser.Phone.NotNull() ? wxUnifyUser.Phone : ""; + wxUser.Gender = wxUnifyUser.Gender; + wxUser.Country = wxUnifyUser.City.NotNull() ? wxUnifyUser.City : ""; + wxUser.Province = wxUnifyUser.Province.NotNull() ? wxUnifyUser.Province : ""; + wxUser.City = wxUnifyUser.City.NotNull() ? wxUnifyUser.City : ""; + await _wxUnifyUserRepository.UpdateAsync(wxUser); + } + } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Services/Znyc.CloudCar.Services.csproj b/Znyc.CloudCar.Services/Znyc.CloudCar.Services.csproj new file mode 100644 index 0000000..98f85d4 --- /dev/null +++ b/Znyc.CloudCar.Services/Znyc.CloudCar.Services.csproj @@ -0,0 +1,25 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + + + + + + diff --git a/Znyc.CloudCar.Swagger/CustomApiVersion.cs b/Znyc.CloudCar.Swagger/CustomApiVersion.cs new file mode 100644 index 0000000..ba78d27 --- /dev/null +++ b/Znyc.CloudCar.Swagger/CustomApiVersion.cs @@ -0,0 +1,24 @@ +namespace Znyc.CloudCar.Swagger +{ + /// + /// 自定义版本 + /// + public class CustomApiVersion + { + /// + /// Api接口版本 自定义 + /// + public enum ApiVersion + { + /// + /// V1版本 + /// + V1 = 1, + + /// + /// V2版本 + /// + V2 = 2, + } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar.Swagger/Znyc.CloudCar.Swagger.csproj b/Znyc.CloudCar.Swagger/Znyc.CloudCar.Swagger.csproj new file mode 100644 index 0000000..87c7f89 --- /dev/null +++ b/Znyc.CloudCar.Swagger/Znyc.CloudCar.Swagger.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/Znyc.CloudCar.Task/HangfireDispose.cs b/Znyc.CloudCar.Task/HangfireDispose.cs new file mode 100644 index 0000000..29dbbd9 --- /dev/null +++ b/Znyc.CloudCar.Task/HangfireDispose.cs @@ -0,0 +1,48 @@ +using Hangfire; +using Znyc.CloudCar.Task.TaskJobs; + +namespace Znyc.CloudCar.Task +{ + public class HangfireDispose + { + public static void HangfireService() + { + //Fire - And - forget（发布 / 订阅） + //这是一个主要的后台任务类型，持久化消息队列会去处理这个任务。当你创建了一个发布 / 订阅任务，该任务会被保存到默认队列里面（默认队列是"Default"，但是支持使用多队列）。多个专注的工作者（Worker）会监听这个队列，并且从中获取任务并且完成任务。 + //BackgroundJob.Enqueue(() => Console.WriteLine("Fire-and-forget")); + + //延迟 + //如果想要延迟某些任务的执行，可以是用以下任务。在给定延迟时间后，任务会被排入队列，并且和发布 / 订阅任务一样执行。 + //BackgroundJob.Schedule(() => Console.WriteLine("Delayed"), TimeSpan.FromDays(1)); + + //循环 + //按照周期性（小时，天等）来调用方法，请使用RecurringJob类。在复杂的场景，您可以使用CRON表达式指定计划时间来处理任务。 + //RecurringJob.AddOrUpdate(() => Console.WriteLine("Daily Job"), Cron.Daily); + + //连续 + //连续性允许您通过将多个后台任务链接在一起来定义复杂的工作流。 + //var id = BackgroundJob.Enqueue(() => Console.WriteLine("Hello, ")); + //BackgroundJob.ContinueWith(id, () => Console.WriteLine("world!")); + + //这里呢就是需要触发的方法 "0/10 * * * * ? " 可以自行搜索cron表达式 代表循环的规律很简单 + //CancelOrderJob代表你要触发的类 Execute代表你要触发的方法 + + //RecurringJob.AddOrUpdate(s => s.Execute(), "0 0 5 1/1 * ?", TimeZoneInfo.Local); + + //定时刷新获取微信AccessToken + RecurringJob.AddOrUpdate(s => s.Execute(), "0 0/30 * * * ? ", TimeZoneInfo.Utc); // 每30分钟刷新获取微信AccessToken + + //定时重置用户修改次数 + RecurringJob.AddOrUpdate(s => s.ResetUserUpdateExecute(), "0 58 23 L * ? ", TimeZoneInfo.Utc); // 每月最后一天23点58分重置用户修改次数 + + //定时同步设备浏览量 + RecurringJob.AddOrUpdate(s => s.PageViewAsyncExecute(), "0 55 23 * * ? ", TimeZoneInfo.Utc); // 每晚23点55分同步设备浏览量 + + //定时取消置顶设备信息 + RecurringJob.AddOrUpdate(s => s.CancelTopAsyncExecute(), "0 0/5 * * * ? ", TimeZoneInfo.Utc); // 每5分钟取消置顶设备信息 + + //定时禁用优惠卡到期 + RecurringJob.AddOrUpdate(s => s.DisablePreferentialCardExecute(), "0 0/5 * * * ? ", TimeZoneInfo.Utc); // 每5分钟修改用户优惠卡是否到期 + } + } +} diff --git a/Znyc.CloudCar.Task/TaskJobs/AutoEquipmentJob.cs b/Znyc.CloudCar.Task/TaskJobs/AutoEquipmentJob.cs new file mode 100644 index 0000000..bac6693 --- /dev/null +++ b/Znyc.CloudCar.Task/TaskJobs/AutoEquipmentJob.cs @@ -0,0 +1,53 @@ +using Znyc.CloudCar.IServices.CaChe; +using Znyc.CloudCar.IServices.Equipment; + +namespace Znyc.CloudCar.Task.TaskJobs +{ + /// + /// 设备信息定时任务 + /// + public class AutoEquipmentJob + { + private readonly IEquipmentService _equipmentService; + private readonly ICacheService _cacheService; + + public AutoEquipmentJob(IEquipmentService equipmentService, + ICacheService cacheService + ) + { + _equipmentService = equipmentService; + _cacheService = cacheService; + } + + /// + /// 重置用户修改次数 + /// + /// + public async System.Threading.Tasks.Task ResetUserUpdateExecute() + { + + Console.WriteLine($"{DateTime.Now}定时重置用户修改次数"); + await _cacheService.RemoveUserUpdateCountAsync(); + } + + /// + /// 同步设备浏览量 + /// + /// + public async System.Threading.Tasks.Task PageViewAsyncExecute() + { + await _equipmentService.PageViewAsync(); + } + + /// + /// 取消置顶设备信息 + /// + /// + public async System.Threading.Tasks.Task CancelTopAsyncExecute() + { + Console.WriteLine($"{DateTime.Now}取消置顶设备信息"); + + await _equipmentService.CancelTopAsync(); + } + } +} diff --git a/Znyc.CloudCar.Task/TaskJobs/AutoUserJob.cs b/Znyc.CloudCar.Task/TaskJobs/AutoUserJob.cs new file mode 100644 index 0000000..54c511d --- /dev/null +++ b/Znyc.CloudCar.Task/TaskJobs/AutoUserJob.cs @@ -0,0 +1,40 @@ +using Znyc.CloudCar.IServices.User; +using Znyc.CloudCar.Model.Dtos.Login; + +namespace Znyc.CloudCar.Task.TaskJobs +{ + /// + /// 用户定时任务 + /// + public class AutoUserJob + { + private readonly IUserService _userService; + private readonly IUserCardService _userCardService; + + public AutoUserJob( + IUserService userService, + IUserCardService userCardService + ) + { + _userService = userService; + _userCardService = userCardService; + } + + public async System.Threading.Tasks.Task Execute() + { + LoginInput login = new LoginInput(); + //await _userService.LoginAsync(login); + } + + /// + /// 定时禁用优惠卡到期 + /// + /// + public async System.Threading.Tasks.Task DisablePreferentialCardExecute() + { + Console.WriteLine($"{DateTime.Now}定时禁用优惠卡到期"); + + await _userCardService.UpdateUserCardAsync(); + } + } +} diff --git a/Znyc.CloudCar.Task/TaskJobs/RefreshWeChatAccessTokenJob.cs b/Znyc.CloudCar.Task/TaskJobs/RefreshWeChatAccessTokenJob.cs new file mode 100644 index 0000000..0d3e9ff --- /dev/null +++ b/Znyc.CloudCar.Task/TaskJobs/RefreshWeChatAccessTokenJob.cs @@ -0,0 +1,68 @@ +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; +using SKIT.FlurlHttpClient.Wechat.Api; +using SKIT.FlurlHttpClient.Wechat.Api.Models; +using Zncy.CloudCar.WeChat.Service.Options; +using Zncy.CloudCar.WeChat.Service.Services.HttpClients; +using Znyc.CloudCar.Caching; +using Znyc.CloudCar.Configuration; + +namespace Znyc.CloudCar.Task.TaskJobs +{ + /// + /// 定时刷新获取微信AccessToken + /// + public class RefreshWeChatAccessTokenJob + { + private readonly IRedisOperationRepository _redisOperationRepository; + private readonly WeChatOptions _weChatOptions; + private readonly IWeChatApiHttpClientFactory _weChatApiHttpClientFactory; + private readonly ILogger _logger; + + public RefreshWeChatAccessTokenJob(IRedisOperationRepository redisOperationRepository, IOptions weChatOptions, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, ILogger logger) + { + _logger = logger; + _redisOperationRepository = redisOperationRepository; + _weChatApiHttpClientFactory = weChatApiHttpClientFactory; + _weChatOptions = weChatOptions.Value; + } + + public async System.Threading.Tasks.Task Execute() + { + + Console.WriteLine($"{DateTime.Now}定时刷新获取微信AccessToken"); + try + { + if (!string.IsNullOrEmpty(_weChatOptions.WxOpenAppId) && !string.IsNullOrEmpty(_weChatOptions.WxOpenAppSecret)) + { + var accessToken = await _redisOperationRepository.GetAsync(GlobalEnumVars.AccessTokenEnum.WxOpenAccessToken.ToString()); + if (accessToken == null) + { + var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); + var request = new CgibinTokenRequest(); + var response = await client.ExecuteCgibinTokenAsync(request); + if (response.IsSuccessful()) + { + await _redisOperationRepository.SetAsync( + GlobalEnumVars.AccessTokenEnum.WxOpenAccessToken.ToString(), response.AccessToken, TimeSpan.FromDays(30)); + + _logger.LogDebug($"定时刷新获取微信AccessToken:{response.AccessToken}"); + } + else + { + _logger.LogError($"定时刷新获取微信AccessToken,刷新 AppId 为 {_weChatOptions.WeiXinAppId} 微信 AccessToken 失败（状态码：{response.RawStatus}，错误代码：{response.ErrorCode}，错误描述：{response.ErrorMessage}"); + } + } + else + { + _logger.LogDebug($"定时刷新获取微信AccessToken,无需刷新AccessToken,AccessToken 未过期"); + } + } + } + catch (Exception ex) + { + _logger.LogDebug($"定时刷新获取微信AccessToken,{ex.Message}"); + } + } + } +} diff --git a/Znyc.CloudCar.Task/Znyc.CloudCar.Task.csproj b/Znyc.CloudCar.Task/Znyc.CloudCar.Task.csproj new file mode 100644 index 0000000..1c6e8d7 --- /dev/null +++ b/Znyc.CloudCar.Task/Znyc.CloudCar.Task.csproj @@ -0,0 +1,20 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + diff --git a/Znyc.CloudCar.Utility/Attributes/TransactionAttribute.cs b/Znyc.CloudCar.Utility/Attributes/TransactionAttribute.cs new file mode 100644 index 0000000..1116c5b --- /dev/null +++ b/Znyc.CloudCar.Utility/Attributes/TransactionAttribute.cs @@ -0,0 +1,22 @@ +using FreeSql; +using System.Data; + +namespace Znyc.CloudCar.Utility.Attributes +{ + /// + /// 启用事物 + /// + [AttributeUsage(AttributeTargets.Method)] + public class TransactionAttribute : Attribute + { + /// + /// 事务传播方式 REQUIRED + /// + public Propagation Propagation { get; set; } + + /// + /// 事务隔离级别 + /// + public IsolationLevel? IsolationLevel { get; set; } + } +} diff --git a/Znyc.CloudCar.Utility/Extensions/ConvertObjectExtensions.cs b/Znyc.CloudCar.Utility/Extensions/ConvertObjectExtensions.cs new file mode 100644 index 0000000..ff4fb97 --- /dev/null +++ b/Znyc.CloudCar.Utility/Extensions/ConvertObjectExtensions.cs @@ -0,0 +1,227 @@ +using Newtonsoft.Json; +using System.Reflection; + +namespace Znyc.CloudCar.Utility.Extensions +{ + public class ConvertObjectExtensions + { + #region Method1 + + /// + /// 将object对象转换为实体对象 + /// + /// 实体对象类名 + /// object对象 + /// + private T ConvertObject(object asObject) where T : new() + { + //创建实体对象实例 + var t = Activator.CreateInstance(); + if (asObject != null) + { + Type type = asObject.GetType(); + //遍历实体对象属性 + foreach (var info in typeof(T).GetProperties()) + { +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + object obj = null; +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + //取得object对象中此属性的值 + var val = type.GetProperty(info.Name)?.GetValue(asObject); + if (val != null) + { + //非泛型 + if (!info.PropertyType.IsGenericType) + obj = Convert.ChangeType(val, info.PropertyType); + else//泛型Nullable<> + { + Type genericTypeDefinition = info.PropertyType.GetGenericTypeDefinition(); + if (genericTypeDefinition == typeof(Nullable<>)) + { +#pragma warning disable CS8604 // “object? Convert.ChangeType(object? value, Type conversionType)”中的形参“conversionType”可能传入 null 引用实参。 + obj = Convert.ChangeType(val, Nullable.GetUnderlyingType(info.PropertyType)); +#pragma warning restore CS8604 // “object? Convert.ChangeType(object? value, Type conversionType)”中的形参“conversionType”可能传入 null 引用实参。 + } + else + { + obj = Convert.ChangeType(val, info.PropertyType); + } + } + info.SetValue(t, obj, null); + } + } + } + return t; + } + + #endregion + + #region Method2 + + /// + /// 将object对象转换为实体对象 + /// + /// 实体对象类名 + /// object对象 + /// + public static T ConvertObjectByJson(object asObject) where T : new() + { + //将object对象转换为json字符 + var json = JsonConvert.SerializeObject(asObject); + //将json字符转换为实体对象 + var t = JsonConvert.DeserializeObject(json); +#pragma warning disable CS8603 // 可能返回 null 引用。 + return t; +#pragma warning restore CS8603 // 可能返回 null 引用。 + } + #endregion + + #region Method3 + /// + /// 将object尝试转为指定对象 + /// + /// + /// + public static T ConvertObjToModel(object data) where T : new() + { + if (data == null) return new T(); + // 定义集合 + T result = new T(); + + // 获得此模型的类型 + Type type = typeof(T); + string tempName = ""; + + // 获得此模型的公共属性 + PropertyInfo[] propertys = result.GetType().GetProperties(); + foreach (PropertyInfo pi in propertys) + { + tempName = pi.Name; // 检查object是否包含此列 + + // 判断此属性是否有Setter + if (!pi.CanWrite) continue; + + try + { + object value = GetPropertyValue(data, tempName); + if (value != DBNull.Value) + { + Type tempType = pi.PropertyType; + pi.SetValue(result, GetDataByType(value, tempType), null); + + } + } + catch + { } + + } + + return result; + } + + /// + /// 获取一个类指定的属性值 + /// + /// object对象 + /// 属性名称 + /// + public static object GetPropertyValue(object info, string field) + { +#pragma warning disable CS8603 // 可能返回 null 引用。 + if (info == null) return null; +#pragma warning restore CS8603 // 可能返回 null 引用。 + Type t = info.GetType(); + IEnumerable property = from pi in t.GetProperties() where pi.Name.ToLower() == field.ToLower() select pi; +#pragma warning disable CS8603 // 可能返回 null 引用。 + return property.First().GetValue(info, null); +#pragma warning restore CS8603 // 可能返回 null 引用。 + } + + /// + /// 将数据转为制定类型 + /// + /// + /// + /// + public static object GetDataByType(object data1, Type itype, params object[] myparams) + { + object result = new object(); + try + { + if (itype == typeof(decimal)) + { + result = Convert.ToDecimal(data1); + if (myparams.Length > 0) + { + result = Convert.ToDecimal(Math.Round(Convert.ToDecimal(data1), Convert.ToInt32(myparams[0]))); + } + } + else if (itype == typeof(double)) + { + + if (myparams.Length > 0) + { + result = Convert.ToDouble(Math.Round(Convert.ToDouble(data1), Convert.ToInt32(myparams[0]))); + } + else + { + result = double.Parse(Convert.ToDecimal(data1).ToString("0.00")); + } + } + else if (itype == typeof(int)) + { + result = Convert.ToInt32(data1); + } + else if (itype == typeof(DateTime)) + { + result = Convert.ToDateTime(data1); + } + else if (itype == typeof(Guid)) + { +#pragma warning disable CS8604 // “Guid.Guid(string g)”中的形参“g”可能传入 null 引用实参。 + result = new Guid(data1.ToString()); +#pragma warning restore CS8604 // “Guid.Guid(string g)”中的形参“g”可能传入 null 引用实参。 + } + else if (itype == typeof(string)) + { +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + result = data1.ToString(); +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + } + } + catch + { + if (itype == typeof(decimal)) + { + result = 0; + } + else if (itype == typeof(double)) + { + result = 0; + } + else if (itype == typeof(int)) + { + result = 0; + } + else if (itype == typeof(DateTime)) + { +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + result = null; +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + } + else if (itype == typeof(Guid)) + { + result = Guid.Empty; + } + else if (itype == typeof(string)) + { + result = ""; + } + } +#pragma warning disable CS8603 // 可能返回 null 引用。 + return result; +#pragma warning restore CS8603 // 可能返回 null 引用。 + } + #endregion + } +} diff --git a/Znyc.CloudCar.Utility/Extensions/EnumExtensions.cs b/Znyc.CloudCar.Utility/Extensions/EnumExtensions.cs new file mode 100644 index 0000000..0a23865 --- /dev/null +++ b/Znyc.CloudCar.Utility/Extensions/EnumExtensions.cs @@ -0,0 +1,32 @@ + +using System.ComponentModel; +using System.Reflection; + +namespace Znyc.CloudCar.Utility.Extensions +{ + public static class EnumExtensions + { + public static string ToDescription(this Enum item) + { + string name = item.ToString(); + DescriptionAttribute desc = item.GetType().GetField(name)?.GetCustomAttribute(); + return desc?.Description ?? name; + } + + public static long ToInt64(this Enum item) + { + return Convert.ToInt64(item); + } + + /// + /// 根据枚举的value获取枚举 + /// + /// 枚举的类型,示例:typeof(enum1) + /// 可能的枚举值 + /// 枚举,示例：enum1.en1 + public static Enum ParseEnum(Type enumType, string value) + { + return Enum.Parse(enumType, value) as Enum; + } + } +} diff --git a/Znyc.CloudCar.Utility/Extensions/ObjectExtensions.cs b/Znyc.CloudCar.Utility/Extensions/ObjectExtensions.cs new file mode 100644 index 0000000..af131f8 --- /dev/null +++ b/Znyc.CloudCar.Utility/Extensions/ObjectExtensions.cs @@ -0,0 +1,215 @@ +namespace Znyc.CloudCar.Utility.Extensions +{ + /// + /// 扩展数据 + /// + public static class ObjectExtensions + { + /// + /// 判断字符串是否为Null、空 + /// + /// + /// + public static bool IsNull(this string s) + { + return string.IsNullOrWhiteSpace(s); + } + + /// + /// 判断字符串是否不为Null、空 + /// + /// + /// + public static bool NotNull(this string s) + { + return !string.IsNullOrWhiteSpace(s); + } + + + /// + /// 数据转换为int类型 + /// + /// + /// + public static int ObjectToInt(this object thisValue) + { + int result = 0; + if (thisValue == null) + return 0; + return thisValue != null && thisValue != DBNull.Value && int.TryParse(thisValue.ToString(), out result) ? result : result; + } + + /// + /// 数据转换为int类型 + /// + /// + /// + /// + public static int ObjectToInt(this object thisValue, int errorValue) + { + int result = 0; + return thisValue != null && thisValue != DBNull.Value && int.TryParse(thisValue.ToString(), out result) ? result : errorValue; + } + + /// + /// 数据转换为Long类型 + /// + /// + /// + public static long ObjectToLong(this object thisValue) + { + long result = 0; + if (thisValue == null) + return 0; + return thisValue != null && thisValue != DBNull.Value && long.TryParse(thisValue.ToString(), out result) ? result : result; + } + + /// + /// 数据转换为Double类型 + /// + /// + /// + public static double ObjectToDouble(this object thisValue) + { + double result = 0.0; + return thisValue != null && thisValue != DBNull.Value && double.TryParse(thisValue.ToString(), out result) ? result : 0.0; + } + + /// + /// 数据转换为Double类型 + /// + /// + /// + /// + public static double ObjectToDouble(this object thisValue, double errorValue) + { + double result = 0.0; + return thisValue != null && thisValue != DBNull.Value && double.TryParse(thisValue.ToString(), out result) ? result : errorValue; + } + + /// + /// 数据转换为Float类型 + /// + /// + /// + public static float ObjectToFloat(this object thisValue) + { + float result = 0; + return thisValue != null && thisValue != DBNull.Value && float.TryParse(thisValue.ToString(), out result) ? result : 0; + } + + /// + /// 数据转换为Float类型 + /// + /// + /// + /// + public static float ObjectToFloat(this object thisValue, float errorValue) + { + float result = 0; + return thisValue != null && thisValue != DBNull.Value && float.TryParse(thisValue.ToString(), out result) ? result : errorValue; + } + + /// + /// 数据转换为String类型 + /// + /// + /// + public static string ObjectToString(this object thisValue) + { + + return thisValue != null ? thisValue.ToString().Trim() : ""; + + } + + /// + /// 数据转换为String类型 + /// + /// + /// + /// + public static string ObjectToString(this object thisValue, string errorValue) + { + return thisValue != null ? thisValue.ToString().Trim() : errorValue; + } + + /// + /// 数据转换为Decimal类型 + /// + /// + /// + public static decimal ObjectToDecimal(this object thisValue) + { + decimal result = new decimal(); + return thisValue != null && thisValue != DBNull.Value && decimal.TryParse(thisValue.ToString(), out result) ? result : decimal.Zero; + } + + /// + /// 数据转换为Decimal类型 + /// + /// + /// + /// + public static decimal ObjectToDecimal(this object thisValue, decimal errorValue) + { + decimal result = new decimal(); + return thisValue != null && thisValue != DBNull.Value && decimal.TryParse(thisValue.ToString(), out result) ? result : errorValue; + } + + /// + /// 数据转换为DateTime类型 + /// + /// + /// + public static DateTime ObjectToDate(this object thisValue) + { + DateTime result = DateTime.MinValue; + if (thisValue != null && thisValue != DBNull.Value && DateTime.TryParse(thisValue.ToString(), out result)) + result = Convert.ToDateTime(thisValue); + return result; + } + + /// + /// 数据转换为DateTime类型 + /// + /// + /// + /// + public static DateTime ObjectToDate(this object thisValue, DateTime errorValue) + { + DateTime result = DateTime.MinValue; + return thisValue != null && thisValue != DBNull.Value && DateTime.TryParse(thisValue.ToString(), out result) ? result : errorValue; + } + + /// + /// 数据转换为bool类型 + /// + /// + /// + public static bool ObjectToBool(this object thisValue) + { + bool result = false; + return thisValue != null && thisValue != DBNull.Value && bool.TryParse(thisValue.ToString(), out result) ? result : result; + } + + /// + /// 判断对象是否为空 + /// + /// + /// + public static bool IsNull(this object obj) + { + return obj == null; + } + + /// + /// 判断对象是否不为空 + /// + /// + /// + public static bool IsNotNull(this object obj) + { + return obj != null; + } + } +} diff --git a/Znyc.CloudCar.Utility/Extensions/SerializeExtensions.cs b/Znyc.CloudCar.Utility/Extensions/SerializeExtensions.cs new file mode 100644 index 0000000..634948a --- /dev/null +++ b/Znyc.CloudCar.Utility/Extensions/SerializeExtensions.cs @@ -0,0 +1,46 @@ + +using Newtonsoft.Json; +using System.Text; + +namespace Znyc.CloudCar.Utility.Extensions +{ + /// + /// 字符串序列化类(用于redis数据传递保持编码格式统一) + /// + public static class SerializeExtensions + { + /// + /// 序列化 + /// + /// + /// + public static byte[] Serialize(object item) + { + var jsonString = JsonConvert.SerializeObject(item); + + return Encoding.UTF8.GetBytes(jsonString); + } + + /// + /// 反序列化 + /// + /// + /// + /// + public static TEntity Deserialize(byte[] value) + { + if (value == null) + { + +#pragma warning disable CS8603 // 可能返回 null 引用。 + return default; +#pragma warning restore CS8603 // 可能返回 null 引用。 + } + var jsonString = Encoding.UTF8.GetString(value); + +#pragma warning disable CS8603 // 可能返回 null 引用。 + return JsonConvert.DeserializeObject(jsonString); +#pragma warning restore CS8603 // 可能返回 null 引用。 + } + } +} diff --git a/Znyc.CloudCar.Utility/Helper/CommonHelper.cs b/Znyc.CloudCar.Utility/Helper/CommonHelper.cs new file mode 100644 index 0000000..eb0bee5 --- /dev/null +++ b/Znyc.CloudCar.Utility/Helper/CommonHelper.cs @@ -0,0 +1,608 @@ +using System.Security.Cryptography; +using System.Text; +using System.Text.RegularExpressions; + +namespace Znyc.CloudCar.Utility.Helper +{ + /// + /// 通用帮助类 + /// + public class CommonHelper + { + #region 判断字符串是否为手机号码 + /// + /// 判断字符串是否为手机号码 + /// + /// + /// + public static bool IsMobile(string mobilePhoneNumber) + { + if (mobilePhoneNumber.Length < 11) + { + return false; + } + + //电信手机号码正则 + string dianxin = @"^1[345789][01379]\d{8}$"; + Regex regexDx = new Regex(dianxin); + //联通手机号码正则 + string liantong = @"^1[345678][01256]\d{8}$"; + Regex regexLt = new Regex(liantong); + //移动手机号码正则 + string yidong = @"^1[345789][0123456789]\d{8}$"; + Regex regexYd = new Regex(yidong); + if (regexDx.IsMatch(mobilePhoneNumber) || regexLt.IsMatch(mobilePhoneNumber) || regexYd.IsMatch(mobilePhoneNumber)) + { + return true; + } + else + { + return false; + } + } + #endregion + + #region 检测是否符合email格式 + + /// + /// 检测是否符合email格式 + /// + /// 要判断的email字符串 + /// 判断结果 + public static bool IsValidEmail(string strEmail) + { + return Regex.IsMatch(strEmail, @"^[\w\.]+([-]\w+)*@[A-Za-z0-9-_]+[\.][A-Za-z0-9-_]"); + } + + public static bool IsValidDoEmail(string strEmail) + { + return Regex.IsMatch(strEmail, + @"^@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$"); + } + #endregion + + #region 检测是否是正确的Url + /// + /// 检测是否是正确的Url + /// + /// 要验证的Url + /// 判断结果 + public static bool IsUrl(string strUrl) + { + return Regex.IsMatch(strUrl, + @"^(http|https)\://([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&%\$\-]+)*@)*((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|localhost|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{1,10}))(\:[0-9]+)*(/($|[a-zA-Z0-9\.\,\?\'\\\+&%\$#\=~_\-]+))*$"); + } + + + #endregion + + #region string 转int数组 + + public static int[] StringToIntArray(string str) + { + try + { + if (string.IsNullOrEmpty(str)) return new int[0]; + if (str.EndsWith(",")) + { + str = str.Remove(str.Length - 1, 1); + } + var idstrarr = str.Split(','); + var idintarr = new int[idstrarr.Length]; + + for (int i = 0; i < idstrarr.Length; i++) + { + idintarr[i] = Convert.ToInt32(idstrarr[i]); + } + return idintarr; + } + catch + { + return new int[0]; + } + } + #endregion + + #region String转数组 + public static string[] StringToStringArray(string str) + { + try + { + if (string.IsNullOrEmpty(str)) return new string[0]; + if (str.EndsWith(",")) str = str.Remove(str.Length - 1, 1); + return str.Split(','); + } + catch + { + return new string[0]; + } + } + #endregion + + #region String数组转Int数组 + public static int[] StringArrAyToIntArray(string[] str) + { + try + { + int[] iNums = Array.ConvertAll(str, s => int.Parse(s)); + return iNums; + } + catch + { + return new int[0]; + } + } + #endregion + + #region string转Guid数组 + public static System.Guid[] StringToGuidArray(string str) + { + try + { + if (string.IsNullOrEmpty(str)) return new System.Guid[0]; + if (str.EndsWith(",")) str = str.Remove(str.Length - 1, 1); + var strarr = str.Split(','); + System.Guid[] guids = new System.Guid[strarr.Length]; + for (int index = 0; index < strarr.Length; index++) + { + guids[index] = System.Guid.Parse(strarr[index]); + } + return guids; + } + catch + { + return new System.Guid[0]; + } + } + #endregion + + #region 获取32位md5加密 + /// + /// 通过创建哈希字符串适用于任何 MD5 哈希函数 （在任何平台） 上创建 32 个字符的十六进制格式哈希字符串 + /// + /// + /// 32位md5加密字符串 + public static string Md5For32(string source) + { + using (MD5 md5Hash = MD5.Create()) + { + byte[] data = md5Hash.ComputeHash(Encoding.UTF8.GetBytes(source)); + StringBuilder sBuilder = new StringBuilder(); + for (int i = 0; i < data.Length; i++) + { + sBuilder.Append(data[i].ToString("x2")); + } + + string hash = sBuilder.ToString(); + return hash.ToUpper(); + } + } + #endregion + + #region 获取16位md5加密 + /// + /// 获取16位md5加密 + /// + /// + /// 16位md5加密字符串 + public static string Md5For16(string source) + { + using (MD5 md5Hash = MD5.Create()) + { + byte[] data = md5Hash.ComputeHash(Encoding.UTF8.GetBytes(source)); + //转换成字符串，并取9到25位 + string sBuilder = BitConverter.ToString(data, 4, 8); + //BitConverter转换出来的字符串会在每个字符中间产生一个分隔符，需要去除掉 + sBuilder = sBuilder.Replace("-", ""); + return sBuilder.ToUpper(); + } + } + + #endregion + + #region 返回当前的毫秒时间戳 + + /// + /// 返回当前的毫秒时间戳 + /// + public static string Msectime() + { + long timeTicks = (DateTime.Now.ToUniversalTime().Ticks - 621355968000000000) / 10000; + return timeTicks.ToString(); + } + + + #endregion + + #region 获取多种数据编号 + /// + /// 获取多种数据编号 + /// + /// + /// + public static string GetSerialNumberType(int type) + { + var str = string.Empty; + Random rand = new Random(); + + + + str = 'T' + Msectime() + rand.Next(0, 9); + + return str; + } + + #endregion + + #region 剩余多久时间文字描述 + /// + /// 剩余多久时间 + /// + /// + /// 文字描述 + public static string GetRemainingTime(DateTime remainingTime) + { + TimeSpan timeSpan = remainingTime - DateTime.Now; + var day = timeSpan.Days; + var hours = timeSpan.Hours; + var minute = timeSpan.Minutes; + var seconds = timeSpan.Seconds; + if (day > 0) + { + return day + "天" + hours + "小时" + minute + "分" + seconds + "秒"; + } + else + { + if (hours > 0) + { + return hours + "小时" + minute + "分" + seconds + "秒"; + } + else + { + return minute + "分" + seconds + "秒"; + } + } + } + + #endregion + + #region 剩余多久时间返回时间类型 + /// + /// 剩余多久时间 + /// + /// + /// 返回时间类型 + public static void GetBackTime(DateTime remainingTime, out int day, out int hours, out int minute, out int seconds) + { + TimeSpan timeSpan = remainingTime - DateTime.Now; + day = timeSpan.Days; + hours = timeSpan.Hours; + minute = timeSpan.Minutes; + seconds = timeSpan.Seconds; + } + + #endregion + + #region 计算时间戳剩余多久时间 + + /// + /// 计算时间戳剩余多久时间 + /// + /// 提交时间(要是以前的时间) + /// + public static string TimeAgo(DateTime postTime) + { + //当前时间的时间戳 + var nowtimes = ConvertTicks(DateTime.Now); + //提交的时间戳 + var posttimes = ConvertTicks(postTime); + //相差时间戳 + var counttime = nowtimes - posttimes; + + //进行时间转换 + if (counttime <= 60) + { + return "刚刚"; + } + else if (counttime > 60 && counttime <= 120) + { + return "1分钟前"; + } + else if (counttime > 120 && counttime <= 180) + { + return "2分钟前"; + } + else if (counttime > 180 && counttime < 3600) + { + return Convert.ToInt32((counttime / 60)) + "分钟前"; + } + else if (counttime >= 3600 && counttime < 3600 * 24) + { + return Convert.ToInt32((counttime / 3600)) + "小时前"; + } + else if (counttime >= 3600 * 24 && counttime < 3600 * 24 * 2) + { + return "昨天"; + } + else if (counttime >= 3600 * 24 * 2 && counttime < 3600 * 24 * 3) + { + return "前天"; + } + else if (counttime >= 3600 * 24 * 3 && counttime <= 3600 * 24 * 7) + { + return Convert.ToInt32((counttime / (3600 * 24))) + "天前"; + } + else if (counttime >= 3600 * 24 * 7 && counttime <= 3600 * 24 * 30) + { + return Convert.ToInt32((counttime / (3600 * 24 * 7))) + "周前"; + } + else if (counttime >= 3600 * 24 * 30 && counttime <= 3600 * 24 * 365) + { + return Convert.ToInt32((counttime / (3600 * 24 * 30))) + "个月前"; + } + else if (counttime >= 3600 * 24 * 365) + { + return Convert.ToInt32((counttime / (3600 * 24 * 365))) + "年前"; + } + else + { + return ""; + } + } + + /// + /// 时间转换为秒的时间戳 + /// + /// + /// + private static long ConvertTicks(DateTime time) + { + long currentTicks = time.Ticks; + DateTime dtFrom = new DateTime(1970, 1, 1, 0, 0, 0, 0); + long currentMillis = (currentTicks - dtFrom.Ticks) / 10000000; //转换为秒为Ticks/10000000，转换为毫秒Ticks/10000 + return currentMillis; + } + + #endregion + + #region 清除HTML中指定样式 + /// + /// 清除HTML中指定样式 + /// + /// + /// + /// + public static string ClearHtml(string content, string[] rule) + { + if (!rule.Any()) + { + return content; + } + + foreach (var item in rule) + { + content = Regex.Replace(content, "/" + item + @"\s*=\s*\d+\s*/i", ""); + content = Regex.Replace(content, "/" + item + @"\s*=\s*.+?[""]/i", ""); + content = Regex.Replace(content, "/" + item + @"\s*:\s*\d+\s*px\s*;?/i", ""); + } + return content; + } + #endregion + + #region list随机排序方法 + /// + /// list随机排序方法 + /// + /// + /// + /// + public static List RandomSortList(List ListT) + { + Random random = new Random(); + List newList = new List(); + foreach (T item in ListT) + { + newList.Insert(random.Next(newList.Count + 1), item); + } + return newList; + } + #endregion + + #region 从字典中取单个数据 + /// + /// 从字典中取单个数据 + /// + /// + /// + /// + //public static string GetConfigDictionary(Dictionary configs, string skey) + //{ + // configs.TryGetValue(skey, out var di); + // return di?.sValue; + //} + + #endregion + + #region 截前后字符(串) + /// + /// 截前后字符(串) + /// + ///原字符串 + ///要截掉的字符串 + ///是否贪婪 + /// + public static string GetCaptureInterceptedText(string val, string str, bool all = false) + { + return Regex.Replace(val, @"(^(" + str + ")" + (all ? "*" : "") + "|(" + str + ")" + (all ? "*" : "") + "$)", ""); + } + #endregion + + #region 密码加密方法 + /// + /// 密码加密方法 + /// + /// 要加密的字符串 + /// 时间组合 + /// + public static string EnPassword(string password, DateTime createTime) + { + var dtStr = createTime.ToString("yyyyMMddHHmmssfff"); + var md5 = Md5For32(password); + var enPwd = Md5For32(md5 + dtStr); + return enPwd; + } + #endregion + + #region 获取现在是星期几 + /// + /// 获取现在是星期几 + /// + /// + public static string GetWeek() + { + string week = string.Empty; + switch (DateTime.Now.DayOfWeek) + { + case DayOfWeek.Monday: + week = "周一"; + break; + case DayOfWeek.Tuesday: + week = "周二"; + break; + case DayOfWeek.Wednesday: + week = "周三"; + break; + case DayOfWeek.Thursday: + week = "周四"; + break; + case DayOfWeek.Friday: + week = "周五"; + break; + case DayOfWeek.Saturday: + week = "周六"; + break; + case DayOfWeek.Sunday: + week = "周日"; + break; + default: + week = "N/A"; + break; + } + return week; + } + + #endregion + + #region UrlEncode (URL编码) + /// + /// UrlEncode (URL编码) + /// + /// + /// + public static string UrlEncode(string str) + { + StringBuilder sb = new StringBuilder(); + byte[] byStr = System.Text.Encoding.UTF8.GetBytes(str); //默认是System.Text.Encoding.Default.GetBytes(str) + for (int i = 0; i < byStr.Length; i++) + { + sb.Append(@"%" + Convert.ToString(byStr[i], 16)); + } + + return (sb.ToString()); + } + + #endregion + + #region 获取10位时间戳 + /// + /// 获取10位时间戳 + /// + /// + public static long GetTimeStampByTotalSeconds() + { + TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0); + return Convert.ToInt64(ts.TotalSeconds); + } + #endregion + + #region 获取13位时间戳 + /// + /// 获取13位时间戳 + /// + /// + public static long GetTimeStampByTotalMilliseconds() + { + TimeSpan ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0); + return Convert.ToInt64(ts.TotalMilliseconds); + } + #endregion + + #region 生成设备编号 + /// + /// 生成设备编号 + /// + /// + public static string GetEquipmentNumber() + { + return DateTime.Now.ToString("yyyyMMddhhmmss"); + } + #endregion + + #region 身份证脱敏处理 + /// + /// 隐藏身份证号 + /// + /// + /// + public static string ConvertIdCard(string idCard) + { + return Regex.Replace(idCard, "(\\d{6})\\d{8}(\\w{4})", "$1********$2"); + } + #endregion + + #region 隐藏手机号 + /// + /// 隐藏手机号 + /// + /// + /// + public static string ToHiddenPhone(string Phone) + { + return Regex.Replace(Phone, "(\\d{3})\\d{4}(\\d{4})", "$1****$2"); + } + #endregion + + #region 生成订单流水号 + /// + /// 生成订单流水号 + /// + /// + /// + public static string GetOrderSn(long orderId) + { + return $"{DateTime.Now.ToString("yyyyMMdd")}{orderId}"; + } + #endregion + + #region 拨打电话云币 + public static int GetCallPhoneCurrency(int sellingPrice) + { + if (sellingPrice < 100000) + { + return 10; + } + else + { + if (sellingPrice % 100000 == 0) + { + return (sellingPrice / 100000) * 10; + } + else + { + return (sellingPrice / 100000 + 1) * 10; + } + } + } + #endregion + } +} diff --git a/Znyc.CloudCar.Utility/Helper/DateHelper.cs b/Znyc.CloudCar.Utility/Helper/DateHelper.cs new file mode 100644 index 0000000..9f35ab6 --- /dev/null +++ b/Znyc.CloudCar.Utility/Helper/DateHelper.cs @@ -0,0 +1,76 @@ +namespace Znyc.CloudCar.Utility.Helper +{ + public static class DateHelper + { + /// + /// 时间戳起始日期 + /// + public static DateTime TimestampStart = new(1970, 1, 1, 0, 0, 0, 0); + + public static DateTime StampToDateTime(string time) + { + time = time.Substring(0, 10); + double timestamp = Convert.ToInt64(time); + System.DateTime dateTime = new System.DateTime(1970, 1, 1, 0, 0, 0, 0); + dateTime = dateTime.AddSeconds(timestamp).ToLocalTime(); + return dateTime; + } + + /// + /// 转换为时间戳 + /// + /// + /// 是否使用毫秒 + /// + public static int ToTimestamp(this DateTime dateTime, bool milliseconds = false) + { + TimeSpan timestamp = dateTime.ToUniversalTime() - TimestampStart; + return (int)(milliseconds ? timestamp.TotalMilliseconds : timestamp.TotalSeconds); + } + + /// + /// 出厂时间 + /// + /// + /// + public static DateOutput GetAppearanceTimeAsync(long id) + { + DateOutput output = new DateOutput(); + switch (id) + { + case 8001: + output.Start = new DateTime(DateTime.Now.AddYears(-3).Year, 1, 1); + output.End = new DateTime(DateTime.Now.Year, 12, 31); + break; + case 8002: + output.Start = new DateTime(DateTime.Now.AddYears(-5).Year, 1, 1); + output.End = new DateTime(DateTime.Now.AddYears(-3).Year, 12, 31); + break; + case 8003: + output.Start = new DateTime(DateTime.Now.AddYears(-8).Year, 1, 1); + output.End = new DateTime(DateTime.Now.AddYears(-5).Year, 12, 31); + break; + case 8004: + output.Start = new DateTime(DateTime.Now.AddYears(-12).Year, 1, 1); + output.End = new DateTime(DateTime.Now.AddYears(-8).Year, 12, 31); + break; + case 8005: + output.Start = DateTime.MinValue; + output.End = new DateTime(DateTime.Now.AddYears(-12).Year, 12, 31); + break; + default: + output.Start = DateTime.MinValue; + output.End = DateTime.MaxValue; + break; + } + return output; + } + + public class DateOutput + { + public DateTime Start { get; set; } + + public DateTime End { get; set; } + } + } +} diff --git a/Znyc.CloudCar.Utility/Helper/EnumHelper.cs b/Znyc.CloudCar.Utility/Helper/EnumHelper.cs new file mode 100644 index 0000000..4880d55 --- /dev/null +++ b/Znyc.CloudCar.Utility/Helper/EnumHelper.cs @@ -0,0 +1,152 @@ +using System.ComponentModel; +using Znyc.CloudCar.Model.ViewModels.Enum; + +namespace Znyc.CloudCar.Utility.Helper +{ + public class EnumHelper + { + public static List EnumToList() + { + List list = new List(); + foreach (var e in Enum.GetValues(typeof(T))) + { + EnumEntity m = new EnumEntity(); +#pragma warning disable CS8604 // “FieldInfo? Type.GetField(string name)”中的形参“name”可能传入 null 引用实参。 +#pragma warning disable CS8602 // 解引用可能出现空引用。 + object[] objArr = e.GetType().GetField(e.ToString()).GetCustomAttributes(typeof(DescriptionAttribute), true); +#pragma warning restore CS8602 // 解引用可能出现空引用。 +#pragma warning restore CS8604 // “FieldInfo? Type.GetField(string name)”中的形参“name”可能传入 null 引用实参。 + if (objArr != null && objArr.Length > 0) + { +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + DescriptionAttribute da = objArr[0] as DescriptionAttribute; +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 +#pragma warning disable CS8602 // 解引用可能出现空引用。 + m.description = da.Description; +#pragma warning restore CS8602 // 解引用可能出现空引用。 + } + m.value = Convert.ToInt32(e); +#pragma warning disable CS8601 // 可能的 null 引用赋值。 + m.title = e.ToString(); +#pragma warning restore CS8601 // 可能的 null 引用赋值。 + list.Add(m); + } + return list; + } + + /// + /// 根据枚举值来获取单个枚举实体 + /// + /// 枚举 + /// value + /// + public static EnumEntity GetEnumberEntity(int value) + { + foreach (var e in Enum.GetValues(typeof(T))) + { + EnumEntity m = new EnumEntity(); +#pragma warning disable CS8604 // “FieldInfo? Type.GetField(string name)”中的形参“name”可能传入 null 引用实参。 +#pragma warning disable CS8602 // 解引用可能出现空引用。 + object[] objArr = e.GetType().GetField(e.ToString()).GetCustomAttributes(typeof(DescriptionAttribute), true); +#pragma warning restore CS8602 // 解引用可能出现空引用。 +#pragma warning restore CS8604 // “FieldInfo? Type.GetField(string name)”中的形参“name”可能传入 null 引用实参。 + if (objArr != null && objArr.Length > 0) + { +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + DescriptionAttribute da = objArr[0] as DescriptionAttribute; +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 +#pragma warning disable CS8602 // 解引用可能出现空引用。 + m.description = da.Description; +#pragma warning restore CS8602 // 解引用可能出现空引用。 + } + m.value = Convert.ToInt32(e); +#pragma warning disable CS8601 // 可能的 null 引用赋值。 + m.title = e.ToString(); +#pragma warning restore CS8601 // 可能的 null 引用赋值。 + if (value == m.value) + { + return m; + } + } +#pragma warning disable CS8603 // 可能返回 null 引用。 + return null; +#pragma warning restore CS8603 // 可能返回 null 引用。 + } + + + /// + /// 根据枚举值value来获取单个枚举实体的文字描述内容 + /// + /// 枚举 + /// value + /// + public static string GetEnumDescriptionByValue(int value) + { + foreach (var e in Enum.GetValues(typeof(T))) + { + EnumEntity m = new EnumEntity(); +#pragma warning disable CS8604 // “FieldInfo? Type.GetField(string name)”中的形参“name”可能传入 null 引用实参。 +#pragma warning disable CS8602 // 解引用可能出现空引用。 + object[] objArr = e.GetType().GetField(e.ToString()).GetCustomAttributes(typeof(DescriptionAttribute), true); +#pragma warning restore CS8602 // 解引用可能出现空引用。 +#pragma warning restore CS8604 // “FieldInfo? Type.GetField(string name)”中的形参“name”可能传入 null 引用实参。 + if (objArr != null && objArr.Length > 0) + { +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + DescriptionAttribute da = objArr[0] as DescriptionAttribute; +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 +#pragma warning disable CS8602 // 解引用可能出现空引用。 + m.description = da.Description; +#pragma warning restore CS8602 // 解引用可能出现空引用。 + } + m.value = Convert.ToInt32(e); +#pragma warning disable CS8601 // 可能的 null 引用赋值。 + m.title = e.ToString(); +#pragma warning restore CS8601 // 可能的 null 引用赋值。 + if (value == m.value) + { + return m.description; + } + } + return ""; + } + + /// + /// 根据枚举key来获取单个枚举实体的文字描述内容 + /// + /// 枚举 + /// value + /// + public static string GetEnumDescriptionByKey(string key) + { + foreach (var e in Enum.GetValues(typeof(T))) + { + EnumEntity m = new EnumEntity(); +#pragma warning disable CS8602 // 解引用可能出现空引用。 +#pragma warning disable CS8604 // “FieldInfo? Type.GetField(string name)”中的形参“name”可能传入 null 引用实参。 + object[] objArr = e.GetType().GetField(e.ToString()).GetCustomAttributes(typeof(DescriptionAttribute), true); +#pragma warning restore CS8604 // “FieldInfo? Type.GetField(string name)”中的形参“name”可能传入 null 引用实参。 +#pragma warning restore CS8602 // 解引用可能出现空引用。 + if (objArr != null && objArr.Length > 0) + { +#pragma warning disable CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 + DescriptionAttribute da = objArr[0] as DescriptionAttribute; +#pragma warning restore CS8600 // 将 null 文本或可能的 null 值转换为不可为 null 类型。 +#pragma warning disable CS8602 // 解引用可能出现空引用。 + m.description = da.Description; +#pragma warning restore CS8602 // 解引用可能出现空引用。 + } + m.value = Convert.ToInt32(e); +#pragma warning disable CS8601 // 可能的 null 引用赋值。 + m.title = e.ToString(); +#pragma warning restore CS8601 // 可能的 null 引用赋值。 + if (key == m.title) + { + return m.description; + } + } + return ""; + } + + } +} diff --git a/Znyc.CloudCar.Utility/Helper/HttpHelper.cs b/Znyc.CloudCar.Utility/Helper/HttpHelper.cs new file mode 100644 index 0000000..0cc2086 --- /dev/null +++ b/Znyc.CloudCar.Utility/Helper/HttpHelper.cs @@ -0,0 +1,39 @@ +using System.Net; +using System.Text; + +namespace Znyc.CloudCar.Utility.Helper +{ + /// + /// 模拟标准表单Post提交 + /// + public class HttpHelper + { + /// + /// 模拟标准表单Post提交 + /// + /// + /// + /// + public static string PostSend(string url, string postdate) + { + HttpWebRequest myHttpWebRequest = (HttpWebRequest)WebRequest.Create(url); + myHttpWebRequest.Method = "POST"; + myHttpWebRequest.ContentType = "application/x-www-form-urlencoded;charset=UTF-8"; + myHttpWebRequest.Method = "POST"; + Stream stream = myHttpWebRequest.GetRequestStream(); + StreamWriter writer = new StreamWriter(stream); + writer.Write(postdate); + writer.Flush(); + writer.Close(); + stream.Close(); + + HttpWebResponse myHttpWebResponse = (HttpWebResponse)myHttpWebRequest.GetResponse(); + Stream myResponseStream = myHttpWebResponse.GetResponseStream(); + StreamReader streamReader = new StreamReader(myResponseStream, Encoding.GetEncoding("utf-8")); + string response = streamReader.ReadToEnd(); + streamReader.Close(); + myHttpWebResponse.Close(); + return response; + } + } +} diff --git a/Znyc.CloudCar.Utility/Helper/IPHelper.cs b/Znyc.CloudCar.Utility/Helper/IPHelper.cs new file mode 100644 index 0000000..8ecedbc --- /dev/null +++ b/Znyc.CloudCar.Utility/Helper/IPHelper.cs @@ -0,0 +1,99 @@ +using Microsoft.AspNetCore.Http; +using System.Net.NetworkInformation; +using System.Text.RegularExpressions; +using Znyc.CloudCar.Utility.Extensions; + +namespace Znyc.CloudCar.Utility.Helper +{ + public class IPHelper + { + /// + /// 是否为ip + /// + /// + /// + public static bool IsIP(string ip) + { + return Regex.IsMatch(ip, @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$"); + } + + /// + /// 获得IP地址 + /// + /// + /// + public static string GetIP(HttpRequest request) + { + if (request == null) + { + return ""; + } + + string ip = request.Headers["X-Real-IP"].FirstOrDefault(); + if (ip.IsNull()) + { + ip = request.Headers["X-Forwarded-For"].FirstOrDefault(); + } + + if (ip.IsNull()) + { + ip = request.HttpContext?.Connection?.RemoteIpAddress?.ToString(); + } + + if (ip.IsNull() || !IsIP(ip.Split(":")[0])) + { + ip = "127.0.0.1"; + } + + return ip; + } + + /// + /// 获得MAC地址 + /// + /// + public static string GetMACIp() + { + //本地计算机网络连接信息 + //IPGlobalProperties computerProperties = IPGlobalProperties.GetIPGlobalProperties(); + //获取本机电脑名 + //var HostName = computerProperties.HostName; + //获取域名 + //var DomainName = computerProperties.DomainName; + + //获取本机所有网络连接 + NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces(); + + if (nics == null || nics.Length < 1) + { + return ""; + } + + string MACIp = ""; + foreach (NetworkInterface adapter in nics) + { + string adapterName = adapter.Name; + + string adapterDescription = adapter.Description; + NetworkInterfaceType NetworkInterfaceType = adapter.NetworkInterfaceType; + if (adapterName == "本地连接" || adapterName == "WLAN") + { + PhysicalAddress address = adapter.GetPhysicalAddress(); + byte[] bytes = address.GetAddressBytes(); + + for (int i = 0; i < bytes.Length; i++) + { + MACIp += bytes[i].ToString("X2"); + + if (i != bytes.Length - 1) + { + MACIp += "-"; + } + } + } + } + + return MACIp; + } + } +} diff --git a/Znyc.CloudCar.Utility/Znyc.CloudCar.Utility.csproj b/Znyc.CloudCar.Utility/Znyc.CloudCar.Utility.csproj new file mode 100644 index 0000000..7b77a26 --- /dev/null +++ b/Znyc.CloudCar.Utility/Znyc.CloudCar.Utility.csproj @@ -0,0 +1,18 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + diff --git a/Znyc.CloudCar.sln b/Znyc.CloudCar.sln new file mode 100644 index 0000000..1603beb --- /dev/null +++ b/Znyc.CloudCar.sln @@ -0,0 +1,184 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31912.275 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Core", "Znyc.CloudCar.Core\Znyc.CloudCar.Core.csproj", "{AA117636-9769-4A1B-9092-CAC600CED87F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Swagger", "Znyc.CloudCar.Swagger\Znyc.CloudCar.Swagger.csproj", "{47AF38AC-0EF9-41B3-814E-F71D9AE09984}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar", "Znyc.CloudCar\Znyc.CloudCar.csproj", "{478B5BE5-4AFB-4769-B14F-EBB2FCC70D5A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.FreeSql", "Znyc.CloudCar.FreeSql\Znyc.CloudCar.FreeSql.csproj", "{09637852-E900-4B08-99FB-582B07096BA7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Model", "Znyc.CloudCar.Model\Znyc.CloudCar.Model.csproj", "{D5E71014-D6AF-4016-800F-7C3E4B528EEE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.IRepository", "Znyc.CloudCar.IRepository\Znyc.CloudCar.IRepository.csproj", "{D03B8D51-F3EA-48BB-9CBD-5D60E44E449B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Repository", "Znyc.CloudCar.Repository\Znyc.CloudCar.Repository.csproj", "{9617B864-3E29-4232-9222-A41BF0DDB4DA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Auth", "Znyc.CloudCar.Auth\Znyc.CloudCar.Auth.csproj", "{F0323E27-FD5D-4786-8F5E-2093527570B9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Configuration", "Znyc.CloudCar.Configuration\Znyc.CloudCar.Configuration.csproj", "{FD75A54F-FE7A-4941-B90C-B1EDCB099A69}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Utility", "Znyc.CloudCar.Utility\Znyc.CloudCar.Utility.csproj", "{2B3B7FAF-3A1B-4C36-B3C2-751E7A9D37D1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Services", "Znyc.CloudCar.Services\Znyc.CloudCar.Services.csproj", "{A4822BD7-A80E-4994-8B42-D1E39E8E4884}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.IServices", "Znyc.CloudCar.IServices\Znyc.CloudCar.IServices.csproj", "{9CA31E26-CBC6-44D5-9976-6B5C8264A37F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.RedisMQ", "Znyc.CloudCar.RedisMQ\Znyc.CloudCar.RedisMQ.csproj", "{2C6BF214-9C30-4D5B-ABEA-591F81B9F05D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Caching", "Znyc.CloudCar.Caching\Znyc.CloudCar.Caching.csproj", "{55583EA9-B0C1-4A82-8045-E4D21B375AF9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Hangfire", "Znyc.CloudCar.Hangfire\Znyc.CloudCar.Hangfire.csproj", "{ED636B9D-0AC1-4716-B39D-62241228B702}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Task", "Znyc.CloudCar.Task\Znyc.CloudCar.Task.csproj", "{1C042CEE-C371-4022-A121-1AAF48ED9AB4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Mapster", "Znyc.CloudCar.Mapster\Znyc.CloudCar.Mapster.csproj", "{50E48312-97D6-409F-AE34-5B07A114EA2E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Loging", "Znyc.CloudCar.Loging\Znyc.CloudCar.Loging.csproj", "{D71F97D7-3D4C-4288-9C47-69A2833B7CD4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Filter", "Znyc.CloudCar.Filter\Znyc.CloudCar.Filter.csproj", "{485B30AC-68B5-48A4-94C5-E764B9EF0E66}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zncy.CloudCar.WeChat.Service", "Zncy.CloudCar.WeChat.Service\Zncy.CloudCar.WeChat.Service.csproj", "{2A5CCC4D-721C-431E-B760-9F2B500EDBDA}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EBE05224-9322-40AC-8866-64FE6A4A0B72}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{EFD3DCF9-59F1-434F-848F-3BE76A9484DE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker", "docker", "{CF47842E-4729-4457-B805-CBC9AAACD8A3}" + ProjectSection(SolutionItems) = preProject + Znyc.CloudCar\Dockerfile = Znyc.CloudCar\Dockerfile + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Znyc.CloudCar.Middlewares", "Znyc.CloudCar.Middlewares\Znyc.CloudCar.Middlewares.csproj", "{00C92022-86BB-4A9E-85EB-760B8F647A80}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zncy.CloudCar.Tests", "Zncy.CloudCar.Tests\Zncy.CloudCar.Tests.csproj", "{EC86DBD9-70D7-465D-9F59-35D5FF597600}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {AA117636-9769-4A1B-9092-CAC600CED87F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AA117636-9769-4A1B-9092-CAC600CED87F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AA117636-9769-4A1B-9092-CAC600CED87F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AA117636-9769-4A1B-9092-CAC600CED87F}.Release|Any CPU.Build.0 = Release|Any CPU + {47AF38AC-0EF9-41B3-814E-F71D9AE09984}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {47AF38AC-0EF9-41B3-814E-F71D9AE09984}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47AF38AC-0EF9-41B3-814E-F71D9AE09984}.Release|Any CPU.ActiveCfg = Release|Any CPU + {47AF38AC-0EF9-41B3-814E-F71D9AE09984}.Release|Any CPU.Build.0 = Release|Any CPU + {478B5BE5-4AFB-4769-B14F-EBB2FCC70D5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {478B5BE5-4AFB-4769-B14F-EBB2FCC70D5A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {478B5BE5-4AFB-4769-B14F-EBB2FCC70D5A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {478B5BE5-4AFB-4769-B14F-EBB2FCC70D5A}.Release|Any CPU.Build.0 = Release|Any CPU + {09637852-E900-4B08-99FB-582B07096BA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {09637852-E900-4B08-99FB-582B07096BA7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {09637852-E900-4B08-99FB-582B07096BA7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {09637852-E900-4B08-99FB-582B07096BA7}.Release|Any CPU.Build.0 = Release|Any CPU + {D5E71014-D6AF-4016-800F-7C3E4B528EEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5E71014-D6AF-4016-800F-7C3E4B528EEE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5E71014-D6AF-4016-800F-7C3E4B528EEE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5E71014-D6AF-4016-800F-7C3E4B528EEE}.Release|Any CPU.Build.0 = Release|Any CPU + {D03B8D51-F3EA-48BB-9CBD-5D60E44E449B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D03B8D51-F3EA-48BB-9CBD-5D60E44E449B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D03B8D51-F3EA-48BB-9CBD-5D60E44E449B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D03B8D51-F3EA-48BB-9CBD-5D60E44E449B}.Release|Any CPU.Build.0 = Release|Any CPU + {9617B864-3E29-4232-9222-A41BF0DDB4DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9617B864-3E29-4232-9222-A41BF0DDB4DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9617B864-3E29-4232-9222-A41BF0DDB4DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9617B864-3E29-4232-9222-A41BF0DDB4DA}.Release|Any CPU.Build.0 = Release|Any CPU + {F0323E27-FD5D-4786-8F5E-2093527570B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F0323E27-FD5D-4786-8F5E-2093527570B9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F0323E27-FD5D-4786-8F5E-2093527570B9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F0323E27-FD5D-4786-8F5E-2093527570B9}.Release|Any CPU.Build.0 = Release|Any CPU + {FD75A54F-FE7A-4941-B90C-B1EDCB099A69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FD75A54F-FE7A-4941-B90C-B1EDCB099A69}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD75A54F-FE7A-4941-B90C-B1EDCB099A69}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FD75A54F-FE7A-4941-B90C-B1EDCB099A69}.Release|Any CPU.Build.0 = Release|Any CPU + {2B3B7FAF-3A1B-4C36-B3C2-751E7A9D37D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2B3B7FAF-3A1B-4C36-B3C2-751E7A9D37D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2B3B7FAF-3A1B-4C36-B3C2-751E7A9D37D1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2B3B7FAF-3A1B-4C36-B3C2-751E7A9D37D1}.Release|Any CPU.Build.0 = Release|Any CPU + {A4822BD7-A80E-4994-8B42-D1E39E8E4884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4822BD7-A80E-4994-8B42-D1E39E8E4884}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4822BD7-A80E-4994-8B42-D1E39E8E4884}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4822BD7-A80E-4994-8B42-D1E39E8E4884}.Release|Any CPU.Build.0 = Release|Any CPU + {9CA31E26-CBC6-44D5-9976-6B5C8264A37F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9CA31E26-CBC6-44D5-9976-6B5C8264A37F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9CA31E26-CBC6-44D5-9976-6B5C8264A37F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9CA31E26-CBC6-44D5-9976-6B5C8264A37F}.Release|Any CPU.Build.0 = Release|Any CPU + {2C6BF214-9C30-4D5B-ABEA-591F81B9F05D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2C6BF214-9C30-4D5B-ABEA-591F81B9F05D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2C6BF214-9C30-4D5B-ABEA-591F81B9F05D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2C6BF214-9C30-4D5B-ABEA-591F81B9F05D}.Release|Any CPU.Build.0 = Release|Any CPU + {55583EA9-B0C1-4A82-8045-E4D21B375AF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {55583EA9-B0C1-4A82-8045-E4D21B375AF9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {55583EA9-B0C1-4A82-8045-E4D21B375AF9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {55583EA9-B0C1-4A82-8045-E4D21B375AF9}.Release|Any CPU.Build.0 = Release|Any CPU + {ED636B9D-0AC1-4716-B39D-62241228B702}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ED636B9D-0AC1-4716-B39D-62241228B702}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ED636B9D-0AC1-4716-B39D-62241228B702}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ED636B9D-0AC1-4716-B39D-62241228B702}.Release|Any CPU.Build.0 = Release|Any CPU + {1C042CEE-C371-4022-A121-1AAF48ED9AB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C042CEE-C371-4022-A121-1AAF48ED9AB4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1C042CEE-C371-4022-A121-1AAF48ED9AB4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C042CEE-C371-4022-A121-1AAF48ED9AB4}.Release|Any CPU.Build.0 = Release|Any CPU + {50E48312-97D6-409F-AE34-5B07A114EA2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50E48312-97D6-409F-AE34-5B07A114EA2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50E48312-97D6-409F-AE34-5B07A114EA2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50E48312-97D6-409F-AE34-5B07A114EA2E}.Release|Any CPU.Build.0 = Release|Any CPU + {D71F97D7-3D4C-4288-9C47-69A2833B7CD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D71F97D7-3D4C-4288-9C47-69A2833B7CD4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D71F97D7-3D4C-4288-9C47-69A2833B7CD4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D71F97D7-3D4C-4288-9C47-69A2833B7CD4}.Release|Any CPU.Build.0 = Release|Any CPU + {485B30AC-68B5-48A4-94C5-E764B9EF0E66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {485B30AC-68B5-48A4-94C5-E764B9EF0E66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {485B30AC-68B5-48A4-94C5-E764B9EF0E66}.Release|Any CPU.ActiveCfg = Release|Any CPU + {485B30AC-68B5-48A4-94C5-E764B9EF0E66}.Release|Any CPU.Build.0 = Release|Any CPU + {2A5CCC4D-721C-431E-B760-9F2B500EDBDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A5CCC4D-721C-431E-B760-9F2B500EDBDA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A5CCC4D-721C-431E-B760-9F2B500EDBDA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A5CCC4D-721C-431E-B760-9F2B500EDBDA}.Release|Any CPU.Build.0 = Release|Any CPU + {00C92022-86BB-4A9E-85EB-760B8F647A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {00C92022-86BB-4A9E-85EB-760B8F647A80}.Debug|Any CPU.Build.0 = Debug|Any CPU + {00C92022-86BB-4A9E-85EB-760B8F647A80}.Release|Any CPU.ActiveCfg = Release|Any CPU + {00C92022-86BB-4A9E-85EB-760B8F647A80}.Release|Any CPU.Build.0 = Release|Any CPU + {EC86DBD9-70D7-465D-9F59-35D5FF597600}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EC86DBD9-70D7-465D-9F59-35D5FF597600}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EC86DBD9-70D7-465D-9F59-35D5FF597600}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EC86DBD9-70D7-465D-9F59-35D5FF597600}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {AA117636-9769-4A1B-9092-CAC600CED87F} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {47AF38AC-0EF9-41B3-814E-F71D9AE09984} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {478B5BE5-4AFB-4769-B14F-EBB2FCC70D5A} = {EBE05224-9322-40AC-8866-64FE6A4A0B72} + {09637852-E900-4B08-99FB-582B07096BA7} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {D5E71014-D6AF-4016-800F-7C3E4B528EEE} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {D03B8D51-F3EA-48BB-9CBD-5D60E44E449B} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {9617B864-3E29-4232-9222-A41BF0DDB4DA} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {F0323E27-FD5D-4786-8F5E-2093527570B9} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {FD75A54F-FE7A-4941-B90C-B1EDCB099A69} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {2B3B7FAF-3A1B-4C36-B3C2-751E7A9D37D1} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {A4822BD7-A80E-4994-8B42-D1E39E8E4884} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {9CA31E26-CBC6-44D5-9976-6B5C8264A37F} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {2C6BF214-9C30-4D5B-ABEA-591F81B9F05D} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {55583EA9-B0C1-4A82-8045-E4D21B375AF9} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {ED636B9D-0AC1-4716-B39D-62241228B702} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {1C042CEE-C371-4022-A121-1AAF48ED9AB4} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {50E48312-97D6-409F-AE34-5B07A114EA2E} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {D71F97D7-3D4C-4288-9C47-69A2833B7CD4} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {485B30AC-68B5-48A4-94C5-E764B9EF0E66} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {2A5CCC4D-721C-431E-B760-9F2B500EDBDA} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {00C92022-86BB-4A9E-85EB-760B8F647A80} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + {EC86DBD9-70D7-465D-9F59-35D5FF597600} = {EFD3DCF9-59F1-434F-848F-3BE76A9484DE} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {126A7811-7AC5-417F-B4C5-14B07BE2C8B9} + EndGlobalSection +EndGlobal diff --git a/Znyc.CloudCar/Controller/AuthController.cs b/Znyc.CloudCar/Controller/AuthController.cs new file mode 100644 index 0000000..c860f91 --- /dev/null +++ b/Znyc.CloudCar/Controller/AuthController.cs @@ -0,0 +1,86 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Auth; +using Znyc.CloudCar.Model.Dtos.Auth; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + public class AuthController : ControllerBase + { + private readonly IAuthService _authService; + + public AuthController(IAuthService authService) + { + _authService = authService; + } + + /// + /// 百度地图获取AccessToken + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/auth/baidu/accesstoken")] + public ResponseOutput GetAccessTokenAsync() + { + return _authService.GetAccessTokenAsync(); + } + + /// + /// 获取微信access_token + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/auth/weixin/accesstoken")] + public WxAccessTokenOutput GetWxAccessTokenAsync() + { + return _authService.GetWxAccessTokenAsync(); + } + + /// + /// 获取小程序 + /// + /// + [Authorize] + [HttpGet] + [Route("api/v1/auth/weixin/unlimited")] + public ResponseOutput GetUnlimitedAsync() + { + return _authService.GetUnlimitedAsync(); + } + + /// + /// + /// + /// + [HttpGet] + [Route("api/v1/auth/weixin/{sellingPrice}")] + public decimal GetCallPhoneCurrency(int sellingPrice) + { + if (sellingPrice < 100000) + { + return 10; + } + else + { + var a = sellingPrice / 100000; + int b = Convert.ToInt32(sellingPrice / 100000 + 1); + return b * 10; + } + } + + /// + /// 获取小程序 + /// + /// + [Authorize] + [HttpGet] + [Route("api/v1/auth/weixin/qrcode/{id}")] + public ResponseOutput GetQrCodeAsync(long id) + { + return _authService.GetQrCodeAsync(id); + } + } +} diff --git a/Znyc.CloudCar/Controller/BannerController.cs b/Znyc.CloudCar/Controller/BannerController.cs new file mode 100644 index 0000000..dc41516 --- /dev/null +++ b/Znyc.CloudCar/Controller/BannerController.cs @@ -0,0 +1,27 @@ +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Banner; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + public class BannerController : ControllerBase + { + private readonly IBannerService _bannerService; + + public BannerController(IBannerService bannerService) + { + _bannerService = bannerService; + } + + /// + /// 查询Banner列表 + /// + /// + [HttpGet] + [Route("api/v1/banners")] + public async Task GetBannerListAsync() + { + return await _bannerService.GetBannerListAsync(); + } + } +} diff --git a/Znyc.CloudCar/Controller/BrowseController.cs b/Znyc.CloudCar/Controller/BrowseController.cs new file mode 100644 index 0000000..3ddb1c8 --- /dev/null +++ b/Znyc.CloudCar/Controller/BrowseController.cs @@ -0,0 +1,30 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Browse; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + public class BrowseController : ControllerBase + { + private readonly IBrowseService _browseSrvice; + public BrowseController(IBrowseService browseSrvice) + { + _browseSrvice = browseSrvice; + } + + /// + /// 分页查询浏览记录列表 + /// + /// + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/browse/search")] + public async Task PageAsync(int currentPage = 1, int pageSize = 10) + { + return await _browseSrvice.PageAsync(currentPage, pageSize); + } + } +} diff --git a/Znyc.CloudCar/Controller/CardIntroController.cs b/Znyc.CloudCar/Controller/CardIntroController.cs new file mode 100644 index 0000000..344cafc --- /dev/null +++ b/Znyc.CloudCar/Controller/CardIntroController.cs @@ -0,0 +1,30 @@ +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.CardIntro; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + /// + /// 优惠卡控制器 + /// + public class CardIntroController : ControllerBase + { + public readonly ICardIntroService _cardIntroService; + + public CardIntroController(ICardIntroService cardIntroService) + { + _cardIntroService = cardIntroService; + } + + /// + /// 查询优惠卡缓存 + /// + /// + [HttpGet] + [Route("api/v1/cardintro")] + public async Task GetCardIntroListAsync() + { + return await _cardIntroService.GetCardIntroListAsync(); + } + } +} diff --git a/Znyc.CloudCar/Controller/CertificationController.cs b/Znyc.CloudCar/Controller/CertificationController.cs new file mode 100644 index 0000000..2a08e71 --- /dev/null +++ b/Znyc.CloudCar/Controller/CertificationController.cs @@ -0,0 +1,61 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Certification; +using Znyc.CloudCar.Model.Dtos.Certification; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + /// + /// 实名认证管理 + /// + public class CertificationController : ControllerBase + { + private readonly ICertificationService _certificationService; + + public CertificationController( + ICertificationService certificationService + ) + { + _certificationService = certificationService; + } + + /// + /// 查询实名认证信息 + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/certification")] + public async Task GetAsync() + { + return await _certificationService.GetAsync(); + } + + /// + /// 新增实名认证信息 + /// + /// + /// + [HttpPost] + [Authorize] + [Route("api/v1/certification")] + public async Task AddAsync([FromBody] CertificationAddInput certificationAddInput) + { + return await _certificationService.AddAsync(certificationAddInput); + } + + /// + /// 更新实名认证信息 + /// + /// + /// + [HttpPut] + [Authorize] + [Route("api/v1/certification/update")] + public async Task UpdateAsync([FromBody] CertificationUpdateInput certificationUpdateInput) + { + return await _certificationService.UpdateAsync(certificationUpdateInput); + } + } +} diff --git a/Znyc.CloudCar/Controller/CollectionController.cs b/Znyc.CloudCar/Controller/CollectionController.cs new file mode 100644 index 0000000..04ac186 --- /dev/null +++ b/Znyc.CloudCar/Controller/CollectionController.cs @@ -0,0 +1,70 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Collection; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + public class CollectionController : ControllerBase + { + private readonly ICollectionService _collectionService; + + public CollectionController(ICollectionService collectionService) + { + _collectionService = collectionService; + } + + /// + /// 分页查询收藏记录列表 + /// + /// + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/collection/search")] + public async Task PageAsync(int currentPage, int pageSize) + { + return await _collectionService.PageAsync(currentPage, pageSize); + } + + /// + /// 添加收藏 + /// + /// + /// + [HttpPost] + [Authorize] + [Route("api/v1/collection/add/{equipmentId}")] + public async Task AddAsync(long equipmentId) + { + return await _collectionService.AddAsync(equipmentId); + } + + /// + /// 取消收藏 + /// + /// + /// + [HttpPut] + [Authorize] + [Route("api/v1/collection/cancel/{equipmentId}")] + public async Task CancelAsync(long equipmentId) + { + return await _collectionService.CancelAsync(equipmentId); + } + + /// + /// 是否收藏 + /// + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/collection/iscollection/{equipmentId}")] + public async Task IsCollection(long equipmentId) + { + return await _collectionService.IsCollection(equipmentId); + } + } +} diff --git a/Znyc.CloudCar/Controller/CurrencyController.cs b/Znyc.CloudCar/Controller/CurrencyController.cs new file mode 100644 index 0000000..fc8cf1d --- /dev/null +++ b/Znyc.CloudCar/Controller/CurrencyController.cs @@ -0,0 +1,49 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Currency; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + /// + /// 用户云币管理 + /// + public class CurrencyController : ControllerBase + { + private readonly ICurrencyService _currencyService; + + public CurrencyController( + ICurrencyService currencyService + ) + { + _currencyService = currencyService; + } + + /// + /// 获取用户云币信息 + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/currency")] + public async Task GetAsync() + { + return await _currencyService.GetAsync(); + } + + /// + /// 云币账单 + /// + /// 0-全部/1-增加/2-减少 + /// + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/currency/search")] + public async Task PageAsync(int currencyType, int currentPage = 1, int pageSize = 10) + { + return await _currencyService.PageAsync(currencyType, currentPage, pageSize); + } + } +} diff --git a/Znyc.CloudCar/Controller/DictionaryController.cs b/Znyc.CloudCar/Controller/DictionaryController.cs new file mode 100644 index 0000000..5767c19 --- /dev/null +++ b/Znyc.CloudCar/Controller/DictionaryController.cs @@ -0,0 +1,57 @@ +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Dictionary; +using Znyc.CloudCar.Model.Dtos.Dictionary; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + /// + /// 数据字典 + /// + public class DictionaryController : ControllerBase + { + private readonly IDictionaryService _dictionaryServices; + public DictionaryController(IDictionaryService dictionaryServices) + { + _dictionaryServices = dictionaryServices; + } + + /// + /// 根据Id获取字典 + /// + /// + /// + [HttpGet] + [Route("api/v1/dict/{id}")] + public async Task GetByIdAsync(long id) + { + return await _dictionaryServices.GetByIdAsync(id); + } + + /// + /// 根据ParentId查询数据字典列表 + /// + /// + /// + [HttpGet] + [Route("api/v1/dict/pid/{pid}")] + public async Task GetListByParentIdAsync(long pid) + { + return await _dictionaryServices.GetListByParentIdAsync(pid); + } + + /// + /// 根据ParentId,Code查询数据字典列表 + /// + /// + /// + /// + [HttpGet] + [Route("api/v1/dict/{parentId}/{code}")] + public async Task GetListByCodeAsync(long parentId, string code) + { + return await _dictionaryServices.GetListByCodeAsync(parentId, code); + } + + } +} diff --git a/Znyc.CloudCar/Controller/DocumentController.cs b/Znyc.CloudCar/Controller/DocumentController.cs new file mode 100644 index 0000000..6447eaf --- /dev/null +++ b/Znyc.CloudCar/Controller/DocumentController.cs @@ -0,0 +1,28 @@ +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Document; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + public class DocumentController : ControllerBase + { + private readonly IDocumentService _documentService; + + public DocumentController(IDocumentService documentService + ) + { + _documentService = documentService; + } + + /// + /// 上传图片 + /// + /// + [HttpGet] + [Route("api/v1/document")] + public ResponseOutput UploadImageAsync() + { + return _documentService.UploadImageAsync(); + } + } +} diff --git a/Znyc.CloudCar/Controller/EquipmentController.cs b/Znyc.CloudCar/Controller/EquipmentController.cs new file mode 100644 index 0000000..83e65f0 --- /dev/null +++ b/Znyc.CloudCar/Controller/EquipmentController.cs @@ -0,0 +1,212 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Equipment; +using Znyc.CloudCar.Model.Dtos.Equipment; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + [ApiController] + public class EquipmentController : ControllerBase + { + private readonly IEquipmentService _equipmentService; + + public EquipmentController( + IEquipmentService equipmentService + ) + { + _equipmentService = equipmentService; + } + + /// + /// 添加设备信息 + /// + /// + /// + [HttpPost] + [Authorize] + [Route("api/v1/equipment")] + public async Task AddAsync([FromBody] EquipmentAddInput input) + { + return await _equipmentService.AddAsync(input); + } + + /// + /// 编辑设备信息 + /// + /// + /// + [HttpPut] + [Authorize] + [Route("api/v1/equipment")] + public async Task UpdateAsync([FromBody] EquipmentUpdateInput input) + { + return await _equipmentService.UpdateAsync(input); + } + + /// + /// 根据Id获取设备信息 + /// + /// + /// + [HttpGet] + [Route("api/v1/equipment/{id}")] + public async Task GetAsync(long id) + { + return await _equipmentService.GetAsync(id); + } + + /// + /// 分页查询设备列表 + /// + /// + /// + /// + /// + /// + /// + /// + [HttpGet] + [Route("api/v1/equipment/search")] + public async Task PageAsync(string key, long categoryId, + long brandId, long yearId, int currentPage = 1, int pageSize = 10) + { + return await _equipmentService.PageAsync(key, categoryId, brandId, yearId, currentPage, pageSize); + } + + /// + /// 刷新设备信息 + /// + /// + /// + [HttpPut] + [Authorize] + [Route("api/v1/equipment/refresh/{id}")] + public async Task RefreshAsync(long id) + { + return await _equipmentService.RefreshAsync(id); + } + + /// + /// 置顶设备信息 + /// + /// + /// + [HttpPut] + [Authorize] + [Route("api/v1/equipment/top/{id}")] + public async Task TopAsync(long id) + { + return await _equipmentService.TopAsync(id); + } + + /// + /// 取消置顶设备信息 + /// + /// + [HttpPut] + [Route("api/v1/equipment/cancel/top")] + [AllowAnonymous] + public async Task CancelTopAsync() + { + return await _equipmentService.CancelTopAsync(); + } + + /// + /// 更改设备信息状态 + /// + /// + /// 设备状态 + /// + [HttpPut] + [Authorize] + [Route("api/v1/equipment/state/{state}/{id}")] + public async Task UpdateStateAsync(long id, int state) + { + return await _equipmentService.UpdateStateAsync(id, state); + } + + /// + /// 是否公开设备信息 + /// + /// + /// + /// + [HttpPut] + [Authorize] + [Route("api/v1/equipment/public/{isPublic}/{id}")] + public async Task IsPublicAsync(long id, bool isPublic) + { + return await _equipmentService.IsPublicAsync(id, isPublic); + } + + /// + /// 获取手机号码 + /// + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/equipment/phone/{id}")] + public async Task GetPhoneAsync(long id) + { + return await _equipmentService.GetPhoneAsync(id); + } + + /// + /// 同步浏览量 + /// + /// + [HttpGet] + [Route("api/v1/equipment/pageview")] + public async Task PageViewAsync() + { + return await _equipmentService.PageViewAsync(); + } + + /// + /// 我的设备信息 + /// + /// 全部-1/审核中10/出售中20/已成交30/审核失败0 + /// + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/my/equipment")] + public async Task MyEquipmentPageAsync( + int state = -1, int currentPage = 1, int pageSize = 10) + { + return await _equipmentService.MyEquipmentPageAsync(state, currentPage, pageSize); + } + + /// + /// 根据UserId查询设备信息 + /// + /// + /// + /// + /// + [HttpGet] + [Route("api/v1/equipment/userid")] + public async Task GetEquipmentByUserIdAsync(long userId, int currentPage = 1, int pageSize = 10) + { + return await _equipmentService.GetEquipmentByUserIdAsync(userId, currentPage, pageSize); + } + + + + /// + /// 获取用户上次保存信息 + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/equipment/history")] + public Task GetLastEquipmentAsync() + { + return _equipmentService.GetLastEquipmentAsync(); + + } + } +} diff --git a/Znyc.CloudCar/Controller/FeedbackController.cs b/Znyc.CloudCar/Controller/FeedbackController.cs new file mode 100644 index 0000000..1e207c2 --- /dev/null +++ b/Znyc.CloudCar/Controller/FeedbackController.cs @@ -0,0 +1,35 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Feedback; +using Znyc.CloudCar.Model.Dtos.Feedback; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + /// + /// 意见反馈 + /// + [ApiController] + public class FeedbackController : ControllerBase + { + private readonly IFeedbackService _feedbackService; + + public FeedbackController(IFeedbackService feedbackService) + { + _feedbackService = feedbackService; + } + + /// + /// 新增意见反馈 + /// + /// + /// + [HttpPost] + [Authorize] + [Route("api/v1/feedback")] + public async Task AddFeedbackAsync([FromBody] FeedbackAddInput input) + { + return await _feedbackService.AddFeedbackAsync(input); + } + } +} diff --git a/Znyc.CloudCar/Controller/LoginController.cs b/Znyc.CloudCar/Controller/LoginController.cs new file mode 100644 index 0000000..b582548 --- /dev/null +++ b/Znyc.CloudCar/Controller/LoginController.cs @@ -0,0 +1,31 @@ +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Login; +using Znyc.CloudCar.Model.Dtos.Login; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + /// + /// 登陆管理 + /// + public class LoginController : ControllerBase + { + private readonly ILoginService _loginService; + public LoginController(ILoginService loginService) + { + _loginService = loginService; + } + + /// + /// Wx登录授权 + /// + /// + /// + [HttpPost] + [Route("api/v1/login")] + public async Task LoginAsync([FromBody] LoginInput loginInput) + { + return await _loginService.LoginAsync(loginInput); + } + } +} diff --git a/Znyc.CloudCar/Controller/MessageController.cs b/Znyc.CloudCar/Controller/MessageController.cs new file mode 100644 index 0000000..d3b757c --- /dev/null +++ b/Znyc.CloudCar/Controller/MessageController.cs @@ -0,0 +1,66 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Message; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + public class MessageController : ControllerBase + { + private readonly IMessageService _messageService; + + public MessageController(IMessageService messageService) + { + _messageService = messageService; + } + + /// + /// 未读提示 + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/message/unread")] + public async Task UnreadMessage() + { + return await _messageService.UnreadMessage(); + } + + /// + /// 查询消息通知列表 + /// + /// + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/message/search")] + public async Task PageAsync(int currentPage, int pageSize) + { + return await _messageService.PageAsync(currentPage, pageSize); + } + + /// + /// 已读消息记录 + /// + /// + [HttpPut] + [Authorize] + [Route("api/v1/message")] + public async Task UpdateAsync() + { + return await _messageService.UpdateAsync(); + } + + /// + /// 获取新用户滚动播放列表 + /// + /// + [HttpGet] + [Route("api/v1/register/newusers")] + public async Task GetRegistUserListAsync() + { + return await _messageService.GetRegistUserListAsync(); + } + } +} diff --git a/Znyc.CloudCar/Controller/RechargeController.cs b/Znyc.CloudCar/Controller/RechargeController.cs new file mode 100644 index 0000000..390c083 --- /dev/null +++ b/Znyc.CloudCar/Controller/RechargeController.cs @@ -0,0 +1,27 @@ +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Recharge; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + public class RechargeController : ControllerBase + { + private readonly IRechargeService _rechargeService; + + public RechargeController(IRechargeService rechargeService) + { + _rechargeService = rechargeService; + } + + /// + /// 获取充值活动 + /// + /// + [HttpGet] + [Route("api/v1/recharge")] + public async Task GetAsync() + { + return await _rechargeService.GetAsync(); + } + } +} diff --git a/Znyc.CloudCar/Controller/ShareController.cs b/Znyc.CloudCar/Controller/ShareController.cs new file mode 100644 index 0000000..14c58b6 --- /dev/null +++ b/Znyc.CloudCar/Controller/ShareController.cs @@ -0,0 +1,34 @@ +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.Currency; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.Recruitment.Api.Controllers +{ + /// + /// 分享管理 + /// + public class ShareController : ControllerBase + { + private readonly ICurrencyService _currencyService; + + public ShareController( + ICurrencyService currencyService + ) + { + _currencyService = currencyService; + } + + /// + /// 分享 + /// + /// + /// newusers(邀请新用户)/dailyshare(每日分享)/personalposter(生成海报) + /// + [HttpGet] + [Route("api/v1/share/{shareType}/{userId}")] + public async Task ShareAsync(string shareType, long userId) + { + return await _currencyService.ShareAsync(shareType, userId); + } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar/Controller/UserCardController.cs b/Znyc.CloudCar/Controller/UserCardController.cs new file mode 100644 index 0000000..b74c5d9 --- /dev/null +++ b/Znyc.CloudCar/Controller/UserCardController.cs @@ -0,0 +1,27 @@ +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.User; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + public class UserCardController : ControllerBase + { + private readonly IUserCardService _userCardService; + + public UserCardController(IUserCardService userCardService) + { + _userCardService = userCardService; + } + + /// + /// 优惠卡到期禁用 + /// + /// + [HttpPut] + [Route("api/v1/user/card")] + public async Task UpdateUserCardAsync() + { + return await _userCardService.UpdateUserCardAsync(); + } + } +} diff --git a/Znyc.CloudCar/Controller/UserController.cs b/Znyc.CloudCar/Controller/UserController.cs new file mode 100644 index 0000000..f6a1d7d --- /dev/null +++ b/Znyc.CloudCar/Controller/UserController.cs @@ -0,0 +1,78 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Znyc.CloudCar.IServices.User; +using Znyc.CloudCar.Model.Dtos.User; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + /// + /// 用户管理 + /// + public class UserController : ControllerBase + { + private readonly IUserService _userService; + private readonly ILogger _logger; + + public UserController(IUserService userService, + ILogger logger + ) + { + _userService = userService; + _logger = logger; + } + + /// + /// 根据Id获取用户信息 + /// + /// + [HttpGet] + [Authorize] + [Route("api/v1/user")] + public async Task GetUserAsync() + { + return await _userService.GetUserAsync(); + } + + + ///// + ///// 根据Id获取用户信息 + ///// + ///// + ///// + //[HttpGet] + //[Authorize] + //[Route("api/v1/getuser/{id}")] + //public async Task GetUserByIdAsync(long id) + //{ + // return await _userService.GetUserByIdAsync(id); + //} + + + + ///// + /// 修改用户信息 + /// + /// + /// + [HttpPut] + [Authorize] + [Route("api/v1/user")] + public async Task UpdateAsync([FromBody] UserUpdateInput userUpdateInput) + { + return await _userService.UpdateAsync(userUpdateInput); + } + + ///// + ///// 获取当前用户信息 + ///// + ///// + [HttpGet] + [Authorize] + [Route("api/v1/userinfo")] + public async Task GetUserInfoAsync() + { + return await _userService.GetUserInfoAsync(); + } + } +} diff --git a/Znyc.CloudCar/Controller/WxPayController.cs b/Znyc.CloudCar/Controller/WxPayController.cs new file mode 100644 index 0000000..7bc66a4 --- /dev/null +++ b/Znyc.CloudCar/Controller/WxPayController.cs @@ -0,0 +1,46 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using System.Text; +using Znyc.CloudCar.IServices.Auth; +using Znyc.CloudCar.Model.ViewModels.ReportsCallBack; + +namespace Znyc.CloudCar.Controller +{ + public class WxPayController : ControllerBase + { + private readonly IAuthService _authService; + + public WxPayController(IAuthService authService) + { + _authService = authService; + } + + + /// + /// 微信小程序支付 + /// + /// 商品Id + /// 1充值，2优惠卡 + /// + [HttpGet] + [Authorize] + [Route("api/v1/wxpay/{productId}/{type}")] + public Task WxPay(long productId, int type) + { + return _authService.WxPay(productId, type); + } + + /// + /// 微信小程序支付回调 + /// + /// + [HttpPost] + [Route("api/v1/wxpay/notify")] + public async Task NotifyUrl() + { + using var reader = new StreamReader(Request.Body, Encoding.UTF8); + string content = await reader.ReadToEndAsync(); + return await _authService.NotifyUrl(content); + } + } +} diff --git a/Znyc.CloudCar/Dockerfile b/Znyc.CloudCar/Dockerfile new file mode 100644 index 0000000..dd32a6a --- /dev/null +++ b/Znyc.CloudCar/Dockerfile @@ -0,0 +1,47 @@ +#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. + +FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +WORKDIR /app +EXPOSE 8001 +EXPOSE 443 + +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + + + +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +WORKDIR /src +COPY ["Znyc.CloudCar/Znyc.CloudCar.csproj", "Znyc.CloudCar/"] +COPY ["Znyc.CloudCar.Services/Znyc.CloudCar.Services.csproj", "Znyc.CloudCar.Services/"] +COPY ["Znyc.CloudCar.Auth/Znyc.CloudCar.Auth.csproj", "Znyc.CloudCar.Auth/"] +COPY ["Znyc.CloudCar.Configuration/Znyc.CloudCar.Configuration.csproj", "Znyc.CloudCar.Configuration/"] +COPY ["Znyc.CloudCar.Utility/Znyc.CloudCar.Utility.csproj", "Znyc.CloudCar.Utility/"] +COPY ["Znyc.CloudCar.Model/Znyc.CloudCar.Model.csproj", "Znyc.CloudCar.Model/"] +COPY ["Znyc.CloudCar.FreeSql/Znyc.CloudCar.FreeSql.csproj", "Znyc.CloudCar.FreeSql/"] +COPY ["Znyc.CloudCar.Core/Znyc.CloudCar.Core.csproj", "Znyc.CloudCar.Core/"] +COPY ["Znyc.CloudCar.RedisMQ/Znyc.CloudCar.RedisMQ.csproj", "Znyc.CloudCar.RedisMQ/"] +COPY ["Znyc.CloudCar.Loging/Znyc.CloudCar.Loging.csproj", "Znyc.CloudCar.Loging/"] +COPY ["Znyc.CloudCar.Caching/Znyc.CloudCar.Caching.csproj", "Znyc.CloudCar.Caching/"] +COPY ["Zncy.CloudCar.WeChat.Service/Zncy.CloudCar.WeChat.Service.csproj", "Zncy.CloudCar.WeChat.Service/"] +COPY ["Znyc.CloudCar.IServices/Znyc.CloudCar.IServices.csproj", "Znyc.CloudCar.IServices/"] +COPY ["Znyc.CloudCar.Swagger/Znyc.CloudCar.Swagger.csproj", "Znyc.CloudCar.Swagger/"] +COPY ["Znyc.CloudCar.Mapster/Znyc.CloudCar.Mapster.csproj", "Znyc.CloudCar.Mapster/"] +COPY ["Znyc.CloudCar.Hangfire/Znyc.CloudCar.Hangfire.csproj", "Znyc.CloudCar.Hangfire/"] +COPY ["Znyc.CloudCar.IRepository/Znyc.CloudCar.IRepository.csproj", "Znyc.CloudCar.IRepository/"] +COPY ["Znyc.CloudCar.Filter/Znyc.CloudCar.Filter.csproj", "Znyc.CloudCar.Filter/"] +COPY ["Znyc.CloudCar.Repository/Znyc.CloudCar.Repository.csproj", "Znyc.CloudCar.Repository/"] +COPY ["Znyc.CloudCar.Task/Znyc.CloudCar.Task.csproj", "Znyc.CloudCar.Task/"] +COPY ["Znyc.CloudCar.Middlewares/Znyc.CloudCar.Middlewares.csproj", "Znyc.CloudCar.Middlewares/"] +RUN dotnet restore "Znyc.CloudCar/Znyc.CloudCar.csproj" +COPY . . +WORKDIR "/src/Znyc.CloudCar" +RUN dotnet build "Znyc.CloudCar.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "Znyc.CloudCar.csproj" -c Release -o /app/publish + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "Znyc.CloudCar.dll"] \ No newline at end of file diff --git a/Znyc.CloudCar/Dockerfile.original b/Znyc.CloudCar/Dockerfile.original new file mode 100644 index 0000000..cefdde6 --- /dev/null +++ b/Znyc.CloudCar/Dockerfile.original @@ -0,0 +1,44 @@ +#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. + +FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base +WORKDIR /app +EXPOSE 80 +EXPOSE 443 + +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +WORKDIR /src +COPY ["Znyc.CloudCar/Znyc.CloudCar.csproj", "Znyc.CloudCar/"] +COPY ["Znyc.CloudCar.Services/Znyc.CloudCar.Services.csproj", "Znyc.CloudCar.Services/"] +COPY ["Znyc.CloudCar.Auth/Znyc.CloudCar.Auth.csproj", "Znyc.CloudCar.Auth/"] +COPY ["Znyc.CloudCar.Configuration/Znyc.CloudCar.Configuration.csproj", "Znyc.CloudCar.Configuration/"] +COPY ["Znyc.CloudCar.Utility/Znyc.CloudCar.Utility.csproj", "Znyc.CloudCar.Utility/"] +COPY ["Znyc.CloudCar.Model/Znyc.CloudCar.Model.csproj", "Znyc.CloudCar.Model/"] +COPY ["Znyc.CloudCar.FreeSql/Znyc.CloudCar.FreeSql.csproj", "Znyc.CloudCar.FreeSql/"] +COPY ["Znyc.CloudCar.Core/Znyc.CloudCar.Core.csproj", "Znyc.CloudCar.Core/"] +COPY ["Znyc.CloudCar.RedisMQ/Znyc.CloudCar.RedisMQ.csproj", "Znyc.CloudCar.RedisMQ/"] +COPY ["Znyc.CloudCar.Loging/Znyc.CloudCar.Loging.csproj", "Znyc.CloudCar.Loging/"] +COPY ["Znyc.CloudCar.Caching/Znyc.CloudCar.Caching.csproj", "Znyc.CloudCar.Caching/"] +COPY ["Zncy.CloudCar.WeChat.Service/Zncy.CloudCar.WeChat.Service.csproj", "Zncy.CloudCar.WeChat.Service/"] +COPY ["Znyc.CloudCar.IServices/Znyc.CloudCar.IServices.csproj", "Znyc.CloudCar.IServices/"] +COPY ["Znyc.CloudCar.Swagger/Znyc.CloudCar.Swagger.csproj", "Znyc.CloudCar.Swagger/"] +COPY ["Znyc.CloudCar.Mapster/Znyc.CloudCar.Mapster.csproj", "Znyc.CloudCar.Mapster/"] +COPY ["Znyc.CloudCar.Hangfire/Znyc.CloudCar.Hangfire.csproj", "Znyc.CloudCar.Hangfire/"] +COPY ["Znyc.CloudCar.IRepository/Znyc.CloudCar.IRepository.csproj", "Znyc.CloudCar.IRepository/"] +COPY ["Znyc.CloudCar.Filter/Znyc.CloudCar.Filter.csproj", "Znyc.CloudCar.Filter/"] +COPY ["Znyc.CloudCar.Repository/Znyc.CloudCar.Repository.csproj", "Znyc.CloudCar.Repository/"] +COPY ["Znyc.CloudCar.Task/Znyc.CloudCar.Task.csproj", "Znyc.CloudCar.Task/"] +RUN dotnet restore "Znyc.CloudCar/Znyc.CloudCar.csproj" +COPY . . +WORKDIR "/src/Znyc.CloudCar" +RUN dotnet build "Znyc.CloudCar.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "Znyc.CloudCar.csproj" -c Release -o /app/publish + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "Znyc.CloudCar.dll"] \ No newline at end of file diff --git a/Znyc.CloudCar/Program.cs b/Znyc.CloudCar/Program.cs new file mode 100644 index 0000000..06ae6b0 --- /dev/null +++ b/Znyc.CloudCar/Program.cs @@ -0,0 +1,224 @@ +using Autofac; +using Autofac.Extensions.DependencyInjection; +using Essensoft.Paylink.WeChatPay; +using Hangfire; +using Hangfire.Dashboard.BasicAuthorization; +using MediatR; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Controllers; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Newtonsoft.Json; +using Newtonsoft.Json.Serialization; +using NLog; +using NLog.Web; +using Zncy.CloudCar.WeChat.Service.Mediator; +using Zncy.CloudCar.WeChat.Service.Options; +using Zncy.CloudCar.WeChat.Service.Services.HttpClients; +using Znyc.CloudCar.Configuration; +using Znyc.CloudCar.Core.AutoFac; +using Znyc.CloudCar.Core.Config; +using Znyc.CloudCar.Filter; +using Znyc.CloudCar.Middlewares; +using Znyc.CloudCar.Swagger; +using Znyc.CloudCar.Task; + +var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger(); + +var builder = WebApplication.CreateBuilder(args); + +//Ӿ̬ļ֧ +builder.Services.AddSingleton(new AppSettingsHelper(builder.Environment.ContentRootPath, builder.Environment.EnvironmentName)); + + +builder.Services.AddControllers(); + +//Swaggerӿĵ +builder.Services.AddSwaggerSetup(); + +//FreeSql +builder.Services.AddFreeSqlSetup(); + +// +builder.Services.AddCoresSetup(); + +//MediatR +builder.Services.AddMediatR(typeof(TextMessageEventCommand).Assembly); + +//Redis +builder.Services.AddRedisCacheSetup(); + +//RedisϢ +builder.Services.AddRedisMessageQueueSetup(); + +// Payment ע΢֧ +builder.Services.AddWeChatPay(); + +// appsettings.json ѡ +builder.Services.Configure(builder.Configuration.GetSection("WeChatPay")); + +//עԶ΢Žӿļ +builder.Services.Configure(builder.Configuration.GetSection(nameof(WeChatOptions))); +builder.Services.Configure(builder.Configuration.GetSection(nameof(TenpayOptions))); + +// ע빤 HTTP ͻ +builder.Services.AddHttpClient(); +builder.Services.AddSingleton(); +builder.Services.AddSingleton(); +builder.Services.AddSingleton(); + +//עHangfireʱ +builder.Services.AddHangFireSetup(); + +//Auth +builder.Services.AddAuthorizationSetup(); + +//ע +builder.Services.AddHttpContextSetup(); + +//עmvc +builder.Services.AddMvc( + options => +{ + //ʵ֤ + //options.Filters.Add(); + //쳣 + options.Filters.Add(); +}) + .AddNewtonsoftJson(p => + { + //ݸʽĸСд ʹշ + p.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); + //ʹշʽkey + p.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); + //ѭ + p.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; + //ʱʽ + p.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss"; + }); + +//AutoFac +builder.Host.UseServiceProviderFactory(new AutofacServiceProviderFactory()); +builder.Host.ConfigureContainer(builder => +{ + builder.RegisterModule(new AutofacModuleRegister()); + var controllerBaseType = typeof(ControllerBase); + builder.RegisterAssemblyTypes(typeof(Program).Assembly).Where(t => controllerBaseType.IsAssignableFrom(t) & t != controllerBaseType).PropertiesAutowired(); +}); +//мAutoFac滻 +builder.Services.Replace(ServiceDescriptor.Transient()); + +//NLog: Setup NLog for Dependency injection +builder.Logging.ClearProviders(); +builder.Logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace); +builder.Host.UseNLog(); + + + +//رղԶУ,ҪԶĸʽ +builder.Services.Configure((o) => +{ + o.SuppressModelStateInvalidFilter = true; +}); + + +var app = builder.Build(); + +// ¼뷵 (ע⿪ȨޣȻ޷д) +app.UseRequestResponseLog(); +// ûʼ¼(ŵ㣬Ȼ쳣ᱨΪܷ)(ע⿪ȨޣȻ޷д) +app.UseRecordAccessLogsMildd(); +// ¼ip (ע⿪ȨޣȻ޷д) +app.UseIpLogMildd(); +// signalr +app.UseSignalRSendMildd(); + + +//if (!app.Environment.IsProduction()) +//{ + //עswagger + app.UseSwagger().UseSwaggerUI(c => + { + //ݰ汾Ƶ չʾ + typeof(CustomApiVersion.ApiVersion).GetEnumNames().OrderByDescending(e => e).ToList().ForEach( + version => + { + c.SwaggerEndpoint($"/swagger/{version}/swagger.json", $"{version}"); + }); + //Ĭתswagger-ui + c.RoutePrefix = "swagger"; + //c.RoutePrefix = string.Empty; + }); +//} + + +//Ȩ +var filter = new BasicAuthAuthorizationFilter( + new BasicAuthAuthorizationFilterOptions + { + SslRedirect = false, + RequireSsl = false, + LoginCaseSensitive = false, + Users = new[] + { + new BasicAuthAuthorizationUser + { + Login=AppSettingsConstVars.HangFireLogin, + PasswordClear=AppSettingsConstVars.HangFirePassWord + } + } + }); +var options = new DashboardOptions +{ + AppPath = "/hangfire",//ʱתĵַ + DisplayStorageConnectionString = false,//ǷʾݿϢ + Authorization = new[] + { + filter + }, + IsReadOnlyFunc = Context => + { + return false;//Ƿֻ + } +}; +app.UseHangfireDashboard("/cloud_pro_hangfire"); +HangfireDispose.HangfireService(); + +if (app.Environment.IsDevelopment()) +{ + app.UseDeveloperExceptionPage(); +} +else +{ + app.UseExceptionHandler("/Home/Error"); + app.UseHsts(); +} + +// +app.UseCors(AppSettingsConstVars.CorsPolicyName); + +app.UseRouting(); + +//ʹþ̬ļ +app.UseStaticFiles(); + +// ȿ֤ +app.UseAuthentication(); +// ȻȨм +app.UseAuthorization(); + +app.UseEndpoints(endpoints => +{ + endpoints.MapControllerRoute( + "areas", + "{area:exists}/{controller=Default}/{action=Index}/{id?}" + ); + endpoints.MapControllerRoute( + "default", + "{controller=Default}/{action=Index}/{id?}" + ); + //endpoints.MapControllers(); +}); + + + +app.Run("http://*:8001"); diff --git a/Znyc.CloudCar/Properties/launchSettings.json b/Znyc.CloudCar/Properties/launchSettings.json new file mode 100644 index 0000000..dc15509 --- /dev/null +++ b/Znyc.CloudCar/Properties/launchSettings.json @@ -0,0 +1,37 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:47229", + "sslPort": 44370 + } + }, + "profiles": { + "Znyc.CloudCar": { + "commandName": "Project", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:8001", + "dotnetRunMessages": true + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Docker (1)": { + "commandName": "Docker", + "launchBrowser": true, + "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger", + "publishAllPorts": true, + "useSSL": true + } + } +} \ No newline at end of file diff --git a/Znyc.CloudCar/Znyc.CloudCar.csproj b/Znyc.CloudCar/Znyc.CloudCar.csproj new file mode 100644 index 0000000..cfcd087 --- /dev/null +++ b/Znyc.CloudCar/Znyc.CloudCar.csproj @@ -0,0 +1,41 @@ + + + + net6.0 + enable + enable + 0b09e002-3a29-4910-b31c-a14b9903163e + Linux + True + doc.xml + + + + + + + + + + + + + + + + + + + + + + + + Always + + + Always + + + + diff --git a/Znyc.CloudCar/appsettings.Development.json b/Znyc.CloudCar/appsettings.Development.json new file mode 100644 index 0000000..cfa9f4b --- /dev/null +++ b/Znyc.CloudCar/appsettings.Development.json @@ -0,0 +1,144 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*", + "ConnectionStrings": { + "DbType": "MySql", + "SqlConnection": "Server= 81.71.138.239; Port=43306; Database=znyc_cloudcar; Uid=znyc; Pwd=Uo!DQ*ee; Charset=utf8mb4", + "SqlMonitorCommand": true, + "SqlCurd": true + }, + //redisΪ뱣redisΪ + "RedisConfig": { + "UseTimedTask": true, //redisΪʱ + // Service Ҫдredisķдַ + "ConnectionString": "81.71.148.57:46379,password=dfeFEgeGH/,defaultdatabase=1" //redisݿַ + }, + //ʱ˻ + "HangFire": { + "Login": "znyc", + "PassWord": "znyc2022" + }, + "AppConfig": { + "AppUrl": "https://admin.demo.coreshop.cn/", //˹ַ + "AppInterFaceUrl": "https://api.demo.coreshop.cn/" //ӿַ + }, + //jwtȨ֤һЩ + "JwtConfig": { + "SecretKey": "8kh2luzmp0oq9wfbdeasygj647vr531n", + "Issuer": "CoreShop", + "Audience": "CoreCms", + "Expires": 480 + }, + // + "Cors": { + "PolicyName": "CorsIpAccess", // + "EnableAllIPs": true, //ǷӦеIPΪtrueȡ + // ֶ֧˿ڣע˿ںźҪ/бˣlocalhost:8000/Ǵ + // ע⣬http://127.0.0.1:1818 http://localhost:1818 Dzһ + "IPs": "https://localhost:7214;http://localhost:5214" + }, + //м + "Middleware": { + //¼Ӧ + "RequestResponseLog": { + "Enabled": false + }, + //¼û + "RecordAccessLogs": { + "Enabled": false, + "IgnoreApis": "/api/Home/GetNav,/api/Home/GetIds4Users" + }, + //¼IP + "IPLog": { + "Enabled": false + } + }, + // ΢֧ + // ã鿴WeChatPayOptions + "WeChatPay": { + // Ӧú + // 磺΢Źƽ̨AppId΢ſƽ̨AppId΢СAppIdҵ΢CorpId + "AppId": "", + // ̻ + // Ϊ΢֧̻ƽ̨̻ + "MchId": "", + // APIԿ + // Ϊ΢֧̻ƽ̨APIԿעⲻAPIv3Կ + "APIKey": "", + // APIv3Կ + // Ϊ΢֧̻ƽ̨APIv3ԿעⲻAPIԿv3ӿڱ + "APIv3Key": "", + // API֤(.p12) + // Ϊ΢֧̻ƽ̨API֤(.p12)v3ӿڱ + // Ϊ֤ļ(.p12)· / ֤ļ(.p12)base64ַ + "Certificate": "WxPayCert\\apiclient_cert.p12", + // RSAԿ + // Ŀǰ"ҵпAPI"ʱʹãִбʾе"ȡRSAܹԿAPI"ɻȡ + "RsaPublicKey": "" + }, + "PayCallBack": { + //΢֧ص + "WeChatPayUrl": "https://api.demo.coreshop.cn/Notify/WeChatPay/Unifiedorder", + //΢˿ص + "WeChatRefundUrl": "https://api.demo.coreshop.cn/Notify/WeChatPay/Refund", + //֧֧ص + "AlipayUrl": "", + //֧˿ص + "AlipayRefundUrl": "" + }, + "WeChatOptions": { + //ں + "WeiXinAppId": "wxc2239a57d8f49a48", + "WeiXinAppSecret": "666fea79827d9f7c517f8a0a6f33ae6b", + "EncodingAESKey": "Z9ifQKA8kvQjybOXuXl8I0r9cFHWJGwW2q5iE5e37AM", + "Token": "rzC0pRTuBznwd3", + //С + "WxOpenAppId": "wx84d4d5585fac29a8", + "WxOpenAppSecret": "f096947a303988ae02f1a3a86570d67e", + "WxOpenToken": "", + "WxOpenEncodingAESKey": "" + }, + "CosConfig": { + "secretId": "AKIDGMBk7D3cuvf8KFtGMBj00iALFsEJ7dsq", + "secretKey": "i9IBn8Bzav0pMcbJkunPjmY3HsCF2Zom", + "bucket": "Znyc-images-1304677865", + "region": "ap-guangzhou", + "allowPrefix": "a.jpg", + "durationSeconds": 1800, + "allowActions": "name/cos:PutObject,name/cos:PostObject,name/cos:InitiateMultipartUpload,name/cos:ListMultipartUploads,name/cos:ListParts,name/cos:UploadPart,name/cos:CompleteMultipartUpload" + //"allowActions": [ + // "name/cos:PutObject", + // // ϴСϴ + // "name/cos:PostObject", + // // Ƭϴ + // "name/cos:InitiateMultipartUpload", + // "name/cos:ListMultipartUploads", + // "name/cos:ListParts", + // "name/cos:UploadPart", + // "name/cos:CompleteMultipartUpload" + //] + }, + "BaiduConfig": { + "AppID": "23954973", + "ApiKey": "zCU8ZvomVm3upmIlI9kY8svK", + "SecretKey": "H4m3G8adKbRpIICyKtX8rqjHmjCugld9" + }, + "TenpayOptions": { + "Merchants": [ + { + "MerchantId": "1610262173", + "SecretV3": "KlRZJKvAstv4SJapStuyHhCOzqrrjSUD", + "CertSerialNumber": "6C37840DA9EB9598A7AE3064655C27B9F5F6CF02", + "CertPrivateKey": "-----BEGINPRIVATEKEY-----MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDF+wWe6XTe/o1K8Ri2lXMRJFgtjZYjxX9E8GZt7rirZRMlsgpqBjymJt/7P2LAxqafUbM9bMOlo6Ecppjyw8yrSGTaHqSzWhoP7NuxpCw9Y4x8QOCIjsp0+UV6aE/AVw/+jfhkn7dBfAqPkIrpRlLjTYti0GSLwPVYCHDHKyYKo2pXbAlCpLjZY0c5Q4cAajPYLUrtAd9Jwzo1vt8aTcIsgPVK8nXJM00BYsvT9NVlV15eWgU/cXg1tzJN6ZT6t75c4iTu9aoGTp2bx0Zd6OsK0FZ4NwfvcQIKHxzShbjeTuK3SMkNd3asvUXsUpus6dJbryEg2d3EmuraSaVcg5tLAgMBAAECggEASOTt4t7OOzS6TTeMA93u6gbZuJwDBdS30Wg6LovQzrp+XEi7cOIu/nYdzeI+t//sZYitWBZtytT+gxAMDIZvGzmieHUD601nfymUkkmCSHAYz78LbPw2Ku+E11cE1iq4Jt+a72GnFaNYOBfeLZnI9wwcIBveiV5YdztUWuDWNt/iJO8+cQol/y9gZqZeZSkE+ksM6SvQzhfEuGzQDXjYyOiIgja+M2mMLw2GQnqryDkygiBmJkqpCFXMw9GQa8lnM5Tw7WRsGoJm/NzMsUuyIT3kwSeUOPlkLd0mzJTcDmmRHRKV6D5lQEH+sxYrCdJ+AgBLOKdg9GALfjdSK/c8IQKBgQDw0kBMDdUwgvJ6JOT1uxlnsXz1BLh1NcS9LzM04h+Bt80omAzwt8jeXW9OgqwvOenWoi58Du4I8RsxnoFCtktqaBqW3a8e47b4UJ1LHr15OukxM24Kkulg7+2/MexMTmN2AYVskqI5Y8ebcQntWrYkar2VeedEANFZx5GF4NlMSQKBgQDSdYSmmw5Oi7oHuhkhOKz3/uH+vWWM2yTXtgFml+iWy8+k8uYxw1BAwoeqNzJNqH/7goKSIudhZt5G/Fz3i1ZAFdYVix5XCLjF3ySz6NPyLGo2MJpWSCoLPqHGFp6jFHmXzDySUsT4YcWeCT88yBM3lGgqJL7Eq8dcgysJqCqi8wKBgQDhL5lUBLNPM4NNV+aJKTUuUzdHXeymHWskhFhboP5ZK+e5h8TB6vj3hWMphONBHeRdATZ6ZvOKhPoqwc6Y9SE8FLCYVh8EwWY8eBU9QzdlfwLDMRY66Pk13eTwndwZ1ksG85Ex30O2amkiHudrfSFImE9C0MTCQAmC7CxVhdVrkQKBgAbxXYjpgJVSwrZSi1WvOvWLcQUoVltJN3PuSymJRWEEJDt6z+FAYjtgr30MCRrKvj4b1hbgE+YAsMCCvsZj0FqY3dEkH8IbRY0xiVJuEd/hWzeibtT92HU6gbe5M06J9GDvmefx1xGimBRYlb95kji5Kp6JS8nNKOyCXz8YTx/FAoGBAKKMZgPpN+4Qd1ZuvALmcouRMQf6EWuCB7u9VuzJW/aaAIEGEXCC4HLEIYpROBwNrG313yseGVzPT2txoxw6u2XjfkdEkhLU3W54TSw4EJedWE5d+TGGqf9eMRdUbhCXylPzTlxmnFwGb0Z31eh7MndPWjaUAjvKQ5xFYg4gUezL-----ENDPRIVATEKEY-----" + } + ], + "NotifyUrl": "https://znyc.natapp4.cc/api/v1/wxpay/notify" + } + +} diff --git a/Znyc.CloudCar/appsettings.Production.json b/Znyc.CloudCar/appsettings.Production.json new file mode 100644 index 0000000..dcfd46a --- /dev/null +++ b/Znyc.CloudCar/appsettings.Production.json @@ -0,0 +1,132 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*", + "ConnectionStrings": { + "DbType": "MySql", + "SqlConnection": "Server=172.16.0.8; Port=43306; Database=znyc_cloudcar; Uid=znyc; Pwd=PWgMtIHz; Charset=utf8mb4", + "SqlMonitorCommand": false, + "SqlCurd": false + }, + //redisΪ뱣redisΪ + "RedisConfig": { + "UseTimedTask": true, //redisΪʱ + // Service Ҫдredisķдַ + "ConnectionString": "172.16.0.8:46379" //redisݿַ + }, + //ʱ˻ + "HangFire": { + "Login": "znyc", + "PassWord": "znyc2022" + }, + "AppConfig": { + "AppUrl": "https://admin.demo.coreshop.cn/", //˹ַ + "AppInterFaceUrl": "https://api.demo.coreshop.cn/" //ӿַ + }, + //jwtȨ֤һЩ + "JwtConfig": { + "SecretKey": "8kh2luzmp0oq9wfbdeasygj647vr531n", + "Issuer": "CoreShop", + "Audience": "CoreCms", + "Expires": 480 + }, + // + "Cors": { + "PolicyName": "CorsIpAccess", // + "EnableAllIPs": true, //ǷӦеIPΪtrueȡ + // ֶ֧˿ڣע˿ںźҪ/бˣlocalhost:8000/Ǵ + // ע⣬http://127.0.0.1:1818 http://localhost:1818 Dzһ + "IPs": "https://localhost:7214;http://localhost:5214" + }, + //м + "Middleware": { + //¼Ӧ + "RequestResponseLog": { + "Enabled": false + }, + //¼û + "RecordAccessLogs": { + "Enabled": false, + "IgnoreApis": "/api/Home/GetNav,/api/Home/GetIds4Users" + }, + //¼IP + "IPLog": { + "Enabled": false + } + }, + // ΢֧ + // ã鿴WeChatPayOptions + "WeChatPay": { + // Ӧú + // 磺΢Źƽ̨AppId΢ſƽ̨AppId΢СAppIdҵ΢CorpId + "AppId": "", + // ̻ + // Ϊ΢֧̻ƽ̨̻ + "MchId": "", + // APIԿ + // Ϊ΢֧̻ƽ̨APIԿעⲻAPIv3Կ + "APIKey": "", + // APIv3Կ + // Ϊ΢֧̻ƽ̨APIv3ԿעⲻAPIԿv3ӿڱ + "APIv3Key": "", + // API֤(.p12) + // Ϊ΢֧̻ƽ̨API֤(.p12)v3ӿڱ + // Ϊ֤ļ(.p12)· / ֤ļ(.p12)base64ַ + "Certificate": "WxPayCert\\apiclient_cert.p12", + // RSAԿ + // Ŀǰ"ҵпAPI"ʱʹãִбʾе"ȡRSAܹԿAPI"ɻȡ + "RsaPublicKey": "" + }, + "PayCallBack": { + //΢֧ص + "WeChatPayUrl": "https://api.demo.coreshop.cn/Notify/WeChatPay/Unifiedorder", + //΢˿ص + "WeChatRefundUrl": "https://api.demo.coreshop.cn/Notify/WeChatPay/Refund", + //֧֧ص + "AlipayUrl": "", + //֧˿ص + "AlipayRefundUrl": "" + }, + "WeChatOptions": { + //ں + "WeiXinAppId": "wxc2239a57d8f49a48", + "WeiXinAppSecret": "666fea79827d9f7c517f8a0a6f33ae6b", + "EncodingAESKey": "Z9ifQKA8kvQjybOXuXl8I0r9cFHWJGwW2q5iE5e37AM", + "Token": "rzC0pRTuBznwd3", + //С + "WxOpenAppId": "wx84d4d5585fac29a8", + "WxOpenAppSecret": "f096947a303988ae02f1a3a86570d67e", + "WxOpenToken": "", + "WxOpenEncodingAESKey": "" + }, + "CosConfig": { + "secretId": "AKIDGMBk7D3cuvf8KFtGMBj00iALFsEJ7dsq", + "secretKey": "i9IBn8Bzav0pMcbJkunPjmY3HsCF2Zom", + "bucket": "Znyc-images-1304677865", + "region": "ap-guangzhou", + "allowPrefix": "a.jpg", + "durationSeconds": 1800, + "allowActions": "name/cos:PutObject,name/cos:PostObject,name/cos:InitiateMultipartUpload,name/cos:ListMultipartUploads,name/cos:ListParts,name/cos:UploadPart,name/cos:CompleteMultipartUpload" + }, + "BaiduConfig": { + "AppID": "23954973", + "ApiKey": "zCU8ZvomVm3upmIlI9kY8svK", + "SecretKey": "H4m3G8adKbRpIICyKtX8rqjHmjCugld9" + }, + "TenpayOptions": { + "Merchants": [ + { + "MerchantId": "1610262173", + "SecretV3": "KlRZJKvAstv4SJapStuyHhCOzqrrjSUD", + "CertSerialNumber": "6C37840DA9EB9598A7AE3064655C27B9F5F6CF02", + "CertPrivateKey": "-----BEGINPRIVATEKEY-----MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDF+wWe6XTe/o1K8Ri2lXMRJFgtjZYjxX9E8GZt7rirZRMlsgpqBjymJt/7P2LAxqafUbM9bMOlo6Ecppjyw8yrSGTaHqSzWhoP7NuxpCw9Y4x8QOCIjsp0+UV6aE/AVw/+jfhkn7dBfAqPkIrpRlLjTYti0GSLwPVYCHDHKyYKo2pXbAlCpLjZY0c5Q4cAajPYLUrtAd9Jwzo1vt8aTcIsgPVK8nXJM00BYsvT9NVlV15eWgU/cXg1tzJN6ZT6t75c4iTu9aoGTp2bx0Zd6OsK0FZ4NwfvcQIKHxzShbjeTuK3SMkNd3asvUXsUpus6dJbryEg2d3EmuraSaVcg5tLAgMBAAECggEASOTt4t7OOzS6TTeMA93u6gbZuJwDBdS30Wg6LovQzrp+XEi7cOIu/nYdzeI+t//sZYitWBZtytT+gxAMDIZvGzmieHUD601nfymUkkmCSHAYz78LbPw2Ku+E11cE1iq4Jt+a72GnFaNYOBfeLZnI9wwcIBveiV5YdztUWuDWNt/iJO8+cQol/y9gZqZeZSkE+ksM6SvQzhfEuGzQDXjYyOiIgja+M2mMLw2GQnqryDkygiBmJkqpCFXMw9GQa8lnM5Tw7WRsGoJm/NzMsUuyIT3kwSeUOPlkLd0mzJTcDmmRHRKV6D5lQEH+sxYrCdJ+AgBLOKdg9GALfjdSK/c8IQKBgQDw0kBMDdUwgvJ6JOT1uxlnsXz1BLh1NcS9LzM04h+Bt80omAzwt8jeXW9OgqwvOenWoi58Du4I8RsxnoFCtktqaBqW3a8e47b4UJ1LHr15OukxM24Kkulg7+2/MexMTmN2AYVskqI5Y8ebcQntWrYkar2VeedEANFZx5GF4NlMSQKBgQDSdYSmmw5Oi7oHuhkhOKz3/uH+vWWM2yTXtgFml+iWy8+k8uYxw1BAwoeqNzJNqH/7goKSIudhZt5G/Fz3i1ZAFdYVix5XCLjF3ySz6NPyLGo2MJpWSCoLPqHGFp6jFHmXzDySUsT4YcWeCT88yBM3lGgqJL7Eq8dcgysJqCqi8wKBgQDhL5lUBLNPM4NNV+aJKTUuUzdHXeymHWskhFhboP5ZK+e5h8TB6vj3hWMphONBHeRdATZ6ZvOKhPoqwc6Y9SE8FLCYVh8EwWY8eBU9QzdlfwLDMRY66Pk13eTwndwZ1ksG85Ex30O2amkiHudrfSFImE9C0MTCQAmC7CxVhdVrkQKBgAbxXYjpgJVSwrZSi1WvOvWLcQUoVltJN3PuSymJRWEEJDt6z+FAYjtgr30MCRrKvj4b1hbgE+YAsMCCvsZj0FqY3dEkH8IbRY0xiVJuEd/hWzeibtT92HU6gbe5M06J9GDvmefx1xGimBRYlb95kji5Kp6JS8nNKOyCXz8YTx/FAoGBAKKMZgPpN+4Qd1ZuvALmcouRMQf6EWuCB7u9VuzJW/aaAIEGEXCC4HLEIYpROBwNrG313yseGVzPT2txoxw6u2XjfkdEkhLU3W54TSw4EJedWE5d+TGGqf9eMRdUbhCXylPzTlxmnFwGb0Z31eh7MndPWjaUAjvKQ5xFYg4gUezL-----ENDPRIVATEKEY-----" + } + ], + "NotifyUrl": "https://znyunchecloudcar.cn/api/v1/wxpay/notify" + } +} diff --git a/Znyc.CloudCar/appsettings.Staging.json b/Znyc.CloudCar/appsettings.Staging.json new file mode 100644 index 0000000..f82410f --- /dev/null +++ b/Znyc.CloudCar/appsettings.Staging.json @@ -0,0 +1,132 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*", + "ConnectionStrings": { + "DbType": "MySql", + "SqlConnection": "Server= 81.71.138.239; Port=43306; Database=znyc_cloudcar; Uid=znyc; Pwd=Uo!DQ*ee; Charset=utf8mb4", + "SqlMonitorCommand": false, + "SqlCurd": false + }, + //redisΪ뱣redisΪ + "RedisConfig": { + "UseTimedTask": true, //redisΪʱ + // Service Ҫдredisķдַ + "ConnectionString": "81.71.148.57:46379,password=dfeFEgeGH/,defaultdatabase=1" //redisݿַ + }, + //ʱ˻ + "HangFire": { + "Login": "znyc", + "PassWord": "znyc2022" + }, + "AppConfig": { + "AppUrl": "https://admin.demo.coreshop.cn/", //˹ַ + "AppInterFaceUrl": "https://api.demo.coreshop.cn/" //ӿַ + }, + //jwtȨ֤һЩ + "JwtConfig": { + "SecretKey": "8kh2luzmp0oq9wfbdeasygj647vr531n", + "Issuer": "CoreShop", + "Audience": "CoreCms", + "Expires": 480 + }, + // + "Cors": { + "PolicyName": "CorsIpAccess", // + "EnableAllIPs": true, //ǷӦеIPΪtrueȡ + // ֶ֧˿ڣע˿ںźҪ/бˣlocalhost:8000/Ǵ + // ע⣬http://127.0.0.1:1818 http://localhost:1818 Dzһ + "IPs": "https://localhost:7214;http://localhost:5214" + }, + //м + "Middleware": { + //¼Ӧ + "RequestResponseLog": { + "Enabled": false + }, + //¼û + "RecordAccessLogs": { + "Enabled": false, + "IgnoreApis": "/api/Home/GetNav,/api/Home/GetIds4Users" + }, + //¼IP + "IPLog": { + "Enabled": false + } + }, + // ΢֧ + // ã鿴WeChatPayOptions + "WeChatPay": { + // Ӧú + // 磺΢Źƽ̨AppId΢ſƽ̨AppId΢СAppIdҵ΢CorpId + "AppId": "", + // ̻ + // Ϊ΢֧̻ƽ̨̻ + "MchId": "", + // APIԿ + // Ϊ΢֧̻ƽ̨APIԿעⲻAPIv3Կ + "APIKey": "", + // APIv3Կ + // Ϊ΢֧̻ƽ̨APIv3ԿעⲻAPIԿv3ӿڱ + "APIv3Key": "", + // API֤(.p12) + // Ϊ΢֧̻ƽ̨API֤(.p12)v3ӿڱ + // Ϊ֤ļ(.p12)· / ֤ļ(.p12)base64ַ + "Certificate": "WxPayCert\\apiclient_cert.p12", + // RSAԿ + // Ŀǰ"ҵпAPI"ʱʹãִбʾе"ȡRSAܹԿAPI"ɻȡ + "RsaPublicKey": "" + }, + "PayCallBack": { + //΢֧ص + "WeChatPayUrl": "https://api.demo.coreshop.cn/Notify/WeChatPay/Unifiedorder", + //΢˿ص + "WeChatRefundUrl": "https://api.demo.coreshop.cn/Notify/WeChatPay/Refund", + //֧֧ص + "AlipayUrl": "", + //֧˿ص + "AlipayRefundUrl": "" + }, + "WeChatOptions": { + //ں + "WeiXinAppId": "wxc2239a57d8f49a48", + "WeiXinAppSecret": "666fea79827d9f7c517f8a0a6f33ae6b", + "EncodingAESKey": "Z9ifQKA8kvQjybOXuXl8I0r9cFHWJGwW2q5iE5e37AM", + "Token": "rzC0pRTuBznwd3", + //С + "WxOpenAppId": "wx84d4d5585fac29a8", + "WxOpenAppSecret": "f096947a303988ae02f1a3a86570d67e", + "WxOpenToken": "", + "WxOpenEncodingAESKey": "" + }, + "CosConfig": { + "secretId": "AKIDGMBk7D3cuvf8KFtGMBj00iALFsEJ7dsq", + "secretKey": "i9IBn8Bzav0pMcbJkunPjmY3HsCF2Zom", + "bucket": "Znyc-images-1304677865", + "region": "ap-guangzhou", + "allowPrefix": "a.jpg", + "durationSeconds": 1800, + "allowActions": "name/cos:PutObject,name/cos:PostObject,name/cos:InitiateMultipartUpload,name/cos:ListMultipartUploads,name/cos:ListParts,name/cos:UploadPart,name/cos:CompleteMultipartUpload" + }, + "BaiduConfig": { + "AppID": "23954973", + "ApiKey": "zCU8ZvomVm3upmIlI9kY8svK", + "SecretKey": "H4m3G8adKbRpIICyKtX8rqjHmjCugld9" + }, + "TenpayOptions": { + "Merchants": [ + { + "MerchantId": "1610262173", + "SecretV3": "KlRZJKvAstv4SJapStuyHhCOzqrrjSUD", + "CertSerialNumber": "6C37840DA9EB9598A7AE3064655C27B9F5F6CF02", + "CertPrivateKey": "-----BEGINPRIVATEKEY-----MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDF+wWe6XTe/o1K8Ri2lXMRJFgtjZYjxX9E8GZt7rirZRMlsgpqBjymJt/7P2LAxqafUbM9bMOlo6Ecppjyw8yrSGTaHqSzWhoP7NuxpCw9Y4x8QOCIjsp0+UV6aE/AVw/+jfhkn7dBfAqPkIrpRlLjTYti0GSLwPVYCHDHKyYKo2pXbAlCpLjZY0c5Q4cAajPYLUrtAd9Jwzo1vt8aTcIsgPVK8nXJM00BYsvT9NVlV15eWgU/cXg1tzJN6ZT6t75c4iTu9aoGTp2bx0Zd6OsK0FZ4NwfvcQIKHxzShbjeTuK3SMkNd3asvUXsUpus6dJbryEg2d3EmuraSaVcg5tLAgMBAAECggEASOTt4t7OOzS6TTeMA93u6gbZuJwDBdS30Wg6LovQzrp+XEi7cOIu/nYdzeI+t//sZYitWBZtytT+gxAMDIZvGzmieHUD601nfymUkkmCSHAYz78LbPw2Ku+E11cE1iq4Jt+a72GnFaNYOBfeLZnI9wwcIBveiV5YdztUWuDWNt/iJO8+cQol/y9gZqZeZSkE+ksM6SvQzhfEuGzQDXjYyOiIgja+M2mMLw2GQnqryDkygiBmJkqpCFXMw9GQa8lnM5Tw7WRsGoJm/NzMsUuyIT3kwSeUOPlkLd0mzJTcDmmRHRKV6D5lQEH+sxYrCdJ+AgBLOKdg9GALfjdSK/c8IQKBgQDw0kBMDdUwgvJ6JOT1uxlnsXz1BLh1NcS9LzM04h+Bt80omAzwt8jeXW9OgqwvOenWoi58Du4I8RsxnoFCtktqaBqW3a8e47b4UJ1LHr15OukxM24Kkulg7+2/MexMTmN2AYVskqI5Y8ebcQntWrYkar2VeedEANFZx5GF4NlMSQKBgQDSdYSmmw5Oi7oHuhkhOKz3/uH+vWWM2yTXtgFml+iWy8+k8uYxw1BAwoeqNzJNqH/7goKSIudhZt5G/Fz3i1ZAFdYVix5XCLjF3ySz6NPyLGo2MJpWSCoLPqHGFp6jFHmXzDySUsT4YcWeCT88yBM3lGgqJL7Eq8dcgysJqCqi8wKBgQDhL5lUBLNPM4NNV+aJKTUuUzdHXeymHWskhFhboP5ZK+e5h8TB6vj3hWMphONBHeRdATZ6ZvOKhPoqwc6Y9SE8FLCYVh8EwWY8eBU9QzdlfwLDMRY66Pk13eTwndwZ1ksG85Ex30O2amkiHudrfSFImE9C0MTCQAmC7CxVhdVrkQKBgAbxXYjpgJVSwrZSi1WvOvWLcQUoVltJN3PuSymJRWEEJDt6z+FAYjtgr30MCRrKvj4b1hbgE+YAsMCCvsZj0FqY3dEkH8IbRY0xiVJuEd/hWzeibtT92HU6gbe5M06J9GDvmefx1xGimBRYlb95kji5Kp6JS8nNKOyCXz8YTx/FAoGBAKKMZgPpN+4Qd1ZuvALmcouRMQf6EWuCB7u9VuzJW/aaAIEGEXCC4HLEIYpROBwNrG313yseGVzPT2txoxw6u2XjfkdEkhLU3W54TSw4EJedWE5d+TGGqf9eMRdUbhCXylPzTlxmnFwGb0Z31eh7MndPWjaUAjvKQ5xFYg4gUezL-----ENDPRIVATEKEY-----" + } + ], + "NotifyUrl": "https://znyc.natapp4.cc/api/v1/wxpay/notify" + } +} diff --git a/Znyc.CloudCar/appsettings.json b/Znyc.CloudCar/appsettings.json new file mode 100644 index 0000000..f5fbc6d --- /dev/null +++ b/Znyc.CloudCar/appsettings.json @@ -0,0 +1,17 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + + "ConnectionStrings": { + "DbType": "MySql", + "SqlConnection": "Server= 81.71.138.239; Port=43306; Database=znyc_cloudcar; Uid=znyc; Pwd=Uo!DQ*ee; Charset=utf8mb4", + "SqlMonitorCommand": false, + "SqlCurd": false + }, + + "AllowedHosts": "*" +} diff --git a/Znyc.CloudCar/doc.xml b/Znyc.CloudCar/doc.xml new file mode 100644 index 0000000..a3bc68a --- /dev/null +++ b/Znyc.CloudCar/doc.xml @@ -0,0 +1,371 @@ + + + + Znyc.CloudCar + + + + + 百度地图获取AccessToken + + + + + + 获取微信access_token + + + + + + 获取小程序 + + + + + + + + + + + + 查询Banner列表 + + + + + + 分页查询浏览记录列表 + + + + + + + + 优惠卡控制器 + + + + + 查询优惠卡缓存 + + + + + + 实名认证管理 + + + + + 查询实名认证信息 + + + + + + 新增实名认证信息 + + + + + + + 更新实名认证信息 + + + + + + + 分页查询收藏记录列表 + + + + + + + + 添加收藏 + + + + + + + 取消收藏 + + + + + + + 是否收藏 + + + + + + + 用户云币管理 + + + + + 获取用户云币信息 + + + + + + 云币账单 + + 0-全部/1-增加/2-减少 + + + + + + + 数据字典 + + + + + 根据Id获取字典 + + + + + + + 根据ParentId查询数据字典列表 + + + + + + + 根据ParentId,Code查询数据字典列表 + + + + + + + + 上传图片 + + + + + + 添加设备信息 + + + + + + + 编辑设备信息 + + + + + + + 根据Id获取设备信息 + + + + + + + 分页查询设备列表 + + + + + + + + + + + + 刷新设备信息 + + + + + + + 置顶设备信息 + + + + + + + 取消置顶设备信息 + + + + + + 更改设备信息状态 + + + 设备状态 + + + + + 是否公开设备信息 + + + + + + + + 获取手机号码 + + + + + + + 同步浏览量 + + + + + + 我的设备信息 + + 全部-1/审核中10/出售中20/已成交30/审核失败0 + + + + + + + 根据UserId查询设备信息 + + + + + + + + + 获取用户上次保存信息 + + + + + + 意见反馈 + + + + + 新增意见反馈 + + + + + + + 登陆管理 + + + + + Wx登录授权 + + + + + + + 未读提示 + + + + + + 查询消息通知列表 + + + + + + + + 已读消息记录 + + + + + + 获取新用户滚动播放列表 + + + + + + 获取充值活动 + + + + + + 优惠卡到期禁用 + + + + + + 用户管理 + + + + + 根据Id获取用户信息 + + + + + + + 微信小程序支付 + + 商品Id + 1充值，2优惠卡 + + + + + 微信小程序支付回调 + + + + + + 分享管理 + + + + + 分享 + + + newusers(邀请新用户)/dailyshare(每日分享)/personalposter(生成海报) + + + + diff --git a/Znyc.CloudCar/nlog.config b/Znyc.CloudCar/nlog.config new file mode 100644 index 0000000..d3ebda0 --- /dev/null +++ b/Znyc.CloudCar/nlog.config @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file