朱兆平 / agent · 提交

转到一个项目

作者 shenhailong
提交 297cae56669bacee1003ea42133c33289fc194fe 1 个父辈 ede17eb5

修改 统一认证 登录之后 页面跳转路径 

修改 判断 验证票据 方式
创建 统一认证所需实体
内嵌 并排对比
正在显示 11 个修改的文件 包含 510 行增加 和 37 行删除
@@ -18,6 +18,16 @@ @@ -18,6 +18,16 @@
18 </sourceRoots> 18 </sourceRoots>
19 </configuration> 19 </configuration>
20 </facet> 20 </facet>
  21 + <facet type="jpa" name="JPA">
  22 + <configuration>
  23 + <setting name="validation-enabled" value="true" />
  24 + <setting name="provider-name" value="Hibernate" />
  25 + <datasource-mapping>
  26 + <factory-entry name="entityManagerFactory" />
  27 + </datasource-mapping>
  28 + <naming-strategy-map />
  29 + </configuration>
  30 + </facet>
21 </component> 31 </component>
22 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7"> 32 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
23 <output url="file://$MODULE_DIR$/target/classes" /> 33 <output url="file://$MODULE_DIR$/target/classes" />
@@ -105,7 +115,7 @@ @@ -105,7 +115,7 @@
105 <orderEntry type="module-library"> 115 <orderEntry type="module-library">
106 <library name="Maven: com.alibaba:jconsole:1.8.0"> 116 <library name="Maven: com.alibaba:jconsole:1.8.0">
107 <CLASSES> 117 <CLASSES>
108 - <root url="jar://D:/Java/jdk/lib/jconsole.jar!/" /> 118 + <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_221.jdk/Contents/Home/lib/jconsole.jar!/" />
109 </CLASSES> 119 </CLASSES>
110 <JAVADOC /> 120 <JAVADOC />
111 <SOURCES /> 121 <SOURCES />
@@ -114,7 +124,7 @@ @@ -114,7 +124,7 @@
114 <orderEntry type="module-library"> 124 <orderEntry type="module-library">
115 <library name="Maven: com.alibaba:tools:1.8.0"> 125 <library name="Maven: com.alibaba:tools:1.8.0">
116 <CLASSES> 126 <CLASSES>
117 - <root url="jar://D:/Java/jdk/lib/tools.jar!/" /> 127 + <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_221.jdk/Contents/Home/lib/tools.jar!/" />
118 </CLASSES> 128 </CLASSES>
119 <JAVADOC /> 129 <JAVADOC />
120 <SOURCES /> 130 <SOURCES />
@@ -132,29 +142,40 @@ @@ -132,29 +142,40 @@
132 <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" /> 142 <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
133 <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> 143 <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
134 <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.8" level="project" /> 144 <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.8" level="project" />
135 - <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.2.3" level="project" />  
136 - <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />  
137 - <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.2.3" level="project" />  
138 - <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.2.3" level="project" />  
139 - <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.2.3" level="project" />  
140 - <orderEntry type="library" name="Maven: org.apache.shiro:shiro-quartz:1.2.3" level="project" />  
141 - <orderEntry type="library" name="Maven: org.opensymphony.quartz:quartz:1.6.1" level="project" /> 145 + <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.5.2" level="project" />
  146 + <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.5.2" level="project" />
  147 + <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.5.2" level="project" />
  148 + <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.5.2" level="project" />
  149 + <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.5.2" level="project" />
  150 + <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.5.2" level="project" />
  151 + <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.5.2" level="project" />
  152 + <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.5.2" level="project" />
  153 + <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.5.2" level="project" />
  154 + <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.5.2" level="project" />
  155 + <orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
  156 + <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.5.2" level="project" />
  157 + <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.5.2" level="project" />
  158 + <orderEntry type="library" name="Maven: org.apache.shiro:shiro-quartz:1.5.2" level="project" />
  159 + <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
  160 + <orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.5.4" level="project" />
  161 + <orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
  162 + <orderEntry type="library" name="Maven: com.zaxxer:HikariCP-java7:2.4.13" level="project" />
