From a8fafe9470fda2aaa6166c539311e901272d9c82 Mon Sep 17 00:00:00 2001
From: "Crystal.Sea" <shimingxy@163.com>
Date: Wed, 26 Aug 2020 23:44:12 +0800
Subject: [PATCH] adapter

---
 .../templates/views/apps/appAddCommon.ftl     | 17 +++++
 .../templates/views/apps/appCommonHead.ftl    | 36 +++++++++++
 .../templates/views/apps/appUpdateCommon.ftl  | 34 +++++-----
 .../templates/views/apps/appsExtendAttr.ftl   |  2 +-
 .../templates/views/apps/basic/appAdd.ftl     | 24 +------
 .../templates/views/apps/basic/appUpdate.ftl  | 32 +---------
 .../templates/views/apps/desktop/appAdd.ftl   | 20 ++----
 .../views/apps/desktop/appUpdate.ftl          | 26 +-------
 .../templates/views/apps/extendapi/appAdd.ftl | 21 +------
 .../views/apps/extendapi/appUpdate.ftl        | 25 +-------
 .../templates/views/apps/formbased/appAdd.ftl | 19 +-----
 .../views/apps/formbased/appUpdate.ftl        | 25 +-------
 .../templates/views/apps/oauth20/appAdd.ftl   | 27 +-------
 .../views/apps/oauth20/appUpdate.ftl          | 37 +----------
 .../templates/views/apps/saml20/appAdd.ftl    | 26 +-------
 .../templates/views/apps/saml20/appUpdate.ftl | 51 +++++----------
 .../views/apps/tokenbased/appAdd.ftl          | 52 +---------------
 .../views/apps/tokenbased/appUpdate.ftl       | 62 ++-----------------
 18 files changed, 118 insertions(+), 418 deletions(-)
 create mode 100644 maxkey-web-manage/src/main/resources/templates/views/apps/appCommonHead.ftl

diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl
index 40eb006c..7294b978 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl
@@ -75,5 +75,22 @@
             <input  type="text" class="form-control"  id="description" name="description"  title="" value=""/>
          </td>
       </tr>
+      <tr>
+		<th><@locale code="apps.isAdapter" />：</th>
+		<td>
+			<select  id="isAdapter" name="isAdapter"  class="form-control"  >
+				<option value="0"  selected><@locale code="apps.isAdapter.no" /></option>
+				<option value="1"><@locale code="apps.isAdapter.yes" /></option>
+			</select>
+		</td>
+		<td >
+		</td>
+	</tr>
+	<tr>
+		<th><@locale code="apps.adapter" />：</th>
+		<td colspan =3>
+			<input type="text" class="form-control"   id="adapter" name="adapter"  title="" value=""/>
+		</td>
+	</tr>
    </tbody>
 </table>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appCommonHead.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appCommonHead.ftl
new file mode 100644
index 00000000..1efafa20
--- /dev/null
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appCommonHead.ftl
@@ -0,0 +1,36 @@
+<style   type="text/css">
+  .table th, .table td {
+    padding: .2rem;
+    vertical-align: middle;
+  }
+</style>
+<script type="text/javascript">
+<!--
+$(function(){	
+	$("#algorithm").change(function(){
+		$.post("<@base/>/apps/generate/secret/"+$(this).val(), {_method:"post",currTime:(new Date()).getTime()}, function(data) {
+			$("#algorithmKey").val(data+"");
+			$("#algorithmKey_text").html(data+"");
+			$("#secret").val(data+"");
+			$("#secret_text").html(data+"");
+		});
+	}); 
+	
+	$("#generateSecret").on("click",function(){
+		$.post("<@base/>/apps/generate/secret/"+$("#algorithm").val(), {_method:"post",currTime:(new Date()).getTime()}, function(data) {
+			$("#algorithmKey").val(data+"");
+			$("#algorithmKey_text").html(data+"");
+			$("#secret").val(data+"");
+			$("#secret_text").html(data+"");
+		}); 
+	});
+	
+	$("#iconFileImg").on("click",function(){
+  		if(!$("#iconFileImg").hasClass("appended")){
+  			$("#iconFileImg").after('<input  type="file" id="iconFile" name="iconFile"  title="" value=""/>');
+  			$("#iconFileImg").addClass("appended");
+  		}
+  	});
+});
+//-->
+</script>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl
index ce6a6b9f..10dbd034 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl
@@ -1,15 +1,3 @@
-<script type="text/javascript">
-   <!--
-      $(function(){	
-      	$("#iconFileImg").on("click",function(){
-      		if(!$("#iconFileImg").hasClass("appended")){
-      			$("#iconFileImg").after('<input  type="file" id="iconFile" name="iconFile"  title="" value=""/>');
-      			$("#iconFileImg").addClass("appended");
-      		}
-      	});
-      });
-      //-->
-</script>
 <!--table-->
 <table width="960"   class="table table-bordered" >
    <tbody>
