diff --git a/src/CloudGaming/Api/CloudGaming.Api/Dockerfile b/src/CloudGaming/Api/CloudGaming.Api/Dockerfile
index 68c5cf0..12c06c2 100644
--- a/src/CloudGaming/Api/CloudGaming.Api/Dockerfile
+++ b/src/CloudGaming/Api/CloudGaming.Api/Dockerfile
@@ -2,7 +2,7 @@
# 此阶段用于在快速模式(默认为调试配置)下从 VS 运行时
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
-USER app
+USER $APP_UID
WORKDIR /app
EXPOSE 80
@@ -13,6 +13,7 @@ ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["Api/CloudGaming.Api/CloudGaming.Api.csproj", "Api/CloudGaming.Api/"]
COPY ["Code/CloudGaming.Code/CloudGaming.Code.csproj", "Code/CloudGaming.Code/"]
+COPY ["Model/CloudGaming.AppConfigModel/CloudGaming.AppConfigModel.csproj", "Model/CloudGaming.AppConfigModel/"]
COPY ["Model/CloudGaming.DtoModel/CloudGaming.DtoModel.csproj", "Model/CloudGaming.DtoModel/"]
COPY ["Model/CloudGaming.GameModel/CloudGaming.GameModel.csproj", "Model/CloudGaming.GameModel/"]
COPY ["Utile/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj", "Utile/HuanMeng.DotNetCore/"]
diff --git a/src/CloudGaming/Api/CloudGaming.PayApi/Dockerfile b/src/CloudGaming/Api/CloudGaming.PayApi/Dockerfile
index 0881e7f..4c4faa6 100644
--- a/src/CloudGaming/Api/CloudGaming.PayApi/Dockerfile
+++ b/src/CloudGaming/Api/CloudGaming.PayApi/Dockerfile
@@ -13,6 +13,7 @@ ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["Api/CloudGaming.PayApi/CloudGaming.PayApi.csproj", "Api/CloudGaming.PayApi/"]
COPY ["Code/CloudGaming.Code/CloudGaming.Code.csproj", "Code/CloudGaming.Code/"]
+COPY ["Model/CloudGaming.AppConfigModel/CloudGaming.AppConfigModel.csproj", "Model/CloudGaming.AppConfigModel/"]
COPY ["Model/CloudGaming.DtoModel/CloudGaming.DtoModel.csproj", "Model/CloudGaming.DtoModel/"]
COPY ["Model/CloudGaming.GameModel/CloudGaming.GameModel.csproj", "Model/CloudGaming.GameModel/"]
COPY ["Utile/HuanMeng.DotNetCore/HuanMeng.DotNetCore.csproj", "Utile/HuanMeng.DotNetCore/"]
diff --git a/src/CloudGaming/Code/CloudGaming.Code/AppExtend/AppConfig.cs b/src/CloudGaming/Code/CloudGaming.Code/AppExtend/AppConfig.cs
deleted file mode 100644
index 5203f9f..0000000
--- a/src/CloudGaming/Code/CloudGaming.Code/AppExtend/AppConfig.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CloudGaming.Code.AppExtend;
-
-///
-/// 项目配置
-///
-public class AppConfig
-{
- public AppConfig() { }
- ///
- /// 用户数据库连接字符串
- ///
- public string UserConnectionString { get; set; }
- ///
- /// 游戏
- ///
- public string GameConnectionString { get; set; }
- ///
- /// 扩展
- ///
- public string ExtConnectionString { get; set; }
-
- ///
- /// 手机app配置
- ///
- public string PhoneConnectionString { get; set; }
-
- ///
- /// redis连接字符串
- ///
- public string RedisConnectionString { get; set; }
-
- ///
- /// 域名
- ///
- public string DomainName { get; set; }
- ///
- /// 标识
- ///
- public string Identifier { get; set; }
- ///
- /// 名称
- ///
- public string Name { get; set; }
-
- ///
- /// 默认语言
- ///
- public string DefaultLanguage { get; set; }
- ///
- /// 租户
- ///
- public Guid TenantId { get; set; }
- ///
- /// 项目支付数据
- ///
- public PaymentModel? Payment { get; set; }
-
- ///
- /// oss阿里云配置
- ///
- public AliyunConfig AliyunConfig { get; set; }
-
- ///
- /// 用户默认配置
- ///
- public UserConfig UserConfig { get; set; }
-
- ///
- /// 游戏配置
- ///
- public GameConfig GameConfig { get; set; }
-
- ///
- /// 获取数据库连接字符串
- ///
- /// user,game,ext,phone
- ///
- ///
- public string GetConnectionString(AppDataBaseType appDataBaseType)
- {
- switch (appDataBaseType)
- {
- case AppDataBaseType.User:
- return UserConnectionString;
- case AppDataBaseType.Game:
- return GameConnectionString;
- case AppDataBaseType.Ext:
- return ExtConnectionString;
- case AppDataBaseType.App:
- return PhoneConnectionString;
- default:
- throw new NotImplementedException("数据库连接字符串不存在");
- }
- }
-}
-
-///
-/// 数据库选项
-///
-
-public enum AppDataBaseType
-{
- ///
- /// 用户数据库
- ///
- User,
- ///
- /// 游戏数据库
- ///
- Game,
- ///
- /// 扩展数据库
- ///
- Ext,
- ///
- /// app数据库
- ///
- App
-}
diff --git a/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/AliyunConfig.cs b/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/AliyunConfig.cs
deleted file mode 100644
index 9e43d35..0000000
--- a/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/AliyunConfig.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CloudGaming.Code.AppExtend.ConfigModel;
-
-
-///
-/// 阿里云配置
-///
-public class AliyunConfig
-{
- ///
- ///
- ///
- public string AccessKeyId { get; set; }
- ///
- /// 配置环境变量
- ///
- public string AccessKeySecret { get; set; }
-
- #region 阿里云OSS配置
- ///
- /// 替换为Bucket所在地域对应的Endpoint。以华东1(杭州)为例,Endpoint填写为https://oss-cn-hangzhou.aliyuncs.com。
- ///
- public string EndPoint { get; set; }
- ///
- /// Bucket名称。
- ///
- public string BucketName { get; set; }
-
- ///
- /// 上传路径
- ///
- public string UploadPath { get; set; }
-
- ///
- /// 域名
- ///
- public string? DomainName { get; set; }
-
- ///
- /// 前缀
- ///
- public string ImagePrefix
- {
- get
- {
- return this.DomainName; //+ this.UploadPath
- }
- }
-
- #endregion
-
- ///
- /// 短信签名名称
- ///
- public string SmsSignName { get; set; }
-
- ///
- /// string 短信模板配置
- ///
- public string SmsTemplateCode { get; set; }
-
-}
diff --git a/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/GameConfig.cs b/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/GameConfig.cs
deleted file mode 100644
index d178123..0000000
--- a/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/GameConfig.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CloudGaming.Code.AppExtend.ConfigModel
-{
- ///
- ///
- ///
- public class GameConfig
- {
- ///
- /// 客户渠道Id,如:edb684859b848362ec56904286947614
- ///
- public string ChannelId { get; set; }
-
- ///
- /// 客户渠道key,加密使用
- ///
- public string SignKey { get; set; }
-
- ///
- /// 客户渠道地址
- ///
- public string BsUrl { get; set; }
- }
-}
diff --git a/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/PaymentModel.cs b/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/PaymentModel.cs
deleted file mode 100644
index 773d6be..0000000
--- a/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/PaymentModel.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using Alipay.EasySDK.Kernel;
-
-using Newtonsoft.Json;
-
-using SKIT.FlurlHttpClient.Wechat.TenpayV3;
-using SKIT.FlurlHttpClient.Wechat.TenpayV3.Models;
-using SKIT.FlurlHttpClient.Wechat.TenpayV3.Settings;
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-namespace CloudGaming.Code.AppExtend.ConfigModel;
-
-///
-///
-///
-public class PaymentModel
-{
- ///
- /// 微信支付数据
- ///
- public WeChatConfig? WeChatConfig { get; set; }
-
- ///
- /// 支付宝支付数据
- ///
- public Alipay.EasySDK.Kernel.Config? AlipayConfig { get; set; }
-
- ///
- ///
- ///
- private WechatTenpayClient _wxClient;
- ///
- /// 微信支付客户端
- ///
- [JsonIgnore]
- public WechatTenpayClient? WxClient
- {
- get
- {
- if (_wxClient == null)
- {
- if (WeChatConfig == null)
- {
- return null;
- }
- var manager = new InMemoryCertificateManager();
- /* 仅列出必须配置项。也包含一些诸如超时时间、UserAgent 等的配置项 */
- var wechatTenpayClientOptions = new WechatTenpayClientOptions()
- {
-
- MerchantId = WeChatConfig.MchId,
- MerchantV3Secret = WeChatConfig.Key,
- MerchantCertificateSerialNumber = WeChatConfig.MerchantCertificateSerialNumber,
- MerchantCertificatePrivateKey = WeChatConfig.MerchantCertificatePrivateKey,
- PlatformCertificateManager = manager
- };
- _wxClient = new WechatTenpayClient(wechatTenpayClientOptions);
- }
- return _wxClient;
- }
- }
-
- // var conf = appConfig.Payment?.AlipayConfig ?? new Alipay.EasySDK.Kernel.Config();
- //var context = new Alipay.EasySDK.Kernel.Context(conf, "alipay-easysdk-net-2.1.0");
- //var app = new Alipay.EasySDK.Payment.App.Client(new Alipay.EasySDK.Kernel.Client(context));
-
- private Alipay.EasySDK.Kernel.Context _aliPayContext;
- [JsonIgnore]
- public Alipay.EasySDK.Kernel.Context AliPayContext
- {
- get
- {
- if (_aliPayContext == null)
- {
- if (AlipayConfig != null)
- {
- _aliPayContext = new Alipay.EasySDK.Kernel.Context(AlipayConfig, "alipay-easysdk-net-2.1.0");
- }
- }
- return _aliPayContext;
- }
- }
-}
diff --git a/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/UserConfig.cs b/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/UserConfig.cs
deleted file mode 100644
index f08a95c..0000000
--- a/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/UserConfig.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CloudGaming.Code.AppExtend.ConfigModel;
-
-///
-/// 用户默认配置
-///
-public class UserConfig
-{
- ///
- /// 用户默认头像
- ///
- public string UserIconUrl { get; set; }
- ///
- /// 用户默认昵称
- ///
- public string NickName { get; set; }
-
- ///
- /// 用户最大登录设备
- ///
- public int MaxDeviceCount { get; set; }
-}
diff --git a/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/WeChatConfig.cs b/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/WeChatConfig.cs
deleted file mode 100644
index 6994888..0000000
--- a/src/CloudGaming/Code/CloudGaming.Code/AppExtend/ConfigModel/WeChatConfig.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CloudGaming.Code.AppExtend.ConfigModel;
-
-///
-///
-///
-public class WeChatConfig
-{
- ///
- /// appId
- ///
- public string AppId { get; set; }
- ///
- /// appkey
- ///
- public string AppSecret { get; set; }
- ///
- ///
- ///
- public string Key { get; set; }
- ///
- /// 商户id
- ///
- public string MchId { get; set; }
- ///
- /// 回调地址
- ///
- public string NotifyUrl { get; set; }
-
- ///
- /// 微信支付序列号
- ///
- public string MerchantCertificateSerialNumber { get; set; }
-
- ///
- /// 微信支付私钥
- ///
- public string MerchantCertificatePrivateKey { get; set; }
-}
-
-
diff --git a/src/CloudGaming/Code/CloudGaming.Code/CloudGaming.Code.csproj b/src/CloudGaming/Code/CloudGaming.Code/CloudGaming.Code.csproj
index 73e7bee..cc5eb55 100644
--- a/src/CloudGaming/Code/CloudGaming.Code/CloudGaming.Code.csproj
+++ b/src/CloudGaming/Code/CloudGaming.Code/CloudGaming.Code.csproj
@@ -25,6 +25,7 @@
+
diff --git a/src/CloudGaming/Code/CloudGaming.Code/Config/AppConfigBLL.cs b/src/CloudGaming/Code/CloudGaming.Code/Config/AppConfigBLL.cs
index 94169ed..05b0a9a 100644
--- a/src/CloudGaming/Code/CloudGaming.Code/Config/AppConfigBLL.cs
+++ b/src/CloudGaming/Code/CloudGaming.Code/Config/AppConfigBLL.cs
@@ -31,6 +31,8 @@ namespace CloudGaming.Code.Config
appConfigDto.IsChecking = IsChecking;
appConfigDto.SignKey = AppConfig.TenantId.ToString("N");
appConfigDto.NightCardTips = $"22点30分至次日7点畅玩无消耗";
+ appConfigDto.ChannelId = AppConfig.GameConfig.ChannelId;
+ appConfigDto.BsUrl = appConfigDto.BsUrl;
return appConfigDto;
}
diff --git a/src/CloudGaming/Code/CloudGaming.Code/Game/PlayGameBLL.cs b/src/CloudGaming/Code/CloudGaming.Code/Game/PlayGameBLL.cs
index ee34721..1b9678e 100644
--- a/src/CloudGaming/Code/CloudGaming.Code/Game/PlayGameBLL.cs
+++ b/src/CloudGaming/Code/CloudGaming.Code/Game/PlayGameBLL.cs
@@ -1,32 +1,11 @@
-using Azure.Core;
-
using CloudGaming.Code.Account;
-using CloudGaming.Code.AppExtend.ConfigModel;
using CloudGaming.Code.Contract;
using CloudGaming.DtoModel.Account.User;
using CloudGaming.DtoModel.Game;
using CloudGaming.DtoModel.JY;
using CloudGaming.DtoModel.PlayGame;
-using HuanMeng.DotNetCore.Redis;
-
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-
using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-using Org.BouncyCastle.Crypto.Macs;
-
-using Refit;
-
-using System;
-using System.Collections.Generic;
-using System.Dynamic;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
namespace CloudGaming.Code.Game;
diff --git a/src/CloudGaming/Code/CloudGaming.Code/GlobalUsings.cs b/src/CloudGaming/Code/CloudGaming.Code/GlobalUsings.cs
index fa3d847..6f2716d 100644
--- a/src/CloudGaming/Code/CloudGaming.Code/GlobalUsings.cs
+++ b/src/CloudGaming/Code/CloudGaming.Code/GlobalUsings.cs
@@ -21,5 +21,5 @@ global using Microsoft.Extensions.DependencyInjection;
global using Microsoft.Extensions.Hosting;
global using System.Diagnostics;
-global using CloudGaming.Code.AppExtend.ConfigModel;
+global using CloudGaming.AppConfigModel;
global using HuanMeng.DotNetCore.Redis;
\ No newline at end of file
diff --git a/src/CloudGaming/Model/CloudGaming.DtoModel/AppConfigDto.cs b/src/CloudGaming/Model/CloudGaming.DtoModel/AppConfigDto.cs
index 8210ca5..278d0ee 100644
--- a/src/CloudGaming/Model/CloudGaming.DtoModel/AppConfigDto.cs
+++ b/src/CloudGaming/Model/CloudGaming.DtoModel/AppConfigDto.cs
@@ -41,5 +41,15 @@ public class AppConfigDto
///
public string NightCardTips { get; set; }
+ ///
+ ///
+ ///
+ public string BsUrl { get; set; }
+
+ ///
+ ///
+ ///
+ public string ChannelId { get; set; }
+
}