针对更美与alpha两个项目的子任务调整

AutoJira.xcworkspace/xcuserdata/wangyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,7 +10,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "AutoJira/Page.swift"
-            timestampString = "574140957.231858"
+            timestampString = "575300302.606153"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "89"

AutoJira/Page.swift

@@ -37,8 +37,8 @@ class Page: NSObject {
         html = loadHTML()
 
         // 这个逻辑是模仿wiki页面中的javasript中的已有的逻辑
-        if let meta = html?.at_xpath("//meta[@name='confluence-request-time']") {
-            lastFetchTime = meta["content"]!
+        if let meta = html?.at_xpath("//meta[@name='confluence-request-time']"), let time = meta["content"] {
+            lastFetchTime = String(time)
         } else {
             lastFetchTime = String(Int(Date().timeIntervalSince1970 * 1000))
         }

AutoJira/Story.swift

@@ -66,7 +66,7 @@ class Story: NSObject {
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        let bodyString = "{\"pageId\":\"\(pageId)\",\"selectedText\":\"项目背景\",\"index\":0,\"numMatches\":1,\"lastFetchTime\":\(pageLastFetchTime),\"xmlModification\":\"<ac:macro ac:name='jira'><ac:parameter ac:name='showSummary'>false</ac:parameter><ac:parameter ac:name='server'>JIRA</ac:parameter><ac:parameter ac:name='serverId'>54ed5447-b029-3ef0-b638-681b4647313b</ac:parameter><ac:parameter ac:name='key'>\(storyKey)</ac:parameter></ac:macro>\"}"
+        let bodyString = "{\"pageId\":\"\(pageId)\",\"selectedText\":\"项目背景\",\"index\":0,\"numMatches\":2,\"lastFetchTime\":\(pageLastFetchTime),\"xmlModification\":\"<ac:macro ac:name='jira'><ac:parameter ac:name='showSummary'>false</ac:parameter><ac:parameter ac:name='server'>JIRA</ac:parameter><ac:parameter ac:name='serverId'>54ed5447-b029-3ef0-b638-681b4647313b</ac:parameter><ac:parameter ac:name='key'>\(storyKey)</ac:parameter></ac:macro>\"}"
         let data = bodyString.data(using: .utf8)
         request.httpBody = data
 
@@ -170,7 +170,8 @@ class Story: NSObject {
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
         request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
-        let formString = "pid=\(pid)&issuetype=10003&parentIssueId=\(storyId)&atl_token=\(subtask_atl_token)&formToken=\(subtask_formToken)&summary=\(summary)&isCreateIssue=true&assignee=\(assignee)&reporter=wangyang&priority=3&issuelinks=issuelinks&issuelinks-linktype=blocks&isCreateIssue=true&isEditIssue=false&"
+
+        let formString = "pid=\(pid)&issuetype=\(RepeatedWork.jira!.subtask_id)&parentIssueId=\(storyId)&atl_token=\(subtask_atl_token)&formToken=\(subtask_formToken)&summary=\(summary)&isCreateIssue=true&assignee=\(assignee)&reporter=wangyang&priority=3&issuelinks=issuelinks&issuelinks-linktype=blocks&isCreateIssue=true&isEditIssue=false&"
 
         let formData = formString.data(using: .utf8)
         request.httpBody = formData

AutoJira/ViewController.swift

@@ -40,11 +40,21 @@ class JIRA: NSObject {
     var jiraProjectId: String = ""
     var sprints: [Sprint] = []
     var currentSprint: Sprint?
-
+    var subtask_id: String = ""
     convenience init(jiraProjectId: String, sprints: [Sprint]) {
         self.init()
         self.jiraProjectId = jiraProjectId
         self.sprints = sprints
+
+        // like sub task 10302
+        // gengmei sub task 10003
+        if jiraProjectId == "10108" {
+            // 更美
+            subtask_id = "10003"
+        } else {
+            // like
+            subtask_id = "10302"
+        }
     }
 }