Merge commit '3031c1d5' into xiezhaolin

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift

@@ -52,11 +52,23 @@ class YHServiceCenterMainViewController: YHBaseViewController {
         setupUI()
         loadData()
     }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        loadData()
+    }
 }
 
 extension YHServiceCenterMainViewController {
     func loadData() {
         self.serviceCenterMainReqVM.getContactList { success, error in
+            if success == true {
+                
+            } else {
+                YHHUD.flash(message: error?.errorMsg ?? "请求出错")
+            }
+            
+            
             if self.serviceCenterMainReqVM.arrContactList.isEmpty {
                 self.homeTableView.isHidden = true
                 self.noDataView.isHidden = false

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/VM/YHBasicInfoFillViewModel.swift

@@ -131,7 +131,6 @@ extension YHBasicInfoFillViewModel {
             let model1 = YHBasicInfoCellModel(question:"1、至少一名直系家庭成员（已婚配偶、父母、兄弟姊妹、子女）是现居于香港的香港永久性居民", answer: dataModelForBasicInfo.background?.background_member?.has ?? "", info: dataModelForBasicInfo.background?.background_member?.info ?? "",type: 1)
             model1.model = dataModelForBasicInfo.background
             let arr = [model1]
-            
             let sessionModel = YHBasicInfoSessionModel(sessionTitle: "家庭背景", arrQuestionItem: arr)
             arrData.append(sessionModel)
         }
@@ -147,9 +146,9 @@ extension YHBasicInfoFillViewModel {
 //        callBackBlock(true,nil)//先返回数据 让界面展示相关的UI
         
         
-//        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.basicInfoApi
-        //http://192.168.25.21:10087   梁杰ip
-        let strUrl = "http://192.168.25.21:10087/" + "infoflow/basics/get_basics"
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.basicInfoApi
+//        //http://192.168.25.21:10087   梁杰ip
+//        let strUrl = "http://192.168.25.21:10087/" + "infoflow/basics/get_basics"
         
         
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildBasicInfoVC.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class YHChildBasicInfoVC: YHBaseViewController {
+class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
 
     var child:YHFamilyMember?
     weak var delegate:YHSpouseInfoVCProtocol?
@@ -539,3 +539,10 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
     }
 }
 
+extension YHChildBasicInfoVC {
+    
+    func nextStep()->Bool {
+        return true
+    }
+}
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildInfoContainerVC.swift

@@ -22,21 +22,21 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
 
     var child:YHFamilyMember? {
         didSet {
-            initalInfoVC.child = child
+            primaryInfoVC.child = child
             certificateVC.familyMember = child
             basicInfoVC.child = child
         }
     }
-    
-    var currentIndex = 0 {
+    var stepVCs:[YHFaimilyStepItem] = []
+    var currentStep = 0 {
         didSet {
-            currentIndex %= self.children.count
-            stepView.currentIndex = currentIndex
-            for (i, vc) in self.children.enumerated() {
-                vc.view.isHidden = (currentIndex != i)
-                if currentIndex == i {
-                    
-                }
+            
+            let index = getArrayIndexOfCurrentStep()
+            if let index = index {
+                stepView.currentIndex = index
+            }
+            for vcItem in stepVCs {
+                vcItem.vc.view.isHidden = (vcItem.step != currentStep)
             }
         }
     }
@@ -50,8 +50,8 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         return YHSaveAndSubmitView.createView()
     }()
         
-    let initalInfoVC =  YHChildPrimaryInfoVC()
-    let uploadVC = UIViewController()
+    let primaryInfoVC =  YHChildPrimaryInfoVC()
+    let uploadVC = YHCertificateUploadVC()
     let certificateVC = YHCertificateInfoController()
     let basicInfoVC = YHChildBasicInfoVC()
 
@@ -62,15 +62,15 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
     
     func createUI() {
         
-        guard child != nil else { return }
+        guard let child = child else { return }
         
-        initalInfoVC.delegate = self
+        primaryInfoVC.delegate = self
         certificateVC.delegate = self
         basicInfoVC.delegate = self
         
         updateStepView()
-
-        currentIndex = 0
+        print("step:\(child.step)")
+        currentStep = child.step
         
         view.addSubview(stepView)
         view.addSubview(bottomView)
@@ -78,7 +78,7 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         bottomView.submitBlock = {
             [weak self] in
             guard let self = self else { return }
-            self.didClickSubmitBtn()
+            submit()
         }
         
         bottomView.saveBlock = {
@@ -100,11 +100,6 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         }
     }
     
-    func didClickSubmitBtn() {
-        currentIndex += 1;
-        
-    }
-    
     func updateStepView() {
         
         guard let child = child else { return }
@@ -114,42 +109,87 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             vc.removeFromParent()
         }
         
+        print(self.children)
+        
         if child.isFollow() {
             
-            self.addChild(initalInfoVC)
-            self.addChild(uploadVC)
-            self.addChild(certificateVC)
-            self.addChild(basicInfoVC)
-            
-            self.view.addSubview(basicInfoVC.view)
-            self.view.addSubview(certificateVC.view)
-            self.view.addSubview(uploadVC.view)
-            self.view.addSubview(initalInfoVC.view)
-            
-            stepView.dataSource = ["初始信息".local, "证件上传".local, "证件信息".local, "基本信息".local]
-            stepView.block = {[weak self]  (index) in
-                guard let self = self else { return }
-                print("follow:%d", self.orderId)
-            }
+            stepVCs = [ YHFaimilyStepItem(title:"初始信息".local, vc:primaryInfoVC, step:0),
+                        YHFaimilyStepItem(title:"证件上传".local, vc:uploadVC, step:1),
+                        YHFaimilyStepItem(title:"证件信息".local, vc:certificateVC, step:2),
+                        YHFaimilyStepItem(title:"基本信息".local, vc:basicInfoVC, step:3)]
             
         } else {
-            self.addChild(initalInfoVC)
-            self.addChild(basicInfoVC)
             
-            self.view.addSubview(basicInfoVC.view)
-            self.view.addSubview(initalInfoVC.view)
-            
-            stepView.dataSource = ["初始信息".local, "基本信息".local]
-            stepView.block = {[weak self]  (index) in
-                guard let self = self else { return }
-                print("follow:%d", self.orderId)
-
+            stepVCs = [ YHFaimilyStepItem(title:"初始信息".local, vc:primaryInfoVC, step:0),
+                        YHFaimilyStepItem(title:"基本信息".local, vc:basicInfoVC, step:3)]
+        }
+        
+        var titles:[String] = []
+        for vcItem in stepVCs {
+            self.addChild(vcItem.vc)
+            self.view.addSubview(vcItem.vc.view)
+            titles.append(vcItem.title)
+        }
+        stepView.dataSource = titles
+        
+        stepView.block = {
+            [weak self] index in
+            guard let self = self else { return }
+            if let targetStep = getStepForArrayIndex(index) {
+                currentStep = targetStep
             }
+            print("index:\(index)")
         }
+        
         self.view.bringSubviewToFront(stepView)
         self.view.bringSubviewToFront(bottomView)
 
     }
+    
+    func submit() {
+        if let targetVC = getCurrentStepViewController() {
+            if targetVC.nextStep() {
+               
+                // 当前步骤已是最后一步
+                if let vc = stepVCs.last, vc.step == currentStep {
+                    YHHUD.flash(message: "已经是最后一步！")
+                    return
+                }
+                if let cur = getArrayIndexOfCurrentStep(), let item = stepVCs[safe:cur+1] {
+                    currentStep = item.step
+                }
+                print("currentIndex:\(currentStep)")
+            }
+        }
+    }
+    
+    // 【WARNING!】步骤step和在数组中的下标有时候并不是一一对应
+    func getArrayIndexOfCurrentStep() ->Int? {
+        for (i, item) in stepVCs.enumerated() {
+            if item.step == currentStep {
+                return i
+            }
+        }
+        return nil
+    }
+    
+    // 【WARNING!】步骤step和在数组中的下标有时候并不是一一对应
+    func getStepForArrayIndex(_ index:Int) -> Int? {
+        if let targetVCItem = stepVCs[safe: index] {
+            return targetVCItem.step
+        }
+        return nil
+    }
+    
+    func getCurrentStepViewController() -> (UIViewController & YHFamilyMemberProtol)? {
+        
+        for vcItem in stepVCs {
+            if vcItem.step == currentStep {
+                return vcItem.vc
+            }
+        }
+        return nil
+    }
 }
 
 extension YHChildInfoContainerVC {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildPrimaryInfoVC.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class YHChildPrimaryInfoVC: YHBaseViewController {
+class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
 
     var child:YHFamilyMember?
     weak var delegate:YHSpouseInfoVCProtocol?
@@ -437,5 +437,38 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
     }
 }
 
+extension YHChildPrimaryInfoVC {
+    
+    // 检查填写信息完整性
+    func checkIntegrity() -> Bool {
+       
+        guard let child = child else { return false}
+        if !child.isFollow() {
+            if isEmptyString(child.birthday) {
+                return false
+            }
+            return true
+        }
+        
+        if isEmptyString(child.nationality) {
+            return false
+        }
+        if isEmptyString(child.address?.country) {
+            return false
+        }
+        if isEmptyString(child.address?.details) {
+            return false
+        }
+        if child.isBirthOverSeas(), isEmptyArray(child.address?.area) {
+            return false
+        }
+        return true
+    }
+    
+    func nextStep()->Bool {
+        return true
+    }
+}
+
 
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift

@@ -50,7 +50,10 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
     var currentStep = 0 {
         didSet {
             
-            stepView.currentIndex = currentStep
+            let index = getArrayIndexOfCurrentStep()
+            if let index = index {
+                stepView.currentIndex = index
+            }
             for vcItem in stepVCs {
                 vcItem.vc.view.isHidden = (vcItem.step != currentStep)
             }
@@ -88,6 +91,8 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         view.addSubview(bottomView)
         
         updateStepView()
+        print("step:\(spouse.step)")
+        currentStep = spouse.step
         
         let tap = UITapGestureRecognizer(target: self, action: #selector(tap))
         tap.cancelsTouchesInView = false
@@ -148,10 +153,8 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             self.view.addSubview(vcItem.vc.view)
             titles.append(vcItem.title)
         }
-        stepView.dataSource = titles
         
-        print("step:\(spouse.step)")
-        currentStep = spouse.step
+        stepView.dataSource = titles
         
         stepView.block = {
             [weak self] index in
@@ -161,7 +164,8 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             }
             print("index:\(index)")
         }
-        
+        let step = currentStep
+        currentStep = step
         self.view.bringSubviewToFront(stepView)
         self.view.bringSubviewToFront(bottomView)
 

galaxy/galaxy/Classes/Modules/Login(登录)/Server/YHLoginManager.swift

@@ -39,9 +39,7 @@ class YHLoginManager: NSObject {
     }
     
     func loadLocalUserInfoData() {
-        
         let dic = UserDefaults.standard.value(forKey: YhConstant.KLoginedInfoKey)
-        
         guard let resultModel = YHUserModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
             return
         }

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -86,10 +86,12 @@ class YHAllApiName {
     //Basics
     struct Basics {
         //获取 基本资料信息
-        static let basicInfoApi = "frontend/basics/get_basics"
+//        static let basicInfoApi = "frontend/basics/get_basics"
+        static let basicInfoApi = "infoflow/basics/get_basics"
         
         //保存基本资料信息
-        static let  updateBasicInfoApi = "frontend/basics/update_basics"
+//        static let  updateBasicInfoApi = "frontend/basics/update_basics"
+        static let  updateBasicInfoApi = "infoflow/basics/update_basics"
     }
     
     struct OrderInformation {

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -93,22 +93,21 @@ class YHNetRequest: NSObject {
         print("sign = \(sign)")
         
         requestHeader.add(name:"sign",value:sign)
-        
         requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-") //for test hjl
-//        testToken(&requestHeader)
+        testToken(&requestHeader)
         headers = requestHeader
     }
     
     private func testToken(_ requestHeader:inout HTTPHeaders) {
         //杜宇的账号
-        requestHeader.add(name: "token", value: "eyJpdiI6Ik5aeEVDclZTK0FISEFBZUgxN2VkdGc9PSIsInZhbHVlIjoiRFRJOHlObzVrZlp4T2tVYW1MSE1ZK0Z3dXlyK3p4QlczNmxsTXdkdW5GQVY4Q2VqZlNNUDdrdVpsb0JcLytpYmJheUp2MWZTUE5pOWgrVWRLdEtIUkx4R1wvS3F6SmRSQ0dWeFVXanFINGkyRWNMTXB4TVlcLzhjXC9NSzVoMFwvZ1ZOaVIwb0VqWlo1VERPSHY2RWJhME1RdWtkXC8yanBQdm9lMWM4WXJVK1BnMDd6SncwVVlWMDNnbSswSnM3eVwveFRRck03M3pOaDFSc3g0UmlYMTJQdmZpSkhUWHVMa21RV2xRbXBkalVTTUFicmFaN2NVNXl1ZTJOeEJoKzhrMnZtdzdvM1U5Qmh4WXNiSEFERUpiZHNWNkxoM2ZkVVRUdFlMMU1MQnIyaWNxNSt4S1NocDVEbnNqeHphUCtVVk1qTlVnMk1ydVNPamJ0c2tDQ1wvWFk1SkxtSWtDMU9oT3ZqaFpuNU5aVUVicHpYVU56VnlqK01Cb20welJMbkQrcTFWOHFUbzlPK0RGdDRcLzJ1T094MjNjYTVZZmJcL2txRE93cEFUYzlKWWdVWE9cLzFnYnVwTFZ4VUtqMFQ5QlgzZitDQjhyNURpU3p0bktqblBicUxPekNBcWRWM0g0WklSOEc0T0RPVkNBMGZQdEtWV3ZqN3IrcHZDYm9UNjREdnA3U1RZY1Z1dFE3K1RRM2F2eGY0QXc2dGlha0RBUDVpVHdFWE53dzl2eVczVk9VNTJSa1Fzb1J4ZGd0c0RCdktPQ1FWOUQ5Y0krckQ3bFc4NkNJMHliSXlnNGtYU1ZCUHRZWTdCKzA5d1wvdldzWTlpeUdYaEg4eGhITHpRSUthMWpSVlZvZVhwZ3BvamxCTHFSUXJmQ1hQNThYbUNNanZnVGs0b3RDTUFmYkdsYTEzeEtnTXJpZVU0QnJHWDJoUk9sUklzaFFhUkJiNWk0Z2E0cUUwejU4RmF2RnE4Z2U0eEo3VmZ2SmFMTlVacFBvSFlZUmM2N3liVTdhTk5NWU9YS0xtalk3QUN3NWV2UTlPeE5hMmk0aHU4MSt0YjNJQytFczRMa2l6XC9jV0Jxc01QYU0yYXdTXC92RXBxTFNVOVd6SlwvRm9KM21jUHlcL2diRlMyU3REeEl0K1RxSjRuck8xaXlOaWY4NXVzMVBibXpVSEZJWkVZQnFUd2k5TUVJcDUwUEFjTmljTzYyaWFYaFkzZUtkR294d29LUzBUTFF1Y0xxbWtMNFF4ZlZkN2k4YktEUnRGekU3OEdaN2J3TUR4T2FpVHRKaGlqRWNcL2c5dlwvOUVEVmdLNUhBSk1wSGV5UXVoOFJydlczc09HU1EyeXI4SFZZQmJJQWx1cGFIaXhmK1VJNmdoNmwrOElMZXFxSHZtazQreW84RFBlOXFnVDI2bm1tZWl0K01OcU1DSGJEQXdnWW9Hc0ptWFVJbXVXdEpyT2FKUHprTzJ1MkxFSEViZGV4cFpuOWRXK3dUdVR4bmJHZ1VRRGJycFRBME5lWUtaT0JCYjViSWVvcVJ3RXllb2tQZ1VkUWFqVWo0UHQzMUQwWVMwZ05rTTU0Nk1QQUdxTm9rZFNISVYrTG5DWlArNkt5RkZxajdZN1luakRKQVdUaVpnOUhCUExYMEVKRXRRT3QyZTI4cU9TdlBrbWxVZkFLSWZFbXNha3lCZUhFRVpyTmxQOERjbVwvMytCc0JpNnZcL1Nvek9yR2pUWGF2XC9VMzN4OEY5T3VsdUNGRFNWbHZZMnBzNHhMeEdIR21majBOOUJNbEhlK1J4S3dFTnlJamdTeFQyTWlTTlhCUWxnSDF6VmNhWHIzVGpoREY5clB2XC9uZHZjSm1iTHZ1bjFIUUFRait6dUJlUk1WQ1FhdXFoN002YlQ5MVwvQVMzYzJJQ0RFR1czdEtqMFBTQT09IiwibWFjIjoiOGVlZjBmNTVmMzEwNjhkZjVmYTlkYzAwYzllMjJmNjUyZmRmN2U1ODFiZTIzNzRjMDVjMTNiOTNhOWRhMmVkYSJ9")
+        //        requestHeader.add(name: "token", value: "eyJpdiI6Ik5aeEVDclZTK0FISEFBZUgxN2VkdGc9PSIsInZhbHVlIjoiRFRJOHlObzVrZlp4T2tVYW1MSE1ZK0Z3dXlyK3p4QlczNmxsTXdkdW5GQVY4Q2VqZlNNUDdrdVpsb0JcLytpYmJheUp2MWZTUE5pOWgrVWRLdEtIUkx4R1wvS3F6SmRSQ0dWeFVXanFINGkyRWNMTXB4TVlcLzhjXC9NSzVoMFwvZ1ZOaVIwb0VqWlo1VERPSHY2RWJhME1RdWtkXC8yanBQdm9lMWM4WXJVK1BnMDd6SncwVVlWMDNnbSswSnM3eVwveFRRck03M3pOaDFSc3g0UmlYMTJQdmZpSkhUWHVMa21RV2xRbXBkalVTTUFicmFaN2NVNXl1ZTJOeEJoKzhrMnZtdzdvM1U5Qmh4WXNiSEFERUpiZHNWNkxoM2ZkVVRUdFlMMU1MQnIyaWNxNSt4S1NocDVEbnNqeHphUCtVVk1qTlVnMk1ydVNPamJ0c2tDQ1wvWFk1SkxtSWtDMU9oT3ZqaFpuNU5aVUVicHpYVU56VnlqK01Cb20welJMbkQrcTFWOHFUbzlPK0RGdDRcLzJ1T094MjNjYTVZZmJcL2txRE93cEFUYzlKWWdVWE9cLzFnYnVwTFZ4VUtqMFQ5QlgzZitDQjhyNURpU3p0bktqblBicUxPekNBcWRWM0g0WklSOEc0T0RPVkNBMGZQdEtWV3ZqN3IrcHZDYm9UNjREdnA3U1RZY1Z1dFE3K1RRM2F2eGY0QXc2dGlha0RBUDVpVHdFWE53dzl2eVczVk9VNTJSa1Fzb1J4ZGd0c0RCdktPQ1FWOUQ5Y0krckQ3bFc4NkNJMHliSXlnNGtYU1ZCUHRZWTdCKzA5d1wvdldzWTlpeUdYaEg4eGhITHpRSUthMWpSVlZvZVhwZ3BvamxCTHFSUXJmQ1hQNThYbUNNanZnVGs0b3RDTUFmYkdsYTEzeEtnTXJpZVU0QnJHWDJoUk9sUklzaFFhUkJiNWk0Z2E0cUUwejU4RmF2RnE4Z2U0eEo3VmZ2SmFMTlVacFBvSFlZUmM2N3liVTdhTk5NWU9YS0xtalk3QUN3NWV2UTlPeE5hMmk0aHU4MSt0YjNJQytFczRMa2l6XC9jV0Jxc01QYU0yYXdTXC92RXBxTFNVOVd6SlwvRm9KM21jUHlcL2diRlMyU3REeEl0K1RxSjRuck8xaXlOaWY4NXVzMVBibXpVSEZJWkVZQnFUd2k5TUVJcDUwUEFjTmljTzYyaWFYaFkzZUtkR294d29LUzBUTFF1Y0xxbWtMNFF4ZlZkN2k4YktEUnRGekU3OEdaN2J3TUR4T2FpVHRKaGlqRWNcL2c5dlwvOUVEVmdLNUhBSk1wSGV5UXVoOFJydlczc09HU1EyeXI4SFZZQmJJQWx1cGFIaXhmK1VJNmdoNmwrOElMZXFxSHZtazQreW84RFBlOXFnVDI2bm1tZWl0K01OcU1DSGJEQXdnWW9Hc0ptWFVJbXVXdEpyT2FKUHprTzJ1MkxFSEViZGV4cFpuOWRXK3dUdVR4bmJHZ1VRRGJycFRBME5lWUtaT0JCYjViSWVvcVJ3RXllb2tQZ1VkUWFqVWo0UHQzMUQwWVMwZ05rTTU0Nk1QQUdxTm9rZFNISVYrTG5DWlArNkt5RkZxajdZN1luakRKQVdUaVpnOUhCUExYMEVKRXRRT3QyZTI4cU9TdlBrbWxVZkFLSWZFbXNha3lCZUhFRVpyTmxQOERjbVwvMytCc0JpNnZcL1Nvek9yR2pUWGF2XC9VMzN4OEY5T3VsdUNGRFNWbHZZMnBzNHhMeEdIR21majBOOUJNbEhlK1J4S3dFTnlJamdTeFQyTWlTTlhCUWxnSDF6VmNhWHIzVGpoREY5clB2XC9uZHZjSm1iTHZ1bjFIUUFRait6dUJlUk1WQ1FhdXFoN002YlQ5MVwvQVMzYzJJQ0RFR1czdEtqMFBTQT09IiwibWFjIjoiOGVlZjBmNTVmMzEwNjhkZjVmYTlkYzAwYzllMjJmNjUyZmRmN2U1ODFiZTIzNzRjMDVjMTNiOTNhOWRhMmVkYSJ9")
         
         
         //明杰的账号
         //        requestHeader.add(name: "token", value: "eyJpdiI6InM0a3dcL1hQYUtPOENKOXNJYzRoMHJnPT0iLCJ2YWx1ZSI6Ik12dW9PUWI2SGRIZDF1cGVrREZ0b2tyd3ZLeUJkVXp5am9vRWhhYVVNRnRyT0FNNWdlNW9cL1BpMFBSS1RKd3B6Y2dyaVM0aHV0NXlIcXJkc1MxdG11d3hMZ3RsZHJ4aGNiRnZLZDJ0Q0NSYndUMUNuODRaYW1lQk1KZ0FqTFFVbTZ1TllMTGdtY1dlV0ZkRm5TeW9Vc1FYY09ZMFMrbGo4TmRnZ0syOWRhUFFRbjBjWDFDKzEwQWxLWjExNWJ5R3VxRGNEbWN0K0Z6Z1VieFIrMmdSbTZ6dU9CZGdFcDJlTktPMTY2cHYyeGhKVXpSNVhxT0VTQjRCa05OTE9aalQzWVFPczRpS1lldk16Zk9BUmZYbnRybDVoVXdRZWM3V1BUV3J0NkIxRHBCT3JDd1czQ0Q3YjU4cnVxVE5Lb0ZnbnlmMWN1RU9ocnU1ZE5pUmVDS21CbmhWTDdxTmYrRCtNNHZLQzdNXC9Bb0lRWXdNcE5HNW5ielwvWGtCZmpKNlNHWW9MaE94TXNSOURlemVSSkNkUXVveFJkUHVWbFIyeXNVZFJ3K0pXNElUWVhLSXpvUGNQek1cLzRBc3BaRE1lUVdKSENCS0FJdjFyeUVBSnNXeTZcL0RNajJIeFF0QUdndzBWRllOQ2R5UzZMK3lqdFZTanRxbXhmeGFrRVRJOE95enA1cUl0VzVjUytpVnBkRTFXMm9uQytobG1vWTlRQWhvNGN4THdRSTUyS0tub29xK25VZkNIb1FVOEh6YktGbjgzdjQ0NlA1cVc0aWNqYWp6OElSb3Vlb0ZPWmVzdVRLQW5SejVJa09kUDIrZW5jbmVtTzYyOFwvQnRTV3ExZVFhOWh4XC9BbDUxaHNRSDlIXC96QThkVGlBcEVkOUZCelBIV21WVXZ0OFlQaWtsclFPOXJzOXFoeGc1QXcyeEgwU2NqcWxXb2g4aTJBK2tCZkxoNjBTU1VrNDEwWWxVUW50STcyMFwvQjlCU2lxc3RSRGFOemdJTDN5NGRhN1RLSHVXVlFVRHdWN1dIVGppTVFNZEkzMWU4ckpXZ1lcL3BKRENnZGpuR0ZaTlpBVFowMVRWc1dpOFEzcERUY3RjXC9nUGYrTkxLdkFGSlc3b0dSUWVuQkRVR2tzZVN2UDFEdCtKNnNMMHNQZnJaT0tGV293OHMxXC9WZ1V5Z0dmM1VLeFM5QVdvVGVcL2IrS0Y3M0Zya0tQbXl6ZTNkWm00V1hZUUdiY3p5UVwvZWthUVlkNGV6cVlNaDMwazJNS0FoejlLT3FlZlBzWklnWkRZclhwUmFqTzk1VWF2eHJ1c1pqYzI2eThqOEJVZDZIbUt1dE81VjZoM0xiWm1NOVBrcjlhM1djOUJvb3VLTjJ2VTJvMzd3MHA1cmRuSWxTMGgzclYrUHF0NnFRN1BPSE4rM1ZTWWF5VlBTWE56aTV0U3Y5M0NrcDNBYVFHTTJvOUsyR1Y4S2k3N05CZUFDMk4xUVwvVWZKSUdiMjdmOXIxSXZjSTdvaGhMSHFISk12N2xDdlRrZUloaVBMS0cyMkVrclhcL3loenQ1MTF2V0lORDZyVmZMaytiWVJyMnk4SzhDRktQSFRQR1FoTFpQZHBzUllRbUUza3NaXC9lMXFSSFZud05JTWo1UkVTTXZjZmZucUF3Mzh2OVpkT2QyaVQ2VXRFVHltRW1MQjlzaHh1Ym02YW1LRUphSVNUeEltMWN5WGxRdlgzSE96V0ErbDdldnQ0ZkRjdGxsQVVpRFZCdnlMSnVrSW5aS3BrT3FRbDh0NWR0TWoxdjNMb3ZUVEJwbkVMbzJjeHRibGJJTGlMOHhSU0tNaTk5VHJxSk9xanRIOTMreVVmZm5lXC82SThIXC9iVXFudW9VOVd1S1RNYlwvbzF5b2V0bDVtRWNkalBTdkVVRGFPVlE9PSIsIm1hYyI6IjNkOTZlZDhiOTVlNmUxZmVlMzZmNDIyYmMzYTc4N2Y2ZmE0ZTI3MGI2YjQxZGVkZGRmMTY0N2IyOGZiM2RhNjYifQ==")
         
         //金龙的账号
-        //        requestHeader.add(name: "token", value: "eyJpdiI6IlwvcVM1VkFpcSs3amtVbTB2Mzh0SWl3PT0iLCJ2YWx1ZSI6IisrRVlDN1p4RkFETG56Y2M2Wmo5OVBXbzhseDJcL3NRRWhCTG02UGZ0b1pPODh6M2pqZCtFUVNWcDJmOHE5eFI0K3U5TnZ3cjI1MnkrbDZpUElsNGZ3WEZWNTJ3bGt4NFQ2enBOK2h4bE41NHZWeFBkSEF3bjlHZG44dlRQYXhrQXpvNmpFSWowNDZPcjRUcFFGZDNleWs4NEU1bG5Lb0FuelU3Slg5VjdcL2g1aU93U01wbGdZU2tUbWhYRUdUaUEzWW1pUUNGbjBkS1NaM09LTGxTeDZ0QVB1dEJZaTRjaVhBXC9scXdzS3djZGNUamgwR3NwbWdwMDkzeE90UVV0cnlBTUVxSHZuclZxN1dIdzZueTY0dEJKMERWcTE1NlVNckdLNE9jMHkrbVZqRm14QXp0aVd3bUhwOEdHQklXVzREdUhrNFI4WW0ybVNDTXhqeDdnTlwvVzhrZlwvQW9EelVOSzZGVFZIWlpcL2dNdjVGa1o0ampQWks2dmk4V1JDWjJjbU5vVFwvZjd4NXlUdWp1ZVVYcXdjK0E1MzQyYTd4WHdGRitsQ0NQMjJmNGUyM0piaXJPcTRYNmhqSm9EMmVLZ0RscHpqRlU5WEtYUE9PSTBsM3FBK09jYVdtZHlpWnJSbWtFUXZYdGNCSlZvTUxmTFlLWm9SUURieW5TbWE3RGFHUXlYTkI0OWo5eVVLODVcL0ZXMGxkaHpibm1Fa2Z2ZmZ3N2V0SWQxREZqQ1MyV3JaWjZkc2RHbVRkTmoyTW9oOHdcL1BBRCt2WHo4V0hJdzdiNFlYWlBSTUNIOCtxNXp3dStveks4SGNqR0x6SjBmcThBSXhtSklYT2d4ZEFtck9ibzExazVuXC8wT2NCRW1sXC9kbnRaaTRYV3dPVjVwQlVpOFcwTktDUFkxdkUxZWJnSkxvXC84XC9BRHNhaUttUnZ0c2dhYTF2VXFtQkcwdkFLeHJZR29qQkxtRFhpZW1tK2dOU1hYVGRmRWM4U0xhY3lSRW01bTdJS3ZCdUF6Z051OUNVekNrWjUxN0diZ3R6T3BySytqWktCcmRxcldnOEZLQzMrRTlLWWZSaTU2OTlTVkZoZFErSHRBSldRVW9HSnB3OGR5S0l2V2U0anE5NU9kWVIrNmFBWkc4UnlBVDBwQmxBNjRySzBITzluZnZVNWJJOGQ4MmJPeU1PSklmSkdncXpJQ3BcL1BkaUswZkJZSlVid0UydUxkWEhKcWtkWmV2dml0Rkh4cnQxNENwVDdVb0x0eUFBXC9VMmlPTDI0OVJ4VHpHMEN6RENWa3hORG9RTXhTcDM1M0xHdE5pcWx1dU55YzBHKzZxOWdEYVcreSt3dmdGaG9kaDQrMXhsTTd0ZFl1OTMySlNxNTRxXC9uVzBvR3RrK3AxZGxaZmJma0ZQMkxlRUlwXC83OHE4T2hTMkF0U2wrdXlzalJXaEhXSnNDMEZqWmt6RGNKbFhUblpcL3lyRGxnQW9nanNja1FsYlwvZUpDUmJtWVhsZzIzY3lUSDhudWRvRmp5TkpJbEN5WEZTTFA4OGpoUVVkdHRqcHFsWVZkXC85d1hIUEpGMkZRbHAyeFphWTJud2FZejRCdkFUK0lSTDlicnZiUDFcL3lhMEFPQVFYQTMxdXJla0tpbDdibmkycGxOU05wY1ZjeTZzdTN0NjdLNk9IUHhOYTZnaUR3VW1iVXJEbmJvMmN3WTZYUFllbHd2Y0J2cnVsUzVvVitHMFFxSGFzc2x3K2ErVUpaaFZkbHVqRG5Ua3NzTTNSZTNRdGtwNnFiS2wyRkVTUEJVVjluZ1ZGN3RHT0VWQjR4MVpXNnBFWnU2bHU1Z2dqOUNuMlNwMUljXC9ZZk5EWjhiXC9sdUVnVUhYelJSQVwvK1FXcytPb3ZYMXZrVVBScmN5YU0rNWR3a0pqcm1BPT0iLCJtYWMiOiJhOGM2NjQwNDVjYjNmMjhiZjI5MWU5YTdiODE0MGVkOGQ2YzIzNWVkYjUzYjkwNjU3OTFiN2U5YTliZWQ1NGQ1In0")
+        requestHeader.add(name: "token", value: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTE2MDcwNjQsImkiOjE0NDg0MTczMjc0MjE2LCJ1Ijoi6ZO25rKz6ZuG5ZuiIiwiciI6InN1cGVyX2FwcCJ9.KwTWdaLy5UG4LLs6i-D9ne0RflRTT5v4zvu-66yihDE")
     }
     
     ///  链式语法