From 58bf73d05cbdbf0ec048fb91d4135638fa75334c Mon Sep 17 00:00:00 2001
From: pengtao <pengtao@kingsome.cn>
Date: Wed, 23 Oct 2019 16:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AA=E6=80=A7=E5=8C=96?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml            | 125 ++++++++++++++++-----------------
 data_channel/produce_ss_csv.py |  17 +++--
 myops/mpsetting.py             |  27 -------
 3 files changed, 73 insertions(+), 96 deletions(-)
 delete mode 100644 myops/mpsetting.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 030288f..cd19fd7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="a022e480-d0d8-46f9-87f5-141a47fd7773" name="Default Changelist" comment="" />
+    <list default="true" id="a022e480-d0d8-46f9-87f5-141a47fd7773" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data_channel/produce_ss_csv.py" beforeDir="false" afterPath="$PROJECT_DIR$/data_channel/produce_ss_csv.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/myops/mpsetting.py" beforeDir="false" />
+    </list>
     <ignored path=".idea/" />
     <ignored path=".idea/modules.xml" />
     <ignored path=".idea/misc.xml" />
@@ -16,7 +20,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data_channel/gamelog_external.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="190">
+            <state relative-caret-position="-2228">
               <caret line="10" selection-start-line="10" selection-end-line="10" />
               <folding>
                 <element signature="e#70#85#0" expanded="true" />
@@ -25,20 +29,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/myops/mpsetting.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="76">
-              <caret line="4" column="12" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data_channel/mp2shushu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="817">
-              <caret line="43" column="18" selection-start-line="43" selection-start-column="18" selection-end-line="43" selection-end-column="18" />
+            <state relative-caret-position="252">
+              <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
               <folding>
                 <element signature="e#24#39#0" expanded="true" />
               </folding>
@@ -55,11 +50,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/data_channel/produce_ss_csv.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="171">
-              <caret line="9" column="51" selection-start-line="9" selection-start-column="51" selection-end-line="9" selection-end-column="51" />
+            <state relative-caret-position="330">
+              <caret line="31" column="18" selection-start-line="31" selection-start-column="18" selection-end-line="31" selection-end-column="18" />
               <folding>
                 <element signature="e#24#34#0" expanded="true" />
               </folding>
@@ -78,11 +73,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/myops/ss_virtual_create.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1957">
-              <caret line="103" selection-start-line="103" selection-end-line="103" />
+            <state relative-caret-position="324">
+              <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
             </state>
           </provider>
         </entry>
@@ -236,7 +231,7 @@
       <workItem from="1571371398024" duration="626000" />
       <workItem from="1571396636592" duration="1545000" />
       <workItem from="1571812301360" duration="2782000" />
-      <workItem from="1571816131529" duration="1243000" />
+      <workItem from="1571816131529" duration="1765000" />
     </task>
     <task id="LOCAL-00001" summary="gamlog config 更新接口">
       <created>1570865234245</created>
@@ -585,7 +580,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="46608000" />
+    <option name="totallyTimeSpent" value="47130000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
@@ -604,7 +599,7 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49946696" visible="true" weight="0.19206008" />
       <window_info anchor="bottom" id="Database Changes" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50053304" side_tool="true" visible="true" weight="0.19206008" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50053304" side_tool="true" weight="0.19206008" />
       <window_info anchor="bottom" id="Terminal" order="11" />
       <window_info anchor="bottom" id="Python Console" order="12" />
       <window_info anchor="bottom" id="Messages" order="13" />
@@ -680,40 +675,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data_channel/gamelog_external.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="10" selection-start-line="10" selection-end-line="10" />
-          <folding>
-            <element signature="e#70#85#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/myops/mpsetting.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="4" column="12" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/data_channel/mp2shushu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="817">
-          <caret line="43" column="18" selection-start-line="43" selection-start-column="18" selection-end-line="43" selection-end-column="18" />
-          <folding>
-            <element signature="e#24#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/config.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/myops/mansible.py">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -740,22 +701,56 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data_channel/produce_ss_csv.py">
+    <entry file="file://$PROJECT_DIR$/config/config.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="171">
-          <caret line="9" column="51" selection-start-line="9" selection-start-column="51" selection-end-line="9" selection-end-column="51" />
+          <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/myops/mpsetting.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="15" column="23" lean-forward="true" selection-start-line="11" selection-start-column="7" selection-end-line="15" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/myops/ss_virtual_create.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="324">
+          <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/data_channel/mp2shushu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
+          <folding>
+            <element signature="e#24#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/data_channel/gamelog_external.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2228">
+          <caret line="10" selection-start-line="10" selection-end-line="10" />
+          <folding>
+            <element signature="e#70#85#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/data_channel/produce_ss_csv.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="31" column="18" selection-start-line="31" selection-start-column="18" selection-end-line="31" selection-end-column="18" />
           <folding>
             <element signature="e#24#34#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/myops/ss_virtual_create.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1957">
-          <caret line="103" selection-start-line="103" selection-end-line="103" />
-        </state>
-      </provider>
-    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/data_channel/produce_ss_csv.py b/data_channel/produce_ss_csv.py
index 87a9dad..f25aa4f 100644
--- a/data_channel/produce_ss_csv.py
+++ b/data_channel/produce_ss_csv.py
@@ -1,6 +1,17 @@
 # -*- coding: utf-8 -*-
 import pdb
-from myops.mpsetting import Mpdata
+import requests
+
+
+def get_mp_interface(gameid, channelid):
+    base_url = "https://mp.kingsome.cn/api/open/cfg/all?"
+    key = "co-list"
+    url = f"{base_url}channelid={channelid}&gameid={gameid}&key={key}"
+    r = requests.get(url)
+    if r.status_code == requests.codes.ok:
+        return r.json().get('result')
+    else:
+        return None
 
 
 class ProduceSSCsv:
@@ -19,10 +30,8 @@ class ProduceSSCsv:
 
 
     def run(self):
-        mi = Mpdata()
-
         for gameid in self.gameid_list:
-            data = mi.get_co_list(gameid, self.channelid)
+            data = get_mp_interface(gameid, self.channelid)
             self.write2csv(gameid, self.channelid, data)
 
 
diff --git a/myops/mpsetting.py b/myops/mpsetting.py
deleted file mode 100644
index a5b1586..0000000
--- a/myops/mpsetting.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-import requests
-
-
-class Mpdata:
-
-    def __init__(self):
-        self.base_url = "https://mp.kingsome.cn/api/open/cfg/all?"
-
-    def get_data(self, url):
-        import requests
-        r = requests.get(url)
-        if r.status_code == requests.codes.ok:
-            return r.json().get('result')
-        else:
-            return None
-
-
-    def get_co_list(self, gameid, channelid):
-        key = "co-list"
-        url = f"{self.base_url}channelid={channelid}&gameid={gameid}&key={key}"
-        return self.get_data(url)
-
-    def get_fromappid_cn(self, gameid, channelid):
-        key = "fromappid_cn"
-        url = f"{self.base_url}channelid={channelid}&gameid={gameid}&key={key}"
-        return self.get_data(url)