diff --git a/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttr.java b/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttr.java index c35aa001f..789846213 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttr.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttr.java @@ -13,6 +13,10 @@ public class ExtraAttr { String type; String value; + public ExtraAttr() { + super(); + } + public ExtraAttr(String attr, String value) { super(); this.attr = attr; diff --git a/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttrs.java b/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttrs.java index b383f873b..fcd73d89a 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttrs.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/ExtraAttrs.java @@ -40,6 +40,13 @@ public class ExtraAttrs { this.extraAttrs.add(new ExtraAttr(attr,value)); } + public void put(String attr,String type,String value) { + if(extraAttrs==null){ + extraAttrs=new ArrayList(); + } + this.extraAttrs.add(new ExtraAttr(attr,type,value)); + } + public String get(String attr) { String value=null; if(extraAttrs!=null&& extraAttrs.size()!=0){ diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java index 1c2f0f798..8699120ef 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java @@ -99,8 +99,6 @@ public class Apps extends JpaBaseDomain implements Serializable{ */ private int isExtendAttr; private String extendAttr; - private String attribute; - private String attributeValue; /** * Signature @@ -492,54 +490,6 @@ public class Apps extends JpaBaseDomain implements Serializable{ this.extendAttr = extendAttr; } - - - - - /** - * @return the attribute - */ - public String getAttribute() { - return attribute; - } - - - - - - /** - * @param attribute the attribute to set - */ - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - - - - - /** - * @return the attributeValue - */ - public String getAttributeValue() { - return attributeValue; - } - - - - - - /** - * @param attributeValue the attributeValue to set - */ - public void setAttributeValue(String attributeValue) { - this.attributeValue = attributeValue; - } - - - - - public int getVisible() { return visible; } @@ -665,8 +615,7 @@ public class Apps extends JpaBaseDomain implements Serializable{ + ", credential=" + credential + ", sharedUsername=" + sharedUsername + ", sharedPassword=" + sharedPassword + ", systemUserAttr=" + systemUserAttr + ", isExtendAttr=" - + isExtendAttr + ", extendAttr=" + extendAttr + ", attribute=" - + attribute + ", attributeValue=" + attributeValue + + isExtendAttr + ", extendAttr=" + extendAttr + ", isSignature=" + isSignature + "]"; } diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsMapper.java index 1e93b7b06..dfcb44825 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsMapper.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/AppsMapper.java @@ -3,6 +3,7 @@ */ package org.maxkey.dao.persistence; +import org.apache.ibatis.annotations.Update; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.maxkey.domain.apps.Apps; @@ -15,4 +16,7 @@ public interface AppsMapper extends IJpaBaseMapper { public int insertApp(Apps app); public int updateApp(Apps app); + + @Update("UPDATE APPS SET ISEXTENDATTR=#{isExtendAttr}, EXTENDATTR=#{extendAttr} WHERE id = #{id}") + public int updateExtendAttr(Apps app); } diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsService.java index fe85bc753..b7b0eac36 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsService.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/AppsService.java @@ -28,4 +28,8 @@ public class AppsService extends JpaBaseService{ return ((AppsMapper)super.getMapper()).updateApp(app)>0; }; + public boolean updateExtendAttr(Apps app) { + return ((AppsMapper)super.getMapper()).updateExtendAttr(app)>0; + } + } diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java index a2e24bbb7..5468460f9 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java @@ -4,6 +4,8 @@ package org.maxkey.web.apps.contorller; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.OPERATEMESSAGE; import org.maxkey.crypto.ReciprocalUtils; +import org.maxkey.domain.ExtraAttr; +import org.maxkey.domain.ExtraAttrs; import org.maxkey.domain.apps.Apps; import org.maxkey.web.WebContext; import org.maxkey.web.message.Message; @@ -68,6 +70,35 @@ public class ApplicationsController extends BaseAppContorller { } + @RequestMapping(value = { "/forwardAppsExtendAttr/{id}" }) + public ModelAndView forwardExtendAttr(@PathVariable("id") String id) { + ModelAndView modelAndView=new ModelAndView("apps/appsExtendAttr"); + modelAndView.addObject("model",appsService.get(id)); + return modelAndView; + } + + @ResponseBody + @RequestMapping(value = { "/updateExtendAttr" }) + public Message updateExtendAttr(@ModelAttribute("application") Apps application,@ModelAttribute("extraAttrs") ExtraAttr extraAttr) { + if(extraAttr.getAttr()!=null){ + String []attributes=extraAttr.getAttr().split(","); + String []attributeType=extraAttr.getType().split(","); + String []attributeValue=extraAttr.getValue().split(","); + ExtraAttrs extraAttrs=new ExtraAttrs(); + for(int i=0;iselected ><@locale code="apps.visible.intranet"/> - <@locale code="common.text.description"/>： + <@locale code="apps.extendAttr"/> + " + wurl="<@base/>/apps/forwardAppsExtendAttr/${model.id!}" + wwidth="900" + wheight="650" + target="window"> + + + + <@locale code="common.text.description"/>： + 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 new file mode 100644 index 000000000..9a9e96e57 --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appsExtendAttr.ftl @@ -0,0 +1,103 @@ + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + + + + +
+ + + + + + + + + + + + + + + + + + + + + +
<@locale code="apps.id"/>： +
${model.id!}
+ + 		<@locale code="apps.name"/>： +
${model.name!}
+
<@locale code="apps.extendAttr"/>： + checked /> + <@locale code="apps.isExtendAttr"/> + + + "/> + "/> +
+ + + +
+
+
+ + \ No newline at end of file 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 7d4dd98ff..99e2de916 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 @@ -60,8 +60,6 @@ $(function(){ $("#systemconfigure").hide(); } }); - $("#protocol_text").html("<%=PROTOCOLS.DESKTOP%>"); - $("#protocol").val("<%=PROTOCOLS.DESKTOP%>"); }); //--> 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 2732e4d53..26b4a9264 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 @@ -13,40 +13,7 @@