更新版本20201111

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();
+    }
 }

power-admin/src/main/resources/config/applicationContext.xml

@@ -29,9 +29,30 @@
         <property name="url" value="${jdbc.url}"/>     <!--数据库地址-->
         <property name="username" value="${jdbc.username}"/>   <!--用户名-->
         <property name="password" value="${jdbc.password}"/>   <!--密码-->
-        <property name="maxActive" value="40"/>     <!-- 最大连接数-->
+        <property name = "filters" value = "${filters}" />
-        <property name="minIdle" value="1"/>       <!--最小连接数-->
+        <!-- 最大并发连接数 -->
-        <property name="initialSize" value="10"/>     <!-- 初始化连接池内的数据库连接-->
+        <property name = "maxActive" value = "${maxActive}" />
+        <!-- 初始化连接数量 -->
+        <property name = "initialSize" value = "${initialSize}" />
+        <!-- 配置获取连接等待超时的时间 -->
+        <property name = "maxWait" value = "${maxWait}" />
+        <!-- 最小空闲连接数 -->
+        <property name = "minIdle" value = "${minIdle}" />
+        <!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
+        <property name = "timeBetweenEvictionRunsMillis" value ="${timeBetweenEvictionRunsMillis}" />
+        <!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
+        <property name = "minEvictableIdleTimeMillis" value ="${minEvictableIdleTimeMillis}" />
+        <property name = "validationQuery" value = "${validationQuery}" />
+        <property name = "testWhileIdle" value = "${testWhileIdle}" />
+        <property name = "testOnBorrow" value = "${testOnBorrow}" />
+        <property name = "testOnReturn" value = "${testOnReturn}" />
+        <property name = "maxOpenPreparedStatements" value ="${maxOpenPreparedStatements}" />
+        <!-- 打开 removeAbandoned 功能 -->
+        <property name = "removeAbandoned" value = "${removeAbandoned}" />
+        <!-- 1800 秒，也就是 30 分钟 -->
+        <property name = "removeAbandonedTimeout" value ="${removeAbandonedTimeout}" />
+        <!-- 关闭 abanded 连接时输出错误日志 -->
+        <property name = "logAbandoned" value = "${logAbandoned}" />
     </bean>
 
 

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
 

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
+

power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp

@@ -124,20 +124,20 @@
                                 <c:when test="${CURRENT_USER.powerDepts == '' || CURRENT_USER.powerDepts == null || CURRENT_USER.powerDepts == 'null'}">
                                     <c:choose>
                                         <c:when test="${CURRENT_USER.name != null && CURRENT_USER.name != '' && CURRENT_USER.name != 'null'}">
-                                            <span class="hidden-xs" title="${CURRENT_USER.name}">${CURRENT_USER.name}</span>
+                                            <div class="hidden-xs" title="${CURRENT_USER.name}">${CURRENT_USER.name}</div>
                                         </c:when>
                                         <c:otherwise>
-                                            <span class="hidden-xs" title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</span>
+                                            <div class="hidden-xs" title="${CURRENT_USER.userName}">${CURRENT_USER.userName}</div>
                                         </c:otherwise>
                                     </c:choose>
                                 </c:when>
                                 <c:otherwise>
                                     <c:choose>
                                         <c:when test="${CURRENT_USER.name != null && CURRENT_USER.name != '' && CURRENT_USER.name != 'null'}">
-                                            <span class="hidden-xs" title="${CURRENT_USER.name}(${CURRENT_USER.powerDepts})">${CURRENT_USER.name}(${CURRENT_USER.powerDepts})</span>
+                                            <div class="hidden-xs" title="${CURRENT_USER.name}(${CURRENT_USER.powerDepts})">${CURRENT_USER.name}(${CURRENT_USER.powerDepts})</div>
                                         </c:when>
                                         <c:otherwise>
-                                            <span class="hidden-xs" title="${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})">${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})</span>
+                                            <div class="hidden-xs" title="${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})">${CURRENT_USER.userName}(${CURRENT_USER.powerDepts})</div>
                                         </c:otherwise>
                                     </c:choose>
                                 </c:otherwise>
@@ -319,7 +319,7 @@
     <!-- 底部版权-->
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
-            <b>Version</b> 20200911_1
+            <b>Version</b> 20201111
         </div>
         <strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
         reserved.

power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp

@@ -274,7 +274,7 @@
     <!-- 底部版权-->
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
-            <b>Version</b> 20201030
+            <b>Version</b> 20201111
         </div>
         <strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
         reserved.

power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp

@@ -81,6 +81,6 @@
     <div class="login_foot">
         <div class="span_div"><span>${loginSet.footContext}</span></div>
     </div>
-<script type="text/javascript" src="${path}/static/js/login.js"></script>
+<script type="text/javascript" src="${path}/static/js/login.js?time=2020-11-09"></script>
 </body>
 </html>

power-admin/src/main/webapp/WEB-INF/views/userDir/updatePersonal.jsp

@@ -55,10 +55,10 @@
             </div>
         </div>
         <div class="form-group">
-            <label for="userWechat" class="col-sm-2 control-label">微信号</label>
+            <label for="userWechat" class="col-sm-2 control-label">微信绑定的卡号</label>
             <div class="col-sm-5">
                 <input type="text" class="form-control input input-sm" id="userWechat" name="userWechat"
-                       placeholder="请输入微信号" maxlength="50" value="${user.userWechat}">
+                       placeholder="请输入微信绑定的卡号" maxlength="50" value="${user.userWechat}">
             </div>
         </div>
         <div class="form-group">

power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp

@@ -104,6 +104,10 @@
                         <label for="user_name">账号:</label>
                         <input type="text" class="form-control input-sm" id="user_name" maxlength="16"/>
                     </div>
