springboot init

springboot init

build.gradle

@@ -8,8 +8,8 @@ defaultTasks "clean", "build"
 ext {
 	jackson2Version      = "2.9.8"
 	log4jVersion         = "2.12.0"
-	springVersion        = "5.1.8.RELEASE"
-	springBootVersion    = "2.1.6.RELEASE"
+	springVersion        = "5.1.9.RELEASE"
+	springBootVersion    = "2.1.7.RELEASE"
 	springSecurityVersion= "5.1.5.RELEASE"
 	hibernateVersion	 = "5.4.2.Final"
 	slf4jVersion	 	 = "1.7.26"

maxkey-protocols/maxkey-protocol-authorize/.settings/org.eclipse.jdt.core.prefs

@@ -8,9 +8,20 @@ org.eclipse.jdt.core.circularClasspath=warning
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error

maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore

@@ -0,0 +1,2 @@
+/META-INF/
+/org/

maxkey-protocols/maxkey-protocol-cas/bin/test/.gitignore

@@ -0,0 +1 @@
+/com/

maxkey-protocols/maxkey-protocol-desktop/bin/main/.gitignore

@@ -0,0 +1,2 @@
+/META-INF/
+/org/

maxkey-protocols/maxkey-protocol-extendapi/bin/main/.gitignore

@@ -0,0 +1,2 @@
+/META-INF/
+/org/

maxkey-protocols/maxkey-protocol-formbased/bin/main/.gitignore

@@ -0,0 +1,2 @@
+/META-INF/
+/org/

maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/.gitignore

@@ -1 +1,2 @@
+/META-INF/
 /org/

maxkey-protocols/maxkey-protocol-saml-2.0/bin/main/.gitignore

@@ -0,0 +1,2 @@
+/META-INF/
+/org/

maxkey-protocols/maxkey-protocol-tokenbased/bin/main/.gitignore

@@ -0,0 +1,2 @@
+/META-INF/
+/org/

maxkey-web-manage/.classpath

@@ -12,6 +12,7 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="static"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer">

maxkey-web-manage/.settings/org.eclipse.wst.common.component

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
 	<wb-module deploy-name="maxkey-web-manage">
 		<property name="context-root" value="maxkey-mgt"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
 		<wb-resource deploy-path="/" source-path="src/main/webapp"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/static"/>
 		<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/maxkey-core/maxkey-core">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>

maxkey-web-manage/src/main/resources/static/css/base.css

@@ -0,0 +1,238 @@
+* { padding:0; margin:0; outline:0; }
+body{
+	margin: 0;
+	margin-top: 0px;
+	margin-left: auto;
+	margin-right: auto;
+	padding: 0 0 0 0px;
+	font-size: 14px;
+	text-align:center;
+	float:center;
+	font-family: "Arial", "Helvetica", "Verdana", "sans-serif";
+}
+
+.form_title_bar{
+	width: 100%;
+	height: 36px;
+  	text-align: left;
+  	text-indent: 30px;
+  	background-color: #f8f8f8;
+}
+
+.form_title_bar a {
+  text-decoration: none;
+  display: inline-block;
+  height: 14px;
+  color: #333;
+  font-size: 14px;
+  font-weight: bold;
+  padding: 8px 0;
+  vertical-align: central;
+}
+
+#topBar{
+	text-shadow: 0 1px 0 #fff;
+	border-bottom: 1px solid #e5e5e5;
+	min-width: 100%;
+	align:left;
+	height:60px;
+	margin-bottom: 1px;
+}
+#topNav{
+	border-bottom: 1px solid #e5e5e5;
+}
+
+#navs{
+	border-bottom: 1px solid #e5e5e5;
+}
+
+#nav_primary{
+	background: #414141;
+}
+
+#nav_second{
+	height:35px;
+}
+#nav_third{
+	/*border-top: 1px solid #e5e5e5;*/
+}
+
+.container {
+	width: 990px;
+	margin-left: auto;
+	margin-right: auto;
+	padding: 0 10px
+}
+
+#mainFrame{
+	margin-top: 0px;
+	margin-left: auto;
+	margin-right: auto;
+	display: block;
+	width:990px;
+	align:center;
+}
+
+#footer{
+	text-shadow: 0 1px 0 #fff;
+	border-top: 1px solid #e5e5e5;
+	min-width: 100%;
+	height:80px;
+	
+}
+
+#content{
+	margin-top: 10px;
+	min-height:480px;
+	*height:480px;
+	margin-bottom: 10px;
+}
+
+#tool_box {
+	margin-bottom: 10px;
+	border: 1px solid #e5e5e5;
+}
+
+#tool_box_left {
+	padding-left: 10px;
+	float: left;
+	height:30px;
+	width:50%;
+	text-align: left;
+	border-right: 1px solid #e5e5e5;
+}
+
+#tool_box_right {
+	height:32px;
+	text-align: right;
+	padding-right: 10px;
+	width:484px;
+}
+
+#advanced_search {
+	margin-top: 10px;
+	min-height:30px;
+	*height:40px;
+	border: 1px solid #e5e5e5;
+	margin-bottom: 10px;
+	display: none;
+}
+
+#logout{
+	width: 45px;
+  	background: #c00 ;
+  	color: #fff;
+  	font-weight: bold;	
+}
+
+#manage{
+	width: 50px;
+	background-color: #2AA9A9;
+	font-weight: bold;	
+}
+
+#changepassword{
+	width: 75px;
+	background-color: #f28018;
+	font-weight: bold;	
+}
+
+#manage a,#logout a,#changepassword a{
+	  color: #fff;
+}
+
+.form_radio_label, .form_checkbox_label{
+  display: inline-block;
+  text-align: left;
+  cursor: pointer;
+  margin-right: 1em;
+}
+
+.icon_checkbox {
+  background: url("../images/checkbox.png") 0 -83px no-repeat;
+  width: 16px;
+  height: 16px;
+  vertical-align: middle;
+  display: inline-block;
+  margin-top: -0.2em;
+}
+
+.icon_checkbox_selected{
+  background: url("../images/checkbox.png") 0 -109px no-repeat;
+  width: 16px;
+  height: 16px;
+  vertical-align: middle;
+  display: inline-block;
+  margin-top: -0.2em;
+}
+
+.icon_radiobox {
+  background: url("../images/checkbox.png") 0 -5px no-repeat;
+  width: 16px;
+  height: 16px;
+  vertical-align: middle;
+  display: inline-block;
+  margin-top: -0.2em;
+}
+
+.icon_radiobox_selected{
+  background: url("../images/checkbox.png") 0 -31px no-repeat;
+  width: 16px;
+  height: 16px;
+  vertical-align: middle;
+  display: inline-block;
+  margin-top: -0.2em;
+}
+
+.select-menu-modal{
+	position: absolute;
+	display: none;
+	z-index: 1989;
+	width: 300px;
+	margin-top: 4px;
+	margin-bottom: 20px;
+	overflow: hidden;
+	font-size: 12px;
+	color: #666;
+	background-color: #fff;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,0.15);
+	border-radius: 5px;
+	box-shadow: 0 3px 12px rgba(0,0,0,0.25);
+}
+
+.select-menu-item{
+	cursor: pointer;
+	line-height: 33px;
+	border-bottom: 1px solid #eee;
+	display: table;
+	table-layout: fixed;
+	width: 100%;
+	overflow: hidden;
+	color: inherit;
+	text-align: left;
+}
+.select-menu-item a{
+	text-decoration : none;
+}
+
+
+.select-menu-item a div{
+	width: 140px;
+	line-height: 33px;
+}
+
+
+
+
+.select-menu-item-selected{
+	background-color: #4183c4;
+	color: #fff;
+}
+
+.select-menu-item-selected a{
+	color: #fff;
+}
+
+

maxkey-web-manage/src/main/webapp/css/login.css → maxkey-web-manage/src/main/resources/static/css/login.css

@@ -3,7 +3,12 @@
 	cellspacing:0;
 }
 
+.login_form_table{
+	width:358px;
+	border:0;
+}
 #j_username,#j_password,#tfa_j_username,#tfa_j_password,#currentTime{
+	width	:230px;
 	font-size: 14px;
 	font-weight: bold;
 }
@@ -29,7 +34,7 @@
 }
 
 #j_captchaimg{
-	width:100px;
+	width:70px;
 	height: 33px;
 	vertical-align: top;
 }