diff --git a/src/main/java/com/emr/controller/LoginController.java b/src/main/java/com/emr/controller/LoginController.java
index 01c81a1f..9cf0e70a 100644
--- a/src/main/java/com/emr/controller/LoginController.java
+++ b/src/main/java/com/emr/controller/LoginController.java
@@ -34,6 +34,12 @@ public class LoginController {
@Value("${powerUrl}")
private String powerUrl;
+ @Value("${STR_SPLIT}")
+ private String STR_SPLIT;
+
+ @Value("${WEBSOCKET_URLHEAD}")
+ private String WEBSOCKET_URLHEAD;
+
@RequestMapping(value = "/toLogin")
public String toLogin(Model model) {
// 从session获取用户名
@@ -49,13 +55,16 @@ public class LoginController {
//实现用户登录@PathVariable("username")
@RequestMapping(value = "/login")
- public String login(Model model, HttpServletRequest request) throws Exception{
+ public String login(Model model, HttpServletRequest request) throws Exception {
String token = request.getParameter("token");
String userName = request.getParameter("userName");
UsernamePasswordToken userToken = new UsernamePasswordToken(userName, "456789");
Subject subject = SecurityUtils.getSubject();
subject.login(userToken);
model.addAttribute("POWER_URLHEAD", POWER_JSP);
+ //传递通知需要的数据
+ model.addAttribute("WEBSOCKET_URLHEAD", WEBSOCKET_URLHEAD);
+ model.addAttribute("STR_SPLIT", STR_SPLIT);
request.getSession().setAttribute("token", token);
JAXDynamicClientFactory dcf = JAXDynamicClientFactory.newInstance();
Client client = dcf.createClient(POWER_URLHEAD + "/WebService/PowerWebService?wsdl");
@@ -64,7 +73,7 @@ public class LoginController {
Power_User powerUser = mapper.readValue(objects[0].toString(), Power_User.class);
//设置进session
request.getSession().setAttribute("CURRENT_USER", powerUser);
- String url = powerUrl+"?sysFlag=emr_medical_record&userName="+ userName;
+ String url = powerUrl + "?sysFlag=emr_medical_record&userName=" + userName;
JSONObject obj = HttpClientUtils.httpGet(url);
if(obj!=null) {
if ((obj.getString("code")).equals("100")) {
diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties
index 0313db24..b44b0e79 100644
--- a/src/main/resources/config/jdbc.properties
+++ b/src/main/resources/config/jdbc.properties
@@ -7,7 +7,6 @@ jdbc.url=jdbc\:sqlserver\://${POWER_IP}:1433;databaseName=${dataBaseName}
jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-
#hibernate config
hibernate.dialect=org.hibernate.dialect.SQLServerDialect
hibernate.show_sql=true
@@ -17,7 +16,10 @@ hibernate.hbm2ddl.auto=update
hibernate.current_session_context_class=thread
hibernate.jdbc.batch_size=50
hibernate.enable_lazy_load_no_trans=true
-
+WEBSOCKET_URLHEAD=${POWER_JSPHEAD}:8088
+#\u901A\u77E5\u5B57\u7B26\u4E32\u95F4\u9694\u7B26
+STR_SPLIT=*^:|,.
+POWER_JSPHEAD=localhost
##\u56FE\u7247\u5730\u5740
pictureUrl=Z:\\test\\uploadImage
#\u672C\u5730\u81EA\u52A8\u751F\u6210PDF\u5730\u5740D:\tesst\autoPdf
diff --git a/src/main/webapp/WEB-INF/jspf/webSocket.jspf b/src/main/webapp/WEB-INF/jspf/webSocket.jspf
new file mode 100644
index 00000000..cf804566
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jspf/webSocket.jspf
@@ -0,0 +1,110 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp
index a4970748..d6376488 100644
--- a/src/main/webapp/WEB-INF/views/index.jsp
+++ b/src/main/webapp/WEB-INF/views/index.jsp
@@ -13,6 +13,9 @@
<%@ include file="/WEB-INF/jspf/common.jspf" %>
+<%
+ String token = (String) request.getSession().getAttribute("token");
+%>