142 <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cas:1.2.3" level="project" /> 163 <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cas:1.2.3" level="project" />
143 <orderEntry type="library" name="Maven: org.jasig.cas.client:cas-client-core:3.2.1" level="project" /> 164 <orderEntry type="library" name="Maven: org.jasig.cas.client:cas-client-core:3.2.1" level="project" />
144 <orderEntry type="library" name="Maven: net.pusuo:patchca:0.5.0" level="project" /> 165 <orderEntry type="library" name="Maven: net.pusuo:patchca:0.5.0" level="project" />
145 <orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.4.0-atlassian-hosted" level="project" /> 166 <orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.4.0-atlassian-hosted" level="project" />
146 <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.12" level="project" /> 167 <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.12" level="project" />
147 <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" /> 168 <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
148 - <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" /> 169 + <orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
149 <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" /> 170 <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
150 <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" /> 171 <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
151 - <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.14" level="project" />  
152 - <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.14" level="project" />  
153 - <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" /> 172 + <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
  173 + <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
  174 + <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
154 <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" /> 175 <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
155 - <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.03" level="project" />  
156 <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> 176 <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
157 <orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" /> 177 <orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
  178 + <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.7.0" level="project" />
158 <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8" level="project" /> 179 <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8" level="project" />
159 <orderEntry type="library" name="Maven: commons-chain:commons-chain:1.1" level="project" /> 180 <orderEntry type="library" name="Maven: commons-chain:commons-chain:1.1" level="project" />
160 <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.3.1" level="project" /> 181 <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.3.1" level="project" />
@@ -7,8 +7,8 @@ @@ -7,8 +7,8 @@
7 <url>http://maven.apache.org</url> 7 <url>http://maven.apache.org</url>
8 <packaging>war</packaging> 8 <packaging>war</packaging>
9 <!-- 设定除中央仓库 (repo1.maven.org/maven2/)外的其他仓库,按设定顺序进行查询，如有Nexus私服, 取消注释并指向正确的服务器地址 --> 9 <!-- 设定除中央仓库 (repo1.maven.org/maven2/)外的其他仓库,按设定顺序进行查询，如有Nexus私服, 取消注释并指向正确的服务器地址 -->
10 - <!-- <repositories> <repository> <id>public</id> <name>Public Repositories</name>  
11 - <url>http://maven.aliyun.com/nexus/content/groups/public</url> </repository> 10 + <!-- <repositories> <repository> <id>public</id> <name>Public Repositories</name>
  11 + <url>http://maven.aliyun.com/nexus/content/groups/public</url> </repository>
12 </repositories> --> 12 </repositories> -->
13 13
14 <!-- 主要依赖库版本定义 --> 14 <!-- 主要依赖库版本定义 -->
@@ -378,7 +378,7 @@ @@ -378,7 +378,7 @@
378 </dependency> 378 </dependency>
379 379
380 <!-- velocity 模板 --> 380 <!-- velocity 模板 -->
381 - <!-- <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> 381 + <!-- <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId>
382 <version>${velocity.version}</version> </dependency> --> 382 <version>${velocity.version}</version> </dependency> -->
383 383
384 <dependency> 384 <dependency>
@@ -567,13 +567,13 @@ @@ -567,13 +567,13 @@
567 <extensions>true</extensions> 567 <extensions>true</extensions>
568 </plugin> 568 </plugin>
569 569
570 - <!-- Maven 打包插件 <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>  
571 - <version>3.1.0</version> <configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor>  
572 - </archive> <webResources> <resource> <directory>src/main/resoreces/conf/${package.environment}</directory>  
573 - <targetPath>WEB-INF/classes</targetPath> <filtering>true</filtering> </resource> 570 + <!-- Maven 打包插件 <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
  571 + <version>3.1.0</version> <configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor>
  572 + </archive> <webResources> <resource> <directory>src/main/resoreces/conf/${package.environment}</directory>
  573 + <targetPath>WEB-INF/classes</targetPath> <filtering>true</filtering> </resource>
