修改默认配置文件

YukiCoco · Dec 13, 2020 · 92ab232 · 92ab232
1 parent 4b4ae13
commit 92ab232
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 30 deletions.
diff --git a/ChpStmScraper.WebApi/.vscode/launch.json b/ChpStmScraper.WebApi/.vscode/launch.json
@@ -11,7 +11,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/bin/Debug/net5.0/linux-x64/ChpStmScraper.WebApi.dll",
+            "program": "${workspaceFolder}/bin/Debug/net5.0/ChpStmScraper.WebApi.dll",
             "args": [],
             "cwd": "${workspaceFolder}",
             "stopAtEntry": false,

diff --git a/ChpStmScraper.WebApi/ChpStmScraper.WebApi.csproj b/ChpStmScraper.WebApi/ChpStmScraper.WebApi.csproj
@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <RuntimeIdentifiers>win10-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+    <EnableDefaultContentItems>false</EnableDefaultContentItems>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,6 +15,10 @@
 
   <ItemGroup>
     <ProjectReference Include="..\ChpStmScraper\ChpStmScraper.csproj" />
+    <Content Include="ChpStmScraper.Template.db" CopyToOutputDirectory="Always" ExcludeFromSingleFile="true"/>
+    <Content Include="appsettings.json" CopyToOutputDirectory="Always" ExcludeFromSingleFile="true"/>
+    <Content Include="wwwroot\**\*.*" CopyToOutputDirectory="Always" ExcludeFromSingleFile="true"/>
+    <Content Update="appsettings.Development.json" CopyToPublishDirectory="Never" ExcludeFromSingleFile="true"/>
   </ItemGroup>
 
 </Project>
