tt

.gitignore

@@ -7,3 +7,5 @@
 /Object/__pycache__
 /Service/__pycache__
 /Object/AWS/__pycache__
+*.log
+*/__pycache__

.idea/workspace.xml

@@ -2,44 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="f832eaab-acfa-4d84-99b0-aa8cb529c6e4" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/Object/TokenObject1.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Ansjer/config.py" beforeDir="false" afterPath="$PROJECT_DIR$/Ansjer/config.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Ansjer/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/Ansjer/settings.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Ansjer/test/util/encryDownLoad.py" beforeDir="false" afterPath="$PROJECT_DIR$/Ansjer/test/util/encryDownLoad.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Ansjer/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/Ansjer/urls.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/AccessLog.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/AccessLog.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/AdminManage.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/AdminManage.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/AppInfo.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/AppInfo.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/CheckUserData.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/CheckUserData.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/DeviceLog.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/DeviceLog.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/DeviceManage.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/DeviceManage.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/DeviceMeal.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/DeviceMeal.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/EquipmentInfo.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/EquipmentInfo.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/EquipmentManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/EquipmentManager.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/EquipmentOTA.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/EquipmentOTA.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/EquipmentSensor.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/EquipmentSensor.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/EquipmentStatus.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/EquipmentStatus.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/FeedBackInfo.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/FeedBackInfo.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/HlsManage.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/HlsManage.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/LogAccess.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/LogAccess.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/LogManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/LogManager.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/MealManage.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/MealManage.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/OTAEquipment.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/OTAEquipment.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/OauthManage.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/OauthManage.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/PermissionManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/PermissionManager.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/StreamMedia.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/StreamMedia.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/SysManage.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/SysManage.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/Test.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/Test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/UserManger.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/UserManger.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Controller/shareUserPermission.py" beforeDir="false" afterPath="$PROJECT_DIR$/Controller/shareUserPermission.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/DB/data.json" beforeDir="false" afterPath="$PROJECT_DIR$/DB/data.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Model/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/Model/models.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Object/AWS/SesClassObject.py" beforeDir="false" afterPath="$PROJECT_DIR$/Object/AWS/SesClassObject.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Service/CommonService.py" beforeDir="false" afterPath="$PROJECT_DIR$/Service/CommonService.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Service/MiscellService.py" beforeDir="false" afterPath="$PROJECT_DIR$/Service/MiscellService.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Service/ModelService.py" beforeDir="false" afterPath="$PROJECT_DIR$/Service/ModelService.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Service/TemplateService.py" beforeDir="false" afterPath="$PROJECT_DIR$/Service/TemplateService.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Service/middleware.py" beforeDir="false" afterPath="$PROJECT_DIR$/Service/middleware.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -77,15 +40,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SyncdbTools.sh" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Ansjer/test/SyncdbTools.sh">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="6" column="26" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="CloudfrontSignCookie.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Object/AWS/CloudfrontSignCookie.py">
           <provider selected="true" editor-type-id="text-editor" />
@@ -108,11 +62,32 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="settings.py" pinned="false" current-in-tab="true">
+      <file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Ansjer/settings.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="72">
-              <caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
+            <state relative-caret-position="360">
+              <caret line="20" column="18" lean-forward="true" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="90">
+                <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="config.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Ansjer/config.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="259">
+              <caret line="36" column="23" selection-start-line="36" selection-start-column="23" selection-end-line="36" selection-end-column="23" />
             </state>
           </provider>
         </entry>
@@ -141,15 +116,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="RedisObject.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Object/RedisObject.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="295">
-              <caret line="51" selection-start-line="51" selection-end-line="51" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -194,6 +160,7 @@
         <option value="$PROJECT_DIR$/Service/CommonService.py" />
         <option value="$PROJECT_DIR$/Controller/UserController.py" />
         <option value="$PROJECT_DIR$/Ansjer/settings.py" />
+        <option value="$PROJECT_DIR$/README.md" />
       </list>
     </option>
   </component>