574 </webResources> </configuration> </plugin> --> 574 </webResources> </configuration> </plugin> -->
575 575
576 </plugins> 576 </plugins>
577 </build> 577 </build>
578 <!-- <modules> <module>?</module> </modules> --> 578 <!-- <modules> <module>?</module> </modules> -->
579 -</project>  
  579 +</project>
@@ -58,10 +58,10 @@ public class UserController extends BasicController { @@ -58,10 +58,10 @@ public class UserController extends BasicController {
58 private String responseUrl; 58 private String responseUrl;
59 59
60 private static final Logger logger = LoggerFactory.getLogger(UserController.class); 60 private static final Logger logger = LoggerFactory.getLogger(UserController.class);
61 - 61 +
62 @Resource 62 @Resource
63 private UserService userService; 63 private UserService userService;
64 - 64 +
65 @Resource 65 @Resource
66 private RoleService roleService; 66 private RoleService roleService;
67 67
@@ -80,11 +80,11 @@ public class UserController extends BasicController { @@ -80,11 +80,11 @@ public class UserController extends BasicController {
80 public String list() { 80 public String list() {
81 return "system/user/list"; 81 return "system/user/list";
82 } 82 }
83 -  
84 -  
85 -  
86 -  
87 - 83 +
  84 +
  85 +
  86 +
  87 +
88 /** 88 /**
89 * 查询用户分页 89 * 查询用户分页
90 * @return 90 * @return
@@ -119,11 +119,11 @@ public class UserController extends BasicController { @@ -119,11 +119,11 @@ public class UserController extends BasicController {
119 vos.setRows(rows); 119 vos.setRows(rows);
120 vos.setTotal(users.getTotal()); 120 vos.setTotal(users.getTotal());
121 return vos; 121 return vos;
122 - 122 +
123 } 123 }
124 124
125 -  
126 - 125 +
  126 +
127 @RequestMapping(value = {"/view" }, method = {RequestMethod.GET }) 127 @RequestMapping(value = {"/view" }, method = {RequestMethod.GET })
128 public String view(Model model, Long id) { 128 public String view(Model model, Long id) {
129 UserEntity entity = this.userService.findOne(id); 129 UserEntity entity = this.userService.findOne(id);
@@ -172,7 +172,7 @@ public class UserController extends BasicController { @@ -172,7 +172,7 @@ public class UserController extends BasicController {
172 user.setCreateDate(new Date()); 172 user.setCreateDate(new Date());
173 user.setCreator(user); 173 user.setCreator(user);
174 } 174 }
175 - 175 +
176 if(StringUtils.isNotBlank(user.getPassword())) { 176 if(StringUtils.isNotBlank(user.getPassword())) {
177 user.setPassword(MD5Tools.MD5(user.getPassword())); 177 user.setPassword(MD5Tools.MD5(user.getPassword()));
178 }else if(user.getId()!=null){ 178 }else if(user.getId()!=null){
@@ -247,7 +247,7 @@ public class UserController extends BasicController { @@ -247,7 +247,7 @@ public class UserController extends BasicController {
247 return model; 247 return model;
248 } 248 }
249 /** 249 /**
250 - * 250 + *
251 * @param originalpassword 251 * @param originalpassword
252 * @return 252 * @return
253 */ 253 */
@@ -337,7 +337,7 @@ public class UserController extends BasicController { @@ -337,7 +337,7 @@ public class UserController extends BasicController {
337 ResponseModel responseModel = new ResponseModel(); 337 ResponseModel responseModel = new ResponseModel();
338 try { 338 try {
339 // log.info("票据接受:{}", ticket); 339 // log.info("票据接受:{}", ticket);
340 - if (!org.springframework.util.StringUtils.isEmpty(ticket)){ 340 + if (!StringUtils.isEmpty(ticket)){
341 // log.info("开始验证票据"); 341 // log.info("开始验证票据");
342 String result = HttpClientUtil.httpGet("http://10.5.14.103:27080/sso/p3/serviceValidate?format=json&service="+"http://10.50.3.73:8003/sso/ssoLogin.html"+"&ticket="+ticket, "UTF-8"); 342 String result = HttpClientUtil.httpGet("http://10.5.14.103:27080/sso/p3/serviceValidate?format=json&service="+"http://10.50.3.73:8003/sso/ssoLogin.html"+"&ticket="+ticket, "UTF-8");
343 // log.info("验证票据返回值:{}", result); 343 // log.info("验证票据返回值:{}", result);
  1 +package com.agent.entity.system;
  2 +
  3 +import java.io.Serializable;
  4 +import java.util.Map;
  5 +
  6 +/**
  7 + * @author shenhailong
  8 + * <p>
  9 + * 2021/6/17/18:04
  10 + */
  11 +public class AuthSuccessResponse implements Serializable {
  12 +
  13 + private static final long serialVersionUID = 1L;
  14 +
  15 + private Object authentication;
  16 +
  17 + private Map<String,Object> loginUserMenus;
  18 +
  19 + public AuthSuccessResponse (Object authentication,Map<String,Object> loginUserMenus){
  20 + this.authentication= authentication;
  21 + this.loginUserMenus = loginUserMenus;
  22 + }
  23 +
  24 + public static long getSerialVersionUID() {
  25 + return serialVersionUID;
  26 + }
  27 +
  28 + public Object getAuthentication() {
  29 + return authentication;
  30 + }
  31 +
  32 + public void setAuthentication(Object authentication) {
  33 + this.authentication = authentication;
  34 + }
  35 +
  36 + public Map<String, Object> getLoginUserMenus() {
  37 + return loginUserMenus;
  38 + }
  39 +
  40 + public void setLoginUserMenus(Map<String, Object> loginUserMenus) {
  41 + this.loginUserMenus = loginUserMenus;
  42 + }
  43 +}
  1 +package com.agent.entity.system;
  2 +
  3 +/**
  4 + * @author shenhailong
  5 + * <p>
  6 + * 2021/5/18/14:51
  7 + */
  8 +public class ResultMessage {
  9 +
  10 + private static final long serialVersionUID = 1L;
  11 +
  12 + private String resultCode;
  13 +
  14 + private String resultMessage;
  15 +
  16 + public ResultMessage(String resultCode, String resultMessage) {
  17 + this.resultCode = resultCode;
  18 + this.resultMessage = resultMessage;
  19 + }
  20 +
  21 + public static long getSerialVersionUID() {
  22 + return serialVersionUID;
  23 + }
  24 +
  25 + public String getResultCode() {
  26 + return resultCode;
  27 + }
  28 +
  29 + public void setResultCode(String resultCode) {
  30 + this.resultCode = resultCode;
  31 + }
  32 +
  33 + public String getResultMessage() {
  34 + return resultMessage;
  35 + }
  36 +
  37 + public void setResultMessage(String resultMessage) {
  38 + this.resultMessage = resultMessage;
  39 + }
  40 +}
  1 +package com.agent.entity.system;
  2 +
  3 +
  4 +import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * @author shenhailong
  10 + * <p>
  11 + * 2021/5/19/15:11
  12 + */
  13 +public class UAM {
  14 +
  15 + private long syncTime;
  16 +
  17 + private String action;
  18 +
  19 + private String resType;
  20 +
  21 + private List<UserData> data;
  22 +
  23 + public long getSyncTime() {
  24 + return syncTime;
  25 + }
  26 +
  27 + public void setSyncTime(long syncTime) {
  28 + this.syncTime = syncTime;
  29 + }
  30 +
  31 + public String getAction() {
  32 + return action;
  33 + }
  34 +
  35 + public void setAction(String action) {
  36 + this.action = action;
  37 + }
  38 +
  39 + public String getResType() {
  40 + return resType;
  41 + }
  42 +
  43 + public void setResType(String resType) {
  44 + this.resType = resType;
  45 + }
  46 +
  47 + public List<UserData> getData() {
  48 + return data;
  49 + }
  50 +
  51 + public void setData(List<UserData> data) {
  52 + this.data = data;
  53 + }
  54 +}
  1 +package com.agent.entity.system;
  2 +
  3 +import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  4 +import com.fasterxml.jackson.annotation.JsonProperty;
  5 +
  6 +/**
  7 + * @author shenhailong
  8 + * <p>
  9 + * 2021/5/19/15:13
  10 + */
  11 +@JsonIgnoreProperties(ignoreUnknown = true)
  12 +public class UserData {
  13 +
  14 + @JsonProperty(value = "USER_ID")
  15 + private String USER_ID;
  16 + @JsonProperty(value = "USER_NAME")
  17 + private String USER_NAME;
  18 + @JsonProperty(value = "USER_NO")
  19 + private String USER_NO;
  20 + @JsonProperty(value = "MOBILE")
  21 + private String MOBILE;
  22 + @JsonProperty(value = "IDCARD_NO")
  23 + private String IDCARD_NO;
  24 + @JsonProperty(value = "COUNTRY")
  25 + private String COUNTRY;
  26 + @JsonProperty(value = "SEX")
  27 + private String SEX;
  28 + @JsonProperty(value = "NATIONALITY")
  29 + private String NATIONALITY;
  30 + @JsonProperty(value = "OFFICE_PHONE")
  31 + private String OFFICE_PHONE;
  32 + @JsonProperty(value = "OFFICE_ADDRESS")
  33 + private String OFFICE_ADDRESS;
  34 + @JsonProperty(value = "EMAIL")
  35 + private String EMAIL;
  36 + @JsonProperty(value = "JOB_LEVEL")
  37 + private String JOB_LEVEL;
  38 + @JsonProperty(value = "JOB_TITLE")
  39 + private String JOB_TITLE;
  40 + @JsonProperty(value = "JOB_TYPE")
  41 + private String JOB_TYPE;
  42 + @JsonProperty(value = "JOB_STATUS")
  43 + private String JOB_STATUS;
  44 + @JsonProperty(value = "JOB_POSITION")
  45 + private String JOB_POSITION;
  46 + @JsonProperty(value = "SECRET_LEVEL")
  47 + private String SECRET_LEVEL;
  48 + @JsonProperty(value = "USER_POST")
  49 + private String USER_POST;
  50 + @JsonProperty(value = "USER_JOB_ID")
  51 + private String USER_JOB_ID;
  52 + @JsonProperty(value = "ORG_ID")
  53 + private String ORG_ID;
  54 + @JsonProperty(value = "USER_TITLE")
  55 + private String USER_TITLE;
  56 + @JsonProperty(value = "LOGIN_NAME")
  57 + private String LOGIN_NAME;
  58 + @JsonProperty(value = "SHOW_ORDER")
  59 + private String SHOW_ORDER;
  60 + @JsonProperty(value = "REMARK")
  61 + private String REMARK;
  62 + @JsonProperty(value = "NAIL_ID")
  63 + private String NAIL_ID;
  64 + @JsonProperty(value = "PK_PSNDOC")
  65 + private String PK_PSNDOC;
  66 + @JsonProperty(value = "PWD")
  67 + private String PWD;
  68 + @JsonProperty(value = "PWD_ENCRYPT")
  69 + private String PWD_ENCRYPT;
  70 + @JsonProperty(value = "UPDATE_TIME")
  71 + private String UPDATE_TIME;
  72 +
  73 + public String getUSER_ID() {
  74 + return USER_ID;
  75 + }
  76 +
  77 + public void setUSER_ID(String USER_ID) {
  78 + this.USER_ID = USER_ID;
  79 + }
  80 +
  81 + public String getUSER_NAME() {
  82 + return USER_NAME;
  83 + }
  84 +
  85 + public void setUSER_NAME(String USER_NAME) {
  86 + this.USER_NAME = USER_NAME;
  87 + }
  88 +
  89 + public String getUSER_NO() {
  90 + return USER_NO;
  91 + }
  92 +
  93 + public void setUSER_NO(String USER_NO) {
  94 + this.USER_NO = USER_NO;
  95 + }
  96 +
  97 + public String getMOBILE() {
  98 + return MOBILE;
  99 + }
  100 +
  101 + public void setMOBILE(String MOBILE) {
  102 + this.MOBILE = MOBILE;
  103 + }
  104 +
  105 + public String getIDCARD_NO() {
  106 + return IDCARD_NO;
  107 + }
  108 +
  109 + public void setIDCARD_NO(String IDCARD_NO) {
  110 + this.IDCARD_NO = IDCARD_NO;
  111 + }
  112 +
  113 + public String getCOUNTRY() {
  114 + return COUNTRY;
  115 + }
  116 +
  117 + public void setCOUNTRY(String COUNTRY) {
  118 + this.COUNTRY = COUNTRY;
  119 + }
  120 +
  121 + public String getSEX() {
  122 + return SEX;
  123 + }
  124 +
  125 + public void setSEX(String SEX) {
  126 + this.SEX = SEX;
  127 + }
  128 +
  129 + public String getNATIONALITY() {
  130 + return NATIONALITY;
  131 + }
  132 +
  133 + public void setNATIONALITY(String NATIONALITY) {
  134 + this.NATIONALITY = NATIONALITY;
  135 + }
  136 +
  137 + public String getOFFICE_PHONE() {
  138 + return OFFICE_PHONE;
  139 + }
  140 +
  141 + public void setOFFICE_PHONE(String OFFICE_PHONE) {
  142 + this.OFFICE_PHONE = OFFICE_PHONE;
  143 + }
  144 +
  145 + public String getOFFICE_ADDRESS() {
  146 + return OFFICE_ADDRESS;
  147 + }
  148 +
  149 + public void setOFFICE_ADDRESS(String OFFICE_ADDRESS) {
  150 + this.OFFICE_ADDRESS = OFFICE_ADDRESS;
  151 + }
  152 +
  153 + public String getEMAIL() {
  154 + return EMAIL;
  155 + }
  156 +
  157 + public void setEMAIL(String EMAIL) {
  158 + this.EMAIL = EMAIL;
  159 + }
  160 +
  161 + public String getJOB_LEVEL() {
  162 + return JOB_LEVEL;
  163 + }
  164 +
  165 + public void setJOB_LEVEL(String JOB_LEVEL) {
  166 + this.JOB_LEVEL = JOB_LEVEL;
  167 + }
  168 +
  169 + public String getJOB_TITLE() {
  170 + return JOB_TITLE;
  171 + }
  172 +
  173 + public void setJOB_TITLE(String JOB_TITLE) {
  174 + this.JOB_TITLE = JOB_TITLE;
  175 + }
  176 +
  177 + public String getJOB_TYPE() {
  178 + return JOB_TYPE;
  179 + }
  180 +
  181 + public void setJOB_TYPE(String JOB_TYPE) {
  182 + this.JOB_TYPE = JOB_TYPE;
  183 + }
  184 +
  185 + public String getJOB_STATUS() {
  186 + return JOB_STATUS;
  187 + }
  188 +
  189 + public void setJOB_STATUS(String JOB_STATUS) {
  190 + this.JOB_STATUS = JOB_STATUS;
  191 + }
  192 +
  193 + public String getJOB_POSITION() {
  194 + return JOB_POSITION;
  195 + }
  196 +
  197 + public void setJOB_POSITION(String JOB_POSITION) {
  198 + this.JOB_POSITION = JOB_POSITION;
  199 + }
  200 +
  201 + public String getSECRET_LEVEL() {
  202 + return SECRET_LEVEL;
  203 + }
  204 +
  205 + public void setSECRET_LEVEL(String SECRET_LEVEL) {
  206 + this.SECRET_LEVEL = SECRET_LEVEL;
  207 + }
  208 +
  209 + public String getUSER_POST() {
  210 + return USER_POST;
  211 + }
  212 +
  213 + public void setUSER_POST(String USER_POST) {
  214 + this.USER_POST = USER_POST;
  215 + }
  216 +
  217 + public String getUSER_JOB_ID() {
  218 + return USER_JOB_ID;
  219 + }
  220 +
  221 + public void setUSER_JOB_ID(String USER_JOB_ID) {
  222 + this.USER_JOB_ID = USER_JOB_ID;
  223 + }
  224 +
  225 + public String getORG_ID() {
  226 + return ORG_ID;
  227 + }
  228 +
  229 + public void setORG_ID(String ORG_ID) {
  230 + this.ORG_ID = ORG_ID;
  231 + }
  232 +
  233 + public String getUSER_TITLE() {
  234 + return USER_TITLE;
  235 + }
  236 +
  237 + public void setUSER_TITLE(String USER_TITLE) {
  238 + this.USER_TITLE = USER_TITLE;
  239 + }
  240 +
  241 + public String getLOGIN_NAME() {
  242 + return LOGIN_NAME;
  243 + }
  244 +
  245 + public void setLOGIN_NAME(String LOGIN_NAME) {
  246 + this.LOGIN_NAME = LOGIN_NAME;
  247 + }
  248 +
  249 + public String getSHOW_ORDER() {
  250 + return SHOW_ORDER;
  251 + }
  252 +
  253 + public void setSHOW_ORDER(String SHOW_ORDER) {
  254 + this.SHOW_ORDER = SHOW_ORDER;
  255 + }
  256 +
  257 + public String getREMARK() {
  258 + return REMARK;
  259 + }
  260 +
  261 + public void setREMARK(String REMARK) {
  262 + this.REMARK = REMARK;
  263 + }
  264 +
  265 + public String getNAIL_ID() {
  266 + return NAIL_ID;
  267 + }
  268 +
  269 + public void setNAIL_ID(String NAIL_ID) {
  270 + this.NAIL_ID = NAIL_ID;
  271 + }
  272 +
  273 + public String getPK_PSNDOC() {
  274 + return PK_PSNDOC;
  275 + }
  276 +
  277 + public void setPK_PSNDOC(String PK_PSNDOC) {
  278 + this.PK_PSNDOC = PK_PSNDOC;
  279 + }
  280 +
  281 + public String getPWD() {
  282 + return PWD;
  283 + }
  284 +
  285 + public void setPWD(String PWD) {
  286 + this.PWD = PWD;
  287 + }
  288 +
  289 + public String getPWD_ENCRYPT() {
  290 + return PWD_ENCRYPT;
  291 + }
  292 +
  293 + public void setPWD_ENCRYPT(String PWD_ENCRYPT) {
  294 + this.PWD_ENCRYPT = PWD_ENCRYPT;
  295 + }
  296 +
  297 + public String getUPDATE_TIME() {
  298 + return UPDATE_TIME;
  299 + }
  300 +
  301 + public void setUPDATE_TIME(String UPDATE_TIME) {
  302 + this.UPDATE_TIME = UPDATE_TIME;
  303 + }
  304 +}
@@ -73,6 +73,17 @@ public class UserEntity extends BasicEntity { @@ -73,6 +73,17 @@ public class UserEntity extends BasicEntity {
73 */ 73 */
74 private int loginerror; 74 private int loginerror;
75 75
  76 + private String uamId;
  77 +
  78 + @Column(name = "uam_id")
  79 + public String getUamId() {
  80 + return uamId;
  81 + }
  82 +
  83 + public void setUamId(String uamId) {
  84 + this.uamId = uamId;
  85 + }
  86 +
76 @Column(name = "loginaccount", nullable = false, length = 20) 87 @Column(name = "loginaccount", nullable = false, length = 20)
77 public String getLoginaccount() { 88 public String getLoginaccount() {
78 return loginaccount; 89 return loginaccount;
@@ -44,7 +44,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. @@ -44,7 +44,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
44 var msg = "该账户不存在本系统"; 44 var msg = "该账户不存在本系统";
45 $.growl({ title: "消息提示", message: msg }); 45 $.growl({ title: "消息提示", message: msg });
46 } else { 46 } else {
47 - window.location.href='<%=basePath %>manifest/list'; 47 + window.location.href='<%=basePath %>/index';
48 } 48 }
49 }).catch(error => { 49 }).catch(error => {
50 $.growl({ title: "消息提示", message: error }); 50 $.growl({ title: "消息提示", message: error });
@@ -59,4 +59,4 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. @@ -59,4 +59,4 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
59 ticket(); 59 ticket();
60 }); 60 });
61 </script> 61 </script>
62 -</html>  
  62 +</html>