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 77e5668de..5bc4beffc 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/Organizations.java @@ -2,10 +2,43 @@ 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; +@Table(name = "ORGANIZATIONS") public class Organizations extends JpaBaseDomain implements Serializable{ - + + @Id + @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; + /** * */ @@ -15,4 +48,180 @@ public class Organizations extends JpaBaseDomain implements Serializable{ // TODO Auto-generated constructor stub } + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + + public String getpId() { + return pId; + } + + public void setpId(String pId) { + this.pId = pId; + } + + public String getpName() { + return pName; + } + + public void setpName(String pName) { + this.pName = pName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getxPath() { + return xPath; + } + + public void setxPath(String xPath) { + this.xPath = xPath; + } + + public String getxNamePath() { + return xNamePath; + } + + public void setxNamePath(String xNamePath) { + this.xNamePath = xNamePath; + } + + public String getLevel() { + return level; + } + + public void setLevel(String level) { + this.level = level; + } + + public String getHasChild() { + return hasChild; + } + + public void setHasChild(String hasChild) { + this.hasChild = hasChild; + } + + public String getDivision() { + return division; + } + + public void setDivision(String division) { + this.division = division; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getLocality() { + return locality; + } + + public void setLocality(String locality) { + this.locality = locality; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getContact() { + return contact; + } + + public void setContact(String contact) { + this.contact = contact; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + } diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java b/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java index adbcd64a2..ce99d8180 100644 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java @@ -1,18 +1,14 @@ package org.maxkey.web.tag; import java.io.IOException; -import java.util.Locale; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.servlet.support.RequestContextUtils; import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.servlet.support.RequestContext; -import org.springframework.web.servlet.tags.RequestContextAwareTag; - import freemarker.core.Environment; import freemarker.template.TemplateDirectiveBody; import freemarker.template.TemplateDirectiveModel; @@ -27,6 +23,7 @@ import freemarker.template.TemplateModel; @FreemarkerTag("locale") public class LocaleTagDirective implements TemplateDirectiveModel { + private static final Logger _logger = LoggerFactory.getLogger(LocaleTagDirective.class); @Autowired private HttpServletRequest request; @@ -38,7 +35,13 @@ public class LocaleTagDirective implements TemplateDirectiveModel { if(params.get("code")==null) { env.getOut().append(RequestContextUtils.getLocale(request).getLanguage()); }else { - env.getOut().append(webApplicationContext.getMessage(params.get("code").toString(), null, RequestContextUtils.getLocale(request))); + _logger.trace("message code "+params.get("code")); + try { + env.getOut().append(webApplicationContext.getMessage(params.get("code").toString(), null, RequestContextUtils.getLocale(request))); + + }catch(Exception e) { + _logger.error("message code "+params.get("code"),e); + } } } diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/St.java b/maxkey-core/src/main/java/org/maxkey/web/tag/St.java deleted file mode 100644 index 7346ec7ad..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/St.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.maxkey.web.tag; - -public class St { - - public static void main(String[] args) { - // TODO Auto-generated method stub - String cv="com.ddm.core.utils.TestClass@InnerClass1@InnerClass2@p2"; - - String[] c = cv.trim().split("@"); - for(String cs : c) { - System.out.println(cs); - } - } - -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/NavigationsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/NavigationsMapper.java deleted file mode 100644 index 512379785..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/NavigationsMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.maxkey.dao.persistence; - -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.maxkey.domain.Navigations; - - -/** - * @author Crystal.Sea - * - */ -public interface NavigationsMapper extends IJpaBaseMapper{ - -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/persistence/OrganizationsMapper.java b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/OrganizationsMapper.java new file mode 100644 index 000000000..ef3a9cea2 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/persistence/OrganizationsMapper.java @@ -0,0 +1,7 @@ +package org.maxkey.dao.persistence; +import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; +import org.maxkey.domain.Organizations; + +public interface OrganizationsMapper extends IJpaBaseMapper { + +} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/NavigationsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/NavigationsService.java deleted file mode 100644 index 9e5b8c267..000000000 --- a/maxkey-dao/src/main/java/org/maxkey/dao/service/NavigationsService.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.maxkey.dao.service; - -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.maxkey.dao.persistence.NavigationsMapper; -import org.maxkey.domain.Navigations; -import org.springframework.stereotype.Service; - - -@Service -public class NavigationsService extends JpaBaseService{ - - public NavigationsService() { - super(NavigationsMapper.class); - - } - - /* (non-Javadoc) - * @see com.connsec.db.service.BaseService#getMapper() - */ - @Override - public NavigationsMapper getMapper() { - // TODO Auto-generated method stub - return (NavigationsMapper)super.getMapper(); - } - -} diff --git a/maxkey-dao/src/main/java/org/maxkey/dao/service/OrganizationsService.java b/maxkey-dao/src/main/java/org/maxkey/dao/service/OrganizationsService.java new file mode 100644 index 000000000..4b5af01b7 --- /dev/null +++ b/maxkey-dao/src/main/java/org/maxkey/dao/service/OrganizationsService.java @@ -0,0 +1,24 @@ +package org.maxkey.dao.service; + +import org.apache.mybatis.jpa.persistence.JpaBaseService; +import org.maxkey.dao.persistence.OrganizationsMapper; +import org.maxkey.domain.Organizations; +import org.springframework.stereotype.Service; + +@Service +public class OrganizationsService extends JpaBaseService{ + + public OrganizationsService() { + super(OrganizationsMapper.class); + } + + /* (non-Javadoc) + * @see com.connsec.db.service.BaseService#getMapper() + */ + @Override + public OrganizationsMapper getMapper() { + // TODO Auto-generated method stub + return (OrganizationsMapper)super.getMapper(); + } + +} diff --git a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/NavigationsMapper.xml b/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/NavigationsMapper.xml deleted file mode 100644 index 3b03b12fc..000000000 --- a/maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/NavigationsMapper.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - AND ID = #{id} - - - AND NAME like '%#{name}%' - - - AND PID = #{pId} - - - AND PNAME like '%#{pName}%' - - - - - - - - - - - - - - - UPDATE NAVIGATIONS SET STATUS = '2' - WHERE 1 = 1 - - AND ID = #{id} - - - ADN ID = #{id} - - - ADN STATUS = '1' - - - ADN XPATH = #{xPath} - - - - - UPDATE NAVIGATIONS SET STATUS = '2' - WHERE ID IN - - #{selectId} - - - - - - - \ No newline at end of file diff --git a/maxkey-web-manage/.settings/org.eclipse.core.resources.prefs b/maxkey-web-manage/.settings/org.eclipse.core.resources.prefs index 896a9a53a..187d582c8 100644 --- a/maxkey-web-manage/.settings/org.eclipse.core.resources.prefs +++ b/maxkey-web-manage/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,4 @@ eclipse.preferences.version=1 -encoding/=UTF-8 \ No newline at end of file +encoding//src/main/resources/templates/views/apps/appAddCommon.ftl=UTF-8 +encoding//src/main/resources/templates/views/apps/appUpdateCommon.ftl=UTF-8 +encoding/=UTF-8 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 new file mode 100644 index 000000000..3fcf50964 --- /dev/null +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java @@ -0,0 +1,175 @@ +package org.maxkey.web.contorller; + +import java.util.HashMap; +import java.util.List; + +import org.maxkey.dao.service.OrganizationsService; +import org.maxkey.domain.Organizations; +import org.maxkey.web.WebContext; +import org.maxkey.web.component.TreeNode; +import org.maxkey.web.component.TreeNodeList; +import org.maxkey.web.message.Message; +import org.maxkey.web.message.MessageType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + + +@Controller +@RequestMapping({"/orgs"}) +public class OrganizationsController{ + static final Logger _logger = LoggerFactory.getLogger(OrganizationsController.class); + + + @Autowired + OrganizationsService organizationsService; + + + @ResponseBody + @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"); + + 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'))) { + treeNode.setHasChild(); + } + + + treeNode.setAttr("data", organization); + treeNode.setPId(organization.getpId()); + if (organization.getId().equals("1")) { + treeNode.setAttr("open", Boolean.valueOf(true)); + } else { + treeNode.setAttr("open", Boolean.valueOf(false)); + } + treeNodeList.addTreeNode(treeNode.getAttr()); + } + + + return treeNodeList.getTreeNodeList(); + } + + + + @RequestMapping({"/list"}) + public ModelAndView orgsTreeList() { return new ModelAndView("orgs/orgsList"); } + + + + + @RequestMapping({"/orgsSelect/{deptId}/{department}"}) + public ModelAndView orgsSelect(@PathVariable("deptId") String deptId, @PathVariable("department") String department) { + ModelAndView modelAndView = new ModelAndView("orgs/orgsSelect"); + modelAndView.addObject("deptId", deptId); + modelAndView.addObject("department", department); + 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(); + } + + if (this.organizationsService.insert(organization)) { + return new Message(WebContext.getI18nValue("message.action.insert.success"), MessageType.success); + } + + return new Message(WebContext.getI18nValue("message.action.insert.success"), MessageType.error); + } + + + + + + + + + @ResponseBody + @RequestMapping({"/query"}) + public Message query(@ModelAttribute("organization") Organizations organization) { + _logger.debug("-query :" + organization); + if (this.organizationsService.load(organization) != null) { + return new Message(WebContext.getI18nValue("message.action.insert.success"), MessageType.success); + } + + return new Message(WebContext.getI18nValue("message.action.insert.error"), MessageType.error); + } + + + + + + + + + @ResponseBody + @RequestMapping({"/update"}) + public Message update(@ModelAttribute("organization") Organizations organization) { + _logger.debug("-update organization :" + organization); + if (this.organizationsService.update(organization)) { + return new Message(WebContext.getI18nValue("message.action.update.success"), MessageType.success); + } + + return new Message(WebContext.getI18nValue("message.action.update.error"), MessageType.error); + } + + + + + + + + + @ResponseBody + @RequestMapping({"/delete"}) + public Message delete(@ModelAttribute("organization") Organizations organization) { + _logger.debug("-delete organization :" + organization); + if (this.organizationsService.delete(organization)) { + return new Message(WebContext.getI18nValue("message.action.delete.success"), MessageType.success); + } + + return new Message(WebContext.getI18nValue("message.action.delete.success"), MessageType.error); + } + + + + + @RequestMapping({"/orgUsersList"}) + public ModelAndView orgUsersList() { return new ModelAndView("orgs/orgUsersList"); } +} 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 c3f2c7830..af2a14c4a 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 @@ -71,9 +71,9 @@ public class UserInfoController { } - @RequestMapping(value={"/forwardSelectUserType"}) + @RequestMapping(value={"/forwardAdd"}) public ModelAndView forwardSelectUserType(){ - ModelAndView modelAndView=new ModelAndView("users/selectUserTypeList"); + ModelAndView modelAndView=new ModelAndView("/userinfo/userAdd"); //List userTypeList=userTypeService.query(null); //modelAndView.addObject("userTypeList", userTypeList); return modelAndView; @@ -84,14 +84,14 @@ public class UserInfoController { @RequestMapping(value={"/list"}) public ModelAndView usersList(){ - return new ModelAndView("userinfo/usersList"); + 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("users/usersSelect"); + ModelAndView modelAndView= new ModelAndView("/userinfo/usersSelect"); modelAndView.addObject("uid", uid); modelAndView.addObject("username", username); return modelAndView; @@ -123,7 +123,7 @@ public class UserInfoController { @RequestMapping(value={"/forwardUpdate/{id}"}) public ModelAndView forwardUpdateUsers(@PathVariable("id")String id){ - ModelAndView modelAndView=new ModelAndView("users/userUpdate"); + ModelAndView modelAndView=new ModelAndView("/userinfo/userUpdate"); UserInfo userInfo=new UserInfo(); userInfo.setId(id); userInfo=userInfoService.load(userInfo); @@ -233,7 +233,7 @@ public class UserInfoController { @RequestMapping(value={"/forwardChangePassword/{id}"}) public ModelAndView forwardChangePassword(@PathVariable("id")String id){ - ModelAndView modelAndView=new ModelAndView("users/changePassword"); + ModelAndView modelAndView=new ModelAndView("/userinfo/changePassword"); UserInfo userInfo=new UserInfo(); userInfo.setId(id); userInfo=userInfoService.load(userInfo); diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java index 997fa7738..10c10aefb 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java @@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.maxkey.config.ApplicationConfig; -import org.maxkey.dao.service.NavigationsService; import org.maxkey.domain.Navigations; import org.maxkey.domain.UserInfo; import org.maxkey.web.WebContext; diff --git a/maxkey-web-manage/src/main/resources/application.properties b/maxkey-web-manage/src/main/resources/application.properties index 464d2bf39..9eecebdd7 100644 --- a/maxkey-web-manage/src/main/resources/application.properties +++ b/maxkey-web-manage/src/main/resources/application.properties @@ -15,6 +15,7 @@ spring.freemarker.expose-request-attributes=false spring.freemarker.expose-session-attributes=false spring.freemarker.request-context-attribute=request spring.freemarker.suffix=.ftl +#spring.freemarker.settings.classic_compatible=true #static resources spring.mvc.static-path-pattern=/static/** diff --git a/maxkey-web-manage/src/main/resources/messages/message.properties b/maxkey-web-manage/src/main/resources/messages/message.properties index 6c8d0dc82..40f4df2c8 100644 --- a/maxkey-web-manage/src/main/resources/messages/message.properties +++ b/maxkey-web-manage/src/main/resources/messages/message.properties @@ -32,6 +32,23 @@ common.text.createdby=\u521B\u5EFA\u4EBA common.text.createddate=\u521B\u5EFA\u65F6\u95F4 common.text.modifiedby=\u4FEE\u6539\u4EBA common.text.modifieddate=\u4FEE\u6539\u65F6\u95F4 + +common.text.status.start=\u5F00\u59CB +common.text.status.normal=\u6B63\u5E38 +common.text.status.validated=\u6709\u6548 +common.text.status.inactive=\u4E0D\u6D3B\u52A8 +common.text.status.activate=\u6D3B\u52A8 +common.text.status.approved=\u6279\u51C6 +common.text.status.stop=\u505C\u6B62 +common.text.status.enabled=\u542F\u7528 +common.text.status.disabled=\u505C\u7528 +common.text.status.lock=\u9501\u5B9A +common.text.status.unlock=\u89E3\u9501 +common.text.status.invalid=\u65E0\u6548 +common.text.status.expired=\u8FC7\u671F +common.text.status.delete=\u5220\u9664 + + login.text.login.twofactor.obtain.valid=\u91CD\u65B0\u83B7\u53D6 login.text.login.twofactor.obtain=\u83B7\u53D6\u52A8\u6001\u9A8C\u8BC1\u7801 @@ -59,16 +76,46 @@ login.password.initial.change.tip=\u9996\u6B21\u767B\u5F55\uFF0C\u8BF7\u4FEE\u65 login.password.changepassword=\u5BC6\u7801\u4FEE\u6539 login.password.applogin.changepassword=\u5E94\u7528\u767B\u5F55\u5BC6\u7801\u8BBE\u7F6E +login.passwordpolicy=\u5BC6\u7801\u7B56\u7565 +login.passwordpolicy.minlength=\u6700\u5C0F\u957F\u5EA6 +login.passwordpolicy.maxlength=\u6700\u5927\u957F\u5EA6 +login.passwordpolicy.lowercase=\u5305\u542B\u5C0F\u5199\u5B57\u6BCD +login.passwordpolicy.uppercase=\u5305\u542B\u5927\u5199\u5B57\u6BCD +login.passwordpolicy.digits=\u5305\u542B\u6570\u5B57 +login.passwordpolicy.specialchar=\u7279\u6B8A\u5B57\u7B26 +login.passwordpolicy.attempts=\u767B\u5F55\u5C1D\u8BD5\u6B21\u6570 +login.passwordpolicy.duration=\u81EA\u52A8\u89E3\u9664 +login.passwordpolicy.expiration=\u8FC7\u671F\u65F6\u95F4 +login.passwordpolicy.username=\u5305\u542B\u7528\u6237\u540D +login.passwordpolicy.simplepasswords=\u7B80\u5355\u5BC6\u7801 + + login.social.link=\u7ED1\u5B9A login.social.unlink=\u89E3\u9664 login.social.icon=\u56FE\u6807 login.social.provider=\u4F9B\u5E94\u5546 +# +userinfo.tab.basic=\u57FA\u672C\u4FE1\u606F +userinfo.tab.business=\u673A\u6784\u4FE1\u606F +userinfo.tab.personal=\u4E2A\u4EBA\u4FE1\u606F +userinfo.tab.extra=\u6269\u5C55\u4FE1\u606F + userinfo.displayName=\u7528\u6237\u540D userinfo.username=\u767B\u5F55\u8D26\u53F7 userinfo.email=\u90AE\u7BB1\u5730\u5740 userinfo.mobile=\u624B\u673A\u53F7\u7801 userinfo.userType=\u7528\u6237\u7C7B\u578B +userinfo.userType.employee=\u5185\u90E8\u5458\u5DE5 +userinfo.userType.contractor=\u627F\u5305\u5546 +userinfo.userType.customer=\u5BA2\u6237 +userinfo.userType.supplier=\u4F9B\u5E94\u5546 +userinfo.userType.partner=\u5408\u4F5C\u4F19\u4F34 +userinfo.userType.external=\u5916\u90E8\u7528\u6237 +userinfo.userType.intern=\u5B9E\u4E60\u751F +userinfo.userType.temp=\u4E34\u65F6\u7528\u6237 +userinfo.userType.dealer=\u7ECF\u9500\u5546 + userinfo.picture=\u5934\u50CF userinfo.familyName=\u59D3 userinfo.givenName=\u540D @@ -84,6 +131,7 @@ userinfo.married.married=\u5DF2\u5A5A userinfo.married.divorce=\u79BB\u5F02 userinfo.married.widowed=\u4E27\u5076 userinfo.website=\u4e2a\u4eba\u4e3b\u9875 +userinfo.birthDate=\u51FA\u751F\u65E5\u671F userinfo.idtype=\u8bc1\u4ef6\u7c7b\u578b userinfo.idtype.unknown=\u672A\u77E5 userinfo.idtype.idcard=\u8EAB\u4EFD\u8BC1 @@ -123,7 +171,7 @@ userinfo.homePostalCode=\u5BB6\u5EAD\u90AE\u7F16 userinfo.homeFax=\u5BB6\u5EAD\u4F20\u771F userinfo.homePhoneNumber=\u5BB6\u5EAD\u7535\u8BDD userinfo.homeEmail=\u5BB6\u5EAD\u90AE\u7BB1 - +userinfo.ims=\u5373\u65F6\u901A\u8BAF userinfo.authnType=\u767B\u5F55\u65B9\u5F0F userinfo.authnType.authnType.1=\u666E\u901A\u767B\u5F55 diff --git a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.jsp b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.jsp rename to maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAddSelect.jsp b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAddSelect.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAddSelect.jsp rename to maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAddSelect.ftl 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 2ae32c9d2..10b879d60 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 @@ -110,7 +110,7 @@ <@locale code="account.username"/> <@locale code="account.displayName"/> <@locale code="account.appName"/> - <@locale code="account.appId"/> + <@locale code="account.appId"/> <@locale code="account.relatedUsername"/> diff --git a/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsUpdate.jsp b/maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsUpdate.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsUpdate.jsp rename to maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsUpdate.ftl diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appAdd.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appAdd.ftl new file mode 100644 index 000000000..f447658b1 --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appAdd.ftl @@ -0,0 +1,21 @@ + +
+ + + + + + + + +
<#include "./appAddCommon.ftl"/> +
+ + + + "/> + "/> +
\ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appAdd.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/appAdd.jsp deleted file mode 100644 index cfa9cafe2..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appAdd.jsp +++ /dev/null @@ -1,25 +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/appAddCommon.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl similarity index 64% rename from maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl index 92775fd87..5e7b0d6b3 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.jsp +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl @@ -1,49 +1,43 @@ -<%@ 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"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ page import="org.maxkey.constants.*"%> - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -103,7 +103,6 @@ - @@ -115,8 +114,8 @@ @@ -137,7 +136,8 @@ data-side-pagination="server"> - + + diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersSelect.jsp b/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersSelect.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/userinfo/usersSelect.jsp rename to maxkey-web-manage/src/main/resources/templates/views/userinfo/usersSelect.ftl diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java index 997fa7738..10c10aefb 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java @@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.maxkey.config.ApplicationConfig; -import org.maxkey.dao.service.NavigationsService; import org.maxkey.domain.Navigations; import org.maxkey.domain.UserInfo; import org.maxkey.web.WebContext; diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/profile/myProfile.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/profile/myProfile.ftl index d35ef1149..42b3f5e78 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/profile/myProfile.ftl +++ b/maxkey-web-maxkey/src/main/resources/templates/views/profile/myProfile.ftl @@ -33,13 +33,13 @@ @@ -50,7 +50,7 @@ @@ -67,7 +67,7 @@ @@ -77,7 +77,7 @@ @@ -86,7 +86,7 @@ @@ -96,7 +96,7 @@ @@ -123,7 +123,7 @@ @@ -142,7 +142,7 @@ @@ -154,7 +154,7 @@ @@ -315,24 +315,24 @@ @@ -341,13 +341,13 @@ @@ -355,38 +355,38 @@ @@ -653,7 +653,7 @@ @@ -661,12 +661,12 @@ @@ -674,12 +674,12 @@ @@ -687,12 +687,12 @@ @@ -961,7 +961,7 @@ @@ -969,12 +969,12 @@ @@ -982,12 +982,12 @@ @@ -995,12 +995,12 @@
<@locale code="apps.basic.info"/>
：<@locale code="apps.id"/>： ${model.id} ：<@locale code="apps.secret"/>： ${model.secret}
：<@locale code="apps.name"/>： *
：<@locale code="apps.loginUrl"/>： *
：<@locale code="apps.protocol"/>： ${model.protocol} ：<@locale code="apps.category"/>：
：<@locale code="apps.icon"/>： * <@locale code="common.text.sortorder"/> *
：<@locale code="apps.vendor"/>： * ：<@locale code="apps.vendor.url"/>： *
<@locale code="apps.visible"/> ：<@locale code="common.text.description"/>： * diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdate.ftl new file mode 100644 index 000000000..8c9f12fb9 --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdate.ftl @@ -0,0 +1,30 @@ + + +
+ + + + + + + + +
<#include "./appUpdateCommon.ftl"/>
+ "/> + "/> +
\ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdate.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdate.jsp deleted file mode 100644 index 81d4d3a4e..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdate.jsp +++ /dev/null @@ -1,35 +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"%> -<%@ 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/apps/appUpdateCommon.jsp b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl similarity index 71% rename from maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.jsp rename to maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl index efa249859..b998df384 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.jsp +++ b/maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl @@ -1,8 +1,3 @@ -<%@ 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"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - -
- - -
-
- - - - - - -
-
    -
    • -
    • -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
：
：
：
：
：
： -
： -
：
：
- ： -
：
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- "/> - - "/> - - "/> - -
- -
-
diff --git a/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsSelect.jsp b/maxkey-web-manage/src/main/resources/templates/views/orgs/orgsSelect.ftl similarity index 100% rename from maxkey-web-manage/src/main/resources/templates/views/orgs/orgsSelect.jsp rename to maxkey-web-manage/src/main/resources/templates/views/orgs/orgsSelect.ftl 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 new file mode 100644 index 000000000..8459141d9 --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl @@ -0,0 +1,501 @@ + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + + + + +
+
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
<@locale code="userinfo.username" />： + + + <@locale code="login.text.password" />： + +
<@locale code="userinfo.employeeNumber" />： + + <@locale code="userinfo.userType" />： + + +
  +
<@locale code="userinfo.displayName" />： + + <@locale code="userinfo.picture" />： + + +
<@locale code="userinfo.familyName" />： + +
<@locale code="userinfo.givenName" />： + +
<@locale code="userinfo.middleName" />： + +
<@locale code="userinfo.nickName" />： + + <@locale code="userinfo.windowsAccount" />： + +
<@locale code="userinfo.gender" />： + + <@locale code="userinfo.birthDate" />： + +
  +
<@locale code="userinfo.preferredLanguage" />： + + <@locale code="userinfo.timeZone" />： + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ + "/> +
+
+
+
+ + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.jsp b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.jsp deleted file mode 100644 index 52ed59073..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.jsp +++ /dev/null @@ -1,51 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - -
-
-
-
    -
    • -
    • -
    • -
    • - -
-
- -
-
- - - <%@ include file="userAddBasic.jsp"%> - <%@ include file="userAddCompany.jsp"%> - <%@ include file="userAddHome.jsp"%> -
-
-
-
-
- - "/> - "/> -
-
-
-
diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddBasic.jsp b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddBasic.jsp deleted file mode 100644 index ec38f102e..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddBasic.jsp +++ /dev/null @@ -1,250 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
： - - - * - ： - - * -
  -
： - - * - ： - " /> - -
： - - * -
： - - * -
： - -
： - - ： - - - - - -
： - - ： - -
  -
： - - ： - -
： - - ： - -
diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddCompany.jsp b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddCompany.jsp deleted file mode 100644 index cb25d180b..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddCompany.jsp +++ /dev/null @@ -1,404 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ 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/userinfo/userAddHome.jsp b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddHome.jsp deleted file mode 100644 index e3ed61077..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddHome.jsp +++ /dev/null @@ -1,428 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ 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/userinfo/userUpdate.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.ftl new file mode 100644 index 000000000..979fbd383 --- /dev/null +++ b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.ftl @@ -0,0 +1,501 @@ + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + + + + +
+
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
<@locale code="userinfo.username" />： + + + <@locale code="login.text.password" />： + +
<@locale code="userinfo.employeeNumber" />： + + <@locale code="userinfo.userType" />： + + +
  +
<@locale code="userinfo.displayName" />： + + <@locale code="userinfo.picture" />： + + +
<@locale code="userinfo.familyName" />： + +
<@locale code="userinfo.givenName" />： + +
<@locale code="userinfo.middleName" />： + +
<@locale code="userinfo.nickName" />： + + <@locale code="userinfo.windowsAccount" />： + +
<@locale code="userinfo.gender" />： + + <@locale code="userinfo.birthDate" />： + +
  +
<@locale code="userinfo.preferredLanguage" />： + + <@locale code="userinfo.timeZone" />： + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ + "/> +
+
+
+
+ + \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.jsp b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.jsp deleted file mode 100644 index 08555cb9d..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.jsp +++ /dev/null @@ -1,54 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - -
-
-
-
    -
    • -
    • -
    • -
    • - -
-
- -
-
- - - <%@ include file="userUpdateBasic.jsp"%> - <%@ include file="userUpdateCompany.jsp"%> - <%@ include file="userUpdateHome.jsp"%> -
-
-
-
-
- - - "/> - "/> -
-
-
-
\ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdateBasic.jsp b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdateBasic.jsp deleted file mode 100644 index b1ac13edd..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdateBasic.jsp +++ /dev/null @@ -1,254 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ 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/userinfo/userUpdateCompany.jsp b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdateCompany.jsp deleted file mode 100644 index c6753db5e..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdateCompany.jsp +++ /dev/null @@ -1,415 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ 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/userinfo/userUpdateHome.jsp b/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdateHome.jsp deleted file mode 100644 index abc5a0ebf..000000000 --- a/maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdateHome.jsp +++ /dev/null @@ -1,444 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="s" uri="http://www.connsec.com/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ 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/userinfo/usersList.ftl b/maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl index 3501180af..25fd67caf 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 @@ -67,22 +67,22 @@
" - wurl="<@base/>/users/forwardChangePassword" wwidth="600px" wheight="250px" /> + wurl="<@base/>/userinfo/forwardChangePassword" wwidth="600px" wheight="250px" /> " - wurl="<@base/>/users/forwardSelectUserType" + wurl="<@base/>/userinfo/forwardAdd" wwidth="960" wheight="600" target="window"> " - wurl="<@base/>/users/forwardUpdate" + wurl="<@base/>/userinfo/forwardUpdate" wwidth="960" wheight="600" target="window"> " - wurl="<@base/>/users/delete" /> + wurl="<@base/>/userinfo/delete" />
<@locale code="userinfo.department"/><@locale code="userinfo.userType"/> - - " title="UserType" wurl="/usertype//selectUserTypeList" wwidth="700" wheight="500" /> + +
<@locale code="log.loginhistory.id"/><@locale code="userinfo.id"/><@locale code="apps.icon"/> <@locale code="apps.icon"/> <@locale code="userinfo.username"/> <@locale code="userinfo.displayName"/>
<@locale code="userinfo.username" />： - - + + <@locale code="userinfo.userType" />： - +
<@locale code="userinfo.displayName" />： - + <@locale code="userinfo.picture" />：
<@locale code="userinfo.familyName" />： - + *
<@locale code="userinfo.givenName" />： - + *
<@locale code="userinfo.middleName" />： - + <@locale code="userinfo.nickName" />： - + <@locale code="userinfo.gender" />： <@locale code="userinfo.website" />： - + <@locale code="userinfo.idCardNo" />： - +
<@locale code="userinfo.startWorkDate" />： - + <@locale code="userinfo.preferredLanguage" />：
<@locale code="userinfo.employeeNumber" />： - + <@locale code="userinfo.windowsAccount" />： - +
<@locale code="userinfo.organization" />： - + <@locale code="userinfo.division" />： - +
<@locale code="userinfo.department" />： - - + + <@locale code="userinfo.costCenter" />： - +
<@locale code="userinfo.jobTitle" />： - + <@locale code="userinfo.jobLevel" />： - +
<@locale code="userinfo.manager" />： - - + + <@locale code="userinfo.assistant" />： - - + +
<@locale code="userinfo.entryDate" />： - + <@locale code="userinfo.quitDate" />： - +
<@locale code="userinfo.workRegion" />： - +
<@locale code="userinfo.workLocality" />： - + <@locale code="userinfo.workStreetAddress" />： - +
<@locale code="userinfo.workPostalCode" />： - + <@locale code="userinfo.workFax" />： - +
<@locale code="userinfo.workPhoneNumber" />： - + <@locale code="userinfo.workEmail" />： - + <@locale code="userinfo.homeRegion" />： - +
<@locale code="userinfo.homeLocality" />： - + <@locale code="userinfo.homeStreetAddress" />： - +
<@locale code="userinfo.homePostalCode" />： - + <@locale code="userinfo.homeFax" />： - +
<@locale code="userinfo.homePhoneNumber" />： - + <@locale code="userinfo.homeEmail" />： - +