Merge branch 'develop' of http://47.109.31.237:13000/kxs-end/admin-server into DuGuYang

# Conflicts:
#	wwwroot/other/oss/upload-min-oss.js

AppStart/OssHelper.cs

@@ -12,11 +12,11 @@ namespace MySystem
 {
     public class OssHelper
     {
-        string key = "LTAI5tAp9ASZtq4wYzuXfeer"; //阿里云AccessKey ID
-        string secret = "N0o6TwowU8r4aeNWoefMnnus9Q2saW";  //阿里云Access Key Secret
+        string key = "LTAI5tJsPaNzqCSMCPwb8zfz"; //阿里云AccessKey ID
+        string secret = "efM31Up75fQcgZ32U6xvAciagceQae";  //阿里云Access Key Secret
         public string PathName = ConfigurationManager.AppSettings["Database"].ToString();
         public string endpoint = "oss-cn-chengdu.aliyuncs.com";  //endpoint
-        public string bucketName = "kexiaoshuang";
+        public string bucketName = "kexiaoshuang-oss";
         public string SourceHost = ConfigurationManager.AppSettings["OssHost"].ToString();
         public bool OssStatus = true;
         public readonly static OssHelper Instance = new OssHelper();

Startup.cs

@@ -172,10 +172,10 @@ namespace MySystem
         private void initMainServer(string Env)
         {
             string dbName = "KxsMainServer";
-            // if(Env == "Production")
-            // {
-            //     dbName = "KxsProfitServer";
-            // }
+            if(Env == "Production")
+            {
+                dbName = "KxsProfitServer";
+            }
             Dictionary<string, Dictionary<string, string>> tables = new Dictionary<string, Dictionary<string, string>>();
             Library.OtherMySqlConn.connstr = Configuration["Setting:SqlConnStr"];
             System.Data.DataTable tablecollection = Library.OtherMySqlConn.dtable("select DISTINCT TABLE_NAME from information_schema.columns where table_schema = '" + dbName + "'");