1、使用配置URL

2、修改版本号 0.2.10.5

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2989,7 +2989,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3195,7 +3195,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3243,7 +3243,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHConfigManager.swift

@@ -22,17 +22,66 @@ class YHConfigManager: NSObject {
         super.init()
     }
     
+    
+    //测试环境-H5
+    static let baseH5UrlTest : String = "https://test-hkdiy-h5.galaxy-immi.com"
+    //正式环境-H5
+    static let baseH5UrlRelease : String = "https://hkdiy-h5.galaxy-immi.com"
+    
+    //h5地址
     var h5Url : String {
-        return reqVM.configModel?.article_h5_url ?? ""
+        var tH5url = reqVM.configModel?.article_h5_url ?? ""
+        if tH5url.isEmpty {
+#if DEBUG
+            tH5url = YHConfigManager.baseH5UrlTest
+#elseif TESTENV
+            tH5url = YHConfigManager.baseH5UrlTest
+#else
+            tH5url = YHConfigManager.baseH5UrlRelease
+#endif
+        }
+        
+        if !loadNewDataFlag {
+            loadConfigData()
+        }
+        return tH5url + "/"
+    }
+    
+    //测试环境-OSS
+    static let baseOSSUrlTest : String = "https://test-comserver.galaxy-immi.com"
+    //正式环境-OSS
+    static let baseOSSUrlRelease : String = "http://comserver.galaxy-immi.com"
+    
+    //OSS
+    var ossUrl : String {
+        var tOssUrl = reqVM.configModel?.oss_server ?? ""
+        if tOssUrl.isEmpty {
+#if DEBUG
+            tOssUrl = YHConfigManager.baseOSSUrlTest
+#elseif TESTENV
+            tOssUrl = YHConfigManager.baseOSSUrlTest
+#else
+            tOssUrl = YHConfigManager.baseOSSUrlRelease
+#endif
+        }
+        
+        if !loadNewDataFlag {
+            loadConfigData()
+        }
+        return tOssUrl + "/"
     }
 }
 
 extension YHConfigManager {
     func loadConfigData() {
-        reqVM.getHomeConfig { flag, error in
+        DispatchQueue.global().async {
+            self.reqVM.getHomeConfig { flag, error in
+                DispatchQueue.main.async {
                     if flag {
                         self.loadNewDataFlag = true
                     }
                 }
             }
+        }
+    }
 }

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -193,7 +193,7 @@ extension YHHomePageViewController: UICollectionViewDelegate, UICollectionViewDa
         guard let model = self.viewModel.arrHomeNewsData?[indexPath.row] else { return }
         if model.type == 2 {
             let vc = YHHomeWebViewController()
-            vc.url = YHConfigManager.shared.h5Url + "/articleDetail.html" + "?id=\(model.id)"
+            vc.url = YHBaseUrlManager.shared.curH5URL() + "articleDetail.html" + "?id=\(model.id)"
             vc.id = model.id
             vc.block = { item in
                 if let arr = self.viewModel.arrHomeNewsData {

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHSearchInfomationVC.swift

@@ -356,7 +356,7 @@ extension YHSearchInfomationVC: UITableViewDelegate, UITableViewDataSource {
             
             // 非视频类型
             let vc = YHHomeWebViewController()
-            vc.url = YHConfigManager.shared.h5Url + "/articleDetail.html" + "?id=\(model.id)"
+            vc.url = YHBaseUrlManager.shared.curH5URL() + "articleDetail.html" + "?id=\(model.id)"
             vc.id = model.id
             print("URL: \(vc.url)")
             self.navigationController?.pushViewController(vc)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceTableFootView.swift

@@ -84,7 +84,7 @@ extension YHServiceTableFootView: UICollectionViewDelegate, UICollectionViewData
         guard let model = items[indexPath.row] else { return }
         if model.type == 2 {
             let vc = YHHomeWebViewController()
-            vc.url = YHConfigManager.shared.h5Url + "/articleDetail.html" + "?id=\(model.id)"
+            vc.url = YHBaseUrlManager.shared.curH5URL() + "articleDetail.html" + "?id=\(model.id)"
             vc.id = model.id
             vc.block = {[weak self] model in
                 guard let self = self else { return }

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -252,15 +252,9 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
             printLog("积分中心")
             if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
                 printLog(param)
-                // todo: 黄金龙
                 var token : String = param
-#if DEBUG
-                var url = "https://test-hkdiy-h5.galaxy-immi.com/superApp/integral"
-#elseif TESTENV
-                var url = "https://test-hkdiy-h5.galaxy-immi.com/superApp/integral"
-#else
-                var url = "https://thkdiy-h5.galaxy-immi.com/superApp/integral"
-#endif
+
+                var url = YHBaseUrlManager.shared.curH5URL() + "superApp/integral"
                 let addtionString = randomAlphanumericString(6)//随机6个字母或者数字
                 let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
                 token.insert(contentsOf: addtionString, at: indexToInsert)
@@ -278,7 +272,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
             vc.showSavePicBottomFlag = true
             vc.url = "https://cdn-public.galaxy-immi.com/app/cepingma.png"
             self.navigationController?.pushViewController(vc)
-            // todo: 黄金龙
         case .appointGalaxyBay://预约银河湾
             printLog("预约银河湾")
             let vc = YHHomeWebViewController()

galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift

@@ -12,34 +12,28 @@ class YHBaseUrlManager {
     static let shared = YHBaseUrlManager()
     
     //测试环境
-    static let baseUrlTest : String = "https://test-app-go-api.galaxy-immi.com/" //APP 使用域名
+    static let baseUrlTest : String = "https://test-app-go-api.galaxy-immi.com" //APP 使用域名
     //正式环境
-    static let baseUrlRelease : String = "https://app-go-api.galaxy-immi.com/"
-    
-    
-    //测试环境-OSS
-    static let baseOSSUrlTest : String = "https://test-comserver.galaxy-immi.com/"
-    //正式环境-OSS
-    static let baseOSSUrlRelease : String = "http://comserver.galaxy-immi.com/"
+    static let baseUrlRelease : String = "https://app-go-api.galaxy-immi.com"
     
     
     func curURL() -> String {
 #if DEBUG
-        return YHBaseUrlManager.baseUrlTest
+        return YHBaseUrlManager.baseUrlTest + "/"
 #elseif TESTENV
-        return YHBaseUrlManager.baseUrlTest
+        return YHBaseUrlManager.baseUrlTest + "/"
 #else
-        return YHBaseUrlManager.baseUrlRelease
+        return YHBaseUrlManager.baseUrlRelease + "/"
 #endif
     }
     
+    //ossUrl
     func curOssURL() -> String {
-#if DEBUG
-        return YHBaseUrlManager.baseOSSUrlTest
-#elseif TESTENV
-        return YHBaseUrlManager.baseOSSUrlTest
-#else
-        return YHBaseUrlManager.baseOSSUrlRelease
-#endif
+        return YHConfigManager.shared.ossUrl
+    }
+    
+    //h5Url
+    func curH5URL() -> String {
+        return YHConfigManager.shared.h5Url
     }
 }