diff --git a/gradle.properties b/gradle.properties index 1dc4f6a0..6200b1ff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ #maxkey properties group =maxkey.top -version =2.6.0 +version =2.7.0 vendor =https://www.maxkey.top author =maxkeyTop diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsDesktopDetails.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsDesktopDetails.java deleted file mode 100644 index 287d69d6..00000000 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/AppsDesktopDetails.java +++ /dev/null @@ -1,331 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/** - * - */ -package org.maxkey.domain.apps; - -import javax.persistence.Entity; -import javax.persistence.Table; - -import org.maxkey.domain.Accounts; - - -/** - * @author Crystal.Sea - * - */ - -@Entity -@Table(name = "MXK_APPS_DESKTOP_DETAILS") -public class AppsDesktopDetails extends Apps { - - - public static final class ParameterType{ - - public static final String PARAMETER="PARAMETER"; - public static final String SIMULATION="SIMULATION"; - - }; - /** - * - */ - private static final long serialVersionUID = 6691566522839823638L; - - private String programPath; - - //PARAMETER,SIMULATION - private String parameter; - - private String preUsername; - - private String usernameType;//PARAMETER,SIMULATION - - private String usernameParameter; - - private String prePassword; - - private String passwordType;//PARAMETER,SIMULATION - - private String passwordParameter; - - - private String preSubmit; - //Enter or key - private String submitType; - - private String submitKey; - - Accounts appUser; - /** - * - */ - public AppsDesktopDetails() { - - } - - - - /** - * @return the programPath - */ - public String getProgramPath() { - return programPath; - } - - - - /** - * @param programPath the programPath to set - */ - public void setProgramPath(String programPath) { - this.programPath = programPath; - } - - - - /** - * @return the parameter - */ - public String getParameter() { - return parameter; - } - - - - /** - * @param parameter the parameter to set - */ - public void setParameter(String parameter) { - this.parameter = parameter; - } - - - - /** - * @return the preUsername - */ - public String getPreUsername() { - return preUsername; - } - - - - /** - * @param preUsername the preUsername to set - */ - public void setPreUsername(String preUsername) { - this.preUsername = preUsername; - } - - - - /** - * @return the usernameType - */ - public String getUsernameType() { - return usernameType; - } - - - - /** - * @param usernameType the usernameType to set - */ - public void setUsernameType(String usernameType) { - this.usernameType = usernameType; - } - - - - /** - * @return the usernameParameter - */ - public String getUsernameParameter() { - return usernameParameter; - } - - - - /** - * @param usernameParameter the usernameParameter to set - */ - public void setUsernameParameter(String usernameParameter) { - this.usernameParameter = usernameParameter; - } - - - - /** - * @return the prePassword - */ - public String getPrePassword() { - return prePassword; - } - - - - /** - * @param prePassword the prePassword to set - */ - public void setPrePassword(String prePassword) { - this.prePassword = prePassword; - } - - - - /** - * @return the passwordType - */ - public String getPasswordType() { - return passwordType; - } - - - - /** - * @param passwordType the passwordType to set - */ - public void setPasswordType(String passwordType) { - this.passwordType = passwordType; - } - - - - /** - * @return the passwordParameter - */ - public String getPasswordParameter() { - return passwordParameter; - } - - - - /** - * @param passwordParameter the passwordParameter to set - */ - public void setPasswordParameter(String passwordParameter) { - this.passwordParameter = passwordParameter; - } - - - - /** - * @return the preSubmit - */ - public String getPreSubmit() { - return preSubmit; - } - - - - /** - * @param preSubmit the preSubmit to set - */ - public void setPreSubmit(String preSubmit) { - this.preSubmit = preSubmit; - } - - - - /** - * @return the submitType - */ - public String getSubmitType() { - return submitType; - } - - - - /** - * @param submitType the submitType to set - */ - public void setSubmitType(String submitType) { - this.submitType = submitType; - } - - - - /** - * @return the submitKey - */ - public String getSubmitKey() { - return submitKey; - } - - - - /** - * @param submitKey the submitKey to set - */ - public void setSubmitKey(String submitKey) { - this.submitKey = submitKey; - } - - - - /** - * @return the appUser - */ - public Accounts getAppUser() { - return appUser; - } - - - - /** - * @param appUser the appUser to set - */ - public void setAppUser(Accounts appUser) { - this.appUser = appUser; - } - - - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("AppsDesktopDetails [programPath="); - builder.append(programPath); - builder.append(", parameter="); - builder.append(parameter); - builder.append(", preUsername="); - builder.append(preUsername); - builder.append(", usernameType="); - builder.append(usernameType); - builder.append(", usernameParameter="); - builder.append(usernameParameter); - builder.append(", prePassword="); - builder.append(prePassword); - builder.append(", passwordType="); - builder.append(passwordType); - builder.append(", passwordParameter="); - builder.append(passwordParameter); - builder.append(", preSubmit="); - builder.append(preSubmit); - builder.append(", submitType="); - builder.append(submitType); - builder.append(", submitKey="); - builder.append(submitKey); - builder.append(", appUser="); - builder.append(appUser); - builder.append("]"); - return builder.toString(); - } - -} diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsDesktopDetailsMapper.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsDesktopDetailsMapper.java deleted file mode 100644 index 30ca3fb4..00000000 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsDesktopDetailsMapper.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/** - * - */ -package org.maxkey.persistence.mapper; - -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.AppsDesktopDetails; - -/** - * @author Crystal.sea - * - */ -public interface AppsDesktopDetailsMapper extends IJpaBaseMapper { - - public AppsDesktopDetails getAppDetails(String id); -} diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsDesktopDetailsService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsDesktopDetailsService.java deleted file mode 100644 index 506124eb..00000000 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsDesktopDetailsService.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.persistence.service; - -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.domain.apps.AppsDesktopDetails; -import org.maxkey.persistence.mapper.AppsDesktopDetailsMapper; -import org.springframework.stereotype.Repository; - -@Repository -public class AppsDesktopDetailsService extends JpaBaseService{ - - public AppsDesktopDetailsService() { - super(AppsDesktopDetailsMapper.class); - } - - /* (non-Javadoc) - * @see com.connsec.db.service.BaseService#getMapper() - */ - @Override - public AppsDesktopDetailsMapper getMapper() { - // TODO Auto-generated method stub - return (AppsDesktopDetailsMapper)super.getMapper(); - } - public AppsDesktopDetails getAppDetails(String id) { - return getMapper().getAppDetails(id); - } -} diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsDesktopDetailsMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsDesktopDetailsMapper.xml deleted file mode 100644 index 66502315..00000000 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsDesktopDetailsMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-desktop/build.gradle b/maxkey-protocols/maxkey-protocol-desktop/build.gradle deleted file mode 100644 index 7709bb08..00000000 --- a/maxkey-protocols/maxkey-protocol-desktop/build.gradle +++ /dev/null @@ -1,15 +0,0 @@ - -description = "maxkey-protocol-desktop" - - -dependencies { - //local jars - compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar') - - compile project(":maxkey-common") - compile project(":maxkey-core") - compile project(":maxkey-persistence") - compile project(":maxkey-protocols:maxkey-protocol-authorize") - compile project(":maxkey-authentications:maxkey-authentication-core") - -} \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-desktop/src/main/java/META-INF/MANIFEST.MF deleted file mode 100644 index 254272e1..00000000 --- a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/DesktopAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/DesktopAuthorizeEndpoint.java deleted file mode 100644 index 44c18eac..00000000 --- a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/DesktopAuthorizeEndpoint.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/** - * - */ -package org.maxkey.authz.desktop.endpoint; - -import javax.servlet.http.HttpServletRequest; - -import org.maxkey.authn.SigninPrincipal; -import org.maxkey.authz.desktop.endpoint.adapter.DesktopDefaultAdapter; -import org.maxkey.authz.endpoint.AuthorizeBaseEndpoint; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.constants.Boolean; -import org.maxkey.domain.Accounts; -import org.maxkey.domain.apps.AppsDesktopDetails; -import org.maxkey.persistence.service.AppsDesktopDetailsService; -import org.maxkey.util.Instance; -import org.maxkey.web.WebContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; - -/** - * @author Crystal.Sea - * - */ -@Api(tags = "Desktop接口文档模块") -@Controller -public class DesktopAuthorizeEndpoint extends AuthorizeBaseEndpoint{ - final static Logger _logger = LoggerFactory.getLogger(DesktopAuthorizeEndpoint.class); - - @Autowired - AppsDesktopDetailsService desktopDetailsService; - - DesktopDefaultAdapter defaultDesktopAdapter=new DesktopDefaultAdapter(); - - @ApiOperation(value = "Desktop认证接口", notes = "传递参数应用ID",httpMethod="GET") - @RequestMapping("/authz/desktop/{id}") - public ModelAndView authorize( - HttpServletRequest request, - @PathVariable("id") String id){ - AppsDesktopDetails desktopDetails=desktopDetailsService.getAppDetails(id); - _logger.debug(""+desktopDetails); - - Accounts appUser=getAccounts(desktopDetails); - if(appUser == null){ - return generateInitCredentialModelAndView(id,"/authorize/desktop/"+id); - - }else{ - desktopDetails.setAppUser(appUser); - ModelAndView modelAndView=new ModelAndView(); - - AbstractAuthorizeAdapter adapter; - if(Boolean.isTrue(desktopDetails.getIsAdapter())){ - adapter =(AbstractAuthorizeAdapter)Instance.newInstance(desktopDetails.getAdapter()); - }else{ - adapter =(AbstractAuthorizeAdapter)defaultDesktopAdapter; - } - - String paramString=adapter.generateInfo( - (SigninPrincipal)WebContext.getAuthentication().getPrincipal(), - WebContext.getUserInfo(), desktopDetails); - - String encryptParamString=adapter.encrypt(paramString, null, null); - - String signParamString=adapter.sign(encryptParamString, desktopDetails); - - modelAndView=adapter.authorize( - WebContext.getUserInfo(), - desktopDetails, - signParamString, - modelAndView); - - return modelAndView; - } - } -} diff --git a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopDefaultAdapter.java b/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopDefaultAdapter.java deleted file mode 100644 index 20bed547..00000000 --- a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopDefaultAdapter.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.authz.desktop.endpoint.adapter; - -import java.util.HashMap; - -import org.maxkey.authn.SigninPrincipal; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.crypto.HexUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Apps; -import org.maxkey.domain.apps.AppsDesktopDetails; -import org.maxkey.util.JsonUtils; -import org.maxkey.util.StringGenerator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.servlet.ModelAndView; - -public class DesktopDefaultAdapter extends AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(DesktopDefaultAdapter.class); - @Override - public String generateInfo(SigninPrincipal authentication,UserInfo userInfo,Object app) { - AppsDesktopDetails details=(AppsDesktopDetails)app; - String parameter=details.getParameter()==null?"":details.getParameter(); - - if(details.getUsernameType().equalsIgnoreCase(AppsDesktopDetails.ParameterType.PARAMETER)){ - parameter = parameter+ " "+details.getUsernameParameter(); - parameter = parameter+ " "+ details.getAppUser().getRelatedUsername(); - } - if(details.getPasswordType().equalsIgnoreCase(AppsDesktopDetails.ParameterType.PARAMETER)){ - parameter = parameter+ " "+details.getPasswordParameter(); - parameter = parameter+ " "+ details.getAppUser().getRelatedPassword(); - } - - HashMap beanMap=new HashMap(); - beanMap.put("randomId",(new StringGenerator()).uuidGenerate()); - beanMap.put("programPath", details.getProgramPath()); - beanMap.put("parameter", details.getParameter()); - beanMap.put("preUsername", details.getPreUsername()); - beanMap.put("usernameType", details.getUsernameType()); - beanMap.put("usernameParameter", details.getUsernameParameter()); - beanMap.put("username", details.getAppUser().getRelatedUsername()); - beanMap.put("prePassword", details.getPrePassword()); - beanMap.put("passwordType", details.getPasswordType()); - beanMap.put("passwordParameter", details.getPasswordParameter()); - beanMap.put("password", details.getAppUser().getRelatedPassword()); - beanMap.put("preSubmit", details.getPreSubmit()); - beanMap.put("submitType", details.getSubmitType()); - beanMap.put("submitKey", details.getSubmitKey()); - - String jsonString=JsonUtils.object2Json(beanMap); - _logger.debug("Token : "+jsonString); - - return jsonString; - } - - @Override - public String encrypt(String data, String algorithmKey, String algorithm) { - _logger.debug("Parameter String : "+data); - String encoderParamString=HexUtils.bytes2HexString(data.getBytes()); - return encoderParamString; - } - - - - /* (non-Javadoc) - * @see com.connsec.web.authorize.endpoint.adapter.AbstractAuthorizeAdapter#sign(java.lang.String, com.connsec.domain.apps.Applications) - */ - @Override - public String sign(String data, Apps app) { - String signData=super.sign(data, app); - return signData; - } - - @Override - public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { - modelAndView.setViewName("authorize/desktop_sso_execute"); - AppsDesktopDetails details=(AppsDesktopDetails)app; - modelAndView.addObject("username", details.getAppUser().getRelatedUsername()); - modelAndView.addObject("password", details.getAppUser().getRelatedPassword()); - modelAndView.addObject("encoderParam", data); - return modelAndView; - } - -} diff --git a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopQQAdapter.java b/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopQQAdapter.java deleted file mode 100644 index 334797e7..00000000 --- a/maxkey-protocols/maxkey-protocol-desktop/src/main/java/org/maxkey/authz/desktop/endpoint/adapter/DesktopQQAdapter.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.authz.desktop.endpoint.adapter; - -import java.util.HashMap; - -import org.maxkey.authn.SigninPrincipal; -import org.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; -import org.maxkey.crypto.HexUtils; -import org.maxkey.domain.UserInfo; -import org.maxkey.domain.apps.Apps; -import org.maxkey.domain.apps.AppsDesktopDetails; -import org.maxkey.util.JsonUtils; -import org.maxkey.util.StringGenerator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.servlet.ModelAndView; - -public class DesktopQQAdapter extends AbstractAuthorizeAdapter { - final static Logger _logger = LoggerFactory.getLogger(DesktopQQAdapter.class); - @Override - public String generateInfo(SigninPrincipal authentication,UserInfo userInfo,Object app) { - AppsDesktopDetails details=(AppsDesktopDetails)app; - String parameter=details.getParameter()==null?"":details.getParameter(); - - if(details.getUsernameType().equalsIgnoreCase(AppsDesktopDetails.ParameterType.PARAMETER)){ - parameter = parameter+ " "+details.getUsernameParameter(); - parameter = parameter+ " "+ details.getAppUser().getRelatedUsername(); - } - if(details.getPasswordType().equalsIgnoreCase(AppsDesktopDetails.ParameterType.PARAMETER)){ - parameter = parameter+ " "+details.getPasswordParameter(); - parameter = parameter+ " "+ details.getAppUser().getRelatedPassword(); - } - - HashMap beanMap=new HashMap(); - beanMap.put("randomId",(new StringGenerator()).uuidGenerate()); - beanMap.put("programPath", details.getProgramPath()); - beanMap.put("parameter", details.getParameter()); - beanMap.put("preUsername", details.getPreUsername()); - beanMap.put("usernameType", details.getUsernameType()); - beanMap.put("usernameParameter", details.getUsernameParameter()); - beanMap.put("username", details.getAppUser().getRelatedUsername()); - beanMap.put("prePassword", details.getPrePassword()); - beanMap.put("passwordType", details.getPasswordType()); - beanMap.put("passwordParameter", details.getPasswordParameter()); - beanMap.put("password", details.getAppUser().getRelatedPassword()); - beanMap.put("preSubmit", details.getPreSubmit()); - beanMap.put("submitType", details.getSubmitType()); - beanMap.put("submitKey", details.getSubmitKey()); - - String jsonString=JsonUtils.object2Json(beanMap); - _logger.debug("Token : "+jsonString); - - return jsonString; - } - - @Override - public String encrypt(String data, String algorithmKey, String algorithm) { - _logger.debug("Parameter String : "+data); - String encoderParamString=HexUtils.bytes2HexString(data.getBytes()); - return encoderParamString; - } - - - - /* (non-Javadoc) - * @see com.connsec.web.authorize.endpoint.adapter.AbstractAuthorizeAdapter#sign(java.lang.String, com.connsec.domain.apps.Applications) - */ - @Override - public String sign(String data, Apps app) { - String signData=super.sign(data, app); - return signData; - } - - @Override - public ModelAndView authorize(UserInfo userInfo, Object app, String data,ModelAndView modelAndView) { - modelAndView.setViewName("authorize/desktop_qq_sso_execute"); - AppsDesktopDetails details=(AppsDesktopDetails)app; - modelAndView.addObject("username", details.getAppUser().getRelatedUsername()); - modelAndView.addObject("password", details.getAppUser().getRelatedPassword()); - modelAndView.addObject("encoderParam", data); - return modelAndView; - } - -} diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/DesktopDetailsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/DesktopDetailsController.java deleted file mode 100644 index 3e7a4410..00000000 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/DesktopDetailsController.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.maxkey.web.apps.contorller; - -import java.util.List; - -import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.constants.ConstantsProtocols; -import org.maxkey.crypto.ReciprocalUtils; -import org.maxkey.domain.apps.AppsDesktopDetails; -import org.maxkey.persistence.service.AppsDesktopDetailsService; -import org.maxkey.web.WebContext; -import org.maxkey.web.message.Message; -import org.maxkey.web.message.MessageType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; - - -@Controller -@RequestMapping(value={"/apps/desktop"}) -public class DesktopDetailsController extends BaseAppContorller { - final static Logger _logger = LoggerFactory.getLogger(DesktopDetailsController.class); - - @Autowired - AppsDesktopDetailsService desktopDetailsService; - - @RequestMapping(value = { "/forwardAdd" }) - public ModelAndView forwardAdd() { - ModelAndView modelAndView=new ModelAndView("apps/desktop/appAdd"); - AppsDesktopDetails desktopDetails=new AppsDesktopDetails(); - desktopDetails.setId(desktopDetails.generateId()); - desktopDetails.setProtocol(ConstantsProtocols.DESKTOP); - desktopDetails.setSecret(ReciprocalUtils.generateKey("")); - - modelAndView.addObject("model",desktopDetails); - return modelAndView; - } - - - - @RequestMapping(value={"/add"}) - public ModelAndView insert(@ModelAttribute("desktopDetails") AppsDesktopDetails desktopDetails) { - _logger.debug("-Add :" + desktopDetails); - - transform(desktopDetails); - desktopDetailsService.insert(desktopDetails); - if (appsService.insertApp(desktopDetails)) { - new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS),MessageType.success); - - } else { - new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS),MessageType.error); - } - return WebContext.forward("forwardUpdate/"+desktopDetails.getId()); - } - - @RequestMapping(value = { "/forwardUpdate/{id}" }) - public ModelAndView forwardUpdate(@PathVariable("id") String id) { - ModelAndView modelAndView=new ModelAndView("apps/desktop/appUpdate"); - AppsDesktopDetails desktopDetails=desktopDetailsService.getAppDetails(id); - decoderSecret(desktopDetails); - decoderSharedPassword(desktopDetails); - WebContext.setAttribute(desktopDetails.getId(), desktopDetails.getIcon()); - - modelAndView.addObject("model",desktopDetails); - return modelAndView; - } - /** - * modify - * @param application - * @return - */ - - @RequestMapping(value={"/update"}) - public ModelAndView update(@ModelAttribute("desktopDetails") AppsDesktopDetails desktopDetails) { - // - _logger.debug("-update application :" + desktopDetails); - transform(desktopDetails); - - if (desktopDetailsService.update(desktopDetails)&&appsService.updateApp(desktopDetails)) { - new Message(WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_SUCCESS),MessageType.success); - - } else { - new Message(WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_ERROR),MessageType.error); - } - return WebContext.forward("forwardUpdate/"+desktopDetails.getId()); - } - - @ResponseBody - @RequestMapping(value={"/delete/{id}"}) - public Message delete(@PathVariable("id") String id) { - _logger.debug("-delete application :" + id); - if (desktopDetailsService.remove(id)&&appsService.remove(id)) { - return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_SUCCESS),MessageType.success); - - } else { - return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_SUCCESS),MessageType.error); - } - } - - -} diff --git a/maxkey-web-manage/src/main/resources/application.properties b/maxkey-web-manage/src/main/resources/application.properties index a4bfecf7..1cd9df9b 100644 --- a/maxkey-web-manage/src/main/resources/application.properties +++ b/maxkey-web-manage/src/main/resources/application.properties @@ -2,7 +2,7 @@ #application application.title=MaxKey application.name=MaxKey-Mgt -application.formatted-version=v2.6.0 GA +application.formatted-version=v2.7.0 GA #server config #server port server.port=9527 diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl index bdabac6b..75df8c1a 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appsList.ftl @@ -23,7 +23,6 @@ protocolArray["Extend_API"]="extendapi"; protocolArray["CAS"]="cas"; protocolArray["Basic"]="basic"; - protocolArray["Desktop"]="desktop"; protocolArray["JWT"]="jwt"; $(function () { @@ -140,7 +139,6 @@   <@locale code="apps.protocol.jwt" />   <@locale code="apps.protocol.tokenbased" />   <@locale code="apps.protocol.extendapi" /> -   <@locale code="apps.protocol.desktop" />   <@locale code="apps.protocol.basic" /> 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 deleted file mode 100644 index 347c9cdd..00000000 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appAdd.ftl +++ /dev/null @@ -1,215 +0,0 @@ - - - - <#include "../../layout/header.ftl"/> - <#include "../../layout/common.cssjs.ftl"/> - <#include "../appCommonHead.ftl"/> - - - -
- - - - - - - - - - - -
<#include "../appAddCommon.ftl"/>
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -> - - - - - - - - - - - - - -
<@locale code="apps.desktop.info" />
<@locale code="apps.desktop.programPath" />： - - * -
<@locale code="apps.desktop.parameter" />： - - - * -
<@locale code="apps.desktop.usernameType" />： - - * - <@locale code="apps.desktop.preUsername" />： - - * -
<@locale code="apps.desktop.passwordType" />： - - * - <@locale code="apps.desktop.prePassword" />： - - * -
<@locale code="apps.desktop.submitType" />： - - - * - <@locale code="apps.desktop.preSubmit" />： - - * -
<@locale code="apps.credential" />： - - <@locale code="apps.credential.user-defined" /> - - <@locale code="apps.credential.shared" /> - - <@locale code="apps.credential.system" /> - * - - -
-
- - "/> - "/> -
- - \ No newline at end of file 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 deleted file mode 100644 index c1ad3898..00000000 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/desktop/appUpdate.ftl +++ /dev/null @@ -1,219 +0,0 @@ - - - - <#include "../../layout/header.ftl"/> - <#include "../../layout/common.cssjs.ftl"/> - <#include "../appCommonHead.ftl"/> - - - -
- - - - - - - - - - - -
<#include "../appUpdateCommon.ftl"/>
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - style="display:none" > - - - - style="display:none"> - - - - - - - - - - - -
<@locale code="apps.desktop.info" />
<@locale code="apps.desktop.programPath" />： - - -
<@locale code="apps.desktop.parameter" />： - - -
<@locale code="apps.desktop.usernameType" />： - - - style="display:none" > - <@locale code="apps.desktop.usernameParameter" />：style="display:none" > - - - style="display:none" > - <@locale code="apps.desktop.preUsername" />：style="display:none" > - - -
<@locale code="apps.desktop.passwordType" />： - - - style="display:none" > - <@locale code="apps.desktop.passwordParameter" />：style="display:none" > - - - style="display:none" > - <@locale code="apps.desktop.prePassword" />：style="display:none" > - - -
<@locale code="apps.desktop.submitType" />： - - style="display:none" type="text" id="submitKey" name="submitKey" size="3" title="" value="${model.submitKey}"/> - - style="display:none" > - <@locale code="apps.desktop.preSubmit" />：style="display:none" > - - -
<@locale code="apps.credential" />： - checked /> - <@locale code="apps.credential.user-defined" /> - checked /> - <@locale code="apps.credential.shared" /> - checked /> - <@locale code="apps.credential.system" /> - - -
<@locale code="apps.credential.system" />： - -
<@locale code="apps.credential.sharedUsername" />： - - - <@locale code="apps.credential.sharedPassword" />： - -
- "/> - "/> -
-
-
- - \ No newline at end of file diff --git a/maxkey-web-maxkey/build.gradle b/maxkey-web-maxkey/build.gradle index 90363100..6bd5c9a6 100644 --- a/maxkey-web-maxkey/build.gradle +++ b/maxkey-web-maxkey/build.gradle @@ -15,7 +15,6 @@ dependencies { compile project(":maxkey-protocols:maxkey-protocol-authorize") compile project(":maxkey-protocols:maxkey-protocol-cas") - compile project(":maxkey-protocols:maxkey-protocol-desktop") compile project(":maxkey-protocols:maxkey-protocol-extendapi") compile project(":maxkey-protocols:maxkey-protocol-formbased") compile project(":maxkey-protocols:maxkey-protocol-tokenbased") diff --git a/settings.gradle b/settings.gradle index b0356226..61c9a7f9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,7 +27,7 @@ include 'maxkey-protocols:maxkey-protocol-jwt' include 'maxkey-protocols:maxkey-protocol-formbased' include 'maxkey-protocols:maxkey-protocol-tokenbased' include 'maxkey-protocols:maxkey-protocol-extendapi' -include 'maxkey-protocols:maxkey-protocol-desktop' + //include 'maxkey-webs' //maxkey