修改密码无法使用

pom.xml

@@ -32,7 +32,7 @@
         <mybatis.version>3.4.6</mybatis.version>
         <mybatis.spring.version>1.3.2</mybatis.spring.version>
         <mysql.version>5.1.32</mysql.version>
-        <slf4j.version>1.6.4</slf4j.version>
+        <log4j2.version>2.15.0</log4j2.version>
         <jackson.version>2.9.4</jackson.version>
         <druid.version>1.0.9</druid.version>
         <httpclient.version>4.3.5</httpclient.version>
@@ -101,10 +101,17 @@
                 <version>${mybatis.version}</version>
             </dependency>
             <!-- 日志处理 -->
+            <!-- Web项目需添加 -->
             <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>${slf4j.version}</version>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-web</artifactId>
+                <version>${log4j2.version}</version>
+            </dependency>
+            <!--用于与slf4j保持桥接-->
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-slf4j-impl</artifactId>
+                <version>${log4j2.version}</version>
             </dependency>
             <!-- 连接池 -->
             <dependency>

power-admin/pom.xml

@@ -123,9 +123,15 @@
             <artifactId>commons-fileupload</artifactId>
         </dependency>
         <!-- 日志处理 -->
+        <!-- Web项目需添加 -->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-web</artifactId>
+        </dependency>
+        <!--用于与slf4j保持桥接-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
         </dependency>
     </dependencies>
     <build>

power-admin/src/main/java/com/manage/controller/UserController.java

@@ -30,6 +30,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -160,17 +161,23 @@ public class UserController {
         }
     }
 
-    @OptionalLog(module = "重置密码",methods = "用户管理",fieldName = "userName",tableName = "power_user")
-    @RequiresPermissions(value="/user/resetPassword")
     @RequestMapping("/resetPassword")
     @ResponseBody
-    public Msg update(Integer userId) throws Exception{
+    public Msg update(String ids) throws Exception{
         ServletRequestAttributes attr=(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request =attr.getRequest();
-        Power_UserVo powerUser = powerUserService.selectByPrimaryKey(userId);
-        powerUser.setUserPwd(Base64.encode(MD5.KL("000000")));
-        powerUserService.updateByPrimaryKeySelective(powerUser,request);
-        CacheManager.addExcCount("noExc");
+//        Power_UserVo powerUser = powerUserService.selectByPrimaryKey(userId);
+//        powerUser.setUserPwd(Base64.encode(MD5.KL("000000")));
+//        powerUserService.updateByPrimaryKeySelective(powerUser,request);
+//        CacheManager.addExcCount("noExc");
+        //取得当前登录账号
+        HttpSession session= request.getSession();
+        Power_User powerUser1 =(Power_User) session.getAttribute("CURRENT_USER");
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+        String date = df.format(new Date());// new Date()为获取当前系统时间
+        String userName = powerUser1.getUserName();
+        String encode = Base64.encode(MD5.KL("000000"));
+        powerUserService.updateUserPass(ids,userName,encode,date);
         return Msg.success();
     }
     @RequestMapping("/selectUser")

power-admin/src/main/resources/config/config.properties

@@ -1,7 +1,7 @@
 # \u62E6\u622A\u83DC\u5355\u914D\u7F6E\u6587\u4EF6  ljx  2019-4-27
 #interceptRequest  \u672A\u767B\u5F55\u4E4B\u524D\u653E\u884C\u3002\u9ED8\u8BA4\u4E3Anone
 #ajaxRequest       ajax\u8BF7\u6C42\u6CA1\u6709\u5BF9\u5E94\u6A21\u5757\uFF0C\u9700\u8981\u653E\u884C\u3002 \u9ED8\u8BA4\u4E3Anone
-releaseRequest = /login,/logout,/services,/font,/refuse,/swagger-ui.html,/webjars,/swagger-resources,/v2
+releaseRequest = /login,/logout,/services,/font,/refuse,/swagger-ui.html,/webjars,/swagger-resources,/v2,/collector
 ajaxRequest = none
 
 #session\u8FC7\u671F\u65F6\u95F4,\u5355\u4F4D\u79D2

power-admin/src/main/resources/config/jdbc.properties

@@ -1,8 +1,8 @@
 #jdbc.url=jdbc\:mysql\://200.100.104.40\:3306/power?useUnicode\=true&characterEncoding\=utf-8
 #jdbc.password=AbcXyz123
 
-jdbc.url=jdbc\:mysql\://localhost\:3306/gmpower?useUnicode\=true&characterEncoding\=utf-8
-jdbc.password=docus702
+jdbc.url=jdbc\:mysql\://localhost\:3306/gm_power?useUnicode\=true&characterEncoding\=utf-8
+jdbc.password=root
 
 jdbc.driver=com.mysql.jdbc.Driver
 jdbc.username=root

power-admin/src/main/resources/log4j.properties

@@ -1,18 +0,0 @@
-log4j.logger.myLog=debug,myLog
-log4j.appender.myLog=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.myLog.File=D:\\logs\\power\\info\\info_log
-log4j.appender.myLog.DatePattern=-yyyy-MM-dd'.log'
-log4j.appender.myLog.Append = true
-log4j.appender.myLog.Threshold = INFO
-log4j.appender.myLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.myLog.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss}:%m%n
-
-log4j.logger.errorMsg=error,errorMsg
-log4j.appender.errorMsg=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.errorMsg.File=D:\\logs\\power\\error\\error_log
-log4j.appender.errorMsg.DatePattern=-yyyy-MM-dd'.log'
-log4j.appender.errorMsg.Append = true
-log4j.appender.errorMsg.Threshold = error
-log4j.appender.errorMsg.layout=org.apache.log4j.PatternLayout
-log4j.appender.errorMsg.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss}:%m%n
-

