diff --git a/.metadata/.plugins/com.genuitec.eclipse.devstyle/recent.json b/.metadata/.plugins/com.genuitec.eclipse.devstyle/recent.json index 43d8fa83..f0d057d9 100644 --- a/.metadata/.plugins/com.genuitec.eclipse.devstyle/recent.json +++ b/.metadata/.plugins/com.genuitec.eclipse.devstyle/recent.json @@ -1 +1 @@ -{"lastUsed":1553177969489,"path":"E:\/workspace\/ConnSec\/IAM\/MaxKey","projectCount":0} \ No newline at end of file +{"lastUsed":1577372119129,"path":"D:\/JavaIDE\/Workspaces\/maxkey\/MaxKey","projectCount":0} \ No newline at end of file diff --git a/.metadata/.plugins/com.genuitec.eclipse.monitor/myeclipse-usage.properties b/.metadata/.plugins/com.genuitec.eclipse.monitor/myeclipse-usage.properties index a8acc182..cd15db14 100644 --- a/.metadata/.plugins/com.genuitec.eclipse.monitor/myeclipse-usage.properties +++ b/.metadata/.plugins/com.genuitec.eclipse.monitor/myeclipse-usage.properties @@ -1,46 +1,47 @@ #MyEclipse Usage Data -#Thu Mar 21 22:20:03 GMT+08:00 2019 +#Thu Dec 26 22:55:20 CST 2019 bundle/com.genuitec.eclipse.theming.css=-1 misc/ws=win32 misc/core_version= -misc/timestamp=2019-3-21 14\:20\:03 +misc/timestamp=2019-12-26 14\:55\:20 bundle/com.genuitec.eclipse.theming.base.win=-1 bundle/com.genuitec.eclipse.news=-1 misc/productType/devstyle=1 misc/arch=x86_64 misc/eclipseVersion/4.10.0.I20181206-0815=1 -bundle/com.genuitec.eclipse.inlinesearch=1 -bundle/com.genuitec.eclipsecolortheme.api=3 +bundle/com.genuitec.eclipse.inlinesearch=-1 +bundle/com.genuitec.eclipsecolortheme.api=1 misc/installmode/standalone=0 -bundle/com.genuitec.eclipse.startup=1 +bundle/com.genuitec.eclipse.startup=-1 view/org.eclipse.ui.internal.introview=1 -misc/workspace_hash=1855252173 -bundle/com.genuitec.eclipse.core.common.platform=3 +misc/workspace_hash=-1304913758 +bundle/com.genuitec.eclipse.core.common.platform=1 +bundle/com.genuitec.eclipse.theming.elevation.win32=-1 devstyle/state/workbenchColor/Dark_Gray=1 -bundle/com.genuitec.eclipse.monitor=1 -bundle/com.genuitec.eclipse.ui.common.platform=3 -misc/count=3 +bundle/com.genuitec.eclipse.monitor=-1 +bundle/com.genuitec.eclipse.theming.icon.designer=-1 +bundle/com.genuitec.eclipse.ui.common.platform=1 +misc/count=1 devstyle/state/inlinesearch=1 +misc/eclipseVersion/4.14.0.I20191210-0610=1 devstyle/state/editorColor/Darkest_Dark=1 bundle/com.genuitec.eclipse.theming.scrollbar=1 misc/locale=zh_CN bundle/com.genuitec.eclipse.theming.scrollbar.win=-1 misc/os=win32 bundle/com.genuitec.eclipse.theming.base=1 -bundle/com.genuitec.eclipse.meexplorer.jdt=1 +bundle/com.genuitec.eclipse.meexplorer.jdt=-1 devstyle/state/enabled=1 +misc/period=7425 view/org.eclipse.ui.views.ContentOutline=1 -misc/period=199367 -perspective/org.eclipse.jst.j2ee.J2EEPerspective=2 bundle/com.genuitec.eclipse.theming.epl=-1 devstyle/state/iconsColor/primary=1 -bundle/com.genuitec.eclipse.theming.core=1 misc/product/org.eclipse.epp.package.jee.product=1 -bundle/com.genuitec.eclipse.webclipse.evergreen=1 -bundle/com.genuitec.eclipse.theming.ui=1 -bundle/com.genuitec.eclipse.meexplorer=1 -view/org.eclipse.ui.navigator.ProjectExplorer=1 +bundle/com.genuitec.eclipse.theming.core=1 +bundle/com.genuitec.eclipse.meexplorer=-1 +bundle/com.genuitec.eclipse.theming.ui=-1 +bundle/com.genuitec.eclipse.webclipse.evergreen=-1 misc/installmode/stable=0 -bundle/com.genuitec.eclipse.patches=3 -bundle/com.genuitec.eclipse.startup.workspace=1 -bundle/com.genuitec.eclipse.webicons=3 +bundle/com.genuitec.eclipse.startup.workspace=-1 +bundle/com.genuitec.eclipse.patches=1 +bundle/com.genuitec.eclipse.webicons=1 diff --git a/.metadata/.plugins/com.genuitec.eclipse.ui.common.platform/color-definitions-fix.css b/.metadata/.plugins/com.genuitec.eclipse.ui.common.platform/color-definitions-fix.css index dd76ee0a..980b76c1 100644 --- a/.metadata/.plugins/com.genuitec.eclipse.ui.common.platform/color-definitions-fix.css +++ b/.metadata/.plugins/com.genuitec.eclipse.ui.common.platform/color-definitions-fix.css @@ -2159,6 +2159,16 @@ IEclipsePreferences#org-eclipse-ui-workbench { 'org.eclipse.egit.ui.IgnoredResourceForegroundColor=157,167,175' 'org.eclipse.egit.ui.UncommittedChangeBackgroundColor=25,29,31' 'org.eclipse.egit.ui.UncommittedChangeForegroundColor=216,220,223' + 'org.eclipse.emf.codegen.ui.jet.commentBackground=2,3,3' + 'org.eclipse.emf.codegen.ui.jet.commentForeground=255,0,255' + 'org.eclipse.emf.codegen.ui.jet.contentBackground=7,8,8' + 'org.eclipse.emf.codegen.ui.jet.contentForeground=255,255,255' + 'org.eclipse.emf.codegen.ui.jet.directiveBackground=2,3,3' + 'org.eclipse.emf.codegen.ui.jet.directiveForeground=255,185,185' + 'org.eclipse.emf.codegen.ui.jet.expressionBackground=3,4,4' + 'org.eclipse.emf.codegen.ui.jet.expressionForeground=152,152,255' + 'org.eclipse.emf.codegen.ui.jet.scriptletBackground=2,3,3' + 'org.eclipse.emf.codegen.ui.jet.scriptletForeground=235,237,239' 'org.eclipse.jdt.ui.ColoredLabels.inherited=143,143,191' 'org.eclipse.jdt.ui.ColoredLabels.writeaccess_highlight=52,46,35' 'org.eclipse.jdt.ui.Javadoc.backgroundColor=48,54,59' @@ -2233,6 +2243,7 @@ IEclipsePreferences#org-eclipse-ui-workbench { 'org.eclipse.ui.editors.foregroundColor=255,255,255' 'org.eclipse.ui.editors.lineNumberRulerColor=120,135,145' 'org.eclipse.ui.editors.printMarginColor=62,70,76' + 'org.eclipse.ui.showkeys.backgroundColor=182,190,195' 'org.eclipse.wst.jsdt.ui.ColoredLabels.counter=0,208,255' 'org.eclipse.wst.jsdt.ui.ColoredLabels.decorations=181,152,86' 'org.eclipse.wst.jsdt.ui.abstractMethodInvocationHighlighting=255,255,255' @@ -2282,49 +2293,10 @@ IEclipsePreferences#org-eclipse-ui-workbench { 'org.eclipse.wst.jsdt.ui.typeArgumentHighlighting=255,255,0' 'org.eclipse.wst.jsdt.ui.typeParameterHighlighting=247,173,123' 'org.eclipse.wst.jsdt.ui.typeVariableDeclarationHighlighting=247,173,123' - 'org.jkiss.dbeaver.erd.diagram.attributes.background=55,62,67' - 'org.jkiss.dbeaver.erd.diagram.attributes.foreground=255,255,255' - 'org.jkiss.dbeaver.erd.diagram.background=11,13,14' - 'org.jkiss.dbeaver.erd.diagram.entity.association.background=55,62,67' - 'org.jkiss.dbeaver.erd.diagram.entity.name.foreground=255,255,255' - 'org.jkiss.dbeaver.erd.diagram.entity.primary.background=124,62,31' - 'org.jkiss.dbeaver.erd.diagram.entity.regular.background=0,0,0' - 'org.jkiss.dbeaver.erd.diagram.lines.foreground=0,169,245' - 'org.jkiss.dbeaver.erd.diagram.notes.background=55,62,67' - 'org.jkiss.dbeaver.erd.diagram.notes.foreground=255,255,255' - 'org.jkiss.dbeaver.sql.editor.color.command.foreground=255,255,255' - 'org.jkiss.dbeaver.sql.editor.color.comment.foreground=199,221,12' - 'org.jkiss.dbeaver.sql.editor.color.datatype.foreground=210,82,82' - 'org.jkiss.dbeaver.sql.editor.color.delimiter.foreground=255,255,255' - 'org.jkiss.dbeaver.sql.editor.color.disabled.background=25,29,31' - 'org.jkiss.dbeaver.sql.editor.color.keyword.foreground=141,203,226' - 'org.jkiss.dbeaver.sql.editor.color.number.foreground=127,179,71' - 'org.jkiss.dbeaver.sql.editor.color.parameter.foreground=121,171,255' - 'org.jkiss.dbeaver.sql.editor.color.string.foreground=255,198,0' - 'org.jkiss.dbeaver.sql.editor.color.text.background=25,29,31' - 'org.jkiss.dbeaver.sql.editor.color.text.foreground=216,216,216' - 'org.jkiss.dbeaver.sql.resultset.color.binary.foreground=239,192,144' - 'org.jkiss.dbeaver.sql.resultset.color.boolean.foreground=239,192,144' - 'org.jkiss.dbeaver.sql.resultset.color.cell.deleted.background=135,0,0' - 'org.jkiss.dbeaver.sql.resultset.color.cell.error.background=124,0,0' - 'org.jkiss.dbeaver.sql.resultset.color.cell.matched.background=134,66,18' - 'org.jkiss.dbeaver.sql.resultset.color.cell.modified.background=203,65,0' - 'org.jkiss.dbeaver.sql.resultset.color.cell.new.background=0,111,0' - 'org.jkiss.dbeaver.sql.resultset.color.cell.odd.background=11,13,14' - 'org.jkiss.dbeaver.sql.resultset.color.cell.readonly.background=55,62,67' - 'org.jkiss.dbeaver.sql.resultset.color.datetime.foreground=239,192,144' - 'org.jkiss.dbeaver.sql.resultset.color.header.background=103,117,126' - 'org.jkiss.dbeaver.sql.resultset.color.header.foreground=255,255,255' - 'org.jkiss.dbeaver.sql.resultset.color.header.selected.background=101,101,145' - 'org.jkiss.dbeaver.sql.resultset.color.lines.normal=55,62,67' - 'org.jkiss.dbeaver.sql.resultset.color.lines.selected=90,101,109' - 'org.jkiss.dbeaver.sql.resultset.color.null.foreground=87,99,107' - 'org.jkiss.dbeaver.sql.resultset.color.numeric.foreground=127,179,71' - 'org.jkiss.dbeaver.sql.resultset.color.preview.background=7,8,8' - 'org.jkiss.dbeaver.sql.resultset.color.string.foreground=255,198,0' - 'org.jkiss.dbeaver.txn.color.committed.background=37,50,37' - 'org.jkiss.dbeaver.txn.color.reverted.background=197,76,54' - 'org.jkiss.dbeaver.txn.color.transaction.background=36,32,26' + 'org.springframework.ide.eclipse.boot.dash.AltTextDecorColor=173,216,230' + 'org.springframework.ide.eclipse.boot.dash.MutedTextDecorColor=205,210,214' + 'org.springframework.ide.eclipse.boot.dash.TextDecorColor=144,238,144' + 'org.springframework.tooling.ls.eclipse.commons.STS4BootMarkerIndicationColor=54,81,25' 'piBorder=0,254,254' 'tagAttributeName=255,0,255' 'tagAttributeValue=212,0,255' diff --git a/.metadata/.plugins/com.genuitec.eclipse.ui.common.platform/colors-org.eclipse.buildship.ui-1231266899.css b/.metadata/.plugins/com.genuitec.eclipse.ui.common.platform/colors-org.eclipse.buildship.ui-1231266899.css index d24bf2e8..6b9b791e 100644 --- a/.metadata/.plugins/com.genuitec.eclipse.ui.common.platform/colors-org.eclipse.buildship.ui-1231266899.css +++ b/.metadata/.plugins/com.genuitec.eclipse.ui.common.platform/colors-org.eclipse.buildship.ui-1231266899.css @@ -1,4 +1,4 @@ -GradleProjectSettingsComposite, GradleDistributionGroup, GradleUserHomeGroup { +GradleProjectSettingsComposite, GradleDistributionGroup, AdvancedOptionsGroup { background-color:#49535a; color:#ebedef; } diff --git a/.metadata/.plugins/com.genuitec.eclipse.ui.common.platform/splash-fix.css b/.metadata/.plugins/com.genuitec.eclipse.ui.common.platform/splash-fix.css index 72bad56f..ddfa46ff 100644 --- a/.metadata/.plugins/com.genuitec.eclipse.ui.common.platform/splash-fix.css +++ b/.metadata/.plugins/com.genuitec.eclipse.ui.common.platform/splash-fix.css @@ -1,5 +1,5 @@ #org-eclipse-ui-splash-progressText { - color: #c1bc1f; + color: #ffffff; } #org-eclipse-ui-splash-progressPart { diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index index 73feb1c5..ed9b5149 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index and b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree b/.metadata/.plugins/org.eclipse.core.resources/.root/3.tree similarity index 100% rename from .metadata/.plugins/org.eclipse.core.resources/.root/2.tree rename to .metadata/.plugins/org.eclipse.core.resources/.root/3.tree diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index f103ad2e..9ef88fd0 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.genuitec.eclipse.monitor.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.genuitec.eclipse.monitor.prefs index 7a177124..aeb98da1 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.genuitec.eclipse.monitor.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.genuitec.eclipse.monitor.prefs @@ -1,2 +1,2 @@ eclipse.preferences.version=1 -last.upload.time=1551788171357 +last.upload.time=1577372112826 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.genuitec.eclipse.theming.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.genuitec.eclipse.theming.ui.prefs index a3804936..3b981f8f 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.genuitec.eclipse.theming.ui.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.genuitec.eclipse.theming.ui.prefs @@ -1,10 +1,11 @@ applyBackground=false approved.defs.file.last.changed.time=1540329737000 -configurationInstallLocation=/C\:/eclipse/jee-2018-12/eclipse/ +configurationInstallLocation=/D\:/JavaIDE/eclipse-jee-2019-12/ eclipse.preferences.version=1 +elearning.dont.show.until=1578408851549 iconcolormode=primary last.download.attempt.time=1551788196373 -lastConfiguration=1553177910681 +lastConfiguration=1577371928158 newinstall=false showWelcomeDialog=false workbench.theme=Dark Gray diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.mpc.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.mpc.ui.prefs new file mode 100644 index 00000000..824488cd --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.mpc.ui.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +native-borders=false +overriddenByCSS=,native-borders, diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs index 10f6067a..27e8c258 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs @@ -2,7 +2,7 @@ content_assist_favorite_static_members=org.assertj.core.api.Assertions.*;org.moc eclipse.preferences.version=1 org.eclipse.jdt.internal.ui.navigator.layout=2 org.eclipse.jdt.internal.ui.navigator.librariesnode=true -org.eclipse.jdt.ui.formatterprofiles.version=15 +org.eclipse.jdt.ui.formatterprofiles.version=18 org.eclipse.jdt.ui.text.code_templates_migrated=true org.eclipse.jdt.ui.text.custom_code_templates= spelling_locale_initialized=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs new file mode 100644 index 00000000..eeb6630a --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs @@ -0,0 +1,2 @@ +activeuserprofiles=I97BIVG4JZDY7X5;Team +eclipse.preferences.version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs index a6f5bcda..0c3f8e90 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs @@ -1,3 +1,4 @@ +AbstractTextEditor.Color.Background=28,31,34 AbstractTextEditor.Color.Background.SystemDefault=false AbstractTextEditor.Color.SelectionBackground.SystemDefault=false AbstractTextEditor.Color.SelectionForeground.SystemDefault=false diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs index dd74e3d0..1b0cfe8c 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs @@ -1,5 +1,5 @@ PROBLEMS_FILTERS_MIGRATE=true eclipse.preferences.version=1 -platformState=1551180553617 +platformState=1577371337872 quickStart=false tipsAndTricks=true diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index d42d2443..183ca983 100644 --- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -79,6 +79,7 @@ persp.showIn:org.eclipse.eclemma.ui.CoverageView persp.newWizSC:org.eclipse.jpt.jpa.ui.wizard.newJpaProject persp.perspSC:org.eclipse.jpt.ui.jpaPerspective + persp.actionSet:org.eclipse.text.quicksearch.actionSet @@ -191,6 +192,7 @@ + View categoryTag:General @@ -346,7 +348,7 @@ Draggable - + toolbarSeparator @@ -359,6 +361,9 @@ toolbarSeparator + + Draggable + Draggable @@ -380,7 +385,7 @@ Draggable - + toolbarSeparator @@ -408,7 +413,7 @@ stretch - + Draggable @@ -557,9 +562,7 @@ - - @@ -590,14 +593,12 @@ - - @@ -611,26 +612,20 @@ - - - - - - @@ -653,20 +648,13 @@ - - platform:win32 - - - platform:win32 - - @@ -737,6 +725,7 @@ + @@ -792,36 +781,9 @@ - - - platform:win32 - - - - - - platform:win32 - - - - - - - - - - - - - - - - - - - - - + + + @@ -843,40 +805,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -942,6 +873,7 @@ + @@ -970,13 +902,7 @@ - - - - - - - + @@ -995,14 +921,7 @@ - - - - - - - - + @@ -1034,7 +953,7 @@ - + @@ -1137,6 +1056,24 @@ + + + + + + + + + + + + + + + + + + @@ -1190,6 +1127,7 @@ + @@ -1210,7 +1148,9 @@ - + + + @@ -1277,8 +1217,11 @@ + + Editor + removeOnHide @@ -1401,7 +1344,7 @@ View categoryTag:General - + View @@ -1545,7 +1488,7 @@ View categoryTag:Oomph - + View @@ -1669,7 +1612,7 @@ View categoryTag:General - + View @@ -1687,7 +1630,7 @@ View categoryTag:General - + View @@ -1831,48 +1774,17 @@ View categoryTag:Other - - - + + + View - categoryTag:数据库 + categoryTag:Plug-in Development - - - + + + View - categoryTag:数据库 - NoRestore - - - - - View - categoryTag:数据库 - - - - - View - categoryTag:数据库 - - - - - View - categoryTag:数据库 - - - - - View - categoryTag:数据库 - - - - - View - categoryTag:数据库 + categoryTag:DevStyle @@ -1975,7 +1887,7 @@ - + @@ -2086,7 +1998,7 @@ - + @@ -2226,7 +2138,7 @@ - + @@ -2284,7 +2196,7 @@ - + @@ -2294,7 +2206,7 @@ - + @@ -2553,7 +2465,7 @@ - + @@ -2629,14 +2541,14 @@ - + - + @@ -3028,7 +2940,7 @@ - + @@ -3383,6 +3295,23 @@ + + + + + + + + + + + + + + + + + @@ -3394,7 +3323,7 @@ - + @@ -3463,4 +3392,8 @@ + + + + diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.14.0.20191209-1925.xml b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.14.0.20191209-1925.xml new file mode 100644 index 00000000..e33758c3 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.14.0.20191209-1925.xml @@ -0,0 +1,43 @@ + + + + %date [%thread] %-5level %logger{35} - %msg%n + + + OFF + + + + + ${org.eclipse.m2e.log.dir}/0.log + + ${org.eclipse.m2e.log.dir}/%i.log + 1 + 10 + + + 100MB + + + %date [%thread] %-5level %logger{35} - %msg%n + + + + + + WARN + + + + + + + + + + + + + + + diff --git a/.metadata/.lock b/.metadata/defender.check similarity index 100% rename from .metadata/.lock rename to .metadata/defender.check diff --git a/.metadata/version.ini b/.metadata/version.ini index 39b6151c..9c25fe0d 100644 --- a/.metadata/version.ini +++ b/.metadata/version.ini @@ -1,3 +1,3 @@ -#Thu Mar 21 22:18:29 GMT+08:00 2019 +#Thu Dec 26 22:53:50 CST 2019 org.eclipse.core.runtime=2 -org.eclipse.platform=4.10.0.v20181206-0815 +org.eclipse.platform=4.14.0.v20191210-0610 diff --git a/maxkey-client-sdk/.project b/maxkey-client-sdk/.project index 59e13e30..ef7f802b 100644 --- a/maxkey-client-sdk/.project +++ b/maxkey-client-sdk/.project @@ -25,6 +25,11 @@ + + org.springframework.ide.eclipse.boot.validation.springbootbuilder + + + org.eclipse.jdt.core.javanature diff --git a/maxkey-core/src/main/java/org/maxkey/config/ApplicationConfig.java b/maxkey-core/src/main/java/org/maxkey/config/ApplicationConfig.java index a947dadf..5696c377 100644 --- a/maxkey-core/src/main/java/org/maxkey/config/ApplicationConfig.java +++ b/maxkey-core/src/main/java/org/maxkey/config/ApplicationConfig.java @@ -38,7 +38,7 @@ public class ApplicationConfig { @Value("${config.server.domain}") String domainName; - @Value("${config.server.subdomain}") + @Value("${config.server.domain.sub}") String subDomainName; @Value("${config.server.name}") @@ -151,6 +151,7 @@ public class ApplicationConfig { String []domainSubStrings=domainName.split("\\."); if(domainSubStrings.length>=3){ this.subDomainName=domainSubStrings[domainSubStrings.length-2]+"."+domainSubStrings[domainSubStrings.length-1]; + _logger.debug("subDomainName "+subDomainName); }else{ this.subDomainName=domainName; } diff --git a/maxkey-jose-jwt/.project b/maxkey-jose-jwt/.project index c435a63c..151088db 100644 --- a/maxkey-jose-jwt/.project +++ b/maxkey-jose-jwt/.project @@ -25,6 +25,11 @@ + + org.springframework.ide.eclipse.boot.validation.springbootbuilder + + + org.eclipse.jdt.core.javanature diff --git a/maxkey-protocols/.project b/maxkey-protocols/.project index 6711488a..ac5db984 100644 --- a/maxkey-protocols/.project +++ b/maxkey-protocols/.project @@ -15,6 +15,11 @@ + + org.springframework.ide.eclipse.boot.validation.springbootbuilder + + + org.eclipse.jdt.core.javanature diff --git a/maxkey-web-manage/src/main/resources/config/applicationConfig.properties b/maxkey-web-manage/src/main/resources/config/applicationConfig.properties index 4e5e9dcc..234dbce2 100644 --- a/maxkey-web-manage/src/main/resources/config/applicationConfig.properties +++ b/maxkey-web-manage/src/main/resources/config/applicationConfig.properties @@ -2,9 +2,9 @@ # MaxKey Management ############################################################################ # domain name configuration -config.server.subdomain=maxkey.org -config.server.domain=sso.${config.server.subdomain} -config.server.name=http://${config.server.domain} +config.server.domain=maxkey.org +config.server.domain.sub=sso.${config.server.domain} +config.server.name=http://${config.server.domain.sub} config.server.prefix.uri=${config.server.name}:9521/maxkey-mgt #default.uri config.server.default.uri=${config.server.prefix.uri}/main @@ -54,14 +54,6 @@ config.login.socialAuth=true config.login.msad.kerberos=false # End Login ############################################################################ - - -############################################################################ -# domain name configuration -config.domain.name=sso.maxkey.org -config.server.name=http://${config.domain.name} -config.server.prefix=${config.server.name}/manage -############################################################################ # EMAIL configuration config.email.username=test@maxkey.org diff --git a/maxkey-web-manage/src/main/resources/config/applicationLogin.properties b/maxkey-web-manage/src/main/resources/config/applicationLogin.properties index bf10f09f..ef286271 100644 --- a/maxkey-web-manage/src/main/resources/config/applicationLogin.properties +++ b/maxkey-web-manage/src/main/resources/config/applicationLogin.properties @@ -81,8 +81,8 @@ config.support.wsfederation.logoutUrl=https://adfs.connsec.com/adfs/ls/?wa=wsign ############################################################################# ############################################################################# -config.oidc.metadata.issuer=${config.server.name}/maxkey -config.oidc.metadata.authorizationEndpoint=${config.server.maxkey.uri}/oauth/v20/authorize -config.oidc.metadata.tokenEndpoint=${config.server.maxkey.uri}/oauth/v20/token -config.oidc.metadata.userinfoEndpoint=${config.server.maxkey.uri}/api/connect/userinfo +config.oidc.metadata.issuer=http://${config.server.name}/maxkey +config.oidc.metadata.authorizationEndpoint=http://${config.server.name}/maxkey/oauth/v20/authorize +config.oidc.metadata.tokenEndpoint=http://${config.server.name}/maxkey/oauth/v20/token +config.oidc.metadata.userinfoEndpoint=http://${config.server.name}/maxkey/api/connect/userinfo ############################################################################# diff --git a/maxkey-web-maxkey/src/main/resources/config/applicationConfig.properties b/maxkey-web-maxkey/src/main/resources/config/applicationConfig.properties index c7546e43..88f62820 100644 --- a/maxkey-web-maxkey/src/main/resources/config/applicationConfig.properties +++ b/maxkey-web-maxkey/src/main/resources/config/applicationConfig.properties @@ -2,13 +2,14 @@ # MaxKey ############################################################################ # domain name configuration -config.server.subdomain=maxkey.org -config.server.domain=sso.${config.server.subdomain} -config.server.name=http://${config.server.domain} +config.server.domain=maxkey.org +config.server.domain.sub=sso.${config.server.domain} +config.server.name=http://${config.server.domain.sub} config.server.prefix.uri=${config.server.name}/maxkey #default.uri -config.server.default.uri=${config.server.prefix.uri}/main +config.server.default.uri=${config.server.prefix.uri}/maxkey/appList config.server.manage.uri=${config.server.name}:9521/maxkey-mgt/login + ############################################################################ # DataBase configuration ############################################################################ diff --git a/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties b/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties index 241295bc..9e6af77d 100644 --- a/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties +++ b/maxkey-web-maxkey/src/main/resources/config/applicationLogin.properties @@ -71,8 +71,8 @@ config.support.wsfederation.logoutUrl=https://adfs.connsec.com/adfs/ls/?wa=wsign ############################################################################# ############################################################################# -config.oidc.metadata.issuer=${config.server.prefix.uri} -config.oidc.metadata.authorizationEndpoint=${config.server.prefix.uri}/oauth/v20/authorize -config.oidc.metadata.tokenEndpoint=${config.server.prefix.uri}/oauth/v20/token -config.oidc.metadata.userinfoEndpoint=${config.server.prefix.uri}/api/connect/userinfo +config.oidc.metadata.issuer=http://${config.server.name}/maxkey +config.oidc.metadata.authorizationEndpoint=http://${config.server.name}/maxkey/oauth/v20/authorize +config.oidc.metadata.tokenEndpoint=http://${config.server.name}/maxkey/oauth/v20/token +config.oidc.metadata.userinfoEndpoint=http://${config.server.name}/maxkey/api/connect/userinfo ############################################################################# diff --git a/maxkey-web-maxkey/src/main/resources/spring/maxkey-persistence.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-persistence.xml index 93bddd73..92175846 100644 --- a/maxkey-web-maxkey/src/main/resources/spring/maxkey-persistence.xml +++ b/maxkey-web-maxkey/src/main/resources/spring/maxkey-persistence.xml @@ -1,21 +1,19 @@ - + + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util.xsd + http://www.springframework.org/schema/mvc + http://www.springframework.org/schema/mvc/spring-mvc.xsd">