diff --git a/maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java b/maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java index e800ecfa..28589eea 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java @@ -2,6 +2,12 @@ package org.maxkey.domain; import java.io.Serializable; +import javax.persistence.Column; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + /* ID varchar(40) not null, @@ -9,17 +15,24 @@ import java.io.Serializable; UID varchar(40) null constraint PK_ROLES primary key clustered (ID) */ +@Table(name = "GROUP_MEMBER") public class GroupMember extends UserInfo implements Serializable{ /** * */ private static final long serialVersionUID = -8059639972590554760L; + @Id + @Column + @GeneratedValue(strategy=GenerationType.AUTO,generator="uuid") + String id; + @Column private String groupId; private String groupName; - + @Column private String memberId; private String memberName; + @Column private String type;//User or Group @@ -54,6 +67,16 @@ public class GroupMember extends UserInfo implements Serializable{ } + public String getId() { + return id; + } + + + public void setId(String id) { + this.id = id; + } + + /** * @return the groupId */ diff --git a/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java b/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java index f9b17402..31a54536 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java @@ -2,7 +2,12 @@ package org.maxkey.domain; import java.io.Serializable; -import org.hibernate.validator.constraints.NotEmpty; +import javax.persistence.Column; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + import org.maxkey.domain.apps.Applications; @@ -12,15 +17,20 @@ import org.maxkey.domain.apps.Applications; MENUID varchar(40) null constraint PK_ROLES primary key clustered (ID) */ +@Table(name = "GROUP_APP") public class GroupPrivileges extends Applications implements Serializable{ /** * */ private static final long serialVersionUID = 8634166407201007340L; - @NotEmpty + @Id + @Column + @GeneratedValue(strategy=GenerationType.AUTO,generator="uuid") + String id; + @Column private String groupId; - @NotEmpty + @Column private String appId; public GroupPrivileges(){ @@ -65,6 +75,16 @@ public class GroupPrivileges extends Applications implements Serializable{ } + public String getId() { + return id; + } + + + public void setId(String id) { + this.id = id; + } + + /* (non-Javadoc) * @see java.lang.Object#toString() */ diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Groups.java b/maxkey-core/src/main/java/org/maxkey/domain/Groups.java index 17420113..bb859122 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Groups.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/Groups.java @@ -2,6 +2,10 @@ package org.maxkey.domain; import java.io.Serializable; +import javax.persistence.Column; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; import javax.persistence.Table; import org.apache.mybatis.jpa.persistence.JpaBaseDomain; @@ -14,17 +18,27 @@ public class Groups extends JpaBaseDomain implements Serializable{ * */ private static final long serialVersionUID = 4660258495864814777L; - + @Id + @Column + @GeneratedValue(strategy=GenerationType.AUTO,generator="uuid") String id; @Length(max=60) + @Column private String name; + @Column private int isdefault; + @Column String description; + @Column String createdBy; + @Column String createdDate; + @Column String modifiedBy; + @Column String modifiedDate; + @Column String status; public Groups() {} diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java b/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java index 5bc4beff..a576736f 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java @@ -17,27 +17,52 @@ public class Organizations extends JpaBaseDomain implements Serializable{ @Column @GeneratedValue(strategy=GenerationType.AUTO,generator="uuid") private String id; - private String code; - private String name; - private String fullName; - private String pId; - private String pName; - private String type; - private String xPath; - private String xNamePath; - private String level; - private String hasChild; - private String division; - private String country; - private String region; - private String locality; - private String street; - private String address; - private String contact; - private String postalCode; - private String phone; - private String fax; - private String email; + @Column + private String code; + @Column + private String name; + @Column + private String fullName; + @Column + private String pId; + @Column + private String pName; + @Column + private String type; + @Column + private String xPath; + @Column + private String xNamePath; + @Column + private String level; + @Column + private String hasChild; + @Column + private String division; + @Column + private String country; + @Column + private String region; + @Column + private String locality; + @Column + private String street; + @Column + private String address; + @Column + private String contact; + @Column + private String postalCode; + @Column + private String phone; + @Column + private String fax; + @Column + private String email; + @Column + private String sortOrder; + @Column + private String description; /** * @@ -224,4 +249,31 @@ public class Organizations extends JpaBaseDomain implements Serializable{ this.email = email; } + + public String getSortOrder() { + return sortOrder; + } + + public void setSortOrder(String sortOrder) { + this.sortOrder = sortOrder; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @Override + public String toString() { + return "Organizations [id=" + id + ", code=" + code + ", name=" + name + ", fullName=" + fullName + ", pId=" + + pId + ", pName=" + pName + ", type=" + type + ", xPath=" + xPath + ", xNamePath=" + xNamePath + + ", level=" + level + ", hasChild=" + hasChild + ", division=" + division + ", country=" + country + + ", region=" + region + ", locality=" + locality + ", street=" + street + ", address=" + address + + ", contact=" + contact + ", postalCode=" + postalCode + ", phone=" + phone + ", fax=" + fax + + ", email=" + email + ", sortOrder=" + sortOrder + ", description=" + description + "]"; + } + } diff --git a/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java b/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java index 131b3388..a5a89ab0 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java @@ -33,49 +33,81 @@ public class UserInfo extends JpaBaseDomain { String id; @Column protected String username; + @Column protected String password; + @Column protected String decipherable; + @Column protected String sharedSecret; + @Column protected String sharedCounter; /** * "Employee", "Supplier","Dealer","Contractor",Partner,Customer "Intern", "Temp", "External", and "Unknown" */ + @Column protected String userType; + @Column protected String windowsAccount; //for user name + @Column protected String displayName; + @Column protected String nickName; + @Column protected String nameZHSpell; + @Column protected String nameZHShortSpell; + @Column protected String givenName; + @Column protected String middleName; + @Column protected String familyName; + @Column protected String honorificPrefix; + @Column protected String honorificSuffix; + @Column protected String formattedName; + @Column protected int married; + @Column protected int gender; + @Column protected String birthDate; @JsonIgnore + @Column protected byte[] picture; @JsonIgnore protected MultipartFile pictureFile; + @Column protected int idType; + @Column protected String idCardNo; + @Column protected String webSite; + @Column protected String startWorkDate; //for security + @Column protected int authnType; + @Column protected String email; + protected int emailVerified; + @Column protected String mobile; + protected int mobileVerified; + protected String passwordQuestion; + protected String passwordAnswer; + @Column //for apps login protected protected int appLoginAuthnType; protected String appLoginPassword; @@ -94,59 +126,83 @@ public class UserInfo extends JpaBaseDomain { protected int passwordSetType; protected Integer loginCount; - + @Column protected String locale; + @Column protected String timeZone; + @Column protected String preferredLanguage; //for work + @Column protected String workCountry; + @Column protected String workRegion;//province; + @Column protected String workLocality;//city; + @Column protected String workStreetAddress; + @Column protected String workAddressFormatted; + @Column protected String workEmail; + @Column protected String workPhoneNumber; + @Column protected String workPostalCode; + @Column protected String workFax; //for home + @Column protected String homeCountry; + @Column protected String homeRegion;//province; + @Column protected String homeLocality;//city; + @Column protected String homeStreetAddress; + @Column protected String homeAddressFormatted; + @Column protected String homeEmail; + @Column protected String homePhoneNumber; + @Column protected String homePostalCode; + @Column protected String homeFax; //for company + @Column protected String employeeNumber; + @Column protected String costCenter; + @Column protected String organization; + @Column protected String division; + @Column protected String departmentId; + @Column protected String department; + @Column protected String jobTitle; + @Column protected String jobLevel; + @Column protected String managerId; + @Column protected String manager; + @Column protected String assistantId; + @Column protected String assistant; + @Column protected String entryDate; + @Column protected String quitDate; //for social contact - protected String qq; - protected String weixin; - protected String sinaweibo; - protected String yixin; - protected String facebook; - protected String skype; - protected String msn; - protected String gtalk; - protected String yahoo; - protected String line; - protected String aim; + @Column protected String defineIm; protected int weixinFollow; @@ -167,13 +223,17 @@ public class UserInfo extends JpaBaseDomain { protected int gridList; - String createdBy;; + @Column + String createdBy; + @Column String createdDate; + @Column String modifiedBy; + @Column String modifiedDate; - + @Column int status; - + @Column String description ; @@ -1025,94 +1085,7 @@ public class UserInfo extends JpaBaseDomain { this.gridList = gridList; } - public String getQq() { - return qq; - } - - public void setQq(String qq) { - this.qq = qq; - } - - public String getWeixin() { - return weixin; - } - - public void setWeixin(String weixin) { - this.weixin = weixin; - } - - public String getSinaweibo() { - return sinaweibo; - } - - public void setSinaweibo(String sinaweibo) { - this.sinaweibo = sinaweibo; - } - - public String getYixin() { - return yixin; - } - - public void setYixin(String yixin) { - this.yixin = yixin; - } - - public String getFacebook() { - return facebook; - } - - public void setFacebook(String facebook) { - this.facebook = facebook; - } - - public String getSkype() { - return skype; - } - - public void setSkype(String skype) { - this.skype = skype; - } - - public String getMsn() { - return msn; - } - - public void setMsn(String msn) { - this.msn = msn; - } - - public String getGtalk() { - return gtalk; - } - - public void setGtalk(String gtalk) { - this.gtalk = gtalk; - } - - public String getYahoo() { - return yahoo; - } - - public void setYahoo(String yahoo) { - this.yahoo = yahoo; - } - - public String getLine() { - return line; - } - - public void setLine(String line) { - this.line = line; - } - - public String getAim() { - return aim; - } - - public void setAim(String aim) { - this.aim = aim; - } - + public String getDefineIm() { return defineIm; } diff --git a/maxkey-core/src/main/java/org/maxkey/web/BasicController.java b/maxkey-core/src/main/java/org/maxkey/web/BasicController.java new file mode 100644 index 00000000..7c1cce70 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/BasicController.java @@ -0,0 +1,25 @@ +package org.maxkey.web; + +import org.apache.mybatis.jpa.persistence.JpaBaseDomain; +import org.apache.mybatis.jpa.persistence.JpaPageResults; +import org.maxkey.web.message.Message; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.servlet.ModelAndView; + +public interface BasicController { + + public JpaPageResults pageResults(@ModelAttribute("modelAttr") T modelAttr); + + public ModelAndView forwardAdd(@ModelAttribute("modelAttr") T modelAttr); + + public Message insert(@ModelAttribute("modelAttr") T modelAttr); + + public ModelAndView forwardUpdate(@PathVariable("id") String id); + + public Message update(@ModelAttribute("modelAttr") T modelAttr); + + public Message delete(@ModelAttribute("modelAttr") T modelAttr) ; + + +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupMemberMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupMemberMapper.java index c47e7b15..cbf1a351 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupMemberMapper.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupMemberMapper.java @@ -7,8 +7,6 @@ import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.maxkey.domain.GroupMember; -import org.maxkey.domain.Groups; -import org.maxkey.domain.UserInfo; /** * @author Crystal.sea @@ -17,22 +15,8 @@ import org.maxkey.domain.UserInfo; public interface GroupMemberMapper extends IJpaBaseMapper { - public List gridUserMemberInGroup(GroupMember entity); - - public Integer countUserMemberInGroup(GroupMember entity); - - public List gridAllUserMemberInGroup(GroupMember entity); - - public Integer countAllUserMemberInGroup(GroupMember entity); - - public List gridUserMemberNotInGroup(GroupMember entity); - - public Integer countUserMemberNotInGroup(GroupMember entity); - - public List gridGroupMemberInGroup(GroupMember entity); - - public Integer countGroupMemberInGroup(GroupMember entity); - - - + public List allMemberInGroup(GroupMember entity); + public List memberInGroup(GroupMember entity); + public List memberNotInGroup(GroupMember entity); + public List groupMemberInGroup(GroupMember entity); } diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupPrivilegesMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupPrivilegesMapper.java index 4903d3f2..cceabc38 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupPrivilegesMapper.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/GroupPrivilegesMapper.java @@ -7,7 +7,6 @@ import java.util.List; import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.maxkey.domain.GroupPrivileges; -import org.maxkey.domain.apps.Applications; /** * @author Crystal.sea @@ -16,12 +15,10 @@ import org.maxkey.domain.apps.Applications; public interface GroupPrivilegesMapper extends IJpaBaseMapper { - public List gridAppsInGroup(GroupPrivileges entity); + public ListappsInGroup(GroupPrivileges entity); - public Integer countAppsInGroup(GroupPrivileges entity); - public List gridAppsNotInGroup(GroupPrivileges entity); + public List appsNotInGroup(GroupPrivileges entity); - public Integer countAppsNotInGroup(GroupPrivileges entity); } diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupMemberService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupMemberService.java index f3bdf280..a71c081d 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupMemberService.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupMemberService.java @@ -22,64 +22,4 @@ public class GroupMemberService extends JpaBaseService{ // TODO Auto-generated method stub return (GroupMemberMapper)super.getMapper(); } - - public JpaPageResults gridMemberInGroup(GroupMember entity) { - Integer totalCount = parseCount(getMapper().countUserMemberInGroup(entity)); - if(totalCount == 0) { - return new JpaPageResults(); - } - - int totalPage = calculateTotalPage(entity,totalCount); - - if(totalPage == 0) { - return new JpaPageResults(); - } - - if(totalPage < entity.getPage()) { - entity.setPage(totalPage); - entity.setStartRow(calculateStartRow(totalPage ,entity.getPageResults())); - } - entity.setPageable(true); - return new JpaPageResults(entity.getPage(),entity.getPageResults(),totalCount,getMapper().gridUserMemberInGroup(entity)); - } - - public JpaPageResults gridAllMemberInGroup(GroupMember entity) { - Integer totalCount = parseCount(getMapper().countAllUserMemberInGroup(entity)); - if(totalCount == 0) { - return new JpaPageResults(); - } - - int totalPage = calculateTotalPage(entity,totalCount); - - if(totalPage == 0) { - return new JpaPageResults(); - } - - if(totalPage < entity.getPage()) { - entity.setPage(totalPage); - entity.setStartRow(calculateStartRow(totalPage ,entity.getPageResults())); - } - entity.setPageable(true); - return new JpaPageResults(entity.getPage(),entity.getPageResults(),totalCount,getMapper().gridAllUserMemberInGroup(entity)); - } - - public JpaPageResults gridMemberNotInGroup(GroupMember entity) { - Integer totalCount = parseCount(getMapper().countUserMemberNotInGroup(entity)); - if(totalCount == 0) { - return new JpaPageResults(); - } - - int totalPage = calculateTotalPage(entity,totalCount); - - if(totalPage == 0) { - return new JpaPageResults(); - } - - if(totalPage < entity.getPage()) { - entity.setPage(totalPage); - entity.setStartRow(calculateStartRow(totalPage ,entity.getPageResults())); - } - entity.setPageable(true); - return new JpaPageResults(entity.getPage(),entity.getPageResults(),totalCount,getMapper().gridUserMemberNotInGroup(entity)); - } } diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupPrivilegesService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupPrivilegesService.java index 778fa411..3269411a 100644 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupPrivilegesService.java +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/GroupPrivilegesService.java @@ -1,10 +1,8 @@ package org.maxkey.dao.service; import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.dao.persistence.GroupPrivilegesMapper; import org.maxkey.domain.GroupPrivileges; -import org.maxkey.domain.apps.Applications; import org.springframework.stereotype.Service; @Service @@ -25,47 +23,4 @@ public class GroupPrivilegesService extends JpaBaseService{ return (GroupPrivilegesMapper)super.getMapper(); } - - - public JpaPageResults gridAppsInGroup(GroupPrivileges entity) { - Integer totalCount = parseCount(getMapper().countAppsInGroup(entity)); - if(totalCount == 0) { - return new JpaPageResults(); - } - - int totalPage = calculateTotalPage(entity,totalCount); - - if(totalPage == 0) { - return new JpaPageResults(); - } - - if(totalPage < entity.getPage()) { - entity.setPage(totalPage); - entity.setStartRow(calculateStartRow(totalPage ,entity.getPageResults())); - } - entity.setPageable(true); - return new JpaPageResults(entity.getPage(),entity.getPageResults(),totalCount,getMapper().gridAppsInGroup(entity)); - } - - public JpaPageResults gridAppsNotInGroupGrid(GroupPrivileges entity) { - Integer totalCount = parseCount(getMapper().countAppsNotInGroup(entity)); - if(totalCount == 0) { - return new JpaPageResults(); - } - - int totalPage = calculateTotalPage(entity,totalCount); - - if(totalPage == 0) { - return new JpaPageResults(); - } - - if(totalPage < entity.getPage()) { - entity.setPage(totalPage); - entity.setStartRow(calculateStartRow(totalPage ,entity.getPageResults())); - } - entity.setPageable(true); - return new JpaPageResults(entity.getPage(),entity.getPageResults(),totalCount,getMapper().gridAppsNotInGroup(entity)); - } - - } diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupMemberMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupMemberMapper.xml index 5f2ed6ac..517f3a95 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupMemberMapper.xml +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupMemberMapper.xml @@ -13,7 +13,7 @@ - SELECT DISTINCT U.ID, U.USERNAME, @@ -57,17 +57,9 @@ WHERE 1 = 1 - - - SELECT DISTINCT - U.ID, + GM.ID, U.USERNAME, U.USERTYPE, U.WINDOWSACCOUNT, @@ -121,27 +113,8 @@ AND GM.MEMBERID = U.ID - - SELECT DISTINCT U.ID, U.USERNAME, @@ -199,30 +172,9 @@ ) - - SELECT DISTINCT IG.* FROM @@ -242,28 +194,6 @@ AND G.NAME = #{groupName} - - - + \ 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 new file mode 100644 index 00000000..1c30d46c --- /dev/null +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/GroupPrivilegesMapper.xml @@ -0,0 +1,51 @@ + + + + + + + AND APPS.ID = #{id} + + + AND APPS.NAME LIKE '%${name}%' + + + AND APPS.PROTOCOL = #{protocol} + + + AND APPS.CATEGORY = #{category} + + + + + + + + + \ No newline at end of file diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/OrganizationsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/OrganizationsMapper.xml index d1bd5431..44a55577 100644 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/OrganizationsMapper.xml +++ b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/OrganizationsMapper.xml @@ -20,7 +20,7 @@ - SELECT * FROM ORGANIZATIONS @@ -29,13 +29,6 @@ - - - UPDATE ORGANIZATIONS SET STATUS = '2' WHERE 1 = 1 diff --git a/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore index f1f834d4..59d60644 100644 --- a/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore +++ b/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore @@ -1,2 +1,2 @@ -/org/ /META-INF/ +/org/ diff --git a/maxkey-protocols/maxkey-protocol-desktop/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-desktop/bin/main/.gitignore new file mode 100644 index 00000000..59d60644 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-desktop/bin/main/.gitignore @@ -0,0 +1,2 @@ +/META-INF/ +/org/ diff --git a/maxkey-protocols/maxkey-protocol-extendapi/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-extendapi/bin/main/.gitignore new file mode 100644 index 00000000..59d60644 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-extendapi/bin/main/.gitignore @@ -0,0 +1,2 @@ +/META-INF/ +/org/ diff --git a/maxkey-protocols/maxkey-protocol-formbased/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-formbased/bin/main/.gitignore index f1f834d4..59d60644 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/bin/main/.gitignore +++ b/maxkey-protocols/maxkey-protocol-formbased/bin/main/.gitignore @@ -1,2 +1,2 @@ -/org/ /META-INF/ +/org/ diff --git a/maxkey-protocols/maxkey-protocol-ltpa/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-ltpa/bin/main/.gitignore new file mode 100644 index 00000000..59d60644 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-ltpa/bin/main/.gitignore @@ -0,0 +1,2 @@ +/META-INF/ +/org/ diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/.gitignore index f1f834d4..59d60644 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/.gitignore +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/.gitignore @@ -1,2 +1,2 @@ -/org/ /META-INF/ +/org/ diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-saml-2.0/bin/main/.gitignore index cf1db2ee..59d60644 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/bin/main/.gitignore +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/bin/main/.gitignore @@ -1 +1,2 @@ +/META-INF/ /org/ diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-tokenbased/bin/main/.gitignore new file mode 100644 index 00000000..59d60644 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-tokenbased/bin/main/.gitignore @@ -0,0 +1,2 @@ +/META-INF/ +/org/ diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/AccountsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/AccountsController.java index 4b390793..915741c9 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/AccountsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/AccountsController.java @@ -64,8 +64,8 @@ public class AccountsController { @RequestMapping(value = { "/forwardAdd" }) public ModelAndView forwardAdd(@ModelAttribute("appAccounts") Accounts appAccounts) { ModelAndView modelAndView=new ModelAndView("/accounts/appAccountsAdd"); - Applications app= applicationsService.get(appAccounts.getAppId()); - appAccounts.setAppName(app.getName()); + //Applications app= applicationsService.get(appAccounts.getAppId()); + //appAccounts.setAppName(app.getName()); modelAndView.addObject("model",appAccounts); return modelAndView; } diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupMemberController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupMemberController.java index d12cfb9a..ca6cd7cd 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupMemberController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupMemberController.java @@ -66,13 +66,14 @@ public class GroupMemberController { } - @RequestMapping(value = { "/gridUserMemberInGroup" }) + @RequestMapping(value = { "/queryMemberInGroup" }) @ResponseBody - public JpaPageResults gridUserMemberInGroup(@ModelAttribute("groups") GroupMember groupMember) { + public JpaPageResults queryMemberInGroup(@ModelAttribute("groupMember") GroupMember groupMember) { + _logger.debug("groupMember : "+groupMember); if(groupMember.getGroupId()==null||groupMember.getGroupId().equals("")||groupMember.getGroupId().equals("ALL_USER_GROUP")){ - return groupMemberService.gridAllMemberInGroup(groupMember); + return groupMemberService.queryPageResults("allMemberInGroup",groupMember); }else{ - return groupMemberService.gridMemberInGroup(groupMember); + return groupMemberService.queryPageResults("memberInGroup",groupMember); } } @@ -85,10 +86,10 @@ public class GroupMemberController { return modelAndView; } - @RequestMapping(value = { "/gridUserMemberNotInGroup" }) + @RequestMapping(value = { "/queryMemberNotInGroup" }) @ResponseBody - public JpaPageResults queryUserMemberNotInGroupGrid(@ModelAttribute("groupMember") GroupMember groupMember) { - return groupMemberService.gridMemberNotInGroup(groupMember); + public JpaPageResults queryMemberNotInGroupGrid(@ModelAttribute("groupMember") GroupMember groupMember) { + return groupMemberService.queryPageResults("memberNotInGroup",groupMember); } @@ -124,23 +125,17 @@ public class GroupMemberController { @RequestMapping(value = {"/delete"}) @ResponseBody public Message deleteGroupMember(@ModelAttribute("groupMember") GroupMember groupMember) { - if (groupMember == null || groupMember.getGroupId() == null) { + _logger.debug("groupMember : "+groupMember); + + if (groupMember == null || groupMember.getId() == null) { return new Message("传入参数为空",MessageType.error); } - String groupId = groupMember.getGroupId(); - - boolean result = true; - String memberIds = groupMember.getMemberId(); - String memberNames = groupMember.getMemberName(); - if (memberIds != null) { - String[] arrMemberIds = memberIds.split(","); - String[] arrMemberNames = memberNames.split(","); - + String groupMemberIds = groupMember.getId(); + if (groupMemberIds != null) { + String[] arrMemberIds = groupMemberIds.split(","); for (int i = 0; i < arrMemberIds.length; i++) { - GroupMember newGroupMember = new GroupMember(groupId,groupMember.getGroupName(), arrMemberIds[i], arrMemberNames[i],"USER"); - newGroupMember.setId(newGroupMember.generateId()); - result = groupMemberService.delete(newGroupMember); + groupMemberService.remove(arrMemberIds[i]); } if(!result) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_ERROR),MessageType.error); diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java index 6b389899..fdc33dcd 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java @@ -35,12 +35,13 @@ public class GroupPrivilegesController { return new ModelAndView("groupapp/groupAppsList"); } - @RequestMapping(value = { "/gridAppsInGroup" }) + @RequestMapping(value = { "/queryAppsInGroup" }) @ResponseBody - public JpaPageResults queryAppsInGroupGrid(@ModelAttribute("groupApp") GroupPrivileges groupApp) { + public JpaPageResults queryAppsInGroup(@ModelAttribute("groupApp") GroupPrivileges groupApp) { - JpaPageResults jqGridApp; - jqGridApp= groupPrivilegesService.gridAppsInGroup(groupApp); + JpaPageResults jqGridApp; + + jqGridApp= groupPrivilegesService.queryPageResults("appsInGroup",groupApp); if(jqGridApp!=null&&jqGridApp.getRows()!=null){ for (Applications app : jqGridApp.getRows()){ @@ -59,13 +60,12 @@ public class GroupPrivilegesController { } - @RequestMapping(value = { "/appsNotInGroupGrid" }) + @RequestMapping(value = { "/queryAppsNotInGroup" }) @ResponseBody - public JpaPageResults queryAppsNotInGroupGrid(@ModelAttribute("groupApp") GroupPrivileges groupApp) { - - JpaPageResults jqGridApp; + public JpaPageResults queryAppsNotInGroup(@ModelAttribute("groupApp") GroupPrivileges groupApp) { + JpaPageResults jqGridApp; - jqGridApp= groupPrivilegesService.gridAppsNotInGroupGrid(groupApp); + jqGridApp= groupPrivilegesService.queryPageResults("appsNotInGroup",groupApp); if(jqGridApp!=null&&jqGridApp.getRows()!=null){ for (Applications app : jqGridApp.getRows()){ @@ -107,20 +107,18 @@ public class GroupPrivilegesController { @RequestMapping(value = {"/delete"}) @ResponseBody public Message deleteGroupApp(@ModelAttribute("groupApp") GroupPrivileges groupApp) { - if (groupApp == null || groupApp.getGroupId() == null) { + if (groupApp == null || groupApp.getId() == null) { return new Message("传入参数为空",MessageType.error); } - String groupId = groupApp.getGroupId(); + String privilegesIds = groupApp.getId(); boolean result = true; - String appIds = groupApp.getAppId(); - if (appIds != null) { - String[] arrAppIds = appIds.split(","); + if (privilegesIds != null) { + String[] arrPrivilegesIds = privilegesIds.split(","); - for (int i = 0; i < arrAppIds.length; i++) { - GroupPrivileges newGroupApp = new GroupPrivileges(groupId, arrAppIds[i]); - result = groupPrivilegesService.delete(newGroupApp); + for (int i = 0; i < arrPrivilegesIds.length; i++) { + result = groupPrivilegesService.remove(arrPrivilegesIds[i]); } if(!result) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_ERROR),MessageType.error); diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupsController.java index 12671412..8906632a 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/GroupsController.java @@ -119,7 +119,7 @@ public class GroupsController { public Message delete(@ModelAttribute("group") Groups group) { _logger.debug("-delete group :" + group); - if (groupsService.delete(group)) { + if (groupsService.remove(group.getId())) { return new Message(WebContext.getI18nValue(OPERATEMESSAGE.DELETE_SUCCESS),MessageType.success); } else { diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java index 3fcf5096..977dd1d7 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java @@ -3,6 +3,7 @@ package org.maxkey.web.contorller; import java.util.HashMap; import java.util.List; +import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.dao.service.OrganizationsService; import org.maxkey.domain.Organizations; import org.maxkey.web.WebContext; @@ -24,7 +25,7 @@ import org.springframework.web.servlet.ModelAndView; @Controller @RequestMapping({"/orgs"}) -public class OrganizationsController{ +public class OrganizationsController { static final Logger _logger = LoggerFactory.getLogger(OrganizationsController.class); @@ -36,35 +37,19 @@ public class OrganizationsController{ @RequestMapping({"/tree"}) public List> organizationsTree(@RequestParam(value = "id", required = false) String id) { _logger.debug("organizationsTree id :" + id); - Organizations org = new Organizations(); - List organizationsList = this.organizationsService.query(org); - - Organizations rootOrganization = new Organizations(); - rootOrganization.setId("1"); - rootOrganization.setName(""); - rootOrganization.setFullName(""); - rootOrganization.setpName("Root"); - rootOrganization.setxPath("/1"); - rootOrganization.setxNamePath("/" ); - rootOrganization.setpId("-1"); - + Organizations queryOrg = new Organizations(); + List organizationsList = this.organizationsService.query(queryOrg); TreeNodeList treeNodeList = new TreeNodeList(); - TreeNode rootTreeNode = new TreeNode("1", ""); - rootTreeNode.setAttr("data", rootOrganization); - rootTreeNode.setPId(rootOrganization.getpId()); - rootTreeNode.setAttr("open", Boolean.valueOf(true)); - treeNodeList.addTreeNode(rootTreeNode.getAttr()); - for (Organizations organization : organizationsList) { - TreeNode treeNode = new TreeNode(organization.getId(), organization.getName()); - if (organization.getHasChild() != null && organization.getHasChild().equals(Character.valueOf('Y'))) { + for (Organizations org : organizationsList) { + TreeNode treeNode = new TreeNode(org.getId(), org.getName()); + if (org.getHasChild() != null && org.getHasChild().startsWith("Y")) { treeNode.setHasChild(); } - - treeNode.setAttr("data", organization); - treeNode.setPId(organization.getpId()); - if (organization.getId().equals("1")) { + treeNode.setAttr("data", org); + treeNode.setPId(org.getpId()); + if (org.getId().equals("1")) { treeNode.setAttr("open", Boolean.valueOf(true)); } else { treeNode.setAttr("open", Boolean.valueOf(false)); @@ -78,10 +63,17 @@ public class OrganizationsController{ - @RequestMapping({"/list"}) - public ModelAndView orgsTreeList() { return new ModelAndView("orgs/orgsList"); } + @RequestMapping({ "/list" }) + public ModelAndView orgsTreeList() { + return new ModelAndView("orgs/orgsList"); + } + @RequestMapping(value = { "/pageresults" }) + @ResponseBody + public JpaPageResults pageResults(@ModelAttribute("orgs") Organizations orgs) { + return organizationsService.queryPageResults(orgs); + } @RequestMapping({"/orgsSelect/{deptId}/{department}"}) @@ -93,20 +85,26 @@ public class OrganizationsController{ } - + @RequestMapping(value = { "/forwardAdd" }) + public ModelAndView forwardAdd(@ModelAttribute("org") Organizations org) { + ModelAndView modelAndView=new ModelAndView("/orgs/orgsAdd"); + org =organizationsService.get(org.getId()); + modelAndView.addObject("model",org); + return modelAndView; + } @ResponseBody @RequestMapping({"/add"}) - public Message insert(@ModelAttribute("organization") Organizations organization) { - _logger.debug("-Add :" + organization); - if (null == organization.getId() || organization.getId().equals("")) { - organization.generateId(); + public Message insert(@ModelAttribute("org") Organizations org) { + _logger.debug("-Add :" + org); + if (null == org.getId() || org.getId().equals("")) { + org.generateId(); } - if (this.organizationsService.insert(organization)) { + if (this.organizationsService.insert(org)) { return new Message(WebContext.getI18nValue("message.action.insert.success"), MessageType.success); } @@ -122,9 +120,9 @@ public class OrganizationsController{ @ResponseBody @RequestMapping({"/query"}) - public Message query(@ModelAttribute("organization") Organizations organization) { - _logger.debug("-query :" + organization); - if (this.organizationsService.load(organization) != null) { + public Message query(@ModelAttribute("org") Organizations org) { + _logger.debug("-query :" + org); + if (this.organizationsService.load(org) != null) { return new Message(WebContext.getI18nValue("message.action.insert.success"), MessageType.success); } @@ -134,15 +132,22 @@ public class OrganizationsController{ - + @RequestMapping(value = { "/forwardUpdate/{id}" }) + public ModelAndView forwardUpdate(@PathVariable("id") String id) { + ModelAndView modelAndView=new ModelAndView("/orgs/orgsUpdate"); + Organizations org =organizationsService.get(id); + + modelAndView.addObject("model",org); + return modelAndView; + } @ResponseBody @RequestMapping({"/update"}) - public Message update(@ModelAttribute("organization") Organizations organization) { - _logger.debug("-update organization :" + organization); - if (this.organizationsService.update(organization)) { + public Message update(@ModelAttribute("org") Organizations org) { + _logger.debug("-update organization :" + org); + if (this.organizationsService.update(org)) { return new Message(WebContext.getI18nValue("message.action.update.success"), MessageType.success); } @@ -155,12 +160,11 @@ public class OrganizationsController{ - @ResponseBody @RequestMapping({"/delete"}) - public Message delete(@ModelAttribute("organization") Organizations organization) { - _logger.debug("-delete organization :" + organization); - if (this.organizationsService.delete(organization)) { + public Message delete(@ModelAttribute("org") Organizations org) { + _logger.debug("-delete organization :" + org); + if (this.organizationsService.remove(org.getId())) { return new Message(WebContext.getI18nValue("message.action.delete.success"), MessageType.success); } @@ -172,4 +176,11 @@ public class OrganizationsController{ @RequestMapping({"/orgUsersList"}) public ModelAndView orgUsersList() { return new ModelAndView("orgs/orgUsersList"); } + + + + + + + } diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ReportLoginController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ReportLoginController.java deleted file mode 100644 index 9be676ad..00000000 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/ReportLoginController.java +++ /dev/null @@ -1,255 +0,0 @@ -package org.maxkey.web.contorller; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.joda.time.DateTime; -import org.joda.time.format.DateTimeFormat; -import org.maxkey.dao.service.ReportService; -import org.maxkey.util.JsonUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; - - -/** - * @author Crystal.Sea - * - */ -@Controller -@RequestMapping(value = { "/report" }) -public class ReportLoginController { - final static Logger _logger = LoggerFactory.getLogger(ReportLoginController.class); - - @Autowired - @Qualifier("reportService") - private ReportService reportService; - - - @RequestMapping(value = { "/login/day" }) - public ModelAndView dayReport( - @RequestParam(value="reportDate",required=false) String reportDate) { - ModelAndView modelAndView=new ModelAndView("report/login/day"); - if(reportDate==null||reportDate.equals("")){ - DateTime currentdateTime = new DateTime(); - reportDate=currentdateTime.toString( DateTimeFormat.forPattern("yyyy-MM-dd")); - } - - List> listDayReport=reportService.analysisDay(reportDate); - Integer[] dayReportArray=new Integer[24]; - for(int i=0;i<24;i++){ - dayReportArray[i]=0; - } - for(Map record :listDayReport){ - Integer count=Integer.parseInt(record.get("REPORTCOUNT").toString()); - int hour=Integer.parseInt(record.get("REPORTHOUR").toString()); - dayReportArray[hour]=count; - } - - String jsonDayReport=JsonUtils.gson2Json(dayReportArray); - _logger.info(""+jsonDayReport); - - modelAndView.addObject("dayReportArray",jsonDayReport); - modelAndView.addObject("reportDate",reportDate); - return modelAndView; - } - - @RequestMapping(value = { "/login/month" }) - public ModelAndView monthReport( - @RequestParam(value="reportDate",required=false) String reportDate) { - ModelAndView modelAndView=new ModelAndView("report/login/month"); - if(reportDate==null||reportDate.equals("")){ - DateTime currentdateTime = new DateTime(); - reportDate=currentdateTime.toString( DateTimeFormat.forPattern("yyyy-MM-dd")); - } - - List> listMonthReport=reportService.analysisMonth(reportDate); - Integer[] monthReportArray=new Integer[31]; - for(int i=0;i<31;i++){ - monthReportArray[i]=0; - } - for(Map record :listMonthReport){ - Integer count=Integer.parseInt(record.get("REPORTCOUNT").toString()); - int day=Integer.parseInt(record.get("REPORTDAY").toString()); - monthReportArray[day-1]=count; - } - - String jsonMonthReport=JsonUtils.gson2Json(monthReportArray); - _logger.info(""+jsonMonthReport); - - modelAndView.addObject("jsonMonthReport",jsonMonthReport); - modelAndView.addObject("reportDate",reportDate); - return modelAndView; - } - - @RequestMapping(value = { "/login/year" }) - public ModelAndView yearReport( - @RequestParam(value="reportDate",required=false) Integer reportDate) { - ModelAndView modelAndView=new ModelAndView("report/login/year"); - if(reportDate==null||reportDate.equals("")){ - DateTime currentdateTime = new DateTime(); - reportDate=Integer.parseInt(currentdateTime.toString( DateTimeFormat.forPattern("yyyy"))); - } - - List> listMonthReport=reportService.analysisYear(reportDate); - - Integer[] monthReportArray=new Integer[12]; - for(int i=0;i<12;i++){ - monthReportArray[i]=0; - } - for(Map record :listMonthReport){ - Integer count=Integer.parseInt(record.get("REPORTCOUNT").toString()); - int month=Integer.parseInt(record.get("REPORTMONTH").toString()); - monthReportArray[month-1]=count; - } - - String jsonMonthReport=JsonUtils.gson2Json(monthReportArray); - _logger.info(""+jsonMonthReport); - - modelAndView.addObject("jsonMonthReport",jsonMonthReport); - modelAndView.addObject("reportDate",reportDate); - return modelAndView; - } - - @RequestMapping(value = { "/login/browser" }) - public ModelAndView browserReport( - @RequestParam(value="startDate",required=false) String startDate, - @RequestParam(value="endDate",required=false) String endDate) { - ModelAndView modelAndView=new ModelAndView("report/login/browser"); - String startDateTime=""; - String endDateTime=""; - if(startDate==null||startDate.equals("")){ - DateTime currentdateTime = new DateTime(); - startDate=currentdateTime.toString( DateTimeFormat.forPattern("yyyy-MM-dd")); - startDateTime=currentdateTime.toString( DateTimeFormat.forPattern("yyyy-MM-dd 00:00:00")); - }else{ - startDateTime=startDate+" 00:00:00"; - } - if(endDate==null||endDate.equals("")){ - DateTime currentdateTime = new DateTime(); - endDate=currentdateTime.toString( DateTimeFormat.forPattern("yyyy-MM-dd")); - endDateTime=currentdateTime.toString( DateTimeFormat.forPattern("yyyy-MM-dd 23:59:59")); - }else{ - endDateTime=endDate+" 23:59:59"; - } - - Map reportDate=new HashMap(); - reportDate.put("startDate", startDateTime); - reportDate.put("endDate", endDateTime); - List> listReport=reportService.analysisBrowser(reportDate); - - Integer[] countArray=new Integer[listReport.size()]; - String [] categoryArray=new String[listReport.size()]; - String [] categoryPieArray=new String[listReport.size()]; - Map[] countPieArray=new HashMap[listReport.size()]; - for(int i=0;i record :listReport){ - countAll=countAll+Integer.parseInt(record.get("REPORTCOUNT").toString()); - } - _logger.info("countAll : "+countAll); - - for(Map record :listReport){ - Integer count=Integer.parseInt(record.get("REPORTCOUNT").toString()); - String browser=record.get("BROWSER").toString(); - - countArray[recordCount]=count; - categoryArray[recordCount]=browser; - String pieBrowser=((count*100f)/countAll)+""; - if(pieBrowser.length()>5){ - pieBrowser=browser+"("+(pieBrowser.substring(0, 5))+"%)"; - }else{ - pieBrowser=browser+"("+pieBrowser+"%)"; - } - Map nameValue=new HashMap(); - nameValue.put("name", pieBrowser); - nameValue.put("value", count); - countPieArray[recordCount]=nameValue; - categoryPieArray[recordCount]=pieBrowser; - - _logger.info("count : "+count); - - recordCount--; - } - - String jsonReport=JsonUtils.gson2Json(countArray); - String categoryReport=JsonUtils.gson2Json(categoryArray); - String pieReport=JsonUtils.gson2Json(countPieArray); - String categoryPieReport=JsonUtils.gson2Json(categoryPieArray); - _logger.info(""+jsonReport); - - modelAndView.addObject("jsonReport",jsonReport); - modelAndView.addObject("categoryReport",categoryReport); - modelAndView.addObject("categoryPieReport",categoryPieReport); - modelAndView.addObject("pieReport",pieReport); - modelAndView.addObject("startDate",startDate); - modelAndView.addObject("endDate",endDate); - return modelAndView; - } - - @RequestMapping(value = { "/login/app" }) - public ModelAndView appReport( - @RequestParam(value="startDate",required=false) String startDate, - @RequestParam(value="endDate",required=false) String endDate) { - ModelAndView modelAndView=new ModelAndView("report/login/app"); - String startDateTime=""; - String endDateTime=""; - if(startDate==null||startDate.equals("")){ - DateTime currentdateTime = new DateTime(); - startDate=currentdateTime.toString( DateTimeFormat.forPattern("yyyy-MM-dd")); - startDateTime=currentdateTime.toString( DateTimeFormat.forPattern("yyyy-MM-dd 00:00:00")); - }else{ - startDateTime=startDate+" 00:00:00"; - } - if(endDate==null||endDate.equals("")){ - DateTime currentdateTime = new DateTime(); - endDate=currentdateTime.toString( DateTimeFormat.forPattern("yyyy-MM-dd")); - endDateTime=currentdateTime.toString( DateTimeFormat.forPattern("yyyy-MM-dd 23:59:59")); - }else{ - endDateTime=endDate+" 23:59:59"; - } - - Map reportDate=new HashMap(); - reportDate.put("startDate", startDateTime); - reportDate.put("endDate", endDateTime); - List> listReport=reportService.analysisApp(reportDate); - - Integer[] countArray=new Integer[listReport.size()]; - String [] categoryArray=new String[listReport.size()]; - - for(int i=0;i record :listReport){ - Integer count=Integer.parseInt(record.get("REPORTCOUNT").toString()); - String app=record.get("APPNAME").toString(); - countArray[recordCount]=count; - categoryArray[recordCount]=app; - - recordCount--; - } - - String jsonReport=JsonUtils.gson2Json(countArray); - String categoryReport=JsonUtils.gson2Json(categoryArray); - - _logger.info(""+jsonReport); - - modelAndView.addObject("jsonReport",jsonReport); - modelAndView.addObject("categoryReport",categoryReport); - modelAndView.addObject("startDate",startDate); - modelAndView.addObject("endDate",endDate); - return modelAndView; - } - -} diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java index af2a14c4..f6df2f4d 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java @@ -4,7 +4,6 @@ import java.beans.PropertyEditorSupport; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.Map; import javax.validation.Valid; @@ -14,7 +13,6 @@ import org.maxkey.constants.OPERATEMESSAGE; import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.dao.service.UserInfoService; import org.maxkey.domain.UserInfo; -import org.maxkey.util.DateUtils; import org.maxkey.util.JsonUtils; import org.maxkey.util.StringUtils; import org.maxkey.web.WebContext; @@ -87,13 +85,9 @@ public class UserInfoController { return new ModelAndView("/userinfo/usersList"); } - @RequestMapping(value={"/usersSelect/{uid}/{username}"}) - public ModelAndView usersSelect( - @PathVariable("uid") String uid, - @PathVariable("username") String username){ - ModelAndView modelAndView= new ModelAndView("/userinfo/usersSelect"); - modelAndView.addObject("uid", uid); - modelAndView.addObject("username", username); + @RequestMapping(value={"/select"}) + public ModelAndView usersSelect(){ + ModelAndView modelAndView= new ModelAndView("/userinfo/userinfoSelect"); return modelAndView; } @@ -124,12 +118,10 @@ public class UserInfoController { @RequestMapping(value={"/forwardUpdate/{id}"}) public ModelAndView forwardUpdateUsers(@PathVariable("id")String id){ ModelAndView modelAndView=new ModelAndView("/userinfo/userUpdate"); - UserInfo userInfo=new UserInfo(); - userInfo.setId(id); - userInfo=userInfoService.load(userInfo); - WebContext.getSession().setAttribute(userInfo.getId(), userInfo.getPicture()); - - + UserInfo userInfo=userInfoService.get(id); + if(userInfo.getPicture()!=null){ + WebContext.getSession().setAttribute(userInfo.getId(), userInfo.getPicture()); + } modelAndView.addObject("model", userInfo); return modelAndView; @@ -234,9 +226,7 @@ public class UserInfoController { @RequestMapping(value={"/forwardChangePassword/{id}"}) public ModelAndView forwardChangePassword(@PathVariable("id")String id){ ModelAndView modelAndView=new ModelAndView("/userinfo/changePassword"); - UserInfo userInfo=new UserInfo(); - userInfo.setId(id); - userInfo=userInfoService.load(userInfo); + UserInfo userInfo=userInfoService.get(id); modelAndView.addObject("model", userInfo); return modelAndView; diff --git a/maxkey-web-manage/src/main/resources/messages/message.properties b/maxkey-web-manage/src/main/resources/messages/message.properties index 40f4df2c..40dc21ac 100644 --- a/maxkey-web-manage/src/main/resources/messages/message.properties +++ b/maxkey-web-manage/src/main/resources/messages/message.properties @@ -47,7 +47,7 @@ common.text.status.unlock=\u89E3\u9501 common.text.status.invalid=\u65E0\u6548 common.text.status.expired=\u8FC7\u671F common.text.status.delete=\u5220\u9664 - +common.text.description=\u63CF\u8FF0 login.text.login.twofactor.obtain.valid=\u91CD\u65B0\u83B7\u53D6 @@ -185,6 +185,31 @@ userinfo.authnType.authnType.8=RSA\u4EE4\u724C userinfo.authnType.authnType.9=\u6570\u5B57\u8BC1\u4E66 userinfo.authnType.authnType.10=USB Key +org.tab.basic=\u57FA\u672C\u4FE1\u606F +org.tab.extra=\u6269\u5C55\u4FE1\u606F +org.id=\u673A\u6784\u7F16\u53F7 +org.name=\u673A\u6784\u540D\u79F0 +org.pid=\u7236\u7EA7\u7F16\u53F7 +org.pname=\u7236\u7EA7\u540D\u79F0 +org.fullname=\u673A\u6784\u5168\u79F0 +org.xpath=ID\u8DEF\u5F84 +org.xnamepath=\u540D\u79F0\u8DEF\u5F84 +org.type=\u7C7B\u578B +org.division=\u5206\u652F\u673A\u6784 +org.contact=\u8054\u7CFB\u4EBA +org.phone=\u7535\u8BDD +org.email=\u90AE\u7BB1 +org.fax=\u4F20\u771F +org.country=\u56FD\u5BB6 +org.region=\u7701 +org.locality=\u57CE\u5E02 +org.street=\u8857\u9053 +org.address=\u5730\u5740 +org.postalcode=\u90AE\u7F16 +org.sortorder=\u6392\u5E8F +org.description=\u63CF\u8FF0 + + login.totp.sharedSecret=\u5171\u4EAB\u5BC6\u7801 login.totp.period=\u5468\u671F login.totp.digits=\u6570\u5B57 @@ -240,6 +265,9 @@ button.text.select=\u8BF7\u9009\u62E9 button.text.search=\u67E5\u8BE2 button.text.expandsearch=\u5C55\u5F00 button.text.collapsesearch=\u6536\u7F29 +button.text.cancel=\u53D6\u6D88 +button.text.add.member=\u65B0\u589E\u6210\u5458 +button.text.delete.member=\u5220\u9664\u6210\u5458 log.loginhistory.id=\u7F16\u53F7 log.loginhistory.sessionId=\u4F1A\u8BDD diff --git a/maxkey-web-manage/src/main/resources/static/css/login.css b/maxkey-web-manage/src/main/resources/static/css/login.css index 2190b496..59a086e8 100644 --- a/maxkey-web-manage/src/main/resources/static/css/login.css +++ b/maxkey-web-manage/src/main/resources/static/css/login.css @@ -8,15 +8,15 @@ border:0; } #j_username,#j_password,#tfa_j_username,#tfa_j_password,#currentTime{ - width :230px; font-size: 14px; font-weight: bold; } #j_captcha{ - width :160px; + width :70%; font-size: 14px; font-weight: bold; + float: left; } #tfa_j_otp_captcha{ 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 e89ede67..3fc7d07e 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 @@ -339,15 +339,14 @@ $(function(){ beforeUpdate(this); } - var selectId=null; - if($("#list2").length>0){//get grid list selected ids - selectId=$("#list2").jqGrid("getGridParam", "selrow"); - var rowData = $("#list2").jqGrid("getRowData", selectId); - selectId=rowData.id; - }else if($("#list").length>0){//get grid list selected ids - selectId=$("#list").jqGrid("getGridParam", "selrow"); - var rowData = $("#list").jqGrid("getRowData", selectId); - selectId=rowData.id; + var selectId=""; + if($("#datagrid").length>0){//get grid list selected ids + var selRows = $('#datagrid').bootstrapTable('getSelections'); + for (var i=0;i0){//get grid list selected ids - if(list2_gridSettings.multiselect==true){ - selectIds = $("#list2").jqGrid("getGridParam", "selarrrow"); - for (var i = 0; i < selectIds.length; i++){ - var rowData = $("#list2").jqGrid("getRowData", selectIds[i]); - selectIds[i]=rowData.id; - } - }else{ - selectIds=$("#list2").jqGrid("getGridParam", "selrow"); - var rowData = $("#list2").jqGrid("getRowData", selectIds); - selectIds=rowData.id; - } - }else if($("#list").length>0){//get grid list selected ids - if(list_gridSettings.multiselect==true){ - selectIds = $("#list").jqGrid("getGridParam", "selarrrow"); - for (var i = 0; i < selectIds.length; i++){ - var rowData = $("#list").jqGrid("getRowData", selectIds[i]); - selectIds[i]=rowData.id; - } - }else{ - selectIds=$("#list").jqGrid("getGridParam", "selrow"); - var rowData = $("#list").jqGrid("getRowData", selectIds); - selectIds=rowData.id; + var selectIds=""; + if($("#datagrid").length>0){//get grid list selected ids + var selRows = $('#datagrid').bootstrapTable('getSelections'); + for (var i=0;i0){ - $("#list2").jqGrid('setGridParam').trigger("reloadGrid"); - }else if($("#list").length>0){ - $("#list").jqGrid('setGridParam').trigger("reloadGrid"); - } + }); } }); @@ -476,9 +452,7 @@ $(function(){ if($("#actionForm").attr("autoclose")) { // try to refresh parent grid list if($.dialog.parent) { - try { - $.dialog.parent.$("#list").jqGrid('setGridParam').trigger("reloadGrid"); - }catch(e){} + $.dialog.close(); return; } @@ -595,277 +569,12 @@ $(function(){ }); }; - //define grid - $.platform.gridRefesh={}; - $.extend($.platform.gridRefesh, { - gridRefesh:{ - mask : true,//is unmask - grid : "list",//grid list id - subGrid : null,//grid's sub id - callback : null//callbak - } - }); - //$.window open,refresh callback - $.windowGridRefresh=function(){ - var settings=$.extend({ - mask : true,//is unmask - grid : "list",//grid list id - subGrid : null,//grid's sub id - callback : null//callbak - }, $.platform.gridRefesh || {}); - settings.subGrid=null; - $.gridRefresh(settings); - }; - //$.window open,refresh sub callback - $.windowSubGridRefresh=function(){ - var settings=$.extend({ - mask : true,//is unmask - grid : "list",//grid list id - subGrid : null,//grid's sub id - callback : null//callbak - }, $.platform.gridRefesh || {}); - $.gridRefresh(settings); + $.dataGridSelRowsData=function(dataGridElement){ + return $(dataGridElement).bootstrapTable('getSelections'); }; - //grid refresh - $.gridRefresh=function (settings){ - var settings=$.extend({ - mask : false,//mask - grid : "list",//grid list id - subGrid : null,//grid's sub id - callback : null//callbak - }, settings || {}); - - if(settings.subGrid){//sub grid refresh - $("#"+settings.subGrid+" .ui-icon-refresh").click(); - //$("#"+settings.subGrid).jqGrid('setGridParam').trigger("reloadGrid"); - }else{//refresh grid - $("#"+settings.grid).jqGrid('setGridParam').trigger("reloadGrid"); - } - - if(settings.mask==true){//unmask - $.unmask(); - } - if(settings.callback){//callback - settings.callback(); - } - }; - $.gridRowData=function(listId,rowId){ - return $(listId).jqGrid("getRowData",rowId); - }; - - $.gridSel=function (listId){ - var selectIds=null; - var gridIds=""; - if(typeof($(listId))=="object"){//get grid list selected ids - //alert("typeof"+(typeof($(listId))=="object")); - if($(listId).jqGrid("getGridParam", "multiselect")){ - selectIds = $(listId).jqGrid("getGridParam", "selarrrow"); - }else{ - selectIds=$(listId).jqGrid("getGridParam", "selrow"); - } - gridIds=selectIds; - if(gridIds == null || gridIds == ""){ - $.alert({content:$.platform.messages.select.alertText}); - return null; - }else{ - return gridIds; - } - - } - }; - - $.gridSelIds=function (listId){ - var selectIds=null; - var gridIds=""; - if(typeof($(listId))=="object"){//get grid list selected ids - //alert("typeof"+(typeof($(listId))=="object")); - if($(listId).jqGrid("getGridParam", "multiselect")){ - selectIds = $(listId).jqGrid("getGridParam", "selarrrow"); - for (var i = 0; i < selectIds.length; i++){ - var rowData = $(listId).jqGrid("getRowData", selectIds[i]); - if(i==0){gridIds=rowData.id;}else{gridIds=gridIds+","+rowData.id;} - } - }else{ - selectIds=$(listId).jqGrid("getGridParam", "selrow"); - var rowData = $(listId).jqGrid("getRowData", selectIds); - gridIds=rowData.id; - } - - if(gridIds == null || gridIds == ""){ - $.alert({content:$.platform.messages.select.alertText}); - return null; - }else{ - return gridIds; - } - - } - }; - - $.grid=function (gridSettings){ - var columnNameWidth=""; - if(gridSettings.resize==true){ - var cumulativeWidth=0; - var cumulativeVisible=0; - for (var i=0;i"+$.platform.messages.grid.loadnodata+""); - } - $("#"+pager_id).hide(); - $(".subnorecords").show(); - }else{ - $("#"+pager_id).show(); - $(".subnorecords").hide(); - } - $("#"+subgrid_table_id).trigger("resize"); - if($.browser.version=="7.0"||$.browser.version=="8.0"){//msie 7.0/8.0 - $("#"+subgrid_table_id+" .ui-jqgrid-hdiv").width($("#"+subgrid_table_id+" .ui-jqgrid-hbox").width()); - } - - } - }, gridSettings.subGirdSettings || {}); - - $("#"+gridSettings.element).setGridHeight('auto'); //click '+'，set list height auto - $("#"+subgrid_id).html("
"); - $("#"+subgrid_table_id).jqGrid(subGirdSettings).navGrid("#"+pager_id,{edit:false,add:false,del:false,search:false }); - }, - subGridRowColapsed: function(subgrid_id, row_id) {//close sub grid - var list_records = $("#"+gridSettings.element).getGridParam('records'); - if(($("table[id*=list_]").length > 1 && list_records != null && list_records > 5) - || (list_records != null && list_records > 10 && $("#"+gridSettings.element).getGridParam('rowNum') > 10) - || $("table[id*=list_]").length > 2) { - $("#"+gridSettings.element).setGridHeight('auto'); - } else { - $("#"+gridSettings.element).setGridHeight('495'); //restore list height - } - $.platform.gridRefesh.subGrid=null; - // this function is called before removing the data - //var subgrid_table_id; - //subgrid_table_id = subgrid_id+"_t"; - //jQuery("#"+subgrid_table_id).remove(); - }, - loadComplete: function(){//load Complete - var re_records = $("#"+gridSettings.element).getGridParam('records'); - if(re_records != null && re_records > 0){ - $("#"+gridSettings.element).setGridHeight(""+(35*$("#"+gridSettings.element).getGridParam('rowNum'))); - }else{ - - } - - $("#gbox_"+gridSettings.element).attr("gridWidth",gridSettings.visibleColumnWidth); - $("#gbox_"+gridSettings.element).attr("columnNameWidth",columnNameWidth); - - if($("#list").height()>$(".ui-jqgrid .ui-jqgrid-bdiv").height()){ - $(".ui-jqgrid .ui-jqgrid-bdiv").height($("#list").height()+20); - } - - $(".forward").on("click",function(){ - var settings={ - url : $(this).attr("url"),//current element url - href : $(this).attr("href")//current element href - }; - $.forward(settings); - }); - } - }, gridSettings || {}); - - $("#"+gridSettings.element).jqGrid(settings).navGrid("#"+gridSettings.element+"_pager",{edit:false,add:false,del:false,search:false }); - }; var curExpandNode = null; diff --git a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl index 48b66fef..c53a2f43 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl @@ -1,69 +1,85 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + + -
- + +
- + - + - + - + - + - +
：<@locale code="userinfo.id" />： - - * + +
：<@locale code="userinfo.username" />： - - * + + " + wurl="<@base/>/userinfo/select" + wwidth="800" + wheight="500" + target="window"/> +
：<@locale code="userinfo.displayName" />： - - * + +
：<@locale code="apps.name" />： - - * + + " + wurl="<@base/>/apps/select" + wwidth="800" + wheight="500" + target="window"/> +
：<@locale code="account.relatedUsername" />： - - * + +
：<@locale code="account.relatedPassword" />： - - * + +
- - - "/> - "/> + + + "/> + "/>
-
\ No newline at end of file + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAddSelect.ftl b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAddSelect.ftl deleted file mode 100644 index 84328014..00000000 --- a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAddSelect.ftl +++ /dev/null @@ -1,70 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" import="java.util.Map,java.util.LinkedHashMap" %> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - - -
-
- - - - - - -
-
-
- -
- - - - - - - -
: -
- - "> - -
-
- "> -
-
-
- -
- - -
\ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl index 10b879d6..1ca8f964 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl @@ -54,19 +54,13 @@
" - wurl="<@base/>/users/forwardSelectUserType" + wurl="<@base/>/app/accounts/forwardAdd" wwidth="960" wheight="600" - target="window"> - - " - wurl="<@base/>/users/forwardUpdate" - wwidth="960" - wheight="600" - target="window"> + target="window"> " - wurl="<@base/>/users/delete" /> + wurl="<@base/>/app/accounts/delete" />
@@ -96,6 +90,7 @@ id="datagrid" data-toggle="table" data-classes="table table-bordered table-hover table-striped" + data-click-to-select="true" data-pagination="true" data-total-field="records" data-page-list="[10, 25, 50, 100]" @@ -106,12 +101,13 @@ data-side-pagination="server"> - Id - <@locale code="account.username"/> - <@locale code="account.displayName"/> - <@locale code="account.appName"/> - <@locale code="account.appId"/> - <@locale code="account.relatedUsername"/> + + Id + <@locale code="account.username"/> + <@locale code="account.displayName"/> + <@locale code="account.appName"/> + <@locale code="account.appId"/> + <@locale code="account.relatedUsername"/> diff --git a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsUpdate.ftl deleted file mode 100644 index 9c7ca83d..00000000 --- a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsUpdate.ftl +++ /dev/null @@ -1,64 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
： - - * -
： - - * -
： - - * -
： - - * -
： - - * -
： - - * -
- - - - - "/> - "/> - -
-
\ No newline at end of file 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 c4f466d5..86dd59c0 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 @@ -4,8 +4,8 @@ <#include "../layout/header.ftl"/> <#include "../layout/common.cssjs.ftl"/> + +
- + @@ -85,46 +52,37 @@
:<@locale code="apps.name"/>:
- "> + ">
- " expandValue="" collapseValue=""> - " /> + " />
- - - - - -
- - - -
- +
- - -
\ No newline at end of file + + + + + + + + + + + + + + +
Id<@locale code="apps.icon"/><@locale code="apps.name"/><@locale code="apps.protocol"/><@locale code="apps.category"/><@locale code="apps.vendor"/><@locale code="log.loginhistory.loginUrl"/>
+ + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl b/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl index 259abc7e..2fb415c9 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl @@ -42,29 +42,26 @@
-
- -
-
-

Dashboard 2

-
-
-
    -
  1. Dashboard
    2. -
  2. / Dashboard 2
    3. -
-
-
- +
+
+
+

Dashboard 2

+
+
+
    +
  1. Dashboard
    2. +
  2. / Dashboard 2
    3. +
+
+
+
+
+
+
+
+

<@locale code="login.passwordpolicy"/>

- - -
-
-
-

<@locale code="login.passwordpolicy"/>

-
-
+
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 0db5cc1c..3e0ac284 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 @@ -1,29 +1,41 @@ - - + +
- + @@ -35,16 +47,16 @@
- + @@ -55,11 +67,11 @@
:<@locale code="app.name"/>: - "> + ">
- "> + ">
- + - + - - - - - - -
<@locale code="apps.name"/> <@locale code="apps.protocol"/> + + + + + + + + + + - \ No newline at end of file + + +
Id<@locale code="apps.icon"/><@locale code="apps.name"/><@locale code="apps.protocol"/><@locale code="apps.category"/><@locale code="apps.vendor"/><@locale code="log.loginhistory.loginUrl"/>
+ + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl index 05278559..1c44bdca 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl @@ -1,66 +1,83 @@ - + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + +
+
+
+ <#include "../layout/top.ftl"/> +
+ +
+ <#include "../layout/sidenav.ftl"/> +
+
+ +
-
- - - - - -
- -
+
+
+
+

Dashboard 2

+
+
+
    +
  1. Dashboard
    2. +
  2. / Dashboard 2
    3. +
+
+
+ +
+ +
+
+
+
- + @@ -73,11 +90,11 @@
:<@locale code="group.name"/>:
- - - "> + " + wurl="<@base/>/groups/selectGroupsList" + wwidth="700" + wheight="500" + target="window"> + ">
- " expandValue="" collapseValue=""> - "> - "> + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> + "> + " + wurl="<@base/>/groupPrivileges/delete" />
- + - +
<@locale code="apps.name"/> <@locale code="apps.protocol"/>
-
- - -
\ No newline at end of file +
+ + + + + + + + + + + + + + +
Id<@locale code="apps.icon"/><@locale code="apps.name"/><@locale code="apps.protocol"/><@locale code="apps.category"/><@locale code="apps.vendor"/><@locale code="log.loginhistory.loginUrl"/>
+
+
+
+
+ <#include "../layout/footer.ftl"/> +
+ +
+ +
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl index 1520230d..01254af1 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl @@ -1,11 +1,23 @@ - + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + +
- +
- + @@ -13,10 +25,12 @@
：<@locale code="group.name" />： - + *
- "> - "> + "> + ">
-
\ No newline at end of file + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl index 6e2ff26f..59c2f79d 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl @@ -1,10 +1,18 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - -
- + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + + + +
@@ -13,22 +21,22 @@ - +
：
：<@locale code="group.name" />： - + *
- - - "> - "> + "> + ">
-
\ No newline at end of file + + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl index bf5bfe7c..7381fe27 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groups/groupsList.ftl @@ -18,26 +18,23 @@
-
- -
-
-

Dashboard 2

-
-
-
    -
  1. Dashboard
    2. -
  2. / Dashboard 2
    3. -
-
-
- -
- - -
-
-
+
+
+
+

Dashboard 2

+
+
+
    +
  1. Dashboard
    2. +
  2. / Dashboard 2
    3. +
+
+
+
+
+
+
+
@@ -53,19 +50,19 @@ @@ -81,20 +78,21 @@
" - wurl="<@base/>/users/forwardSelectUserType" - wwidth="960" - wheight="600" + wurl="<@base/>/groups/forwardAdd" + wwidth="400" + wheight="300" target="window"> " - wurl="<@base/>/users/forwardUpdate" - wwidth="960" - wheight="600" + wurl="<@base/>/groups/forwardUpdate" + wwidth="400" + wheight="300" target="window"> " - wurl="<@base/>/users/delete" /> + wurl="<@base/>/groups/delete" />
+ data-toggle="table" + data-classes="table table-bordered table-hover table-striped" + data-click-to-select="true" + data-pagination="true" + data-total-field="records" + data-page-list="[10, 25, 50, 100]" + data-search="false" + data-locale="zh-CN" + data-query-params="dataGridQueryParams" + data-query-params-type="pageSize" + data-side-pagination="server"> + - @@ -109,7 +107,7 @@ -
+
<#include "../layout/footer.ftl"/>
diff --git a/maxkey-web-manage/src/main/resources/templates/views/groups/selectGroupsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groups/selectGroupsList.ftl index 4e975910..9146839c 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groups/selectGroupsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groups/selectGroupsList.ftl @@ -1,21 +1,29 @@ -<%@ page contentType="text/html; charset=UTF-8" import="java.util.Map,java.util.LinkedHashMap" %> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + - + +
Id<@locale code="group.name"/> <@locale code="common.text.description"/> <@locale code="common.text.createdby"/>
@@ -23,12 +31,12 @@ @@ -37,14 +45,35 @@
- - +
- "> + ">
- " > + " >
+ + + + + + + + + + + + + +
Id<@locale code="group.name"/><@locale code="common.text.description"/><@locale code="common.text.createdby"/><@locale code="common.text.createddate"/><@locale code="common.text.modifiedby"/><@locale code="common.text.modifieddate"/>
-
\ No newline at end of file +
+ + + \ No newline at end of file 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 d49587ca..642855f8 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 @@ -1,27 +1,30 @@ -<%@ page contentType="text/html; charset=UTF-8" import="java.util.Map,java.util.LinkedHashMap" %> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + + +
-
+ @@ -45,16 +51,16 @@
- + @@ -65,14 +71,33 @@
- - -
\ No newline at end of file +
:<@locale code="userinfo.username"/>: - "> + ">
- "> + ">
+ + + + + + + + + + + + + +
Id<@locale code="userinfo.username"/><@locale code="userinfo.displayName"/><@locale code="common.text.createdby"/><@locale code="common.text.createddate"/><@locale code="common.text.modifiedby"/><@locale code="common.text.modifieddate"/>
+
+ + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl index 6f6864a3..c0ab69d8 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl @@ -1,8 +1,8 @@ -<%@ page contentType="text/html; charset=UTF-8" import="java.util.Map,java.util.LinkedHashMap" %> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> -
-
- - - - - - -
-
-
+ + +
+
+
+ <#include "../layout/top.ftl"/> +
+ +
+ <#include "../layout/sidenav.ftl"/> +
+
+ +
+
+
+
+

Dashboard 2

+
+
+
    +
  1. Dashboard
    2. +
  2. / Dashboard 2
    3. +
+
+
+
+
+
+
+
- + @@ -83,34 +89,69 @@
:<@locale code="group.name"/>:
- - - - "> + + " + wurl="<@base/>/groups/selectGroupsList" + wwidth="700" + wheight="500" + target="window"> + ">
- " expandValue="" collapseValue=""> + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> - "> - "> + "> + " + wurl="<@base/>/groupMember/delete"/>
- + - + - + - +
<@locale code="apps.protocol"/> <@locale code="apps.protocol"/>
<@locale code="apps.protocol"/> <@locale code="apps.protocol"/>
-
- - -
\ No newline at end of file +
+ + + + + + + + + + + + + + + +
Id<@locale code="userinfo.username"/><@locale code="userinfo.displayName"/><@locale code="common.text.createdby"/><@locale code="common.text.createddate"/><@locale code="common.text.modifiedby"/><@locale code="common.text.modifieddate"/>
+ +
+
+
+
+ <#include "../layout/footer.ftl"/> +
+ +
+ +
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/layout/sidenav.ftl b/maxkey-web-manage/src/main/resources/templates/views/layout/sidenav.ftl index 40c6c279..46df320e 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/layout/sidenav.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/layout/sidenav.ftl @@ -19,25 +19,18 @@
  • - + 应用管理 -
    • + +
  • + + + 账号管理 + +
  • @@ -57,7 +50,7 @@
  • - + 权限管理 @@ -105,44 +98,6 @@
    • -
  • - - - 统计报表 - - -
    • diff --git a/maxkey-web-manage/src/main/resources/templates/views/login.ftl b/maxkey-web-manage/src/main/resources/templates/views/login.ftl index f2b9f997..dc4a0f75 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/login.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/login.ftl @@ -36,7 +36,7 @@ ">
    - " style="float: left; width: 70%;"> + ">
    diff --git a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsAdd.ftl new file mode 100644 index 00000000..c9bdd46f --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsAdd.ftl @@ -0,0 +1,144 @@ + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + + + + + +
    + + + + + + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    <@locale code="org.pid" />：
    <@locale code="org.pname" />： +
    <@locale code="org.id" />：
    <@locale code="org.name" />：
    <@locale code="org.fullname" />：
    <@locale code="org.xpath" /> ： + +
    <@locale code="org.xnamepath" /> ： + +
    <@locale code="org.type" />：
    <@locale code="org.division" />：
    + <@locale code="org.sortorder" /> ： +
    <@locale code="org.description" />： +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + "/> + +
    + +
    + + diff --git a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl index 829b870e..78babef0 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl @@ -8,10 +8,10 @@ function onClick (event, treeId, treeNode) { - $("#actionForm").clearForm(); - $("#actionForm").json2form({data:treeNode.data}); - $("#_method").val("put"); - $("#status").val("1"); + $("#pId").val(treeNode.data.id) + $.cookie("select_org_id", treeNode.data.id, { path: '/' }); + $.cookie("select_org_name", treeNode.data.name,{ path: '/' }); + $("#searchBtn").click(); } @@ -21,7 +21,7 @@ $(function () { element : "orgsTree", rootId : "1", checkbox : null, - onClick : null, + onClick : onClick, onDblClick : null, url : "<@base/>/orgs/tree" }; @@ -130,58 +130,7 @@ $(function () { } } );//end tree - - $("#addChildBtn").click(function(){ - var nodes = $.fn.zTree.getZTreeObj("orgsTree").getSelectedNodes(); - if (nodes.length == 0) { - //$.alert({content:""}); - return; - } - $("#actionForm").clearForm(); - $("#pId").val(nodes[0].data.id); - $("#pName").val(nodes[0].data.name); - $("#sortOrder").val(1); - $("#status").val("1"); - $("#_method").val("post"); - }); - - $("#saveBtn").click(function(){ - if($("#_method").val()=="put"){ - $("#actionForm").attr("action",'/orgs/update'); - }else{ - $("#actionForm").attr("action",'/orgs/add'); - var nodedata = $.fn.zTree.getZTreeObj("orgsTree").getSelectedNodes()[0].data; - $("#xNamePath").val(nodedata.xNamePath+"/"+$("#name").val()); - $("#xPath").val(nodedata.xPath+"/"+$("#id").val()); - } - - if($("#fullName").val()==""){ - $("#fullName").val($("#name").val()); - } - if($("#_method").val()=="post"){ - var node=$("#actionForm").serializeObject(); - node.data=$("#actionForm").serializeObject(); - delete node['url']; - $.fn.zTree.getZTreeObj("orgsTree").addNodes( - $.fn.zTree.getZTreeObj("orgsTree").getSelectedNodes()[0],node); - }else{ - var node=$("#actionForm").serializeObject(); - node.data=$("#actionForm").serializeObject(); - node=$.extend( $.fn.zTree.getZTreeObj("orgsTree").getSelectedNodes()[0],node); - delete node['url']; - $.fn.zTree.getZTreeObj("orgsTree").updateNode(node); - } - $('#actionForm').submit(); - }); - - - $("#deleteBtn").click(function(){ - $.post('<@base/>/orgs/delete',{ id:$("#id").val(),_method:"delete"}, function(data) { - $.fn.zTree.getZTreeObj("orgsTree").removeNode($.fn.zTree.getZTreeObj("orgsTree").getSelectedNodes()[0]); - $.alert({content:data.message}); - }); - }); }); @@ -213,15 +162,50 @@ $(function () {
    - +
    -
    -

    <@locale code="login.passwordpolicy"/>

    -
    - + +
    + + + + + + +
    + <@locale code="org.name"/>: + +
    + + + "> + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> +
    +     		+
    + " + wurl="<@base/>/orgs/forwardAdd" + wwidth="620" + wheight="600" + target="window"> + + " + wurl="<@base/>/orgs/forwardUpdate" + wwidth="620" + wheight="600" + target="window"> + + " + wurl="<@base/>/orgs/delete" /> +
    +
    + + +
    + @@ -230,130 +214,31 @@ $(function () {
    -
    -
    - - - - - - -
    -
      -
      • -
      • -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    ：
    ：
    ：
    ：
    ：
    ： -
    ： -
    ：
    ：
    - ： -
    ：
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - "/> - - "/> - - "/> - -
    - -
    + + + + + + + + + + + + +
    Id<@locale code="org.id"/><@locale code="org.name"/><@locale code="org.sortorder"/><@locale code="org.division"/><@locale code="org.description"/>
    diff --git a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsSelect.ftl b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsSelect.ftl index 8847a59e..3a70ab95 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsSelect.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsSelect.ftl @@ -1,9 +1,14 @@ -<%@ page contentType="text/html; charset=UTF-8" import="java.util.Map,java.util.LinkedHashMap" %> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> - + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + - - + + +
    - +
    + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsUpdate.ftl new file mode 100644 index 00000000..375d2a73 --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsUpdate.ftl @@ -0,0 +1,143 @@ + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + + + + + +
    + + + + + + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    <@locale code="org.pid" />：
    <@locale code="org.pname" />： +
    <@locale code="org.id" />：
    <@locale code="org.name" />：
    <@locale code="org.fullname" />：
    <@locale code="org.xpath" /> ： + +
    <@locale code="org.xnamepath" /> ： + +
    <@locale code="org.type" />：
    <@locale code="org.division" />：
    + <@locale code="org.sortorder" /> ： +
    <@locale code="org.description" />： +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + "/> + +
    + +
    + + diff --git a/maxkey-web-manage/src/main/resources/templates/views/report/loginApp.ftl b/maxkey-web-manage/src/main/resources/templates/views/report/loginApp.ftl deleted file mode 100644 index 9d0f4530..00000000 --- a/maxkey-web-manage/src/main/resources/templates/views/report/loginApp.ftl +++ /dev/null @@ -1,88 +0,0 @@ - - - - - -
    -
    -
    - - - - - - -
    - <@locale code="common.text.startdate"/> - - - - - - <@locale code="common.text.enddate"/> - - "> - -
    - - -
    -
    -
    - - -
    \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/report/loginBrowser.ftl b/maxkey-web-manage/src/main/resources/templates/views/report/loginBrowser.ftl deleted file mode 100644 index 59304164..00000000 --- a/maxkey-web-manage/src/main/resources/templates/views/report/loginBrowser.ftl +++ /dev/null @@ -1,139 +0,0 @@ - - - - - -
    -
    -
    - - - - - - -
    - <@locale code="common.text.startdate"/>: - - - - - - <@locale code="common.text.enddate"/>: - - "> - -
    - - -
    -
    -
    -
    - -
    \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/report/loginDay.ftl b/maxkey-web-manage/src/main/resources/templates/views/report/loginDay.ftl deleted file mode 100644 index b4a355c0..00000000 --- a/maxkey-web-manage/src/main/resources/templates/views/report/loginDay.ftl +++ /dev/null @@ -1,99 +0,0 @@ - - - - - -
    - -
    - - - - - - -
    - <@locale code="common.text.date"/>: - -
    - - "> -
    -     		- -
    - - -
    - -
    - - -
    \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/report/loginMonth.ftl b/maxkey-web-manage/src/main/resources/templates/views/report/loginMonth.ftl deleted file mode 100644 index 38646b9a..00000000 --- a/maxkey-web-manage/src/main/resources/templates/views/report/loginMonth.ftl +++ /dev/null @@ -1,99 +0,0 @@ - - - - - -
    - -
    - - - - - - -
    - <@locale code="common.text.date"/>: - -
    - - "> -
    -     		- -
    - - -
    - -
    - - -
    \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/report/loginYear.ftl b/maxkey-web-manage/src/main/resources/templates/views/report/loginYear.ftl deleted file mode 100644 index 7a099542..00000000 --- a/maxkey-web-manage/src/main/resources/templates/views/report/loginYear.ftl +++ /dev/null @@ -1,100 +0,0 @@ - - - - - -
    - -
    - - - - - - -
    - <@locale code="common.text.year"/>: - -
    - - "> -
    -     		- -
    - - -
    - -
    - - -
    \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.ftl index 3a9ef46e..a7842a0f 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/changePassword.ftl @@ -1,57 +1,57 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> - - - - - -
    + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + +
    - +
    <@locale code="userinfo.displayName" /> : - +
    <@locale code="userinfo.username" /> : - +
    <@locale code="login.password.newPassword" />: - - * - +
    <@locale code="login.password.confirmPassword" />: - - * - +
    - "/> + "/>
    -
    \ No newline at end of file + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl index 8459141d..9dabe675 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl @@ -6,8 +6,12 @@ + + +
    + +
    + + + + + + +
    +
    + +     		+ + + + + + + + + + + + + + + + +
    <@locale code="userinfo.id"/><@locale code="userinfo.username"/><@locale code="userinfo.displayName"/><@locale code="userinfo.employeeNumber"/><@locale code="userinfo.organization"/><@locale code="userinfo.department"/><@locale code="userinfo.jobTitle"/><@locale code="userinfo.mobile"/><@locale code="userinfo.email"/><@locale code="userinfo.gender"/>
    +
    + + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl index 25fd67ca..659c30c2 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl @@ -4,17 +4,144 @@ <#include "../layout/header.ftl"/> <#include "../layout/common.cssjs.ftl"/> @@ -59,14 +186,18 @@
    + + + "> " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>">
    - " + " /> + " wurl="<@base/>/userinfo/forwardChangePassword" wwidth="600px" wheight="250px" /> " @@ -104,52 +235,48 @@
    <@locale code="userinfo.department"/> - - - " title="department" wurl="/orgs/orgsSelect/deptId/department" wwidth="300" wheight="400" /> - <@locale code="userinfo.userType"/> - - - -
    - - - - - - - - - - - - - - - - - + +
    <@locale code="userinfo.id"/><@locale code="apps.icon"/><@locale code="apps.icon"/><@locale code="userinfo.username"/><@locale code="userinfo.displayName"/><@locale code="userinfo.employeeNumber"/><@locale code="userinfo.organization"/><@locale code="userinfo.department"/><@locale code="userinfo.jobTitle"/><@locale code="userinfo.mobile"/><@locale code="userinfo.email"/><@locale code="userinfo.gender"/>
    + + + +
    +
    + +     		+ + + + + + + + + + + + + + + + +
    <@locale code="userinfo.id"/><@locale code="userinfo.username"/><@locale code="userinfo.displayName"/><@locale code="userinfo.employeeNumber"/><@locale code="userinfo.organization"/><@locale code="userinfo.department"/><@locale code="userinfo.jobTitle"/><@locale code="userinfo.mobile"/><@locale code="userinfo.email"/><@locale code="userinfo.gender"/>
    +
    diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersSelect.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersSelect.ftl deleted file mode 100644 index 7869a6c3..00000000 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersSelect.ftl +++ /dev/null @@ -1,50 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" import="java.util.Map,java.util.LinkedHashMap" %> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> - -
    - -
    - - - - - - -
    - - - - - -