power-admin/src/main/resources/log4j2.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?><configuration status="warn">
+    <Properties>
+        <Property name="infoLogFileDir">D:docus_logs/power/info</Property>
+        <Property name="infoLogFileName">info_log</Property>
+        <Property name="infoLogFileSrc">${infoLogFileDir}/${infoLogFileName}</Property>
+        <Property name="errorLogFileDir">D:docus_logs/power/error</Property>
+        <Property name="errorLogFileName">error_log</Property>
+        <Property name="errorLogFileSrc">${errorLogFileDir}/${errorLogFileName}</Property>
+    </Properties>
+
+    <appenders>
+        <RollingFile name="infoLogRollingFile" fileName="${infoLogFileSrc}"
+                     filePattern="${infoLogFileSrc}-%d{yyyy-MM-dd}-%i.log">
+            <PatternLayout pattern="%d{yyyy-MM-dd 'at' HH:mm:ss z} %-5level %class{36} %L %M - %msg%xEx%n"/>
+            <!--配置1天存储一个文件-->
+            <TimeBasedTriggeringPolicy interval="1" modulate="true" />
+            <!--配置超过文件大小切割成多个文件%i区分序号，目前配一个文件20M-->
+            <SizeBasedTriggeringPolicy size="20MB"/>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
+            <DefaultRolloverStrategy max="20">
+                <Delete basePath="${infoLogFileDir}/" maxDepth="1">
+                    <IfFileName glob="*.log" />
+                    <!--!Note: 这里的age必须和filePattern协调, 后者是精确到HH, 这里就要写成xH, xd就不起作用
+                    另外, 数字最好>2, 否则可能造成删除的时候, 最近的文件还处于被占用状态,导致删除不成功!-->
+                    <!--保留30天-->
+                    <IfLastModified age="30d" />
+                </Delete>
+            </DefaultRolloverStrategy>
+        </RollingFile>
+
+        <RollingFile name="errorLogRollingFile" fileName="${errorLogFileSrc}"
+                     filePattern="${errorLogFileSrc}-%d{yyyy-MM-dd}-%i.log">
+            <PatternLayout pattern="%d{yyyy-MM-dd 'at' HH:mm:ss z} %-5level %class{36} %L %M - %msg%xEx%n"/>
+            <!--配置1天存储一个文件-->
+            <TimeBasedTriggeringPolicy interval="1" modulate="true" />
+            <!--配置超过文件大小切割成多个文件%i区分序号，目前配一个文件20M-->
+            <SizeBasedTriggeringPolicy size="20MB"/>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
+            <DefaultRolloverStrategy max="20">
+                <Delete basePath="${errorLogFileDir}/" maxDepth="1">
+                    <IfFileName glob="*.log" />
+                    <!--!Note: 这里的age必须和filePattern协调, 后者是精确到HH, 这里就要写成xH, xd就不起作用
+                    另外, 数字最好>2, 否则可能造成删除的时候, 最近的文件还处于被占用状态,导致删除不成功!-->
+                    <!--保留30天-->
+                    <IfLastModified age="30d" />
+                </Delete>
+            </DefaultRolloverStrategy>
+        </RollingFile>
+    </appenders>
+
+    <loggers>
+        <Logger name="infoLog" additivity="TRUE" level="ALL">
+            <AppenderRef ref="infoLogRollingFile" level="INFO" />
+        </Logger>
+        <Logger name="errorLog" additivity="TRUE" level="ALL">
+            <AppenderRef ref="errorLogRollingFile" level="ERROR" />
+        </Logger>
+    </loggers>
+</configuration>