@@ -25,9 +13,8 @@
          </td>
          <th style="width:15%;"><@locale code="apps.secret"/>：</th>
          <td style="width:35%;">
-         	<input id="generateSecret" type="button" class="button" value="<@locale code="button.text.generate"/>"/><br>
-         	<div id="secret_text" style="width:100%;font-weight: bold;">${model.secret!}</div>
-            <input type="hidden" id="secret" name="secret"  title="" value="${model.secret!}"/>
+         	<input type="text" id="secret" readonly style="width:80%;float: left;font-weight: bold;" class="form-control" name="secret"  title="" value="${model.secret!}"/>
+            <input id="generateSecret" type="button"  class="button btn btn-warning mr-2" value="<@locale code="button.text.generate"/>"/>
          </td>
       </tr>
       <tr>
@@ -91,6 +78,23 @@
 	 		    	target="window">
 		 </td>
 	 </tr>
+	 <tr>
+		<th><@locale code="apps.isAdapter" />：</th>
+		<td>
+			<select  id="isAdapter" name="isAdapter"  class="form-control">
+				<option value="0"  <#if 0==model.isAdapter>selected</#if> ><@locale code="apps.isAdapter.no"/></option>
+				<option value="1"  <#if 1==model.isAdapter>selected</#if> ><@locale code="apps.isAdapter.yes"/></option>
+			</select>
+		</td>
+		<td >
+		</td>
+	</tr>
+	<tr>
+		<th><@locale code="apps.adapter" />：</th>
+		<td colspan =3>
+			<input type="text" class="form-control"   id="adapter" name="adapter"  title="" value="${model.adapter!}"/>
+		</td>
+	</tr>
 	 <tr>
          <th><@locale code="common.text.description"/>：</th>
          <td colspan =3>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appsExtendAttr.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appsExtendAttr.ftl
