Api doc

maxkey-core/src/main/java/org/maxkey/constants/ConstantsProtocols.java

@@ -24,8 +24,6 @@ package org.maxkey.constants;
  */
 public final class ConstantsProtocols {
 
-    public static final String DESKTOP = "Desktop";
-
     public static final String BASIC = "Basic";
 
     public static final String EXTEND_API = "Extend_API";

maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/maxkey/authz/endpoint/AuthorizeEndpoint.java

@@ -41,14 +41,14 @@ import io.swagger.annotations.ApiOperation;
  * @author Crystal.Sea
  *
  */
-@Api(tags = "总认证地址文档模块")
+@Api(tags = "认证总地址文档模块")
 @Controller
 public class AuthorizeEndpoint extends AuthorizeBaseEndpoint{
 	@Autowired
 	AppsCasDetailsService casDetailsService;
 	
 	//all single sign on url
-	@ApiOperation(value = "总认证地址接口", notes = "参数应用ID，分发到不同应用的认证地址",httpMethod="GET")
+	@ApiOperation(value = "认证总地址接口", notes = "参数应用ID，分发到不同应用的认证地址",httpMethod="GET")
 	@RequestMapping("/authz/{id}")
 	public ModelAndView authorize(
 			HttpServletRequest request,
@@ -75,9 +75,7 @@ public class AuthorizeEndpoint extends AuthorizeBaseEndpoint{
 			modelAndView=WebContext.forward("/authz/cas/"+id);
 		}else if (application.getProtocol().equalsIgnoreCase(ConstantsProtocols.JWT)){
             modelAndView=WebContext.forward("/authz/jwt/"+id);
-        }else if (application.getProtocol().equalsIgnoreCase(ConstantsProtocols.DESKTOP)){
-			modelAndView=WebContext.forward("/authz/desktop/"+id);
-		}else if (application.getProtocol().equalsIgnoreCase(ConstantsProtocols.BASIC)){
+        }else if (application.getProtocol().equalsIgnoreCase(ConstantsProtocols.BASIC)){
 			modelAndView=WebContext.redirect(application.getLoginUrl());
 		}
 		

maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java

@@ -156,6 +156,7 @@ public class CasAuthorizeEndpoint  extends CasBaseAuthorizeEndpoint{
 	 * @param casService
 	 * @return
 	 */
+	@ApiOperation(value = "CAS注销接口", notes = "CAS注销接口",httpMethod="GET")
 	@RequestMapping("/authz/cas/logout")
 	public ModelAndView logout(
 			HttpServletRequest request,

maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java

@@ -64,7 +64,7 @@ public class JwtAuthorizeEndpoint  extends AuthorizeBaseEndpoint{
 	@Autowired
 	ApplicationConfig applicationConfig;
 	
-	@ApiOperation(value = "JWT��֤��ַ�ӿ�", notes = "����Ӧ��ID",httpMethod="GET")
+	@ApiOperation(value = "JWT应用ID认证接口", notes = "应用ID",httpMethod="GET")
 	@RequestMapping("/authz/jwt/{id}")
 	public ModelAndView authorize(
 			HttpServletRequest request,

maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/BaseAppContorller.java

@@ -82,7 +82,7 @@ public class BaseAppContorller {
 	
 	protected void encodeSharedPassword(Apps application){
 		if(application.getCredential()!=Apps.CREDENTIALS.SHARED){
-			if(application.getProtocol().equals(ConstantsProtocols.DESKTOP)||application.getProtocol().equals(ConstantsProtocols.FORMBASED)){
+			if(application.getProtocol().equals(ConstantsProtocols.FORMBASED)){
 				if(StringUtils.isNotEmpty(application.getSharedPassword())){
 					application.setSharedPassword(ReciprocalUtils.encode(application.getSharedPassword()));
 				}
@@ -92,7 +92,7 @@ public class BaseAppContorller {
 	
 	protected void decoderSharedPassword(Apps application){
 		if(application.getCredential()!=Apps.CREDENTIALS.SHARED){
-			if(application.getProtocol().equals(ConstantsProtocols.DESKTOP)||application.getProtocol().equals(ConstantsProtocols.FORMBASED)){
+			if(application.getProtocol().equals(ConstantsProtocols.FORMBASED)){
 				if(StringUtils.isNotEmpty(application.getSharedPassword())){
 					application.setSharedPassword(ReciprocalUtils.decoder(application.getSharedPassword()));
 				}

maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java

@@ -191,8 +191,9 @@ public class AppListController {
         UserInfo userInfo = WebContext.getUserInfo();
         if (credential == Apps.CREDENTIALS.USER_DEFINED) {
             appUsers = appUsersService.load(new Accounts(userInfo.getId(), appId));
-            if (protocol.equalsIgnoreCase(ConstantsProtocols.DESKTOP) || protocol.equalsIgnoreCase(ConstantsProtocols.FORMBASED)
-                    || protocol.equalsIgnoreCase(ConstantsProtocols.BASIC) || protocol.equalsIgnoreCase(ConstantsProtocols.EXTEND_API)) {
+            if (protocol.equalsIgnoreCase(ConstantsProtocols.FORMBASED)
+                    || protocol.equalsIgnoreCase(ConstantsProtocols.BASIC) 
+                    || protocol.equalsIgnoreCase(ConstantsProtocols.EXTEND_API)) {
 
                 modelAndView.addObject("username", true);
                 modelAndView.addObject("password", true);