Index: ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcProxy.java
===================================================================
diff -u -r19945 -r19956
--- ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcProxy.java (.../JhipSsoWebsvcProxy.java) (revision 19945)
+++ ssts-datasync-settlement-gyey-impl/src/main/java/com/bjgoodwill/jhipwebsvc/JhipSsoWebsvcProxy.java (.../JhipSsoWebsvcProxy.java) (revision 19956)
@@ -67,7 +67,9 @@
throws java.rmi.RemoteException {
if (jhipSsoWebsvc == null)
_initJhipSsoWebsvcProxy();
- return jhipSsoWebsvc.getUserDetailInfo(inputPara);
+ String result=jhipSsoWebsvc.getUserDetailInfo(inputPara);
+ logger.debug("inputPara="+ inputPara +",result=" + result);
+ return result;
}
public static void main(String[] args) {
Index: ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back
===================================================================
diff -u -r19625 -r19956
--- ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back (.../applicationContext-acegi-security-standard.xml.back) (revision 19625)
+++ ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back (.../applicationContext-acegi-security-standard.xml.back) (revision 19956)
@@ -36,6 +36,7 @@
+
Index: ssts-web/src/main/webapp/logonSSOForGyey.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/logonSSOForGyey.jsp (revision 0)
+++ ssts-web/src/main/webapp/logonSSOForGyey.jsp (revision 19956)
@@ -0,0 +1,205 @@
+<%@page import="com.forgon.security.model.User"%>
+<%@page import="com.forgon.disinfectsystem.common.CssdUtils"%>
+<%@page import="com.forgon.security.service.UserManager"%>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@page import="com.forgon.tools.SpringBeanManger"%>
+<%@page import="com.forgon.tools.Constants"%>
+<%@page import="net.sf.json.JSONObject" %>
+<%@page import="java.io.File" %>
+<%@page import="java.util.ArrayList" %>
+<%@page import="org.apache.commons.lang.StringUtils"%>
+<%@page import="com.bjgoodwill.jhipwebsvc.JhipSsoWebsvcProxy"%>
+
+<%
+ArrayList message = new ArrayList();
+String sessionID = request.getParameter("sessionID");
+if(StringUtils.isNotBlank(sessionID)){
+ String xmlInput=""+sessionID +"";
+ String xmlResult=new JhipSsoWebsvcProxy().getUserDetailInfo(xmlInput);
+ String userName=null;
+ try{
+ JSONObject json=(JSONObject)CssdUtils.xml2JsonCommon(xmlResult);
+ String RESULT_SYSTEM_NO=json.optString("RESULT_SYSTEM_NO");
+ if(RESULT_SYSTEM_NO.trim().equals("true")){
+ JSONObject RESULT_CONTENT=json.optJSONObject("RESULT_CONTENT");
+ userName=RESULT_CONTENT.optString("USER_NAME");
+ if(userName==(null)){
+ message.add("xml的格式有误");
+ }
+ else if(userName.equals("")){
+ message.add("userName不能为空");
+ }
+ }
+ else{
+ message.add("xml的格式有误");
+ }
+ }
+ catch(Exception e) {
+ message.add("xml的格式有误");
+ }
+
+ if(StringUtils.isNotBlank(userName)){
+ UserManager userManager=(UserManager)SpringBeanManger.getBean("userManager");
+ User user=userManager.getFirst("name", userName);
+ if(user==null){
+ message.add("用户:"+userName+"不存在");
+ }else{
+ pageContext.setAttribute("barcode", user.getBarcode());
+ }
+ }
+}else{
+ message.add("sessionID不能为空");
+}
+pageContext.setAttribute("message", message);
+
+String companyName = CssdUtils.getSystemSetConfigByName("companyName");
+String companyNameStr = "";
+if(companyName == null || companyName.equals("forgon")){
+ companyNameStr = "©2016 广州孚峻信息技术有限公司 版权所有";
+}else if(companyName.equals("dingxiang")){
+ companyNameStr = "©2016 广州丁香软件有限公司 版权所有";
+}
+session.setAttribute("companyName", companyNameStr);
+String project = CssdUtils.getConfigProperty("project");
+session.setAttribute("profile", project);
+
+String imgPath = "disinfectsystem/config/" + project + "/img/logo_" + project +".png";
+//System.out.println(application.getRealPath("/") + imgPath);
+File file = new File(application.getRealPath("/") + imgPath);
+if(file.exists()){
+ request.setAttribute("logoPath",imgPath);
+}else{
+ if(companyName == null || companyName.equals("forgon")){
+ request.setAttribute("logoPath","themes/portalPage/img/logo_Forgon.png");
+ }else if(companyName.equals("dingxiang")){
+ request.setAttribute("logoPath","themes/portalPage/img/logo_dingxiangsoft.png");
+ }
+}
+
+%>
+
+
+
+
+
+
+
+
+消毒供应质量追溯管理系统
+<%-- --%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/resources/spring/security/applicationContext-acegi-security.xml
===================================================================
diff -u -r19625 -r19956
--- ssts-web/src/main/resources/spring/security/applicationContext-acegi-security.xml (.../applicationContext-acegi-security.xml) (revision 19625)
+++ ssts-web/src/main/resources/spring/security/applicationContext-acegi-security.xml (.../applicationContext-acegi-security.xml) (revision 19956)
@@ -36,6 +36,7 @@
+
Index: build.gradle
===================================================================
diff -u -r19920 -r19956
--- build.gradle (.../build.gradle) (revision 19920)
+++ build.gradle (.../build.gradle) (revision 19956)
@@ -348,6 +348,7 @@
compile group: 'commons-logging', name: 'commons-logging', version:'1.0.2'
compile group: 'commons-betwixt', name: 'commons-betwixt', version:'0.8'
compile 'commons-codec:commons-codec:1.10'
+ compile group: 'commons-discovery', name: 'commons-discovery', version:'0.2'
compile group: 'org.apache.servicemix.specs', name: 'org.apache.servicemix.specs.jsr311-api-1.1.1', version:'2.4.0'
@@ -401,6 +402,9 @@
compile group: 'jdom', name: 'jdom', version:'1.0'
+ compile group: 'dom4j', name: 'dom4j', version:'1.6.1'
+ compile group: 'jaxen', name: 'jaxen', version:'1.1.6'
+
compile group: 'jcifs', name: 'jcifs', version:'1.3.17'
compile group: 'org.jmesa', name: 'jmesa', version:'2.5.2'
@@ -439,6 +443,7 @@
compile 'org.apache.httpcomponents:httpcore:4.4'
compile 'org.apache.httpcomponents:httpclient:4.4'
compile 'commons-logging:commons-logging:1.2'
+ compile 'wsdl4j:wsdl4j:1.6.2'
}