|
@@ -1,7 +1,9 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="8ad4baec-f819-4a7c-b135-6a76a7a0c72f" name="Default" comment="" />
|
|
|
+ <list default="true" id="8ad4baec-f819-4a7c-b135-6a76a7a0c72f" name="Default" comment="">
|
|
|
+ <change beforePath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/JiGuangPushUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/JiGuangPushUtil.java" afterDir="false" />
|
|
|
+ </list>
|
|
|
<ignored path="$PROJECT_DIR$/leiSP-admin/target/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
<ignored path="$PROJECT_DIR$/leiSP-system/target/" />
|
|
@@ -19,20 +21,11 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file leaf-file-name="on_off_switch.js" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="47">
|
|
|
- <caret line="67" column="23" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="23" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="demo.js" pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js">
|
|
|
+ <file leaf-file-name="JiGuangPushUtil.java" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/JiGuangPushUtil.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="227">
|
|
|
- <caret line="136" column="13" lean-forward="true" selection-start-line="136" selection-start-column="13" selection-end-line="136" selection-end-column="13" />
|
|
|
+ <state relative-caret-position="180">
|
|
|
+ <caret line="21" column="65" selection-start-line="21" selection-start-column="65" selection-end-line="21" selection-end-column="65" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -135,6 +128,7 @@
|
|
|
<option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java" />
|
|
|
<option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/dahua/service/impl/DaHuaMessageServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js" />
|
|
|
+ <option value="$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/JiGuangPushUtil.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -230,7 +224,8 @@
|
|
|
<item name="mybusiness" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="business" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
@@ -238,8 +233,9 @@
|
|
|
<item name="mybusiness" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="templates" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="business" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="slfh" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
@@ -247,9 +243,10 @@
|
|
|
<item name="mybusiness" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="templates" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="dahua" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="business" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="slfh" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="tools" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
@@ -258,9 +255,6 @@
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="templates" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="dahua" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="lib" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="sz_jian" type="b2602c69:ProjectViewProjectNode" />
|
|
@@ -270,8 +264,6 @@
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="templates" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="dahua" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="module" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
@@ -524,7 +516,7 @@
|
|
|
<workItem from="1665359355827" duration="7320000" />
|
|
|
<workItem from="1665370196293" duration="24127000" />
|
|
|
<workItem from="1665447580649" duration="15844000" />
|
|
|
- <workItem from="1665533158898" duration="14964000" />
|
|
|
+ <workItem from="1665533158898" duration="16356000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="http">
|
|
|
<created>1665216030960</created>
|
|
@@ -624,14 +616,22 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1665556422052</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="15" />
|
|
|
+ <task id="LOCAL-00015" summary="http">
|
|
|
+ <created>1665556716090</created>
|
|
|
+ <option name="number" value="00015" />
|
|
|
+ <option name="presentableId" value="LOCAL-00015" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1665556716090</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="16" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="78112000" />
|
|
|
+ <option name="totallyTimeSpent" value="79504000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
|
+ <editor active="true" />
|
|
|
<layout>
|
|
|
<window_info anchor="right" id="Palette" order="3" />
|
|
|
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
|
|
@@ -650,7 +650,7 @@
|
|
|
<window_info id="Image Layers" order="2" />
|
|
|
<window_info anchor="bottom" id="Java Enterprise" order="7" />
|
|
|
<window_info anchor="right" id="Capture Analysis" order="3" />
|
|
|
- <window_info anchor="bottom" id="Version Control" order="7" visible="true" weight="0.34666666" />
|
|
|
+ <window_info anchor="bottom" id="Version Control" order="7" visible="true" weight="0.29444444" />
|
|
|
<window_info anchor="bottom" id="Run" order="2" weight="0.52666664" />
|
|
|
<window_info anchor="bottom" id="Spring" order="7" />
|
|
|
<window_info anchor="bottom" id="Terminal" order="7" weight="0.44042554" />
|
|
@@ -683,13 +683,6 @@
|
|
|
</breakpoint-manager>
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/leiSP-admin/src/main/resources/application-druid.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="420">
|
|
|
- <caret line="14" column="104" selection-start-line="14" selection-start-column="104" selection-end-line="14" selection-end-column="104" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/leiSP-common/src/main/java/com/sooka/common/core/text/Convert.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="15450">
|
|
@@ -1031,6 +1024,13 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="227">
|
|
|
+ <caret line="136" column="13" lean-forward="true" selection-start-line="136" selection-start-column="13" selection-end-line="136" selection-end-column="13" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/lib/on_off_switch.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="47">
|
|
@@ -1038,10 +1038,10 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/mybusiness/src/main/resources/templates/dahua/module/demo.js">
|
|
|
+ <entry file="file://$PROJECT_DIR$/mybusiness/src/main/java/com/business/slfh/tools/JiGuangPushUtil.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="227">
|
|
|
- <caret line="136" column="13" lean-forward="true" selection-start-line="136" selection-start-column="13" selection-end-line="136" selection-end-column="13" />
|
|
|
+ <state relative-caret-position="180">
|
|
|
+ <caret line="21" column="65" selection-start-line="21" selection-start-column="65" selection-end-line="21" selection-end-column="65" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|