作者 shenhailong

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

修改 判断 验证票据 方式
创建 统一认证所需实体
... ... @@ -18,6 +18,16 @@
</sourceRoots>
</configuration>
</facet>
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping>
<factory-entry name="entityManagerFactory" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/target/classes" />
... ... @@ -105,7 +115,7 @@
<orderEntry type="module-library">
<library name="Maven: com.alibaba:jconsole:1.8.0">
<CLASSES>
<root url="jar://D:/Java/jdk/lib/jconsole.jar!/" />
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_221.jdk/Contents/Home/lib/jconsole.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
... ... @@ -114,7 +124,7 @@
<orderEntry type="module-library">
<library name="Maven: com.alibaba:tools:1.8.0">
<CLASSES>
<root url="jar://D:/Java/jdk/lib/tools.jar!/" />
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_221.jdk/Contents/Home/lib/tools.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
... ... @@ -132,29 +142,40 @@
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
<orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-quartz:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.opensymphony.quartz:quartz:1.6.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.owasp.encoder:encoder:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-quartz:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.2" level="project" />
<orderEntry type="library" name="Maven: com.mchange:c3p0:0.9.5.4" level="project" />
<orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.15" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP-java7:2.4.13" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-cas:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.jasig.cas.client:cas-client-core:3.2.1" level="project" />
<orderEntry type="library" name="Maven: net.pusuo:patchca:0.5.0" level="project" />
<orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.4.0-atlassian-hosted" level="project" />
<orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.12" level="project" />
<orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.9" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.14" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.14" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.03" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.7.0" level="project" />
<orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8" level="project" />
<orderEntry type="library" name="Maven: commons-chain:commons-chain:1.1" level="project" />
<orderEntry type="library" name="Maven: commons-validator:commons-validator:1.3.1" level="project" />
... ...
... ... @@ -7,8 +7,8 @@
<url>http://maven.apache.org</url>
<packaging>war</packaging>
<!-- 设定除中央仓库 (repo1.maven.org/maven2/)外的其他仓库,按设定顺序进行查询,如有Nexus私服, 取消注释并指向正确的服务器地址 -->
<!-- <repositories> <repository> <id>public</id> <name>Public Repositories</name>
<url>http://maven.aliyun.com/nexus/content/groups/public</url> </repository>
<!-- <repositories> <repository> <id>public</id> <name>Public Repositories</name>
<url>http://maven.aliyun.com/nexus/content/groups/public</url> </repository>
</repositories> -->
<!-- 主要依赖库版本定义 -->
... ... @@ -378,7 +378,7 @@
</dependency>
<!-- velocity 模板 -->
<!-- <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId>
<!-- <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId>
<version>${velocity.version}</version> </dependency> -->
<dependency>
... ... @@ -567,13 +567,13 @@
<extensions>true</extensions>
</plugin>
<!-- Maven 打包插件 <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version> <configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor>
</archive> <webResources> <resource> <directory>src/main/resoreces/conf/${package.environment}</directory>
<targetPath>WEB-INF/classes</targetPath> <filtering>true</filtering> </resource>
<!-- Maven 打包插件 <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
<version>3.1.0</version> <configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor>
</archive> <webResources> <resource> <directory>src/main/resoreces/conf/${package.environment}</directory>
<targetPath>WEB-INF/classes</targetPath> <filtering>true</filtering> </resource>
</webResources> </configuration> </plugin> -->
</plugins>
</build>
<!-- <modules> <module>?</module> </modules> -->
</project>
\ No newline at end of file
</project>
... ...
... ... @@ -58,10 +58,10 @@ public class UserController extends BasicController {
private String responseUrl;
private static final Logger logger = LoggerFactory.getLogger(UserController.class);
@Resource
private UserService userService;
@Resource
private RoleService roleService;
... ... @@ -80,11 +80,11 @@ public class UserController extends BasicController {
public String list() {
return "system/user/list";
}
/**
* 查询用户分页
* @return
... ... @@ -119,11 +119,11 @@ public class UserController extends BasicController {
vos.setRows(rows);
vos.setTotal(users.getTotal());
return vos;
}
@RequestMapping(value = {"/view" }, method = {RequestMethod.GET })
public String view(Model model, Long id) {
UserEntity entity = this.userService.findOne(id);
... ... @@ -172,7 +172,7 @@ public class UserController extends BasicController {
user.setCreateDate(new Date());
user.setCreator(user);
}
if(StringUtils.isNotBlank(user.getPassword())) {
user.setPassword(MD5Tools.MD5(user.getPassword()));
}else if(user.getId()!=null){
... ... @@ -247,7 +247,7 @@ public class UserController extends BasicController {
return model;
}
/**
*
*
* @param originalpassword
* @return
*/
... ... @@ -337,7 +337,7 @@ public class UserController extends BasicController {
ResponseModel responseModel = new ResponseModel();
try {
// log.info("票据接受:{}", ticket);
if (!org.springframework.util.StringUtils.isEmpty(ticket)){
if (!StringUtils.isEmpty(ticket)){
// log.info("开始验证票据");
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");
// log.info("验证票据返回值:{}", result);
... ...
package com.agent.entity.system;
import java.io.Serializable;
import java.util.Map;
/**
* @author shenhailong
* <p>
* 2021/6/17/18:04
*/
public class AuthSuccessResponse implements Serializable {
private static final long serialVersionUID = 1L;
private Object authentication;
private Map<String,Object> loginUserMenus;
public AuthSuccessResponse (Object authentication,Map<String,Object> loginUserMenus){
this.authentication= authentication;
this.loginUserMenus = loginUserMenus;
}
public static long getSerialVersionUID() {
return serialVersionUID;
}
public Object getAuthentication() {
return authentication;
}
public void setAuthentication(Object authentication) {
this.authentication = authentication;
}
public Map<String, Object> getLoginUserMenus() {
return loginUserMenus;
}
public void setLoginUserMenus(Map<String, Object> loginUserMenus) {
this.loginUserMenus = loginUserMenus;
}
}
... ...
package com.agent.entity.system;
/**
* @author shenhailong
* <p>
* 2021/5/18/14:51
*/
public class ResultMessage {
private static final long serialVersionUID = 1L;
private String resultCode;
private String resultMessage;
public ResultMessage(String resultCode, String resultMessage) {
this.resultCode = resultCode;
this.resultMessage = resultMessage;
}
public static long getSerialVersionUID() {
return serialVersionUID;
}
public String getResultCode() {
return resultCode;
}
public void setResultCode(String resultCode) {
this.resultCode = resultCode;
}
public String getResultMessage() {
return resultMessage;
}
public void setResultMessage(String resultMessage) {
this.resultMessage = resultMessage;
}
}
... ...
package com.agent.entity.system;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import java.util.List;
/**
* @author shenhailong
* <p>
* 2021/5/19/15:11
*/
public class UAM {
private long syncTime;
private String action;
private String resType;
private List<UserData> data;
public long getSyncTime() {
return syncTime;
}
public void setSyncTime(long syncTime) {
this.syncTime = syncTime;
}
public String getAction() {
return action;
}
public void setAction(String action) {
this.action = action;
}
public String getResType() {
return resType;
}
public void setResType(String resType) {
this.resType = resType;
}
public List<UserData> getData() {
return data;
}
public void setData(List<UserData> data) {
this.data = data;
}
}
... ...
package com.agent.entity.system;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* @author shenhailong
* <p>
* 2021/5/19/15:13
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class UserData {
@JsonProperty(value = "USER_ID")
private String USER_ID;
@JsonProperty(value = "USER_NAME")
private String USER_NAME;
@JsonProperty(value = "USER_NO")
private String USER_NO;
@JsonProperty(value = "MOBILE")
private String MOBILE;
@JsonProperty(value = "IDCARD_NO")
private String IDCARD_NO;
@JsonProperty(value = "COUNTRY")
private String COUNTRY;
@JsonProperty(value = "SEX")
private String SEX;
@JsonProperty(value = "NATIONALITY")
private String NATIONALITY;
@JsonProperty(value = "OFFICE_PHONE")
private String OFFICE_PHONE;
@JsonProperty(value = "OFFICE_ADDRESS")
private String OFFICE_ADDRESS;
@JsonProperty(value = "EMAIL")
private String EMAIL;
@JsonProperty(value = "JOB_LEVEL")
private String JOB_LEVEL;
@JsonProperty(value = "JOB_TITLE")
private String JOB_TITLE;
@JsonProperty(value = "JOB_TYPE")
private String JOB_TYPE;
@JsonProperty(value = "JOB_STATUS")
private String JOB_STATUS;
@JsonProperty(value = "JOB_POSITION")
private String JOB_POSITION;
@JsonProperty(value = "SECRET_LEVEL")
private String SECRET_LEVEL;
@JsonProperty(value = "USER_POST")
private String USER_POST;
@JsonProperty(value = "USER_JOB_ID")
private String USER_JOB_ID;
@JsonProperty(value = "ORG_ID")
private String ORG_ID;
@JsonProperty(value = "USER_TITLE")
private String USER_TITLE;
@JsonProperty(value = "LOGIN_NAME")
private String LOGIN_NAME;
@JsonProperty(value = "SHOW_ORDER")
private String SHOW_ORDER;
@JsonProperty(value = "REMARK")
private String REMARK;
@JsonProperty(value = "NAIL_ID")
private String NAIL_ID;
@JsonProperty(value = "PK_PSNDOC")
private String PK_PSNDOC;
@JsonProperty(value = "PWD")
private String PWD;
@JsonProperty(value = "PWD_ENCRYPT")
private String PWD_ENCRYPT;
@JsonProperty(value = "UPDATE_TIME")
private String UPDATE_TIME;
public String getUSER_ID() {
return USER_ID;
}
public void setUSER_ID(String USER_ID) {
this.USER_ID = USER_ID;
}
public String getUSER_NAME() {
return USER_NAME;
}
public void setUSER_NAME(String USER_NAME) {
this.USER_NAME = USER_NAME;
}
public String getUSER_NO() {
return USER_NO;
}
public void setUSER_NO(String USER_NO) {
this.USER_NO = USER_NO;
}
public String getMOBILE() {
return MOBILE;
}
public void setMOBILE(String MOBILE) {
this.MOBILE = MOBILE;
}
public String getIDCARD_NO() {
return IDCARD_NO;
}
public void setIDCARD_NO(String IDCARD_NO) {
this.IDCARD_NO = IDCARD_NO;
}
public String getCOUNTRY() {
return COUNTRY;
}
public void setCOUNTRY(String COUNTRY) {
this.COUNTRY = COUNTRY;
}
public String getSEX() {
return SEX;
}
public void setSEX(String SEX) {
this.SEX = SEX;
}
public String getNATIONALITY() {
return NATIONALITY;
}
public void setNATIONALITY(String NATIONALITY) {
this.NATIONALITY = NATIONALITY;
}
public String getOFFICE_PHONE() {
return OFFICE_PHONE;
}
public void setOFFICE_PHONE(String OFFICE_PHONE) {
this.OFFICE_PHONE = OFFICE_PHONE;
}
public String getOFFICE_ADDRESS() {
return OFFICE_ADDRESS;
}
public void setOFFICE_ADDRESS(String OFFICE_ADDRESS) {
this.OFFICE_ADDRESS = OFFICE_ADDRESS;
}
public String getEMAIL() {
return EMAIL;
}
public void setEMAIL(String EMAIL) {
this.EMAIL = EMAIL;
}
public String getJOB_LEVEL() {
return JOB_LEVEL;
}
public void setJOB_LEVEL(String JOB_LEVEL) {
this.JOB_LEVEL = JOB_LEVEL;
}
public String getJOB_TITLE() {
return JOB_TITLE;
}
public void setJOB_TITLE(String JOB_TITLE) {
this.JOB_TITLE = JOB_TITLE;
}
public String getJOB_TYPE() {
return JOB_TYPE;
}
public void setJOB_TYPE(String JOB_TYPE) {
this.JOB_TYPE = JOB_TYPE;
}
public String getJOB_STATUS() {
return JOB_STATUS;
}
public void setJOB_STATUS(String JOB_STATUS) {
this.JOB_STATUS = JOB_STATUS;
}
public String getJOB_POSITION() {
return JOB_POSITION;
}
public void setJOB_POSITION(String JOB_POSITION) {
this.JOB_POSITION = JOB_POSITION;
}
public String getSECRET_LEVEL() {
return SECRET_LEVEL;
}
public void setSECRET_LEVEL(String SECRET_LEVEL) {
this.SECRET_LEVEL = SECRET_LEVEL;
}
public String getUSER_POST() {
return USER_POST;
}
public void setUSER_POST(String USER_POST) {
this.USER_POST = USER_POST;
}
public String getUSER_JOB_ID() {
return USER_JOB_ID;
}
public void setUSER_JOB_ID(String USER_JOB_ID) {
this.USER_JOB_ID = USER_JOB_ID;
}
public String getORG_ID() {
return ORG_ID;
}
public void setORG_ID(String ORG_ID) {
this.ORG_ID = ORG_ID;
}
public String getUSER_TITLE() {
return USER_TITLE;
}
public void setUSER_TITLE(String USER_TITLE) {
this.USER_TITLE = USER_TITLE;
}
public String getLOGIN_NAME() {
return LOGIN_NAME;
}
public void setLOGIN_NAME(String LOGIN_NAME) {
this.LOGIN_NAME = LOGIN_NAME;
}
public String getSHOW_ORDER() {
return SHOW_ORDER;
}
public void setSHOW_ORDER(String SHOW_ORDER) {
this.SHOW_ORDER = SHOW_ORDER;
}
public String getREMARK() {
return REMARK;
}
public void setREMARK(String REMARK) {
this.REMARK = REMARK;
}
public String getNAIL_ID() {
return NAIL_ID;
}
public void setNAIL_ID(String NAIL_ID) {
this.NAIL_ID = NAIL_ID;
}
public String getPK_PSNDOC() {
return PK_PSNDOC;
}
public void setPK_PSNDOC(String PK_PSNDOC) {
this.PK_PSNDOC = PK_PSNDOC;
}
public String getPWD() {
return PWD;
}
public void setPWD(String PWD) {
this.PWD = PWD;
}
public String getPWD_ENCRYPT() {
return PWD_ENCRYPT;
}
public void setPWD_ENCRYPT(String PWD_ENCRYPT) {
this.PWD_ENCRYPT = PWD_ENCRYPT;
}
public String getUPDATE_TIME() {
return UPDATE_TIME;
}
public void setUPDATE_TIME(String UPDATE_TIME) {
this.UPDATE_TIME = UPDATE_TIME;
}
}
... ...
... ... @@ -73,6 +73,17 @@ public class UserEntity extends BasicEntity {
*/
private int loginerror;
private String uamId;
@Column(name = "uam_id")
public String getUamId() {
return uamId;
}
public void setUamId(String uamId) {
this.uamId = uamId;
}
@Column(name = "loginaccount", nullable = false, length = 20)
public String getLoginaccount() {
return loginaccount;
... ...
... ... @@ -44,7 +44,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
var msg = "该账户不存在本系统";
$.growl({ title: "消息提示", message: msg });
} else {
window.location.href='<%=basePath %>manifest/list';
window.location.href='<%=basePath %>/index';
}
}).catch(error => {
$.growl({ title: "消息提示", message: error });
... ... @@ -59,4 +59,4 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
ticket();
});
</script>
</html>
\ No newline at end of file
</html>
... ...