|
|
@ -9,13 +9,10 @@
|
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
<list default="true" id="0225a0e2-2a97-4880-9f19-3a2b4b9c3157" name="默认变更列表" comment="">
|
|
|
|
<list default="true" id="d38a1a39-11ab-49f3-ba5c-d4ebbf69bdaf" name="Changes" comment="fixed img_scale;comment delete">
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/bf_dev.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf_dev.properties" afterDir="false" />
|
|
|
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/bf_local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf_local.properties" afterDir="false" />
|
|
|
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/bf_real.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf_real.properties" afterDir="false" />
|
|
|
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" afterDir="false" />
|
|
|
|
</list>
|
|
|
|
</list>
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
@ -31,30 +28,9 @@
|
|
|
|
</option>
|
|
|
|
</option>
|
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="GitToolBoxStore">
|
|
|
|
<component name="HighlightingSettingsPerFile">
|
|
|
|
<option name="recentBranches">
|
|
|
|
<setting file="file://$PROJECT_DIR$/src/main/webapp/META-INF/context.xml" root0="FORCE_HIGHLIGHTING" />
|
|
|
|
<RecentBranches>
|
|
|
|
<setting file="file://$PROJECT_DIR$/src/main/resources/bf.properties" root0="FORCE_HIGHLIGHTING" />
|
|
|
|
<option name="branchesForRepo">
|
|
|
|
|
|
|
|
<list>
|
|
|
|
|
|
|
|
<RecentBranchesForRepo>
|
|
|
|
|
|
|
|
<option name="branches">
|
|
|
|
|
|
|
|
<list>
|
|
|
|
|
|
|
|
<RecentBranch>
|
|
|
|
|
|
|
|
<option name="branchName" value="dev_jason" />
|
|
|
|
|
|
|
|
<option name="lastUsedInstant" value="1676794156" />
|
|
|
|
|
|
|
|
</RecentBranch>
|
|
|
|
|
|
|
|
<RecentBranch>
|
|
|
|
|
|
|
|
<option name="branchName" value="main" />
|
|
|
|
|
|
|
|
<option name="lastUsedInstant" value="1676794155" />
|
|
|
|
|
|
|
|
</RecentBranch>
|
|
|
|
|
|
|
|
</list>
|
|
|
|
|
|
|
|
</option>
|
|
|
|
|
|
|
|
<option name="repositoryRootUrl" value="file://$PROJECT_DIR$" />
|
|
|
|
|
|
|
|
</RecentBranchesForRepo>
|
|
|
|
|
|
|
|
</list>
|
|
|
|
|
|
|
|
</option>
|
|
|
|
|
|
|
|
</RecentBranches>
|
|
|
|
|
|
|
|
</option>
|
|
|
|
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="LogFilters">
|
|
|
|
<component name="LogFilters">
|
|
|
|
<option name="FILTER_ERRORS" value="false" />
|
|
|
|
<option name="FILTER_ERRORS" value="false" />
|
|
|
@ -73,15 +49,12 @@
|
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="PropertiesComponent">
|
|
|
|
<component name="PropertiesComponent">
|
|
|
|
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
|
|
|
|
|
|
|
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
|
|
|
|
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
|
|
|
|
|
<property name="project.structure.last.edited" value="项目" />
|
|
|
|
<property name="project.structure.last.edited" value="项目" />
|
|
|
|
<property name="project.structure.proportion" value="0.17" />
|
|
|
|
<property name="project.structure.proportion" value="0.0" />
|
|
|
|
<property name="project.structure.side.proportion" value="0.50605655" />
|
|
|
|
<property name="project.structure.side.proportion" value="0.50605655" />
|
|
|
|
<property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
|
|
|
|
<property name="settings.editor.selected.configurable" value="editor.preferences.tabs" />
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="RunManager" selected="Smart Tomcat.tomcat8(2)">
|
|
|
|
<component name="RunManager" selected="Smart Tomcat.tomcat8_535">
|
|
|
|
<configuration default="true" type="JetRunConfigurationType">
|
|
|
|
<configuration default="true" type="JetRunConfigurationType">
|
|
|
|
<module name="bf-git" />
|
|
|
|
<module name="bf-git" />
|
|
|
|
<method v="2">
|
|
|
|
<method v="2">
|
|
|
@ -95,13 +68,31 @@
|
|
|
|
<option name="Make" enabled="true" />
|
|
|
|
<option name="Make" enabled="true" />
|
|
|
|
</method>
|
|
|
|
</method>
|
|
|
|
</configuration>
|
|
|
|
</configuration>
|
|
|
|
|
|
|
|
<configuration default="true" type="com.poratu.idea.plugins.tomcat" factoryName="SMART_TOMCAT_FACTORY">
|
|
|
|
|
|
|
|
<option name="adminPort" value="8005" />
|
|
|
|
|
|
|
|
<option name="contextPath" value="" />
|
|
|
|
|
|
|
|
<option name="docBase" value="" />
|
|
|
|
|
|
|
|
<option name="envOptions" />
|
|
|
|
|
|
|
|
<option name="passParentEnvironmentVariables" value="true" />
|
|
|
|
|
|
|
|
<option name="port" value="8080" />
|
|
|
|
|
|
|
|
<option name="tomcatInfo">
|
|
|
|
|
|
|
|
<TomcatInfo>
|
|
|
|
|
|
|
|
<option name="name" value="Apache Tomcat/8.5.85" />
|
|
|
|
|
|
|
|
<option name="number" value="0" />
|
|
|
|
|
|
|
|
<option name="path" value="$PROJECT_DIR$/../tomcat-8.5.85" />
|
|
|
|
|
|
|
|
<option name="version" value="8.5.85.0" />
|
|
|
|
|
|
|
|
</TomcatInfo>
|
|
|
|
|
|
|
|
</option>
|
|
|
|
|
|
|
|
<option name="vmOptions" value="" />
|
|
|
|
|
|
|
|
<method v="2">
|
|
|
|
|
|
|
|
<option name="Make" enabled="true" />
|
|
|
|
|
|
|
|
</method>
|
|
|
|
|
|
|
|
</configuration>
|
|
|
|
<configuration name="tomcat8" type="com.poratu.idea.plugins.tomcat" factoryName="SMART_TOMCAT_FACTORY">
|
|
|
|
<configuration name="tomcat8" type="com.poratu.idea.plugins.tomcat" factoryName="SMART_TOMCAT_FACTORY">
|
|
|
|
<option name="adminPort" value="8005" />
|
|
|
|
<option name="adminPort" value="8005" />
|
|
|
|
<option name="contextPath" value="/bf" />
|
|
|
|
<option name="contextPath" value="/bf" />
|
|
|
|
<option name="docBase" value="$PROJECT_DIR$/src/main/webapp" />
|
|
|
|
<option name="docBase" value="$PROJECT_DIR$/src/main/webapp" />
|
|
|
|
<option name="envOptions">
|
|
|
|
<option name="envOptions" />
|
|
|
|
<map />
|
|
|
|
|
|
|
|
</option>
|
|
|
|
|
|
|
|
<option name="passParentEnvironmentVariables" value="true" />
|
|
|
|
<option name="passParentEnvironmentVariables" value="true" />
|
|
|
|
<option name="port" value="8080" />
|
|
|
|
<option name="port" value="8080" />
|
|
|
|
<option name="tomcatInfo">
|
|
|
|
<option name="tomcatInfo">
|
|
|
@ -112,18 +103,16 @@
|
|
|
|
<option name="version" value="8.5.85.0" />
|
|
|
|
<option name="version" value="8.5.85.0" />
|
|
|
|
</TomcatInfo>
|
|
|
|
</TomcatInfo>
|
|
|
|
</option>
|
|
|
|
</option>
|
|
|
|
<option name="vmOptions" value="-Dfile.encoding=UTF-8" />
|
|
|
|
<option name="vmOptions" value="" />
|
|
|
|
<method v="2">
|
|
|
|
<method v="2">
|
|
|
|
<option name="Make" enabled="true" />
|
|
|
|
<option name="Make" enabled="true" />
|
|
|
|
</method>
|
|
|
|
</method>
|
|
|
|
</configuration>
|
|
|
|
</configuration>
|
|
|
|
<configuration name="tomcat8(2)" type="com.poratu.idea.plugins.tomcat" factoryName="SMART_TOMCAT_FACTORY">
|
|
|
|
<configuration name="tomcat8_535" type="com.poratu.idea.plugins.tomcat" factoryName="SMART_TOMCAT_FACTORY">
|
|
|
|
<option name="adminPort" value="8005" />
|
|
|
|
<option name="adminPort" value="8005" />
|
|
|
|
<option name="contextPath" value="/bf" />
|
|
|
|
<option name="contextPath" value="/bf" />
|
|
|
|
<option name="docBase" value="$PROJECT_DIR$/src/main/webapp" />
|
|
|
|
<option name="docBase" value="$PROJECT_DIR$/src/main/webapp" />
|
|
|
|
<option name="envOptions">
|
|
|
|
<option name="envOptions" />
|
|
|
|
<map />
|
|
|
|
|
|
|
|
</option>
|
|
|
|
|
|
|
|
<option name="passParentEnvironmentVariables" value="true" />
|
|
|
|
<option name="passParentEnvironmentVariables" value="true" />
|
|
|
|
<option name="port" value="8080" />
|
|
|
|
<option name="port" value="8080" />
|
|
|
|
<option name="tomcatInfo">
|
|
|
|
<option name="tomcatInfo">
|
|
|
@ -141,16 +130,16 @@
|
|
|
|
</configuration>
|
|
|
|
</configuration>
|
|
|
|
<list>
|
|
|
|
<list>
|
|
|
|
<item itemvalue="Smart Tomcat.tomcat8" />
|
|
|
|
<item itemvalue="Smart Tomcat.tomcat8" />
|
|
|
|
<item itemvalue="Smart Tomcat.tomcat8(2)" />
|
|
|
|
<item itemvalue="Smart Tomcat.tomcat8_535" />
|
|
|
|
</list>
|
|
|
|
</list>
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
|
|
|
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
|
|
|
<component name="SvnConfiguration">
|
|
|
|
<component name="SvnConfiguration">
|
|
|
|
<configuration>$USER_HOME$/.subversion</configuration>
|
|
|
|
<configuration />
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="TaskManager">
|
|
|
|
<component name="TaskManager">
|
|
|
|
<task active="true" id="Default" summary="Default task">
|
|
|
|
<task active="true" id="Default" summary="Default task">
|
|
|
|
<changelist id="0225a0e2-2a97-4880-9f19-3a2b4b9c3157" name="默认变更列表" comment="" />
|
|
|
|
<changelist id="d38a1a39-11ab-49f3-ba5c-d4ebbf69bdaf" name="Changes" comment="" />
|
|
|
|
<created>1672126962178</created>
|
|
|
|
<created>1672126962178</created>
|
|
|
|
<option name="number" value="Default" />
|
|
|
|
<option name="number" value="Default" />
|
|
|
|
<option name="presentableId" value="Default" />
|
|
|
|
<option name="presentableId" value="Default" />
|
|
|
@ -161,6 +150,21 @@
|
|
|
|
<workItem from="1672925731411" duration="386000" />
|
|
|
|
<workItem from="1672925731411" duration="386000" />
|
|
|
|
<workItem from="1672972791115" duration="12394000" />
|
|
|
|
<workItem from="1672972791115" duration="12394000" />
|
|
|
|
</task>
|
|
|
|
</task>
|
|
|
|
|
|
|
|
<task id="LOCAL-00001" summary="fixed img_scale;comment delete">
|
|
|
|
|
|
|
|
<created>1677397507818</created>
|
|
|
|
|
|
|
|
<option name="number" value="00001" />
|
|
|
|
|
|
|
|
<option name="presentableId" value="LOCAL-00001" />
|
|
|
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
|
|
|
<updated>1677397507819</updated>
|
|
|
|
|
|
|
|
</task>
|
|
|
|
|
|
|
|
<task id="LOCAL-00002" summary="fixed img_scale;comment delete">
|
|
|
|
|
|
|
|
<created>1677598297317</created>
|
|
|
|
|
|
|
|
<option name="number" value="00002" />
|
|
|
|
|
|
|
|
<option name="presentableId" value="LOCAL-00002" />
|
|
|
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
|
|
|
<updated>1677598297318</updated>
|
|
|
|
|
|
|
|
</task>
|
|
|
|
|
|
|
|
<option name="localTasksCounter" value="3" />
|
|
|
|
<servers />
|
|
|
|
<servers />
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
@ -174,10 +178,10 @@
|
|
|
|
<State>
|
|
|
|
<State>
|
|
|
|
<option name="FILTERS">
|
|
|
|
<option name="FILTERS">
|
|
|
|
<map>
|
|
|
|
<map>
|
|
|
|
<entry key="text">
|
|
|
|
<entry key="branch">
|
|
|
|
<value>
|
|
|
|
<value>
|
|
|
|
<list>
|
|
|
|
<list>
|
|
|
|
<option value="wait .... let's me try" />
|
|
|
|
<option value="origin/dev_bert" />
|
|
|
|
</list>
|
|
|
|
</list>
|
|
|
|
</value>
|
|
|
|
</value>
|
|
|
|
</entry>
|
|
|
|
</entry>
|
|
|
@ -188,8 +192,27 @@
|
|
|
|
</entry>
|
|
|
|
</entry>
|
|
|
|
</map>
|
|
|
|
</map>
|
|
|
|
</option>
|
|
|
|
</option>
|
|
|
|
|
|
|
|
<option name="RECENT_FILTERS">
|
|
|
|
|
|
|
|
<map>
|
|
|
|
|
|
|
|
<entry key="Branch">
|
|
|
|
|
|
|
|
<value>
|
|
|
|
|
|
|
|
<list>
|
|
|
|
|
|
|
|
<RecentGroup>
|
|
|
|
|
|
|
|
<option name="FILTER_VALUES">
|
|
|
|
|
|
|
|
<option value="origin/dev_bert" />
|
|
|
|
|
|
|
|
</option>
|
|
|
|
|
|
|
|
</RecentGroup>
|
|
|
|
|
|
|
|
</list>
|
|
|
|
|
|
|
|
</value>
|
|
|
|
|
|
|
|
</entry>
|
|
|
|
|
|
|
|
</map>
|
|
|
|
|
|
|
|
</option>
|
|
|
|
<option name="oldMeFiltersMigrated" value="true" />
|
|
|
|
<option name="oldMeFiltersMigrated" value="true" />
|
|
|
|
</component>
|
|
|
|
</component>
|
|
|
|
|
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
|
|
|
|
|
<MESSAGE value="fixed img_scale;comment delete" />
|
|
|
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="fixed img_scale;comment delete" />
|
|
|
|
|
|
|
|
</component>
|
|
|
|
<component name="XSLT-Support.FileAssociations.UIState">
|
|
|
|
<component name="XSLT-Support.FileAssociations.UIState">
|
|
|
|
<expand />
|
|
|
|
<expand />
|
|
|
|
<select />
|
|
|
|
<select />
|
|
|
|