@@ -225,49 +192,11 @@
               <item name="AnsjerFormal" type="b2602c69:ProjectViewProjectNode" />
               <item name="AnsjerFormal" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="AnsjerFormal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="AnsjerFormal" type="462c0819:PsiDirectoryNode" />
-              <item name="Ansjer" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="AnsjerFormal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="AnsjerFormal" type="462c0819:PsiDirectoryNode" />
-              <item name="Ansjer" type="462c0819:PsiDirectoryNode" />
-              <item name="file" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="AnsjerFormal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="AnsjerFormal" type="462c0819:PsiDirectoryNode" />
-              <item name="Ansjer" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="AnsjerFormal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="AnsjerFormal" type="462c0819:PsiDirectoryNode" />
-              <item name="Controller" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="AnsjerFormal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="AnsjerFormal" type="462c0819:PsiDirectoryNode" />
-              <item name="Model" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="AnsjerFormal" type="b2602c69:ProjectViewProjectNode" />
               <item name="AnsjerFormal" type="462c0819:PsiDirectoryNode" />
               <item name="Object" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="AnsjerFormal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="AnsjerFormal" type="462c0819:PsiDirectoryNode" />
-              <item name="Object" type="462c0819:PsiDirectoryNode" />
-              <item name="AWS" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="AnsjerFormal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="AnsjerFormal" type="462c0819:PsiDirectoryNode" />
-              <item name="Service" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="AnsjerFormal" type="b2602c69:ProjectViewProjectNode" />
               <item name="AnsjerFormal" type="462c0819:PsiDirectoryNode" />
@@ -287,7 +216,11 @@
     <property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\13.56.215.252\AnsjerFormal\Ansjer\test" />
+    </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\13.56.215.252\AnsjerFormal" />
       <recent name="D:\13.56.215.252\AnsjerFormal\Object" />
     </key>
   </component>
@@ -367,6 +300,14 @@
       <option name="presentableId" value="Default" />
       <updated>1536649215311</updated>
     </task>
+    <task id="LOCAL-00001" summary="删除多余文件">
+      <created>1536732933833</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1536732933833</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="ToolWindowManager">
@@ -439,43 +380,16 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="删除多余文件" />
+    <option name="LAST_COMMIT_MESSAGE" value="删除多余文件" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <option name="time" value="5" />
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Controller/PermissionManager.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Controller/UserManger.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="486">
-          <caret line="338" selection-start-line="338" selection-end-line="338" />
-          <folding>
-            <element signature="e#849#2831#0" />
-            <element signature="e#2970#8040#0" />
-            <element signature="e#8082#9236#0" />
-            <element signature="e#9287#11727#0" />
-            <element signature="e#11783#13513#0" />
-            <element signature="e#13555#14381#0" />
-            <element signature="e#14436#15381#0" />
-            <element signature="e#15418#19382#0" />
-            <element signature="e#19424#19455#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Object/ResponseObject.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3492">
-          <caret line="194" column="29" lean-forward="true" selection-start-line="194" selection-start-column="29" selection-end-line="194" selection-end-column="29" />
-          <folding>
-            <element signature="e#0#41#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Model/models.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2718">
@@ -748,13 +662,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Ansjer/config.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="259">
-          <caret line="36" column="23" selection-start-line="36" selection-start-column="23" selection-end-line="36" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Object/AWS/SesClassObject.py">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -849,10 +756,33 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Ansjer/config.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="259">
+          <caret line="36" column="23" selection-start-line="36" selection-start-column="23" selection-end-line="36" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Ansjer/test/testa.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/util/sql.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/Ansjer/settings.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
+        <state relative-caret-position="360">
+          <caret line="20" column="18" lean-forward="true" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="90">
+            <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>

README.md

@@ -1,3 +1,9 @@
+### 软件版本：V1.1.1.218-9-12
+更新内容：
+令牌加密方案使用jwt
+重写response类，redis类
+无用预定义变量，加快交互速度
+
 ### 软件版本：V1.0.3.218-7-23
 更新内容：
     1.增加报警推送信息