index 6865fbdb..0e4f86bc 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/appsExtendAttr.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appsExtendAttr.ftl
@@ -18,7 +18,7 @@ $(function(){
 		var html =	'<tr  id="extendTr_' + attrIndex + '">';   
 		//Index 
 		html += 		'<th nowrap ><@locale code="apps.extendAttr.parameter"/>：'; 
-		html += 			'<input  class="button delExtendTr"  type="button" name="delExtendTr"  attrTrId="extendTr_'+attrIndex+'" value="<@locale code="button.text.delete" />"/>';
+		html += 			'<input  class="button  btn btn-danger mr-3  delExtendTr"  type="button" name="delExtendTr"  attrTrId="extendTr_'+attrIndex+'" value="<@locale code="button.text.delete" />"/>';
 		html +=			'</th>';  
 		//attribute
 		html +=			'<td>';   
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl
index 9fda5473..0aeff967 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appAdd.ftl
@@ -3,27 +3,7 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
-
-<script type="text/javascript">
-<!--
-$(function(){	
-	$("#algorithm").change(function(){
-		$.post("<s:Base/>/apps/generate/secret/"+$(this).val(), {_method:"post",currTime:(new Date()).getTime()}, function(data) {
-			$("#secret").val(data+"");
-			$("#secret_text").html(data+"");
-			
-		});
-	}); 
-
-});
-//-->
-</script>
+	<#include  "../appCommonHead.ftl"/>
 </head>
 <body>
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
@@ -55,8 +35,6 @@ $(function(){
 				</tr>
 				</tbody>
 				</table>
-			   
-
 			
 </form>
 </body>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl
index 2200458d..04766c09 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/basic/appUpdate.ftl
@@ -3,37 +3,7 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
-
-<script type="text/javascript">
-<!--
-$(function(){	
-
-	$("#algorithm").change(function(){
-		$.post("<@base/>/apps/generate/secret/"+$(this).val(), {_method:"post",currTime:(new Date()).getTime()}, function(data) {
-			$("#algorithmKey").val(data+"");
-			$("#algorithmKey_text").html(data+"");
-			$("#secret").val(data+"");
-			$("#secret_text").html(data+"");
-		});
-	}); 
-	
-	$("#generateSecret").on("click",function(){
-		$.post("<@base/>/apps/generate/secret/"+$("#algorithm").val(), {_method:"post",currTime:(new Date()).getTime()}, function(data) {
-			$("#algorithmKey").val(data+"");
-			$("#algorithmKey_text").html(data+"");
-			$("#secret").val(data+"");
-			$("#secret_text").html(data+"");
-		}); 
-	});
-});
-//-->
-</script>
+	<#include  "../appCommonHead.ftl"/>
 </head>
 <body>
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl
index c041d451..e4b71b16 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl
@@ -3,12 +3,7 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
+	<#include  "../appCommonHead.ftl"/>
 <script type="text/javascript">
 <!--
 $(function(){	
@@ -173,19 +168,12 @@ $(function(){
 						<@locale code="apps.credential.system" />
 						<b class="orange">*</b><label for="credential"></label>
 					</td>
-					<th style="width:15%;"><@locale code="apps.isAdapter" />：</th>
+					<th style="width:15%;"></th>
 					<td style="width:35%;" >
-						<select  id="isAdapter" name="isAdapter" class="form-control" >
-							<option value="0"  selected><@locale code="apps.isAdapter.no" /></option>
-							<option value="1"><@locale code="apps.isAdapter.yes" /></option>
-						</select>
+
 					</td>
 				</tr>
-				<tr>
-					<th><@locale code="apps.adapter" />：</th>
-					<td colspan =3>
-						<input type="text" class="form-control"  id="adapter" name="adapter"  title="" value=""/>
-					</td>
+>
 				</tr>
 				<tr id="systemconfigure"  style="display:none">
 					<th><@locale code="apps.credential" />：</th>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl
index 5348ef0f..181623bf 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl
@@ -3,22 +3,10 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
+	<#include  "../appCommonHead.ftl"/>
 <script type="text/javascript">
 <!--
 $(function(){	
-	$("#generateSecret").on("click",function(){
-		$.post("<@base/>/apps/generate/secret/oauth20", {_method:"post",currTime:(new Date()).getTime()}, function(data) {
-			$("#secret").val(data+"");
-			$("#secret_text").html(data+"");
-		}); 
-	});
-	
  	$("#usernameType").change(function(){
 		if($(this).val()=="SIMULATION"){
 			$(".usernameParameter").hide();
@@ -185,18 +173,8 @@ $(function(){
 						<@locale code="apps.credential.system" />
 						
 					</td>
-					<th style="width:15%;"><@locale code="apps.isAdapter" />：</th>
+					<th style="width:15%;"></th>
 					<td style="width:35%;">
-						<select  id="isAdapter" name="isAdapter" class="form-control">
-							<option value="0"  <#if 0==model.isAdapter>selected</#if> ><@locale code="apps.isAdapter.no" /></option>
-							<option value="1"  <#if 1==model.isAdapter>selected</#if> ><@locale code="apps.isAdapter.yes" /></option>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<th><@locale code="apps.adapter" />：</th>
-					<td colspan =3>
-						<input type="text" class="form-control" id="adapter" name="adapter"  title="" value="${model.adapter}"/>
 					</td>
 				</tr>
 				<tr id="systemconfigure"  <#if 1!=model.credential> style="display:none"</#if> >
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl
index 4c41b2d5..2cdbc3a6 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appAdd.ftl
@@ -3,13 +3,7 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
-
+	<#include  "../appCommonHead.ftl"/>
 <script type="text/javascript">
 <!--
 $(function(){		
@@ -69,18 +63,9 @@ $(function(){
 						<@locale code="apps.credential.system"/>
 						<b class="orange">*</b><label for="credential"></label>
 					</td>
-					<th  style="width:15%;"><@locale code="apps.isAdapter"/>：</th>
+					<th  style="width:15%;"></th>
 					<td  style="width:35%;">
-						<select  class="form-control"  id="isAdapter" name="isAdapter" >
-							<option value="0"  selected><@locale code="apps.isAdapter.no"/></option>
-							<option value="1"><@locale code="apps.isAdapter.yes"/></option>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<th><@locale code="apps.adapter"/>：</th>
-					<td colspan =3>
-						<input  class="form-control" type="text" id="adapter" name="adapter"  title="" value=""/>
+						
 					</td>
 				</tr>
 				<tr id="systemconfigure"  style="display:none">
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl
index 1a3f8463..84d5f2e8 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/extendapi/appUpdate.ftl
@@ -3,21 +3,10 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
+	<#include  "../appCommonHead.ftl"/>
 <script type="text/javascript">
 <!--
 $(function(){	
-	$("#generateSecret").on("click",function(){
-		$.post("<@base/>/apps/generate/secret/oauth20", {_method:"post",currTime:(new Date()).getTime()}, function(data) {
-			$("#secret").val(data+"");
-			$("#secret_text").html(data+"");
-		}); 
-	});
 	
 	$("input[name='credential']").on("click",function(){
 		if($(this).val()=="3"){
@@ -75,18 +64,8 @@ $(function(){
 							<@locale code="apps.credential.system"/>
 						
 					</td>
-					<th style="width:15%;"><@locale code="apps.isAdapter"/>：</th>
+					<th style="width:15%;"></th>
 					<td style="width:35%;" >
-						<select  id="isAdapter" name="isAdapter"  class="form-control" >
-							<option value="0"  <#if  0==model.isAdapter >selected</#if> ><@locale code="apps.isAdapter.no"/></option>
-							<option value="1"  <#if  1==model.isAdapter >selected</#if> ><@locale code="apps.isAdapter.yes"/></option>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<th><@locale code="apps.adapter"/>：</th>
-					<td colspan =3>
-						<input type="text" class="form-control"  id="adapter" name="adapter"  title="" value="${model.adapter}"/>
 					</td>
 				</tr>
 				<tr id="systemconfigure"  <#if  1!=model.credential > style="display:none"</#if> >
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl
index 0120149e..638c53f9 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appAdd.ftl
@@ -3,12 +3,7 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
+	<#include  "../appCommonHead.ftl"/>
 
 <script type="text/javascript">
 <!--
@@ -83,18 +78,8 @@ $(function(){
 						<@locale code="apps.credential.system"/>
 						<b class="orange">*</b><label for="credential"></label>
 					</td>
-					<th><@locale code="apps.isAdapter"/>：</th>
+					<th></th>
 					<td>
-						<select  id="isAdapter" name="isAdapter"  class="form-control" >
-							<option value="0"  selected><@locale code="apps.isAdapter.no"/></option>
-							<option value="1"><@locale code="apps.isAdapter.yes"/></option>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<th><@locale code="apps.adapter"/>：</th>
-					<td colspan =3>
-						<input type="text"  class="form-control"  id="adapter" name="adapter"  title="" value=""/>
 					</td>
 				</tr>
 				<tr>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
index d23be4a2..7270798c 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
@@ -3,21 +3,10 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
+	<#include  "../appCommonHead.ftl"/>
 <script type="text/javascript">
 <!--
 $(function(){	
-	$("#generateSecret").on("click",function(){
-		$.post("<@base/>/apps/generate/secret/oauth20", {_method:"post",currTime:(new Date()).getTime()}, function(data) {
-			$("#secret").val(data+"");
-			$("#secret_text").html(data+"");
-		}); 
-	});
 	
 	$("input[name='credential']").on("click",function(){
 		if($(this).val()=="3"){
@@ -86,18 +75,8 @@ $(function(){
 							<@locale code="apps.credential.system"/>
 						
 					</td>
-					<th><@locale code="apps.isAdapter"/>：</th>
+					<th></th>
 					<td  >
-						<select  id="isAdapter" name="isAdapter"  class="form-control">
-							<option value="0"  <#if 0==model.isAdapter>selected</#if> ><@locale code="apps.isAdapter.no"/></option>
-							<option value="1"  <#if 1==model.isAdapter>selected</#if> ><@locale code="apps.isAdapter.yes"/></option>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<th><@locale code="apps.adapter"/>：</th>
-					<td colspan =3>
-						<input type="text" class="form-control" id="adapter" name="adapter"  title="" value="${model.adapter!}"/>
 					</td>
 				</tr>
 				<tr>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl
index 419fa99c..b9b4c150 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appAdd.ftl
@@ -3,18 +3,7 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
-<script type="text/javascript">
-<!--
-$(function(){	
-});
-//-->
-</script>
+	<#include  "../appCommonHead.ftl"/>
 </head>
 <body>
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
@@ -210,20 +199,8 @@ $(function(){
 								<@locale code="apps.oauth.approvalPrompt.auto" /></option>
 						</select>
 					</td>
-					<th><@locale code="apps.isAdapter" />：</th>
+					<th></th>
 					<td >
-						<select  id="isAdapter" name="isAdapter"  class="form-control" >
-							<option value="0"  selected>
-								<@locale code="apps.isAdapter.no" /></option>
-							<option value="1">
-								<@locale code="apps.isAdapter.yes" /></option>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<th><@locale code="apps.adapter" />：</th>
-					<td colspan =3>
-						<input type="text" class="form-control"  id="adapter" name="adapter"  title="" value=""/>
 					</td>
 				</tr>
 				<tr>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl
index 95536b10..7b873b0a 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/oauth20/appUpdate.ftl
@@ -3,27 +3,7 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
-<script type="text/javascript">
-<!--
-$(function(){	
-
-	$("#generateSecret").on("click",function(){
-		$.post("<@base/>/apps/generate/secret/oauth20", {_method:"post",currTime:(new Date()).getTime()}, function(data) {
-			$("#clientSecret").val(data+"");
-			$("#clientSecret_text").html(data+"");
-			$("#secret").val(data+"");
-			$("#secret_text").html(data+"");
-		}); 
-	});
-});
-//-->
-</script>
+	<#include  "../appCommonHead.ftl"/>
 </head>
 <body>
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
@@ -217,20 +197,9 @@ $(function(){
 								<@locale code="apps.oauth.approvalPrompt.auto" /></option>
 						</select>
 					</td>
-					<th><@locale code="apps.isAdapter" />：</th>
+					<th></th>
 					<td >
-						<select  id="isAdapter" name="isAdapter" class="form-control">
-							<option value="0"  <#if   0==model.isAdapter >selected</#if> >
-								<@locale code="apps.isAdapter.no" /></option>
-							<option value="1"  <#if   1==model.isAdapter >selected</#if> >
-								<@locale code="apps.isAdapter.yes" /></option>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<th><@locale code="apps.adapter" />：</th>
-					<td colspan =3>
-						<input type="text" class="form-control" id="adapter" name="adapter"  title="" value="${model.adapter!}"/>
+
 					</td>
 				</tr>
 				</tbody>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl
index f669556f..58abe417 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appAdd.ftl
@@ -3,19 +3,7 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
-<script type="text/javascript">
-<!--
-$(function(){	
-	
-});
-//-->
-</script>
+	<#include  "../appCommonHead.ftl"/>
 </head>
 <body>
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
@@ -175,18 +163,8 @@ $(function(){
 								<@locale code="apps.saml.encrypted.yes" /></option>
 						</select>
 					</td>
-					<th><@locale code="apps.isAdapter" />：</th>
+					<th></th>
 					<td>
-						<select  id="isAdapter" name="isAdapter"  class="form-control"  >
-							<option value="0"  selected><@locale code="apps.isAdapter.no" /></option>
-							<option value="1"><@locale code="apps.isAdapter.yes" /></option>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<th><@locale code="apps.adapter" />：</th>
-					<td colspan =3>
-						<input type="text" class="form-control"   id="adapter" name="adapter"  title="" value=""/>
 					</td>
 				</tr>
 				<tr>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl
index 3222a0d5..1c3f1f29 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/saml20/appUpdate.ftl
@@ -3,32 +3,20 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
-<script type="text/javascript">
-<!--
-$(function(){	
-	$("#generateSecret").on("click",function(){
-		$.post("<@base/>/apps/generate/secret/oauth20", {_method:"post",currTime:(new Date()).getTime()}, function(data) {
-			$("#secret").val(data+"");
-			$("#secret_text").html(data+"");
-		}); 
+	<#include  "../appCommonHead.ftl"/>
+	<script type="text/javascript">
+	<!--
+	$(function(){	
+		$("#certMetaFileImg").on("click",function(){
+			if(!$("#certMetaFileImg").hasClass("appended")){
+				$("#certMetaFileImg").after('<input id="certMetaFile" type="file" name="certMetaFile" />');
+				$("#certMetaFileImg").addClass("appended");
+			}
+			
+		});
 	});
-	
-	$("#certMetaFileImg").on("click",function(){
-		if(!$("#certMetaFileImg").hasClass("appended")){
-			$("#certMetaFileImg").after('<input id="certMetaFile" type="file" name="certMetaFile" />');
-			$("#certMetaFileImg").addClass("appended");
-		}
-		
-	});
-});
-//-->
-</script>
+	//-->
+	</script>
 </head>
 <body>
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
@@ -183,18 +171,9 @@ $(function(){
 								<@locale code="apps.saml.encrypted.yes" /></option>
 						</select>
 					</td>
-					<th><@locale code="apps.isAdapter" />：</th>
+					<th></th>
 					<td >
-						<select  id="isAdapter" name="isAdapter"  class="form-control" >
-							<option value="0"  <#if 0==model.isAdapter>selected</#if> ><@locale code="apps.isAdapter.no" /></option>
-							<option value="1"  <#if 1==model.isAdapter>selected</#if> ><@locale code="apps.isAdapter.yes" /></option>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<th><@locale code="apps.adapter" />：</th>
-					<td colspan =3>
-						<input type="text" class="form-control"  id="adapter" name="adapter"  title="" value="${model.adapter}"/>
+						
 					</td>
 				</tr>
 				<tr>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl
index 79a8e610..1605666f 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appAdd.ftl
@@ -3,33 +3,7 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
-
-<script type="text/javascript">
-<!--
-$(function(){	
-	$("#algorithm").change(function(){
-		$.post("<@base/>/apps/generate/secret/"+$(this).val(), {_method:"post",currTime:(new Date()).getTime()}, function(data) {
-			$("#algorithmKey").val(data+"");
-			$("#algorithmKey_text").html(data+"");
-			$("#secret").val(data+"");
-			$("#secret_text").html(data+"");
-			
-		});
-	}); 
-	
-	$("#selectAdapter").change(function(){
-		$("#adapter").val($("#selectAdapter").val());
-	}); 
-
-});
-//-->
-</script>
+	<#include  "../appCommonHead.ftl"/>
 </head>
 <body>
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
@@ -111,30 +85,8 @@ $(function(){
 								<td>
 									<input type="text" class="form-control" id="expires" name="expires"  title="" value="1"  required="" />
 								</td>
-								<th><@locale code="apps.isAdapter" />：</th>
+								<th></th>
 								<td >
-									<select  id="isAdapter" name="isAdapter"  class="form-control">
-										<option value="0"  selected><@locale code="apps.isAdapter.no" /></option>
-										<option value="1"><@locale code="apps.isAdapter.yes" /></option>
-									</select>
-								</td>
-							</tr>
-							<tr>
-								<th><@locale code="apps.adapter" />：</th>
-								<td colspan =3>
-									<select id="selectAdapter" name="selectAdapter"   class="form-control">
-										<option value="">No Adapter</option>
-										<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedDefaultAdapter" <#if "org.maxkey.authz.token.endpoint.adapter.TokenBasedDefaultAdapter"==model.adapter!>selected</#if>>DefaultAdapter</option>
-										<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedSimpleAdapter"  <#if  "org.maxkey.authz.token.endpoint.adapter.TokenBasedSimpleAdapter"==model.adapter!>selected</#if> >SimpleAdapter</option>
-										<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTAdapter" 	<#if  "org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTAdapter"==model.adapter!>selected</#if>>JWTAdapter</option>
-										<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTHS256Adapter" <#if  "org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTHS256Adapter"==model.adapter!>selected</#if>>JWTHS256Adapter</option>
-									</select>
-								</td>
-							</tr>
-							<tr>
-								<th><@locale code="apps.adapter" />：</th>
-								<td colspan =3>
-									<input type="text"  class="form-control" id="adapter" name="adapter"  title="" value=""/>
 								</td>
 							</tr>
 							<tr>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl
index 77f31635..ec83e9a8 100644
--- a/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl
+++ b/maxkey-web-manage/src/main/resources/templates/views/apps/tokenbased/appUpdate.ftl
@@ -3,40 +3,7 @@
 <head>
 	<#include  "../../layout/header.ftl"/>
 	<#include  "../../layout/common.cssjs.ftl"/>
-<style   type="text/css">
-  .table th, .table td {
-    padding: .2rem;
-    vertical-align: middle;
-  }
-</style>
-<script type="text/javascript">
-<!--
-$(function(){	
-
-	$("#algorithm").change(function(){
-		$.post("<@base/>/apps/generate/secret/"+$(this).val(), {_method:"post",currTime:(new Date()).getTime()}, function(data) {
-			$("#algorithmKey").val(data+"");
-			$("#algorithmKey_text").html(data+"");
-			$("#secret").val(data+"");
-			$("#secret_text").html(data+"");
-		});
-	}); 
-	
-	$("#selectAdapter").change(function(){
-		$("#adapter").val($("#selectAdapter").val());
-	}); 
-	
-	$("#generateSecret").on("click",function(){
-		$.post("<@base/>/apps/generate/secret/"+$("#algorithm").val(), {_method:"post",currTime:(new Date()).getTime()}, function(data) {
-			$("#algorithmKey").val(data+"");
-			$("#algorithmKey_text").html(data+"");
-			$("#secret").val(data+"");
-			$("#secret_text").html(data+"");
-		}); 
-	});
-});
-//-->
-</script>
+	<#include  "../appCommonHead.ftl"/>
 </head>
 <body>
 <form id="actionForm_app"  method="post" type="label" autoclose="true"  
@@ -76,7 +43,7 @@ $(function(){
 									<th ><@locale code="apps.tokenbased.cookieName" />：</th>
 									<td >
 										<input type="text" class="form-control" id="cookieName" name="cookieName"  title="" value="${model.cookieName!}"/>
-										<b class="orange">*</b><label for="cookieName"></label>
+										
 									</td>
 								</tr>
 								<tr>
@@ -120,32 +87,11 @@ $(function(){
 									<td>
 										<input type="text" class="form-control" id="expires" name="expires"  title="" value="${model.expires}"  required="" />
 									</td>
-									<th><@locale code="apps.isAdapter" />：</th>
+									<th></th>
 									<td>
-										<select  id="isAdapter" name="isAdapter" class="form-control">
-											<option value="0"  <#if 0==model.isAdapter>selected</#if> ><@locale code="apps.isAdapter.no" /></option>
-											<option value="1"  <#if 1==model.isAdapter>selected</#if> ><@locale code="apps.isAdapter.yes" /></option>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th><@locale code="apps.adapter" />：</th>
-									<td colspan =3>
-										<select id="selectAdapter" name="selectAdapter"  class="form-control">
-											<option value="">No Adapter</option>
-											<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedDefaultAdapter" <#if 'org.maxkey.authz.token.endpoint.adapter.TokenBasedDefaultAdapter'==model.adapter!false>selected</#if>>DefaultAdapter</option>
-											<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedSimpleAdapter"  <#if 'org.maxkey.authz.token.endpoint.adapter.TokenBasedSimpleAdapter'==model.adapter!>selected</#if> >SimpleAdapter</option>
-											<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTAdapter" <#if 'org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTAdapter'==model.adapter!>selected</#if>>JWTAdapter</option>
-											<option value="org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTHS256Adapter" <#if 'org.maxkey.authz.token.endpoint.adapter.TokenBasedJWTHS256Adapter'==model.adapter!>selected</#if>>JWTHS256Adapter</option>
-										</select>
-									</td>
-								</tr>
-								<tr>
-									<th><@locale code="apps.adapter" />：</th>
-									<td colspan =3>
-										<input type="text" class="form-control" id="adapter" name="adapter"  title="" value="${model.adapter!}"/>
 									</td>
 								</tr>
+								
 								<tr>
 									<td colspan =4>
 							    		<input class="button btn btn-primary mr-3"  id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>