diff --git a/ChpStmScraper.WebApi/Program.cs b/ChpStmScraper.WebApi/Program.cs
@@ -16,7 +16,7 @@ public class Program
     {
         public static void Main(string[] args)
         {
-
+            Init();
             CreateHostBuilder(args).Build().Run();
         }
 

diff --git a/ChpStmScraper.WebApi/appsettings.json b/ChpStmScraper.WebApi/appsettings.json
@@ -1,23 +1,20 @@
 {
   "Logging": {
     "LogLevel": {
-      "Default": "Information",
+      "Default": "Warning",
       "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
+      "Microsoft.Hosting.Lifetime": "Warning"
     }
   },
   "AllowedHosts": "*",
-  "ProxyUrl": "http://127.0.0.1:7890",
+  "ProxyUrl": "",
   "BuffUrl": "https://buff.163.com/api/market/goods?game=csgo&min_price=20",
   "BuffSession": "",
   "SteamCookies": "",
   "MaxThread": 4,
-  "CsgoMinSellCount": 30,
-  "Dota2MinSellCount": 15,
-  "MinSellPrice": 10,
-  "ConnectionString": "",
-  "MysqlVersion": "8.0.22",
-  "IsEnableScraper" : false,
+  "MinSellCount": 30,
+  "ConnectionString": "Data Source=ChpStmScraper.db",
+  "IsEnableScraper" : true,
   "ListeningUrls": [
     "http://127.0.0.1:1272"
   ]

diff --git a/ChpStmScraper/ChpStmScraper.csproj b/ChpStmScraper/ChpStmScraper.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64;osx-x64;linux-x64</RuntimeIdentifiers>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -15,6 +15,6 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0-alpha.2" />
-  </ItemGroup>
-
-</Project>
+  </ItemGroup>
+
+</Project>
diff --git a/ChpStmScraper/Configuration.cs b/ChpStmScraper/Configuration.cs
@@ -55,19 +55,19 @@ static Configuration()
         /// CSGO 物品最小在售数
         /// </summary>
         /// <value></value>
-        public static int CsgoMinSellCount => int.Parse(configurationRoot["CsgoMinSellCount"]);
+        public static int MinSellCount => int.Parse(configurationRoot["MinSellCount"]);
 
         /// <summary>
         /// DOTA2 物品最小在售数
         /// </summary>
         /// <value></value>
-        public static int Dota2MinSellCount => int.Parse(configurationRoot["Dota2MinSellCount"]);
+        //public static int Dota2MinSellCount => int.Parse(configurationRoot["Dota2MinSellCount"]);
 
         /// <summary>
         /// 最小售价
         /// </summary>
         /// <value></value>
-        public static int MinSellPrice => int.Parse(configurationRoot["MinSellPrice"]);
+        //public static int MinSellPrice => int.Parse(configurationRoot["MinSellPrice"]);
 
         /// <summary>
         /// Steam Cookies

diff --git a/ChpStmScraper/Program.cs b/ChpStmScraper/Program.cs
@@ -108,13 +108,13 @@ public static void Start()
                                   switch (jItem["game"].ToString() == "csgo" ? Goods.GameKind.CSGO : Goods.GameKind.DOTA2)
                                   {
                                       case Goods.GameKind.CSGO:
-                                          if (buffSellNum < Configuration.CsgoMinSellCount)
+                                          if (buffSellNum < Configuration.MinSellCount)
                                           {
                                               continue;
                                           }
                                           break;
                                       case Goods.GameKind.DOTA2:
-                                          if (buffSellNum < Configuration.Dota2MinSellCount)
+                                          if (buffSellNum < Configuration.MinSellCount)
                                           {
                                               continue;
                                           }

diff --git a/ChpStmScraper/ScraperDbContext.cs b/ChpStmScraper/ScraperDbContext.cs
@@ -9,7 +9,7 @@ public class ScraperDbContext : DbContext
         public DbSet<Goods> Goods {get ;set;}
         protected override void OnConfiguring(DbContextOptionsBuilder options)
         {
-            options.UseSqlite("Data Source=ChpStmScraper.db");
+            options.UseSqlite(Configuration.ConnectionString);
             //var verionArray = Configuration.MysqlVersion.Split(".");
             //options.UseMySql(Configuration.ConnectionString,new MySqlServerVersion(new Version(int.Parse(verionArray[0]),int.Parse(verionArray[1]),int.Parse(verionArray[2]))));
         }

diff --git a/chpstm.web/public/guide.md b/chpstm.web/public/guide.md
@@ -0,0 +1,8 @@
+### 欢迎使用
+Cheap Steam 为您提供 STEAM 与 BUFF 的饰品价格对比数据，您可以从此快速找出价格合适的饰品，在 BUFF 购买然后在 Steam 市场出售，以此赚取大额的差价。
+### 注意事项
+1. 请留意数据的更新日期，并在 BUFF 和 STEAM 中进行比对，其中的某些条目可能存在更新延迟。
+2. 表中 STEAM 出售比例，STEAM 收购比例 均计算为税后结果。
+3. 请优先考虑 STEAM 收购比例较低的饰品，它可以快速地收购价出手。
+4. 入手 STEAM 出售比例较低的饰品时，请留意在售数。在售数过低的饰品会导致 STEAM 市场降价，难以出手。
+5. 提交 BUG 和提出建议请发送电邮到 [email protected].
diff --git a/chpstm.web/src/App.vue b/chpstm.web/src/App.vue
@@ -9,7 +9,7 @@
     </v-main>
     <v-footer >
       <v-col class="text-center" style="padding:3px;" cols="12">
-        <p style="padding:0px;margin:0px;">{{ new Date().getFullYear() }} — <strong><a class="" href="">Cheap Steam</a></strong></p>
+        <p style="padding:0px;margin:0px;">{{ new Date().getFullYear() }} — <strong><a class="" href="https://github.com/YukiCoco/CheapSteam">Cheap Steam</a></strong></p>
         <p style="padding:0px;margin:0px;" class="font-weight-medium">[email protected]</p>
       </v-col>
     </v-footer>

diff --git a/chpstm.web/vue.config.js b/chpstm.web/vue.config.js
@@ -2,12 +2,15 @@ module.exports = {
   "transpileDependencies": [
     "vuetify"
   ],
+
   chainWebpack: config => {
     config
       .plugin('html')
       .tap(args => {
         args[0].title = 'Cheap Steam - Steam 市场对比站'
         return args
       })
-  }
+  },
+
+  outputDir: '../ChpStmScraper.WebApi/wwwroot'
 }