From 388b09264b6133b7f3209e16ed599f7d749f80f7 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 11 Nov 2020 17:34:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC20201111?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/manage/controller/FontController.java | 32 +++++++++
.../resources/config/applicationContext.xml | 27 +++++++-
.../main/resources/config/config.properties | 3 +
.../src/main/resources/config/jdbc.properties | 35 +++++++++-
.../WEB-INF/views/gatewayDir/gatewayIndex.jsp | 10 +--
.../webapp/WEB-INF/views/loginDir/index.jsp | 2 +-
.../webapp/WEB-INF/views/loginDir/login.jsp | 2 +-
.../WEB-INF/views/userDir/updatePersonal.jsp | 4 +-
.../webapp/WEB-INF/views/userDir/user.jsp | 6 +-
power-admin/src/main/webapp/WEB-INF/web.xml | 30 ++++++---
.../src/main/webapp/static/js/login.js | 6 ++
.../src/main/webapp/static/js/noticePage.js | 1 -
power-admin/src/main/webapp/static/js/user.js | 3 +-
.../src/main/java/com/manage/vo/Message.java | 65 +++++++++++++++++++
.../resources/mapper/Power_UserMapper.xml | 6 ++
15 files changed, 207 insertions(+), 25 deletions(-)
create mode 100644 power-dao/src/main/java/com/manage/vo/Message.java
diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java
index 8897fac..379e7c8 100644
--- a/power-admin/src/main/java/com/manage/controller/FontController.java
+++ b/power-admin/src/main/java/com/manage/controller/FontController.java
@@ -525,4 +525,36 @@ public class FontController {
e.printStackTrace();
}
}
+
+ /**
+ * @MethodName sendMessage
+ * @Description: 发送信息接口
+ * @Param applyType 申请类型
+ * @Param count 新的待审批份数
+ * @Returnt Msg
+ * @Author: 曾文和
+ * @CreateDate: 2020-04-24
+ * @UpdateUser: 曾文和
+ * @UpdateDate: 2020-04-24
+ * @UpdateRemark: 更新说明
+ * @Version:
+ */
+ @RequestMapping("sendMessage")
+ @ResponseBody
+ public Msg sendMessage(Message message) throws Exception{
+ if(null == message.getUserId()){
+ return Msg.fail("消息用户id不能为空");
+ }
+ if(StringUtils.isBlank(message.getSysFlag())){
+ return Msg.fail("消息系统标识不能为空");
+ }
+ if(StringUtils.isBlank(message.getTitle())){
+ return Msg.fail("消息标题不能为空");
+ }
+ if(StringUtils.isBlank(message.getContent())){
+ return Msg.fail("消息内容不能为空");
+ }
+ WsPool.sendMessageToAll(message.getSysFlag() + "_" + message.getUserId(), message.getTitle() + STR_SPLIT + message.getContent() + STR_SPLIT + message.getTypeFlag());
+ return Msg.success();
+ }
}
diff --git a/power-admin/src/main/resources/config/applicationContext.xml b/power-admin/src/main/resources/config/applicationContext.xml
index 19a60df..a18d8e9 100644
--- a/power-admin/src/main/resources/config/applicationContext.xml
+++ b/power-admin/src/main/resources/config/applicationContext.xml
@@ -29,9 +29,30 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/power-admin/src/main/resources/config/config.properties b/power-admin/src/main/resources/config/config.properties
index 25a743b..812c546 100644
--- a/power-admin/src/main/resources/config/config.properties
+++ b/power-admin/src/main/resources/config/config.properties
@@ -9,6 +9,9 @@ TOKEN_EXPIRE_TIME = 7200
##################################################\u670D\u52A1\u5668ip##########################################################
#\u901A\u7528\u670D\u52A1\u5668IP\u4E0E\u901A\u7528\u670D\u52A1\u5668\u7AEF\u53E3
+#SERVER_IP = 192.168.1.3
+#SERVER_PORT = 8081
+
SERVER_IP = 200.100.104.40
SERVER_PORT = 8081
diff --git a/power-admin/src/main/resources/config/jdbc.properties b/power-admin/src/main/resources/config/jdbc.properties
index fdd224b..6275fa8 100644
--- a/power-admin/src/main/resources/config/jdbc.properties
+++ b/power-admin/src/main/resources/config/jdbc.properties
@@ -1,4 +1,35 @@
+#\u6570\u636E\u5E93IP
+#dataBaseIp=localhost
+##\u6570\u636E\u5E93\u540D\u79F0
+#dataBaseName=gmpower
+##\u6570\u636E\u5E93\u5BC6\u7801
+#dataBasePassword=docus702
+
+#\u6570\u636E\u5E93IP
+dataBaseIp=200.100.104.40
+\u6570\u636E\u5E93\u540D\u79F0
+dataBaseName=power
+\u6570\u636E\u5E93\u5BC6\u7801
+dataBasePassword=AbcXyz123
+
jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc\:mysql\://localhost\:3306/power?useUnicode\=true&characterEncoding\=utf-8
jdbc.username=root
-jdbc.password=AbcXyz123
+jdbc.url=jdbc\:mysql\://${dataBaseIp}\:3306/${dataBaseName}?useUnicode\=true&characterEncoding\=utf-8
+jdbc.password=${dataBasePassword}
+
+filters: stat
+maxActive: 20
+initialSize: 1
+maxWait: 60000
+minIdle: 10
+timeBetweenEvictionRunsMillis: 60000
+minEvictableIdleTimeMillis: 300000
+validationQuery: SELECT 'x'
+testWhileIdle: true
+testOnBorrow: false
+testOnReturn: false
+maxOpenPreparedStatements: 20
+removeAbandoned: true
+removeAbandonedTimeout: 1800
+logAbandoned: true
+
diff --git a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
index d9ed1e3..8074c3f 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
@@ -124,20 +124,20 @@
- ${CURRENT_USER.name}
+ ${CURRENT_USER.name}
- ${CURRENT_USER.userName}
+ ${CURRENT_USER.userName}
- ${CURRENT_USER.name}(${CURRENT_USER.powerDepts})
+ ${CURRENT_USER.name}(${CURRENT_USER.powerDepts})
- ${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})
+ ${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})
@@ -319,7 +319,7 @@