+                    <div class="form-group">
+                        <label for="searchName">姓名:</label>
+                        <input type="text" class="form-control input-sm" id="searchName" maxlength="16"/>
+                    </div>
                     <%-- <div class="form-group">
                          <label for="user_email">邮箱地址:</label>
                          <input type="text" class="form-control input-sm" id="user_email" maxlength="25"/>
@@ -307,7 +311,7 @@
 </script>
 <script src="${path}/static/zTree_v3-master/js/jquery.ztree.core.js"></script>
 <script src="${path}/static/zTree_v3-master/js/jquery.ztree.excheck.js"></script>
-<script src="${path}/static/js/user.js?t=2020-08-18"></script>
+<script src="${path}/static/js/user.js?t=2020-11-10"></script>
 <%@ include file="/WEB-INF/jspf/importExcelJsp.jspf" %>
 </body>
 </html>

power-admin/src/main/webapp/WEB-INF/web.xml

@@ -27,14 +27,28 @@
     <filter-name>characterEncodingFilter</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>
- <!--  <filter>
+  <!-- 连接池 启用 Web 监控统计功能    start-->
-   <filter-name>MyFilter</filter-name>
+  <filter>
-   <filter-class>com.manage.controller.webSocket.StartFilter</filter-class>
+    <filter-name>DruidWebStatFilter</filter-name>
- </filter>
+    <filter-class>com.alibaba.druid.support.http.WebStatFilter</filter-class>
-<filter-mapping>
+    <init-param>
-   <filter-name>MyFilter</filter-name>
+      <param-name>exclusions</param-name>
-   <url-pattern>/myHandler</url-pattern>
+      <param-value>*. js ,*. gif ,*. jpg ,*. png ,*. css ,*. ico ,/ druid /*</param-value>
- </filter-mapping>-->
+    </init-param>
+  </filter>
+  <filter-mapping >
+    <filter-name>DruidWebStatFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <servlet >
+    <servlet-name>DruidStatView</servlet-name>
+    <servlet-class>com.alibaba.druid.support.http.StatViewServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DruidStatView</servlet-name>
+    <url-pattern>/druid/*</url-pattern>
+  </servlet-mapping >
+  <!-- 连接池 启用 Web 监控统计功能    end-->
   <!-- 启动spring的容器 -->
   <context-param>
     <param-name>contextConfigLocation</param-name>

power-admin/src/main/webapp/static/js/login.js

@@ -59,6 +59,12 @@ $('body').keydown(function () {
         }
     }
 })
+/**
+ * 判断是iframe框架跳出iframe框架使用top链接
+ */
+if (top.location != location){
+    top.location.href = location.href;
+}
 
 
 

power-admin/src/main/webapp/static/js/noticePage.js

@@ -597,7 +597,6 @@ function editFlag(noticeId){
 					sync:false,
 					success:function(data){
 						if(data.code == 100){
-							debugger
 							parent.$("#noticeCount").text(data.extend.unReadCount);
 						}
 					}

power-admin/src/main/webapp/static/js/user.js

@@ -28,6 +28,7 @@ $(function(){
                 page : (params.offset / params.limit) + 1, //当前页码
                 userName:$("#user_name").val(),
                 userEmail:$("#user_email").val(),
+                name:$("#searchName").val(),
                 searchRoleId:$("#roleId").val(),
                 deptId : $("#dept_id option:selected").val(),
                 effective : $("#effective option:selected").val(),
@@ -530,7 +531,7 @@ function exportExcel(){
             message: "没有选中，您确定要按搜索栏条件导出?",
             operate: function (reselt) {
                 if (reselt) {
-                    var url = path+"/user/export?userName="+$("#user_name").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val();
+                    var url = path+"/user/export?userName="+$("#user_name").val()+"&searchRoleId="+$("#roleId").val()+"&deptId="+$("#dept_id").val()+"&effective="+$("#effective").val()+"&name="+$("#searchName").val();
                     window.location.href = url;
                 }
             }

power-dao/src/main/java/com/manage/vo/Message.java

@@ -0,0 +1,65 @@
+package com.manage.vo;
+
+/**
+ * @ProjectName:
+ * @Description:
+ * @Param 传输参数
+ * @Return
+ * @Author: 曾文和
+ * @CreateDate: 2020/11/9 15:18
+ * @UpdateUser: 曾文和
+ * @UpdateDate: 2020/11/9 15:18
+ * @UpdateRemark: 更新说明
+ * @Version: 1.0
+ */
+public class Message {
+    private Integer userId;
+
+    private String sysFlag;
+
+    private String title;
+
+    private String content;
+
+    private String typeFlag;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getSysFlag() {
+        return sysFlag;
+    }
+
+    public void setSysFlag(String sysFlag) {
+        this.sysFlag = sysFlag;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getTypeFlag() {
+        return typeFlag;
+    }
+
+    public void setTypeFlag(String typeFlag) {
+        this.typeFlag = typeFlag;
+    }
+}

power-dao/src/main/resources/mapper/Power_UserMapper.xml

@@ -317,6 +317,9 @@
       <if test="userName!=null and userName!=''">
         and power_user.user_name LIKE '%${userName}%'
       </if>
+      <if test="name!=null and name!=''">
+          and power_user.name LIKE '%${name}%'
+      </if>
       <if test="userEmail!=null and userEmail!=''">
         and power_user.user_email LIKE '%${userEmail}%'
       </if>
@@ -369,6 +372,9 @@
       <if test="userName!=null and userName!=''">
         and power_user.user_name LIKE '%${userName}%'
       </if>
+      <if test="name!=null and name!=''">
+        and power_user.name LIKE '%${name}%'
+      </if>
       <if test="userEmail!=null and userEmail!=''">
         and power_user.user_email LIKE '%${userEmail}%'
       </if>