IU-2021.1 <Administrator@E_Z7_CT7NT Merge branch 'master'

Conflicts:
	pluginAdvertiser.xml
This commit is contained in:
Eee 2021-05-17 10:04:21 +08:00
commit cdc6f1b1f6
10 changed files with 4 additions and 1909 deletions

View File

@ -1,5 +0,0 @@
<application>
<component name="KeymapManager">
<active_keymap name="Windows Proper Redo" />
</component>
</application>

View File

@ -1,5 +1,5 @@
<application>
<component name="LafManager">
<component name="LafManager" autodetect="false">
<laf class-name="com.intellij.ide.ui.laf.darcula.DarculaLaf" />
</component>
</application>

View File

@ -1,6 +1,6 @@
<application>
<component name="PathMacrosImpl">
<macro name="MAVEN_REPOSITORY" value="D:\JavaSpace\maven\repository" />
<macro name="KOTLIN_BUNDLED" value="C:\Users\Administrator\AppData\Roaming\JetBrains\IntelliJIdea2021.1\plugins\Kotlin\kotlinc" />
<macro name="KOTLIN_BUNDLED" value="S:\JavaSpace\Intellij IDEA\IntelliJ IDEA 2021.1.1\plugins\Kotlin\kotlinc" />
</component>
</application>

View File

@ -1,123 +1,3 @@
<application>
<component name="LocalDatabaseDriverManager" version="163">
<driver id="cassandra">
<artifact name="Cassandra" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="clickhouse">
<artifact name="ClickHouse" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="db2">
<artifact name="DB2" use="true" />
<option name="auto-sync" value="false" />
</driver>
<driver id="db2.jtopen">
<artifact name="JTOpen (DB2 iSeries)" use="true" />
<option name="auto-sync" value="false" />
</driver>
<driver id="derby.embedded">
<artifact name="Apache Derby" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="derby.remote">
<artifact name="Apache Derby" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="exasol">
<artifact name="Exasol" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="greenplum">
<artifact name="PostgreSQL" use="true" />
<option name="auto-sync" value="true" />
<option name="schema-control" value="MANUAL" />
<option name="send-app-info" value="false" />
</driver>
<driver id="h2.unified">
<artifact name="H2" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="hive">
<artifact name="Hive" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="hsqldb.local">
<artifact name="HSQLDB" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="hsqldb.remote">
<artifact name="HSQLDB" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="mariadb">
<artifact name="MariaDB Connector J" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="mongo">
<artifact name="MongoDB" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="sqlserver.ms">
<artifact name="SQL Server" use="true" />
<option name="auto-sync" value="true" />
<option name="send-app-info" value="false" />
</driver>
<driver id="sqlserver.jtds">
<artifact name="jTDS (SQL Server and Sybase)" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="azure.ms">
<artifact name="SQL Server" use="true" />
<option name="auto-sync" value="true" />
<option name="send-app-info" value="false" />
</driver>
<driver id="mysql.8" driver-class="com.mysql.jdbc.Driver">
<artifact name="MySQL Connector/J" rolling="false" use="true" version="5.1.46" />
<option name="auto-sync" value="true" />
<option name="auto-commit" value="true" />
<option name="format-sources-on-sync" value="true" />
<option name="send-app-info" value="true" />
<option name="source-loading" value="USER_SOURCES" />
<option name="schema-control" value="AUTOMATIC" />
</driver>
<driver id="mysql">
<artifact name="MySQL Connector/J" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="oracle">
<artifact name="Oracle" use="true" />
<option name="auto-sync" value="true" />
<option name="auto-commit" value="false" />
</driver>
<driver id="postgresql">
<artifact name="PostgreSQL" use="true" />
<option name="auto-sync" value="true" />
<option name="schema-control" value="MANUAL" />
</driver>
<driver id="redshift">
<artifact name="Redshift" use="true" />
<option name="auto-sync" value="true" />
<option name="schema-control" value="MANUAL" />
</driver>
<driver id="snowflake">
<artifact name="Snowflake" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="sqlite.xerial">
<artifact name="Xerial SQLiteJDBC" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="sybase.jtds">
<artifact name="jTDS (SQL Server and Sybase)" use="true" />
<option name="auto-sync" value="true" />
</driver>
<driver id="sybase.ase">
<option name="auto-sync" value="true" />
</driver>
<driver id="vertica">
<artifact name="Vertica" use="true" />
<option name="auto-sync" value="true" />
</driver>
</component>
<component name="LocalDatabaseDriverManager" version="201" />
</application>

File diff suppressed because it is too large Load Diff

View File

@ -1,21 +1,10 @@
<application>
<component name="CodeInsightSettings">
<option name="selectAutopopupSuggestionsByChars" value="true" />
<option name="PARAMETER_INFO_DELAY" value="100" />
<option name="AUTO_POPUP_JAVADOC_INFO" value="true" />
<option name="JAVADOC_INFO_DELAY" value="100" />
<option name="SELECT_AUTOPOPUP_SUGGESTIONS_BY_CHARS" value="true" />
<option name="ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY" value="true" />
</component>
<component name="DaemonCodeAnalyzerSettings">
<option name="NEXT_ERROR_ACTION_GOES_TO_ERRORS_FIRST" value="false" />
</component>
<component name="DefaultFont">
<option name="FONT_SIZE" value="18" />
</component>
<component name="EditorSettings">
<option name="USE_SOFT_WRAPS" value="CONSOLE:PREVIEW" />
</component>
<component name="SqlCodeCompletionSettings" AUTO_ALIAS_TABLE="true" INVERT_ON_ORDER="true">
<option name="autoAliasTable" value="true" />
<option name="invertOrderInOnClause" value="true" />

