Merge branch 'master' of https://github.com/carolcoral/CommonUtil
# Conflicts: # README.md
This commit is contained in:
parent
efb850f8d6
commit
2defdbfc90
@ -4,7 +4,6 @@
|
||||
<list default="true" id="52b7c556-aac6-402c-b840-5f2564f1f5d7" name="Default" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/target/" />
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
@ -19,9 +18,9 @@
|
||||
<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="140">
|
||||
<caret line="7" column="30" lean-forward="true" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
|
||||
<state split_layout="FIRST">
|
||||
<first_editor relative-caret-position="240">
|
||||
<caret line="12" column="13" lean-forward="true" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
|
||||
<folding>
|
||||
<element signature="e#256#257#0" expanded="true" />
|
||||
<element signature="e#318#319#0" expanded="true" />
|
||||
@ -264,7 +263,7 @@
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1574318981558</updated>
|
||||
<workItem from="1574318985781" duration="4613000" />
|
||||
<workItem from="1574318985781" duration="6057000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="repair some lombok questions">
|
||||
<created>1574320188766</created>
|
||||
@ -280,11 +279,32 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1574321436529</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="3" />
|
||||
<task id="LOCAL-00003" summary="new info for use it">
|
||||
<created>1574323845093</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1574323845093</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00004" summary="download">
|
||||
<created>1574324452589</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1574324452589</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00005" summary="note">
|
||||
<created>1574324574660</created>
|
||||
<option name="number" value="00005" />
|
||||
<option name="presentableId" value="LOCAL-00005" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1574324574660</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="6" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="4613000" />
|
||||
<option name="totallyTimeSpent" value="6057000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
||||
@ -307,11 +327,11 @@
|
||||
<window_info id="Image Layers" />
|
||||
<window_info anchor="bottom" id="Java Enterprise" />
|
||||
<window_info anchor="right" id="Capture Analysis" />
|
||||
<window_info anchor="bottom" id="Version Control" weight="0.3293348" />
|
||||
<window_info active="true" anchor="bottom" id="Version Control" visible="true" weight="0.3293348" />
|
||||
<window_info anchor="bottom" id="Run" order="2" weight="0.519084" />
|
||||
<window_info anchor="bottom" id="Spring" />
|
||||
<window_info anchor="bottom" id="Terminal" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20415778" />
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20415778" />
|
||||
<window_info anchor="right" id="Bean Validation" />
|
||||
<window_info id="Web" side_tool="true" />
|
||||
<window_info anchor="bottom" id="SonarLint" weight="0.3293348" />
|
||||
@ -360,7 +380,11 @@
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="repair some lombok questions" />
|
||||
<MESSAGE value="SonarLint" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="SonarLint" />
|
||||
<MESSAGE value="new info for use it" />
|
||||
<MESSAGE value="download" />
|
||||
<MESSAGE value="note" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="note" />
|
||||
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/site/cnkj/utils/KafkaUtil.java">
|
||||
@ -476,9 +500,9 @@
|
||||
</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="140">
|
||||
<caret line="7" column="30" lean-forward="true" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
|
||||
<state split_layout="FIRST">
|
||||
<first_editor relative-caret-position="240">
|
||||
<caret line="12" column="13" lean-forward="true" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
|
||||
<folding>
|
||||
<element signature="e#256#257#0" expanded="true" />
|
||||
<element signature="e#318#319#0" expanded="true" />
|
||||
|
Loading…
Reference in New Issue
Block a user