diff --git a/maxkey-core/src/main/java/org/maxkey/domain/apps/UserApps.java b/maxkey-core/src/main/java/org/maxkey/domain/apps/UserApps.java index 8ba46e5876f819535c1cf51830e51249e07ce93e..6c5dcea09c55d82f2e9a929a70b2439694629c94 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/apps/UserApps.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/apps/UserApps.java @@ -1,60 +1,51 @@ -/** - * - */ package org.maxkey.domain.apps; /** + * UserApps . * @author Crystal.Sea * */ public class UserApps extends Apps { + private static final long serialVersionUID = 3186085827268041549L; + + private String username; + + private String userId; + + private String displayName; + + public UserApps() { + + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + @Override + public String toString() { + return "UserApplications [username=" + username + + ", userId=" + userId + ", displayName=" + displayName + "]"; + } - /** - * - */ - private static final long serialVersionUID = 3186085827268041549L; - - private String username; - - private String userId; - - private String displayName; - - /** - * - */ - public UserApps() { - - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public String getDisplayName() { - return displayName; - } - - public void setDisplayName(String displayName) { - this.displayName = displayName; - } - - @Override - public String toString() { - return "UserApplications [username=" + username + ", userId=" + userId - + ", displayName=" + displayName + "]"; - } - } diff --git a/maxkey-core/src/main/java/org/maxkey/web/InitApplicationContext.java b/maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java similarity index 97% rename from maxkey-core/src/main/java/org/maxkey/web/InitApplicationContext.java rename to maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java index 95bcd610735f03f2cc122386178e8a79f8e35c3c..c7bf27c83a5c2216ef187aac8bda95e69beea073 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/InitApplicationContext.java +++ b/maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java @@ -26,8 +26,8 @@ import org.springframework.web.context.support.WebApplicationContextUtils; * @author Crystal.Sea * */ -public class InitApplicationContext extends HttpServlet { - private static final Logger _logger = LoggerFactory.getLogger(InitApplicationContext.class); +public class InitializeContext extends HttpServlet { + private static final Logger _logger = LoggerFactory.getLogger(InitializeContext.class); private static final long serialVersionUID = -797399138268601444L; ApplicationContext applicationContext; @@ -59,12 +59,12 @@ public class InitApplicationContext extends HttpServlet { /** * InitApplicationContext. */ - public InitApplicationContext() { + public InitializeContext() { this.applicationContext = WebApplicationContextUtils.getWebApplicationContext(this.getServletContext()); } - public InitApplicationContext(ConfigurableApplicationContext applicationContext) { + public InitializeContext(ConfigurableApplicationContext applicationContext) { this.applicationContext = applicationContext; } 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 dfcb448256be4fc20f0172dca6b822c541fc4a07..e4c6654331de911a2fe9e603fdd1e9496c200761 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,9 +3,12 @@ */ package org.maxkey.dao.persistence; +import java.util.List; + import org.apache.ibatis.annotations.Update; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.maxkey.domain.apps.Apps; +import org.maxkey.domain.apps.UserApps; /** * @author Crystal.sea @@ -19,4 +22,7 @@ public interface AppsMapper extends IJpaBaseMapper { @Update("UPDATE APPS SET ISEXTENDATTR=#{isExtendAttr}, EXTENDATTR=#{extendAttr} WHERE id = #{id}") public int updateExtendAttr(Apps app); + + + public List queryMyApps(UserApps userApplications); } diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/MyAppsListMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/MyAppsListMapper.java deleted file mode 100644 index f7ae779ae6943f308a128223dee9bd8a5fec4ad8..0000000000000000000000000000000000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/MyAppsListMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * - */ -package org.maxkey.dao.persistence; - -import java.util.List; - -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.apps.UserApps; - -/** - * @author Crystal.sea - * - */ -public interface MyAppsListMapper extends IJpaBaseMapper { - - public List queryMyApps(UserApps userApplications); -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/MyProfileMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/MyProfileMapper.java deleted file mode 100644 index 4652ab853a736203a29fedd36fda31a65f9a58b2..0000000000000000000000000000000000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/MyProfileMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.maxkey.dao.persistence; - -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.UserInfo; - - -/** - * @author Crystal.Sea - * - */ -public interface MyProfileMapper extends IJpaBaseMapper{ - - public int updateProfile(UserInfo userInfo); - -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/UserInfoMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/UserInfoMapper.java index 0926c5cce52163d3d6b50944e936771b83220a52..835dca4b6d67b584c273b825f62e92f9c156b4a0 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/UserInfoMapper.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/UserInfoMapper.java @@ -41,6 +41,8 @@ public interface UserInfoMapper extends IJpaBaseMapper{ public int changeMobile(UserInfo userInfo); + public int updateProfile(UserInfo userInfo); + @Select("SELECT * FROM USERINFO WHERE EMAIL = #{value} OR MOBILE= #{value}") public UserInfo queryUserInfoByEmailMobile(String emailMobile); 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 b7b0eac3600eb79cba7ac2a399cd9a6e5018b191..b4c943180bb9e94831b6244c68ebd429d5d323bf 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 @@ -1,8 +1,11 @@ package org.maxkey.dao.service; +import java.util.List; + import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.maxkey.dao.persistence.AppsMapper; import org.maxkey.domain.apps.Apps; +import org.maxkey.domain.apps.UserApps; import org.springframework.stereotype.Service; @Service @@ -32,4 +35,7 @@ public class AppsService extends JpaBaseService{ return ((AppsMapper)super.getMapper()).updateExtendAttr(app)>0; } + public List queryMyApps(UserApps userApplications){ + return getMapper().queryMyApps(userApplications); + } } diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/MyAppsListService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/MyAppsListService.java deleted file mode 100644 index 85d4fd8797bbcac66e7a9aa4e42d443e99904a3c..0000000000000000000000000000000000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/MyAppsListService.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.maxkey.dao.service; - -import java.util.List; - -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.dao.persistence.MyAppsListMapper; -import org.maxkey.domain.apps.UserApps; -import org.springframework.stereotype.Service; - -@Service -public class MyAppsListService extends JpaBaseService{ - - public MyAppsListService() { - super(MyAppsListMapper.class); - } - - public List queryMyApps(UserApps userApplications){ - return getMapper().queryMyApps(userApplications); - } - /* (non-Javadoc) - * @see com.connsec.db.service.BaseService#getMapper() - */ - @Override - public MyAppsListMapper getMapper() { - // TODO Auto-generated method stub - return (MyAppsListMapper)super.getMapper(); - } - -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/MyProfileService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/MyProfileService.java deleted file mode 100644 index 99e0fe74462409cf4c113b06baaec496bc82a849..0000000000000000000000000000000000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/MyProfileService.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.maxkey.dao.service; - -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.dao.persistence.MyProfileMapper; -import org.maxkey.domain.UserInfo; -import org.springframework.stereotype.Service; - - -/** - * @author Crystal.Sea - * - */ -@Service -public class MyProfileService extends JpaBaseService { - - - public MyProfileService() { - super(MyProfileMapper.class); - } - - /* (non-Javadoc) - * @see com.connsec.db.service.BaseService#getMapper() - */ - @Override - public MyProfileMapper getMapper() { - // TODO Auto-generated method stub - return (MyProfileMapper)super.getMapper(); - } - - - public int updateProfile(UserInfo userInfo){ - - return getMapper().updateProfile(userInfo); - } - -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java index 59ae71034f6a97da215a70c4498e04a361bb9026..dfc22a40b2542bdfe35709987be4eb723569ed21 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java @@ -223,5 +223,10 @@ public class UserInfoService extends JpaBaseService { public UserInfo queryUserInfoByEmailMobile(String emailMobile) { return getMapper().queryUserInfoByEmailMobile(emailMobile); } + + public int updateProfile(UserInfo userInfo){ + + return getMapper().updateProfile(userInfo); + } } diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsMapper.xml index a08a7308af2a518933f234a0b3a6ae0b029b1a7a..4c06610d4b5b3ebd589edbf0e1bbfb06e757c6af 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsMapper.xml +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/AppsMapper.xml @@ -152,4 +152,39 @@ WHERE ID = #{id} + + \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupPrivilegesMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupPrivilegesMapper.xml index cb7220dd12fb9e600c2f2147c5e3b8ee2c7d2ebc..3d23daea9143b4beabcf9016779040bed3ee9e15 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupPrivilegesMapper.xml +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupPrivilegesMapper.xml @@ -20,7 +20,17 @@ - SELECT DISTINCT - APP.* - FROM - APPS APP,GROUP_PRIVILEGES GP - WHERE - APP.ID=GP.APPID - AND GP.GROUPID IN( - SELECT - G.ID - FROM - GROUPS G - WHERE - G.ID='ALL_USER_GROUP' - OR G.ID IN( - SELECT - GM.GROUPID - FROM - GROUP_MEMBER GM,USERINFO U - WHERE 1 = 1 - - AND U.ID = #{userId} - - - AND U.USERNAME = #{username} - - AND GM.MEMBERID = U.ID - ) - ) - - AND NAME = #{name} - - ORDER BY SORTINDEX - - - \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/MyProfileMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/MyProfileMapper.xml deleted file mode 100644 index cddae4e7f9ded1f97f03ced290962a3aa59730c6..0000000000000000000000000000000000000000 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/MyProfileMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - UPDATE USERINFO SET - DISPLAYNAME = #{displayName}, - NICKNAME = #{nickName}, - NAMEZHSPELL = #{nameZhSpell}, - NAMEZHSHORTSPELL= #{nameZhShortSpell}, - GIVENNAME = #{givenName}, - MIDDLENAME = #{middleName}, - FAMILYNAME = #{familyName}, - HONORIFICPREFIX = #{honorificPrefix}, - HONORIFICSUFFIX = #{honorificSuffix}, - FORMATTEDNAME = #{formattedName} , - MARRIED = #{married}, - GENDER = #{gender}, - BIRTHDATE = #{birthDate}, - - PICTURE = #{picture}, - - IDTYPE = #{idType}, - IDCARDNO = #{idCardNo}, - WEBSITE = #{webSite}, - - LOCALE = #{locale}, - TIMEZONE = #{timeZone}, - PREFERREDLANGUAGE= #{preferredLanguage}, - - WINDOWSACCOUNT = #{windowsAccount}, - - WORKCOUNTRY = #{workCountry}, - WORKREGION = #{workRegion}, - WORKLOCALITY = #{workLocality}, - WORKSTREETADDRESS= #{workStreetAddress}, - WORKADDRESSFORMATTED= #{workAddressFormatted}, - WORKEMAIL = #{workEmail}, - WORKPHONENUMBER = #{workPhoneNumber}, - WORKPOSTALCODE = #{workPostalCode}, - WORKFAX = #{workFax}, - - HOMECOUNTRY = #{homeCountry}, - HOMEREGION = #{homeRegion}, - HOMELOCALITY = #{homeLocality}, - HOMESTREETADDRESS= #{homeStreetAddress}, - HOMEADDRESSFORMATTED= #{homeAddressFormatted}, - HOMEEMAIL = #{homeEmail}, - HOMEPHONENUMBER= #{homePhoneNumber}, - HOMEPOSTALCODE = #{homePostalCode}, - HOMEFAX = #{homeFax}, - - EXTRAATTRIBUTE = #{extraAttribute}, - - MODIFIEDBY = #{modifiedBy}, - MODIFIEDDATE = current_timestamp - WHERE - ID = #{id} - - - - \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserInfoMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserInfoMapper.xml index ef2a49b67a3c81429b8d46003cfe145541df0f1b..9b3675a90c4277ad7a4f63d1f910e7cd3e4e2dab 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserInfoMapper.xml +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/UserInfoMapper.xml @@ -189,4 +189,61 @@ #{item} + + + UPDATE USERINFO SET + DISPLAYNAME = #{displayName}, + NICKNAME = #{nickName}, + NAMEZHSPELL = #{nameZhSpell}, + NAMEZHSHORTSPELL= #{nameZhShortSpell}, + GIVENNAME = #{givenName}, + MIDDLENAME = #{middleName}, + FAMILYNAME = #{familyName}, + HONORIFICPREFIX = #{honorificPrefix}, + HONORIFICSUFFIX = #{honorificSuffix}, + FORMATTEDNAME = #{formattedName} , + MARRIED = #{married}, + GENDER = #{gender}, + BIRTHDATE = #{birthDate}, + + PICTURE = #{picture}, + + IDTYPE = #{idType}, + IDCARDNO = #{idCardNo}, + WEBSITE = #{webSite}, + + LOCALE = #{locale}, + TIMEZONE = #{timeZone}, + PREFERREDLANGUAGE= #{preferredLanguage}, + + WINDOWSACCOUNT = #{windowsAccount}, + + WORKCOUNTRY = #{workCountry}, + WORKREGION = #{workRegion}, + WORKLOCALITY = #{workLocality}, + WORKSTREETADDRESS= #{workStreetAddress}, + WORKADDRESSFORMATTED= #{workAddressFormatted}, + WORKEMAIL = #{workEmail}, + WORKPHONENUMBER = #{workPhoneNumber}, + WORKPOSTALCODE = #{workPostalCode}, + WORKFAX = #{workFax}, + + HOMECOUNTRY = #{homeCountry}, + HOMEREGION = #{homeRegion}, + HOMELOCALITY = #{homeLocality}, + HOMESTREETADDRESS= #{homeStreetAddress}, + HOMEADDRESSFORMATTED= #{homeAddressFormatted}, + HOMEEMAIL = #{homeEmail}, + HOMEPHONENUMBER= #{homePhoneNumber}, + HOMEPOSTALCODE = #{homePostalCode}, + HOMEFAX = #{homeFax}, + + EXTRAATTRIBUTE = #{extraAttribute}, + + MODIFIEDBY = #{modifiedBy}, + MODIFIEDDATE = current_timestamp + WHERE + ID = #{id} + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java index b55939837ae63d39b91b56aef8a6f419303cbc79..d690e3c51492f196f9ceb71a7f7437a609938fe3 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/MaxKeyMgtApplication.java @@ -4,7 +4,7 @@ import java.util.Date; import javax.servlet.ServletException; -import org.maxkey.web.InitApplicationContext; +import org.maxkey.web.InitializeContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; @@ -34,7 +34,7 @@ public class MaxKeyMgtApplication extends SpringBootServletInitializer { System.out.println("MaxKeyMgtApplication"); ConfigurableApplicationContext applicationContext =SpringApplication.run(MaxKeyMgtApplication.class, args); - InitApplicationContext initWebContext=new InitApplicationContext(applicationContext); + InitializeContext initWebContext=new InitializeContext(applicationContext); try { diff --git a/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js b/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js index 3b074a8721d642caf26c6618aaa638e0bf400a6b..fa0cf810f60ca7aaff7e82adb4c48cc8e8b9b1f1 100644 --- a/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js +++ b/maxkey-web-manage/src/main/resources/static/jquery/platform.common.js @@ -1,26 +1,18 @@ -/* - * crystal.sea - */ - /* for datagrid queryParams*/ function dataGridQueryParams(params) { var postData={}; if($("#basic_search_form")){//o.length>0 postData=$("#basic_search_form").serializeObject(); } - if($("#advanced_search")){//o.length>0 postData=$.extend(postData,$("#advanced_search_form").serializeObject()||{}); } - params=$.extend(params,postData); - return params; } //jquery begin $(function(){ - //document forward $.forward=function(config){ if(config.target){ @@ -232,6 +224,85 @@ $(function(){ $(".d-footer").show(); }; + // Fetch all the forms we want to apply custom Bootstrap validation styles to + // For actionForm use ajax submit + var forms = $(".needs-validation"); + // Loop over them and prevent submission + Array.prototype.filter.call(forms, function (form) { + form.addEventListener('submit', function (event) { + if (form.checkValidity() === false) { + event.preventDefault(); + event.stopPropagation(); + }else{ + if($("#actionForm")[0]){//ajaxSubmit + $("#actionForm").ajaxSubmit({//form ajax submit + dataType : 'json',//json type + success : function(data) { //success return + $.unloading(); + + var formErrorType=$("#actionForm").attr("type");//error alert type + + if(data.errors && formErrorType){//have error field return + if(formErrorType=="alert"){//alert dialog + var errorMessage=data.message+"
"; + for (var elem in data.errors){ + errorMessage+=data.errors[elem].message+"
"; + } + $.alert({content:errorMessage,type:"error"}); + }else{//label tip + for (var elem in data.errors){ + $("label[for='"+data.errors[elem].field+"']").html(data.errors[elem].message); + } + if(formErrorType!="label"){ + $("#"+formErrorType).show(); + } + } + return; + } else {//no error,alert result message + $.alert({content:data.message,type:$.platform.messages.messageType[data.messageType], + callback:function(){ + if($("#actionForm").attr("autoclose")) {//auto close button + if($("#backBtn").attr("id")){ + $("#backBtn").click(); + }else{ + $.closeWindow(); + } + return; + } + if($("#actionForm").attr("forward")){//auto forwar to actionForm forward attr + document.location.href=$("#actionForm").attr("forward"); + } + } + }); + } + // refresh datagrid after Submit + if($("#datagrid")[0]){ + $("#datagrid").bootstrapTable("refresh"); + } + //self define afterSubmit + if (typeof(afterSubmit) == "function"){ + afterSubmit(data);//call back + } + }, + beforeSubmit: function(arr, $form, options) { //before submit + $.loading();//loading icon + if (typeof(beforeSubmit) == "function"){ + return beforeSubmit();//callback + } + }, + error : function(a, b, c) {//submit error + $.unloading(); + $.alert({content:$.platform.messages.submit.errorText,type:"error"}); + } + }); + event.preventDefault(); + event.stopPropagation(); + } + } + form.classList.add('was-validated'); + }, false); + }); + //window open by element is window style $(".window").on("click",function(){ if (typeof(beforeWindow) == "function"){ @@ -444,7 +515,9 @@ $(function(){ //alert delete result $.alert({content:data.message,type:$.platform.messages.messageType[data.messageType]}); //refresh grid list - + if($("#datagrid")[0]){ + $("#datagrid").bootstrapTable("refresh"); + } }); } }); @@ -456,7 +529,6 @@ $(function(){ if($("#actionForm").attr("autoclose")) { // try to refresh parent grid list if($.dialog.parent) { - $.dialog.close(); return; } @@ -484,111 +556,19 @@ $(function(){ }); - - //submit button - $("#submitBtn").click(function(){ - var canSubmit = true; - if (typeof(beforeAction) == "function"){ - canSubmit = beforeAction();//before submit - } - if($("#actionForm").attr("validate") && $("#actionForm").attr("validate")=="false"){//是否通过验证和自定义验证，validate属性 - return false; - } - if(canSubmit) { - //$("#actionForm").submit();//submit - } - }); - - //form submit form define + //form json url init all ways not used if($("#actionForm")){//actionForm exist if($("#actionForm").attr("loadaction")){//init form $("#actionForm").json2form({url : $("#actionForm").attr("loadaction")});//init #actionForm with loadaction url $("#actionForm").removeAttr('loadaction'); //is need init } }; - - // Fetch all the forms we want to apply custom Bootstrap validation styles to - var forms = $(".needs-validation"); - // Loop over them and prevent submission - Array.prototype.filter.call(forms, function (form) { - form.addEventListener('submit', function (event) { - if (form.checkValidity() === false) { - event.preventDefault(); - event.stopPropagation(); - }else{ - if($("#actionForm")[0]){//ajaxSubmit - $("#actionForm").ajaxSubmit({//form ajax submit - dataType : 'json',//json type - success : function(data) { //success return - $.unloading(); - if (typeof(afterSubmit) == "function"){ - afterSubmit(data);//call back - return; - } - - var formErrorType=$("#actionForm").attr("type");//error alert type - - if(data.errors && formErrorType){//have error field return - if(formErrorType=="alert"){//alert dialog - var errorMessage=data.message+"
"; - for (var elem in data.errors){ - errorMessage+=data.errors[elem].message+"
"; - } - $.alert({content:errorMessage,type:"error"}); - }else{//label tip - for (var elem in data.errors){ - $("label[for='"+data.errors[elem].field+"']").html(data.errors[elem].message); - } - if(formErrorType!="label"){ - $("#"+formErrorType).show(); - } - } - return; - } else {//no error,alert result message - $.alert({content:data.message,type:$.platform.messages.messageType[data.messageType], - callback:function(){ - if($("#actionForm").attr("autoclose")) {//auto close button - if($("#backBtn").attr("id")){ - $("#backBtn").click(); - }else{ - $.closeWindow(); - } - return; - } - if($("#actionForm").attr("forward")){//auto forwar to actionForm forward attr - document.location.href=$("#actionForm").attr("forward"); - } - } - }); - } - }, - beforeSubmit: function(arr, $form, options) { //before submit - $.loading();//loading icon - if (typeof(beforeSubmit) == "function"){ - return beforeSubmit();//callback - } - }, - error : function(a, b, c) {//submit error - $.unloading(); - $.alert({content:$.platform.messages.submit.errorText,type:"error"}); - } - }); - event.preventDefault(); - event.stopPropagation(); - } - } - form.classList.add('was-validated'); - }, false); - }); $.dataGridSelRowsData=function(dataGridElement){ return $(dataGridElement).bootstrapTable('getSelections'); }; - - var curExpandNode = null; - $.tree=function (treeSettings){ function singlePath(newNode) { @@ -696,5 +676,4 @@ $(function(){ } ); };//end tree - -});//jquery end +});//jquery end \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl index 0774bd5b69d5be33068510c25696fab019b6c9fe..2f11e5998fc61e6f34b00e1e15c927611168d8a6 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl @@ -35,11 +35,11 @@
-
+ - +
diff --git a/maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl index a37dcf39672d9d137e0f8770fed5533300583329..010a2bb16c69e326a81446a230804c15dee27245 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl @@ -37,13 +37,13 @@
-
+ - +
diff --git a/maxkey-web-manage/src/main/resources/templates/views/roleusers/addRoleUsersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/roleusers/addRoleUsersList.ftl index 821baf5a22bbfacf2719d1ea7eb0b62d84c9b10c..aa4657019d8beccff418fb061ff44bc294807a5d 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/roleusers/addRoleUsersList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/roleusers/addRoleUsersList.ftl @@ -36,8 +36,8 @@ -
-
+
+ diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java index 6dc1768d462acc8d380c3cbf927d0253bf31acce..bd0af68d0775e8a5938b0574ed85288e951dfb2f 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java @@ -4,7 +4,7 @@ import java.util.Date; import javax.servlet.ServletException; import org.apache.ibatis.io.VFS; import org.apache.mybatis.jpa.SpringBootVFS; -import org.maxkey.web.InitApplicationContext; +import org.maxkey.web.InitializeContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; @@ -24,7 +24,7 @@ public class MaxKeyApplication extends SpringBootServletInitializer { VFS.addImplClass(SpringBootVFS.class); ConfigurableApplicationContext applicationContext = SpringApplication.run(MaxKeyApplication.class, args); - InitApplicationContext initWebContext = new InitApplicationContext(applicationContext); + InitializeContext initWebContext = new InitializeContext(applicationContext); try { initWebContext.init(null); } catch (ServletException e) { diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java index 8f490873876895ebbf2261b7dd3623c9fe570491..287de6baa646014ba43d86d56e705d356c5c3e87 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java @@ -6,7 +6,6 @@ import org.maxkey.constants.ConstantsProtocols; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.dao.service.AccountsService; import org.maxkey.dao.service.AppsService; -import org.maxkey.dao.service.MyAppsListService; import org.maxkey.dao.service.UserInfoService; import org.maxkey.domain.Accounts; import org.maxkey.domain.UserInfo; @@ -42,9 +41,6 @@ public class AppListController { @Autowired protected JdbcTemplate jdbcTemplate; - @Autowired - MyAppsListService myAppsListService; - @Autowired AccountsService appUsersService; @@ -82,7 +78,7 @@ public class AppListController { UserApps userApplications = new UserApps(); userApplications.setUsername(WebContext.getUserInfo().getUsername()); - List appList = myAppsListService.queryMyApps(userApplications); + List appList = appsService.queryMyApps(userApplications); for (UserApps app : appList) { WebContext.setAttribute(app.getId(), app.getIcon()); } diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ProfileController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ProfileController.java index ab09e900aef731510a6fe68fa95f8f4de3044f49..4c0e161600248ef022204f01ac51053f275898fa 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ProfileController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/ProfileController.java @@ -2,7 +2,6 @@ package org.maxkey.web.contorller; import javax.validation.Valid; import org.maxkey.constants.ConstantsOperateMessage; -import org.maxkey.dao.service.MyProfileService; import org.maxkey.dao.service.UserInfoService; import org.maxkey.domain.UserInfo; import org.maxkey.web.WebContext; @@ -27,9 +26,6 @@ public class ProfileController { @Autowired private UserInfoService userInfoService; - @Autowired - private MyProfileService myProfileService; - @RequestMapping(value = { "/myProfile" }) public ModelAndView forwardBasic() { ModelAndView modelAndView = new ModelAndView("profile/myProfile"); @@ -69,7 +65,7 @@ public class ProfileController { // userInfo.setExtraAttribute(extraAttribute); // } - if (myProfileService.updateProfile(userInfo) > 0) { + if (userInfoService.updateProfile(userInfo) > 0) { new Message( WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_SUCCESS), userInfo, MessageType.success,