diff --git a/.gitignore b/.gitignore index d57b3d4..1517990 100644 --- a/.gitignore +++ b/.gitignore @@ -355,7 +355,7 @@ healthchecksdb # Backup folder for Package Reference Convert tool in Visual Studio 2017 MigrationBackup/ - +dist/ # Ionide (cross platform F# VS Code tools) working folder .ionide/ diff --git a/admin-client/src/components.d.ts b/admin-client/src/components.d.ts index 569f0ba..947c182 100644 --- a/admin-client/src/components.d.ts +++ b/admin-client/src/components.d.ts @@ -83,8 +83,6 @@ declare module 'vue' { ColumnSetting: typeof import('./core/components/curd/components/ColumnSetting.vue')['default'] ElAside: typeof import('element-plus/es')['ElAside'] ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete'] - ElButton: typeof import('element-plus/es')['ElButton'] - ElCard: typeof import('element-plus/es')['ElCard'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCheckboxButton: typeof import('element-plus/es')['ElCheckboxButton'] ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] diff --git a/admin-server/CloudGaming.Api.Admin/appsettings.Production.json b/admin-server/CloudGaming.Api.Admin/appsettings.Production.json index 5fc85f2..a8e8b93 100644 --- a/admin-server/CloudGaming.Api.Admin/appsettings.Production.json +++ b/admin-server/CloudGaming.Api.Admin/appsettings.Production.json @@ -5,20 +5,20 @@ "Redis": "192.168.1.23:6379,defaultDatabase=2" }, // pi计算 数据库管理 - "AdminRepositoryOptions": { - //默认数据库类型 SqlServer 、MySql 、PostgreSql、Oracle - "DefaultDatabaseType": "SqlServer", - //是否监控EFCore程序 - "IsMonitorEFCore": false, - // 连接字符串 - mysql - "ConnectionString": "Server=192.168.195.8;Database=HZY;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;" - //// 连接字符串 - sqlserver - //"ConnectionString": "Server=.;Database=hzy_microservices_sqlserver_20230227;User ID=sa;Password=123456;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;", - //// 连接字符串 - postgresql - //"ConnectionString": "User ID=postgres;Password=123456;Host=localhost;Port=5432;Database=hzy_microservices_pgsql_20230227;Pooling=true;TimeZone=Asia/Shanghai", - //// 连接字符串 - oracle - //"ConnectionString": "user id=hzy_admin_oracle_20221213;password=123456; data source=//127.0.0.1:1521/orcl;Pooling=true;Min Pool Size=1" - }, //服务器配置 + "AdminRepositoryOptions": { + //默认数据库类型 SqlServer 、MySql 、PostgreSql、Oracle + "DefaultDatabaseType": "SqlServer", + //是否监控EFCore程序 + "IsMonitorEFCore": false, + // 连接字符串 - mysql + "ConnectionString": "Server=192.168.195.8;Database=CloudGamingAdmin;User Id=sa;Password=Dbt@com@123;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;" + //// 连接字符串 - sqlserver + //"ConnectionString": "Server=.;Database=hzy_microservices_sqlserver_20230227;User ID=sa;Password=123456;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;", + //// 连接字符串 - postgresql + //"ConnectionString": "User ID=postgres;Password=123456;Host=localhost;Port=5432;Database=hzy_microservices_pgsql_20230227;Pooling=true;TimeZone=Asia/Shanghai", + //// 连接字符串 - oracle + //"ConnectionString": "user id=hzy_admin_oracle_20221213;password=123456; data source=//127.0.0.1:1521/orcl;Pooling=true;Min Pool Size=1" + }, //服务器配置 "Kestrel": { "Endpoints": { "Http": {