power-admin/src/main/webapp/WEB-INF/jspf/webSocket.jspf

@@ -71,7 +71,6 @@
     }
 
     function narn (type,title,text,noticeId) {
-        debugger
         naranja()[type]({
             title: title,
             text: text,

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

@@ -155,40 +155,40 @@
         </nav>
     </header>
     <aside class="main-sidebar">
-    <section class="sidebar">
-        <ul class="sidebar-menu home-sidebar-menu" data-widget="tree">
-            <li class="active" title="主页">
-                <div class="aClass" onclick="menuClick(this,'home')">
-                    <i class="fa fa-home"></i>
-                    <span>主页</span>
-                </div>
-            </li>
-            <li title="通知信息">
-                <div class="aClass notice-menu" onclick="menuClick(this,'notice')">
-                    <i class="fa fa-file"></i>
-                    <span>通知信息</span>
-                </div>
-            </li>
-            <li title="个人资料">
-                <div class="aClass" onclick="menuClick(this,'help')">
-                    <i class="fa fa-info"></i>
-                    <span>个人资料</span>
-                </div>
-            </li>
-            <li title="修改密码">
-                <div class="aClass" onclick="menuClick(this,'pwd')">
-                    <i class="fa fa-key"></i>
-                    <span>修改密码</span>
-                </div>
-            </li>
-            <li title="联系我们">
-                <div class="aClass" onclick="menuClick(this,'contact')">
-                    <i class="fa fa-phone"></i>
-                    <span>联系我们</span>
-                </div>
-            </li>
-        </ul>
-    </section>
+        <section class="sidebar">
+            <ul class="sidebar-menu home-sidebar-menu" data-widget="tree">
+                <li class="active" title="主页">
+                    <div class="aClass" onclick="menuClick(this,'home')">
+                        <i class="fa fa-home"></i>
+                        <span>主页</span>
+                    </div>
+                </li>
+                <li title="通知信息">
+                    <div class="aClass notice-menu" onclick="menuClick(this,'notice')">
+                        <i class="fa fa-file"></i>
+                        <span>通知信息</span>
+                    </div>
+                </li>
+                <li title="个人资料">
+                    <div class="aClass" onclick="menuClick(this,'help')">
+                        <i class="fa fa-info"></i>
+                        <span>个人资料</span>
+                    </div>
+                </li>
+                <li title="修改密码">
+                    <div class="aClass" onclick="menuClick(this,'pwd')">
+                        <i class="fa fa-key"></i>
+                        <span>修改密码</span>
+                    </div>
+                </li>
+                <li title="联系我们">
+                    <div class="aClass" onclick="menuClick(this,'contact')">
+                        <i class="fa fa-phone"></i>
+                        <span>联系我们</span>
+                    </div>
+                </li>
+            </ul>
+        </section>
     </aside>
     <div id="iframeDiv" class="content-wrapper" style="display: none">
         <iframe class="row-fluid" style="height:calc(100% - 102px);width:100%;"
@@ -228,7 +228,7 @@
                                     </div>
                                     <div  class="rightTitleDiv">
                                         <div class="rightTitle" style="margin-top: 5px;">
-                                            <span>病案归档系统</span>
+                                            <span>病案无纸化归档系统</span>
                                         </div>
                                     </div>
                                 </div>
@@ -244,7 +244,7 @@
                                     </div>
                                     <div class="rightTitleDiv">
                                         <div class="rightTitle">
-                                            <span>档案管理系统</span>
+                                            <span>病案数码影像信息管理系统</span>
                                         </div>
                                     </div>
                                 </div>
@@ -314,7 +314,7 @@
                     </c:if>--%>
                 </div>
             </section>
-    </div>
+        </div>
     </div>
     <!-- 底部版权-->
     <footer class="main-footer">

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

@@ -500,17 +500,17 @@ function resetPassword(){
     var userNames = $("#userNames").val();
     if(checks != ''){
         var ids = checks.split(",");
+        var s1 = ids.toString();
         var userName = userNames.split(",");
-        if(ids.length == 2){
             Common.confirm({
                 title: "提示",
-                message: '确定是否重置用户名'+userName[0]+'的密码为000000',
+                message: '确定是否重置用户名'+userName+'的密码为000000',
                 operate: function (reselt) {
                     if (reselt) {
                         $.ajax({
                             type: 'post',
                             url: path + '/user/resetPassword',
-                            data: {userId: ids[0]},
+                            data: {ids: s1},
                             dataType: 'json',
                             success: function (data) {
                                 if (data.code == 100) {
@@ -526,9 +526,6 @@ function resetPassword(){
                     }
                 }
             })
-        }else{
-            toastr.warning("以防重置密码误选择,只允许一次重置一个!")
-        }
     }else{
         toastr.warning("请至少选中一条记录!")
     }

power-dao/src/main/java/com/manage/dao/Power_UserMapper.java

@@ -48,6 +48,8 @@ public interface Power_UserMapper {
 
     List<User> selectUserIdAndUserNameList(@Param("userId") Integer userId);
 
+    int updateUserPass(@Param("ids") String ids,@Param("userName") String userName,@Param("encode") String encode,@Param("date") String date);
+
     Integer selectEffectiveCount();
 
     List<Power_UserVo> selectAllNotAdmin();
@@ -67,5 +69,7 @@ public interface Power_UserMapper {
 
     Power_UserVo selectByPrimaryKey1(Integer userId);
 
+    Power_UserVo selectByPrimaryUserId(String userId);
+
     void updatePersonal(Power_User user);
 }

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

@@ -48,6 +48,16 @@ public class Power_UserVo extends Power_User {
 
     private String deptCode;
 
+    public String getIds() {
+        return ids;
+    }
+
+    public void setIds(String ids) {
+        this.ids = ids;
+    }
+
+    private String ids;
+
     public String getDeptCode() {
         return deptCode;
     }

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

@@ -357,7 +357,7 @@
         dict.dict_area
     FROM
         power_sys_dict dict
-    LEFT JOIN power_dept dept ON dict.dept_id = dept.dict_id
+    LEFT JOIN power_dept dept ON dict.dict_id = dept.dict_id
     AND dict.dict_status = 1 AND dept.effective = 1
   </select>
     <!--查询全部-->

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

@@ -317,7 +317,7 @@
         )
       </if>
       <if test="userName!=null and userName!=''">
-        and power_user.user_name LIKE '%${userName}%'
+        and power_user.user_name = #{userName}
       </if>
       <if test="name!=null and name!=''">
           and power_user.name LIKE '%${name}%'
@@ -372,7 +372,7 @@
         )
       </if>
       <if test="userName!=null and userName!=''">
-        and power_user.user_name LIKE '%${userName}%'
+        and power_user.user_name = #{userName}
       </if>
       <if test="name!=null and name!=''">
         and power_user.name LIKE '%${name}%'
@@ -737,5 +737,18 @@
       user_wechat = #{userWechat,jdbcType=VARCHAR}
     where user_id = #{userId,jdbcType=INTEGER}
   </update>
+    <update id="updateUserPass">
+        update  power_user
+        set
+        user_pwd=#{encode},
+        update_date=#{date},
+        updater=#{userName}
+        where
+        user_id IN
+        <foreach item="item" collection="ids.split(',')" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </update>
 
 </mapper>

power-foundaton/pom.xml

@@ -47,9 +47,15 @@
             <scope>compile</scope>
         </dependency>
         <!-- 日志处理 -->
+        <!-- Web项目需添加 -->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-web</artifactId>
+        </dependency>
+        <!--用于与slf4j保持桥接-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
         </dependency>
     </dependencies>
     <build>

power-foundaton/src/main/java/com/manage/util/ExceptionPrintUtil.java

@@ -1,6 +1,8 @@
 package com.manage.util;
 
-import org.apache.log4j.Logger;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -19,7 +21,7 @@ import java.io.PrintStream;
  * @Version: 1.0
  */
 public class ExceptionPrintUtil {
-    private static Logger log = Logger.getLogger("errorMsg");
+    private static Logger log = LogManager.getLogger("errorLog");
     public static void printException(Exception e){
         //方法名
         ByteArrayOutputStream baos = new ByteArrayOutputStream();

power-service/src/main/java/com/manage/service/Power_UserService.java

@@ -26,6 +26,8 @@ public interface Power_UserService {
 
     int updateByPrimaryKey(Power_User record);
 
+    int updateUserPass(String ids,String userName,String encode,String date);
+
     /**
      * @Date 2019-07-31
      * @Author zengwenhe

power-service/src/main/java/com/manage/service/ipml/PowerServiceImpl.java

@@ -748,7 +748,7 @@ public class PowerServiceImpl implements PowerService  {
     public List<PowerTree> getRolePowerTreeBySysFlag(String sysFlag,Power_User user) {
         //根据系统标识查询科室id
         List<Power_Sys_DictVo> dicts = new ArrayList<>();
-        if(user.getRoleId() == 0){
+        if(user.getRoleId() == 0 || user.getRoleId() == -100){
             dicts = sysDictMapper.selectAllByAdmin();
         }/*else if(user.getRoleId() == -100){
             dicts = sysDictMapper.selectAllByHosRoleId(user.getUserId());
@@ -866,7 +866,7 @@ public class PowerServiceImpl implements PowerService  {
     public List<PowerTree> getUserPowerTreeBySysFlag(String sysFlag,Power_User user) {
         //根据系统标识查询科室id
         List<Power_Sys_DictVo> dicts = new ArrayList<>();
-        if(user.getRoleId() == 0){
+        if(user.getRoleId() == 0 || user.getRoleId() == -100){
             dicts = sysDictMapper.selectAllByAdmin();
         }/*else if(user.getRoleId() == -100){
             dicts = sysDictMapper.selectAllByHosRoleId(user.getUserId());

power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java

@@ -116,6 +116,11 @@ public class Power_UserServiceImpl implements Power_UserService {
         return powerUserMapper.updateByPrimaryKey(record);
     }
 
+    @Override
+    public int updateUserPass(String ids, String userName, String encode, String date) {
+        return powerUserMapper.updateUserPass(ids,userName,encode,date);
+    }
+
     @Override
     public Power_UserVo findPowerUserByUserNameAndUserPwd(Power_User powerUser) {
         if(powerUser.getUserPwd() != null && powerUser.getUserName() != null){