|
|
@@ -1,9 +1,7 @@ |
|
|
|
<?xml version="1.0" encoding="UTF-8"?> |
|
|
|
<project version="4"> |
|
|
|
<component name="ChangeListManager"> |
|
|
|
<list default="true" id="a0a18c6e-2fd6-4502-81f5-2b813d5c7375" name="Default Changelist" comment=""> |
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
|
|
|
</list> |
|
|
|
<list default="true" id="a0a18c6e-2fd6-4502-81f5-2b813d5c7375" name="Default Changelist" comment="" /> |
|
|
|
<option name="SHOW_DIALOG" value="false" /> |
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" /> |
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
|
|
@@ -37,11 +35,12 @@ |
|
|
|
</component> |
|
|
|
<component name="Git.Settings"> |
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
|
|
|
<option name="UPDATE_TYPE" value="MERGE" /> |
|
|
|
</component> |
|
|
|
<component name="HighlightingSettingsPerFile"> |
|
|
|
<setting file="file://$PROJECT_DIR$/canyin-common/src/main/java/com/mida/common/config/redis/RedisConfig.java" root0="SKIP_INSPECTION" /> |
|
|
|
<setting file="file://$PROJECT_DIR$/canyin-service/pom.xml" root0="FORCE_HIGHLIGHTING" /> |
|
|
|
<setting file="file://$PROJECT_DIR$/canyin-app/pom.xml" root0="SKIP_INSPECTION" /> |
|
|
|
<setting file="file://$PROJECT_DIR$/canyin-app/pom.xml" root0="SKIP_HIGHLIGHTING" /> |
|
|
|
<setting file="file://$PROJECT_DIR$/canyin-service/src/main/java/com/mida/modules/attachment/service/impl/AttachmentSettingServiceImpl.java" root0="SKIP_INSPECTION" /> |
|
|
|
<setting file="file://$PROJECT_DIR$/canyin-common/pom.xml" root0="FORCE_HIGHLIGHTING" /> |
|
|
|
<setting file="file://$PROJECT_DIR$/canyin-service/src/main/java/com/mida/common/util/attachment/AttachmentUtil.java" root0="SKIP_INSPECTION" /> |
|
|
@@ -155,7 +154,7 @@ |
|
|
|
<path> |
|
|
|
<item name="services root" type="e789fda9:ObjectUtils$Sentinel" /> |
|
|
|
<item name="Spring Boot" type="7427dc5b:ServiceModel$ServiceGroupNode" /> |
|
|
|
<item name="Running" type="7427dc5b:ServiceModel$ServiceGroupNode" /> |
|
|
|
<item name="Finished" type="7427dc5b:ServiceModel$ServiceGroupNode" /> |
|
|
|
</path> |
|
|
|
</expand> |
|
|
|
<select /> |
|
|
@@ -176,7 +175,7 @@ |
|
|
|
<updated>1611978273500</updated> |
|
|
|
<workItem from="1611978275359" duration="2049000" /> |
|
|
|
<workItem from="1611985639822" duration="9113000" /> |
|
|
|
<workItem from="1613961047706" duration="3788000" /> |
|
|
|
<workItem from="1613961047706" duration="4290000" /> |
|
|
|
</task> |
|
|
|
<task id="LOCAL-00001" summary="首次提交"> |
|
|
|
<created>1613968027880</created> |
|
|
@@ -185,7 +184,14 @@ |
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
<updated>1613968027880</updated> |
|
|
|
</task> |
|
|
|
<option name="localTasksCounter" value="2" /> |
|
|
|
<task id="LOCAL-00002" summary="首次提交"> |
|
|
|
<created>1613972603257</created> |
|
|
|
<option name="number" value="00002" /> |
|
|
|
<option name="presentableId" value="LOCAL-00002" /> |
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
<updated>1613972603257</updated> |
|
|
|
</task> |
|
|
|
<option name="localTasksCounter" value="3" /> |
|
|
|
<servers /> |
|
|
|
</component> |
|
|
|
<component name="TypeScriptGeneratedFilesManager"> |
|
|
@@ -204,66 +210,66 @@ |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state x="223" y="67" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824@0.0.1536.824" timestamp="1611990618963" /> |
|
|
|
<state x="288" y="12" key="CommitChangelistDialog2" timestamp="1613972594613"> |
|
|
|
<state x="288" y="12" key="CommitChangelistDialog2" timestamp="1613973108135"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state x="288" y="12" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1613972594613" /> |
|
|
|
<state x="63" y="71" key="DiffContextDialog" timestamp="1613972592228"> |
|
|
|
<state x="288" y="12" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1613973108135" /> |
|
|
|
<state x="63" y="71" key="DiffContextDialog" timestamp="1613973106948"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state x="63" y="71" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1613972592228" /> |
|
|
|
<state x="63" y="71" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1613973106948" /> |
|
|
|
<state x="549" y="153" key="FileChooserDialogImpl" timestamp="1613964467874"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state x="549" y="153" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1613964467874" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.bottom" timestamp="1613972572785"> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.bottom" timestamp="1613972611650"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613972572785" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.center" timestamp="1613972572785"> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613972611650" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.center" timestamp="1613972611650"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1613972572785" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.left" timestamp="1613972572785"> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1613972611650" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.left" timestamp="1613972611650"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1613972572785" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.right" timestamp="1613972572785"> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1613972611650" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.right" timestamp="1613972611650"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1613972572785" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.bottom" timestamp="1613972572785"> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1613972611650" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.bottom" timestamp="1613972611651"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613972572785" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.center" timestamp="1613972572785"> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613972611651" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.center" timestamp="1613972611650"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1613972572785" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.left" timestamp="1613972572785"> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1613972611650" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.left" timestamp="1613972611650"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1613972572785" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.right" timestamp="1613972572785"> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1613972611650" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.right" timestamp="1613972611651"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1613972572785" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.bottom" timestamp="1613972572785"> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1613972611651" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.bottom" timestamp="1613972611651"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613972572785" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.center" timestamp="1613972572785"> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1613972611651" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.center" timestamp="1613972611651"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1613972572785" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.left" timestamp="1613972572785"> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1613972611651" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.left" timestamp="1613972611651"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1613972572785" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.right" timestamp="1613972572785"> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1613972611651" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.right" timestamp="1613972611651"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1613972572785" /> |
|
|
|
<state width="1149" height="400" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1613972611651" /> |
|
|
|
<state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1611988968385"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
@@ -272,10 +278,14 @@ |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state x="249" y="0" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1611987673094" /> |
|
|
|
<state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1613964615220"> |
|
|
|
<state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1613973031487"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1613973031487" /> |
|
|
|
<state x="562" y="329" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1613973111811"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|
<state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1613964615220" /> |
|
|
|
<state x="562" y="329" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1536.824@0.0.1536.824" timestamp="1613973111811" /> |
|
|
|
<state x="447" y="150" width="782" height="590" key="find.popup" timestamp="1611993727670"> |
|
|
|
<screen x="0" y="0" width="1536" height="824" /> |
|
|
|
</state> |
|
|
|