View File

@ -1,13 +1,9 @@
<application>
<component name="FileTypeManager" version="18">
<ignoreFiles list="*.iml;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.idea;.svn;CVS;__pycache__;_svn;jars;target;vssver.scc;vssver2.scc;" />
<extensionMap>
<mapping ext="space.kts" type="Kotlin" />
<mapping ext="gradle.kts" type="Kotlin" />
<mapping ext="main.kts" type="Kotlin" />
<removed_mapping ext="apk" approved="true" type="ARCHIVE" />
<removed_mapping ext="psd" approved="true" type="Image" />
<removed_mapping pattern=".iml" approved="true" type="GitIgnore file" />
</extensionMap>
</component>
</application>

View File

@ -1,9 +0,0 @@
<application>
<component name="GeneralSettings">
<option name="autoSaveIfInactive" value="true" />
<option name="inactiveTimeout" value="10" />
</component>
<component name="Registry">
<entry key="compiler.automake.allow.when.app.running" value="true" />
</component>
</application>

View File

@ -1,17 +0,0 @@
<application>
<component name="LightEdit">
<option name="supportedFilePatterns">
<list>
<option value="*.conf" />
<option value="*.ini" />
<option value="*.json" />
<option value="*.log" />
<option value="*.md" />
<option value="*.sh" />
<option value="*.txt" />
<option value="*.xml" />
<option value="*.yml" />
</list>
</option>
</component>
</application>

View File

@ -1,468 +0,0 @@
<application>
<component name="TemplateSettings">
<option name="deletedKeys">
<list>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_if" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_elif" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_select" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_case" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_for" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_while" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_until" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_function" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_string equal" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_string not equal" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_string is empty" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_string not empty" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_number equal" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_number not equal" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_number less" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_number less or equal" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_number greater" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_number greater or equal" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_file exists" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_file not empty" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_file readable" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_file writable" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_file executable" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_file equals" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_file newer" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_file older" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_path exists" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_directory exists" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Shell Script Hidden" />
<option name="key" value="shell_command exists" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="jsf" />
<option name="key" value="tldTag" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="jsf" />
<option name="key" value="tldFunction" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="jsf" />
<option name="key" value="uicomponent" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="jsf" />
<option name="key" value="jsfconverter" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="jsf" />
<option name="key" value="navrule" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="jsf" />
<option name="key" value="refbean" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="jsf" />
<option name="key" value="renderkit" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="jsf" />
<option name="key" value="jsfvalidator" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="jsf" />
<option name="key" value="propertybean" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="jsf" />
<option name="key" value="mapentriesbean" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="jsf" />
<option name="key" value="listentriesbean" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="sb" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="sbf" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="sbfb" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="aop" />
<option name="key" value="aopautoproxycreator" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="aop" />
<option name="key" value="aopautoproxy" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="hibernatefactory" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="datasource" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="hibernatetm" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="transactionmanager" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="jndids" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="jdopmf" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="jdopmfproxy" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="jdotm" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="jpoxpmf" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="toplinklsf" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="toplinktasa" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="toplinktm" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="ibatisfactory" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="jpaemfb" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="jpacemf" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="jpapum" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="jpapabpp" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="jpapetpp" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="jpatm" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="intscheduler" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="crontrigger" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="scedulerfactorybean" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="simpletrigger" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="jdkscheduledtimertask" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="jdktimerfactorybean" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="ejblssb" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="ejbrssb" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="freemarker" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="placeholder" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="propertyoverrideconfigurer" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="resourcefb" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="commonslogfb" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="fieldretrfactory" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="listfactory" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="mapfactory" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="proprsfactory" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="setfactory" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring webflow" />
<option name="key" value="webflowregistry" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring webflow" />
<option name="key" value="webflowexecutor" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring webflow" />
<option name="key" value="webflowbuildersevices" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring webflow" />
<option name="key" value="conversationservice" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring webflow" />
<option name="key" value="expressionparser" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring webflow" />
<option name="key" value="factorycreator" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring webflow" />
<option name="key" value="webflowexelistener" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Spring Dynamic Modules" />
<option name="key" value="osgisimpleservice" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Spring Dynamic Modules" />
<option name="key" value="osgimultiservice" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Spring Dynamic Modules" />
<option name="key" value="osgisimpleref" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Spring Dynamic Modules" />
<option name="key" value="osgimultiref" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Spring Dynamic Modules" />
<option name="key" value="osgibeannameref" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Spring Dynamic Modules" />
<option name="key" value="osgirefwithlistener" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Spring Dynamic Modules" />
<option name="key" value="osgisimplelist" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Spring Dynamic Modules" />
<option name="key" value="osgisimpleset" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Spring Dynamic Modules" />
<option name="key" value="osgilistwithcomp" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="Spring Dynamic Modules" />
<option name="key" value="osgisetwithcomparator" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="payloadEndpoint" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="payloadMapping" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="mapBasedEndpointMapping" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="annotationEndpointMapping" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="simpleWsdlDefinition" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="wsdlDefinitionWithSchema" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="wsdlDefinitionWithSchemaCollection" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="xsdSchema" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="commonsXsdSchemaCollection" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="messageFactory" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="soapMessageDispatcher" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="messageListenerContainer" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="messageListener" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="connectionFactory" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="mailMessageReceiver" />
</TemplateKey>
<TemplateKey>
<option name="groupName" value="spring" />
<option name="key" value="httpServerFactoryBean" />
</TemplateKey>
</list>
</option>
</component>
</application>