Merge branch 'feature-dgy-后台测试' into test-adminserver

# Conflicts:
#	Startup.cs
#	appsettings.Development.json

Startup.cs

@@ -146,22 +146,22 @@ namespace MySystem
             // }
             // if (Env == "Production")
             // {
-                ResetUserTradeService.Instance.Start();
-                ResetMerchantTradeService.Instance.Start();
-                SycnProfitServiceV3.Instance.Start();
-                SycnHelpProfitService.Instance.Start();
-                ExcelHelper.Instance.Start();
-                OpExcelHelper.Instance.Start();
-                SIMPosMerchantTradeService.Instance.Start(); //导入广电卡数据
-                GetRadioCardInfoService.Instance.Start(); //获取行销宝信息
-                SycnUserMachineCountHelper.Instance.Start(); //重置创客机具数量
-                SIMActCountService.Instance.Start(); //统计注销欠费卡张数
+            ResetUserTradeService.Instance.Start();
+            ResetMerchantTradeService.Instance.Start();
+            SycnProfitServiceV3.Instance.Start();
+            SycnHelpProfitService.Instance.Start();
+            ExcelHelper.Instance.Start();
+            OpExcelHelper.Instance.Start();
+            SIMPosMerchantTradeService.Instance.Start(); //导入广电卡数据
+            GetRadioCardInfoService.Instance.Start(); //获取行销宝信息
+            SycnUserMachineCountHelper.Instance.Start(); //重置创客机具数量
+            SIMActCountService.Instance.Start(); //统计注销欠费卡张数
 
-                TestHelper.Instance.Start(); //生成兑换券
+            TestHelper.Instance.Start(); //生成兑换券
 
-                BatchEditUserAmountService.Instance.Start(); //创客信息相关数据导入
-                StoreHouseWithdrawalResultsService.Instance.Start(); //分仓临额提现结果导入
-                PreWithdrawalResultsService.Instance.Start(); //小分仓临额提现结果导入
+            BatchEditUserAmountService.Instance.Start(); //创客信息相关数据导入
+            StoreHouseWithdrawalResultsService.Instance.Start(); //分仓临额提现结果导入
+            PreWithdrawalResultsService.Instance.Start(); //小分仓临额提现结果导入
             // }
         }
 
@@ -175,8 +175,8 @@ namespace MySystem
         //初始化数据结构
         private void initMainServer(string Env)
         {
-            string dbName = "KxsMainServer";
-            // if(Env == "Production")
+            string dbName = "KxsProfitServer";
+            // if (Env == "Production")
             // {
             //     dbName = "KxsProfitServer";
             // }

appsettings.Development.json

@@ -18,6 +18,7 @@
     "Host": "http://test.bs.kexiaoshuang.com/",
     "OssHost": "http://oss.kexiaoshuang.com",
     "Database": "KxsMainServer",
+<<<<<<< HEAD
     "SqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;",
     "ReadSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;",
     "StatSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
@@ -25,6 +26,15 @@
     "BsSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsBsServer;charset=utf8;",
     "SpSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsSpServer;charset=utf8;",
     "CashSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsCashServer;charset=utf8;",
+=======
+    "SqlConnStr": "server=rm-2vcu953x4yx7z454who.rwlb.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;",
+    "ReadSqlConnStr": "server=rm-2vcu953x4yx7z454who.rwlb.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;",
+    "StatSqlConnStr": "server=rm-2vcu953x4yx7z454who.rwlb.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsProfitServer;charset=utf8;",
+    "BsSqlConnStr": "server=rm-2vcu953x4yx7z454who.rwlb.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsBsServer;charset=utf8;",
+    "OpSqlConnStr": "server=rm-2vcu953x4yx7z454who.rwlb.cn-chengdu.rds.aliyuncs.com;port=3306;user=KxsProfitServer;password=FrW8ZfxlcaVdm1r0;database=KxsOpServer;charset=utf8;",
+    "SpSqlConnStr": "server=47.108.62.166;port=3306;user=KxsSpServer;password=jJ9qKsvwWgQA9xWG;database=KxsSpServer;charset=utf8;",
+    "CashSqlConnStr": "server=47.108.62.166;port=3306;user=KxsCashServer;password=LNGvM18W6SaIGKBC;database=KxsCashServer;charset=utf8;",
+>>>>>>> feature-dgy-后台测试
     "RedisConnStr": "47.108.62.166:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",
     "AndroidAppVersion": "1.0.0",