Merge remote-tracking branch 'origin/master'

db/sqlserver.sql

@@ -788,3 +788,15 @@ alter table index_carousel_manage add is_show varchar(2) not null default (1);
 
 
 ##文件夹内容上传 2021-12-18 Movie   ./redis-server.exe redis.windows.conf  ./redis-server.exe redis.windows-service.conf
+
+knowledgeInfo 表 id 304跳转路径修改为http://192.168.0.77/search/check
+1、上线后需要数据清洗，测试环境没有进行数据清洗
+http://192.168.0.77:9091/office/uploadFileResource/UserFiles/Image/2019image/jd01.png​
+2、数据清洗，第三方网站换了域名
+http://www.gds.org.cn/login.aspx更换成了：
+
+https://www.gds.org.cn/
+
+http://www.gds.org.cn/login.aspx更换成了：
+
+https://www.gds.org.cn/
\ No newline at end of file

src/main/java/io/office/modules/manage/controller/MemberController.java

@@ -2,6 +2,9 @@ package io.office.modules.manage.controller;
 
 import java.util.Arrays;
 import java.util.Map;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.office.modules.app.annotation.Login;
 import io.office.modules.sys.controller.AbstractController;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,6 +94,9 @@ public class MemberController extends AbstractController {
   //  @RequiresPermissions("manage:member:info")
     public R info(){
         Long memberUserId = getMemberUserId();
+/*
+        QueryWrapper<MemberEntity> queryWrapper = new QueryWrapper<MemberEntity>();
+        queryWrapper.eq("phone",memberUserId);*/
         MemberEntity member = memberService.getById(memberUserId);
 
         return R.ok().put("data", member);

src/main/java/io/office/modules/manage/service/impl/MemberServiceImpl.java

 package io.office.modules.manage.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import io.office.common.exception.RRException;
 import io.office.common.utils.IPUtils;
 import io.office.modules.manage.dao.*;
@@ -25,10 +26,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.office.common.utils.PageUtils;
 import io.office.common.utils.Query;
 import io.office.modules.manage.service.MemberService;
-import org.springframework.transaction.annotation.Transactional;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
 
 @Service("memberService")
@@ -163,13 +162,16 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
             throw new RRException("两次密码信息不一致，请重新输入");
         }
         MemberEntity memberEntity = memberDao.selectById(id);
-        String passData = memberEntity.getPass();
-        String passMD5 = MD5Util.md5Encrypt32Lower(oldPass);
-        if (!passMD5.equals(passData)) {
-            throw new RRException("旧密码输入错误");
+        if(memberEntity!=null) {
+            String passData = memberEntity.getPass();
+            String passMD5 = MD5Util.md5Encrypt32Lower(oldPass);
+            if (!passMD5.equals(passData)) {
+                throw new RRException("旧密码输入错误");
+            }
+            //修改密码
+            memberDao.updateByIdPassWord(Long.valueOf(id), MD5Util.md5Encrypt32Lower(newPass));
         }
-        //修改密码
-        memberDao.updateByIdPassWord(Long.valueOf(id), MD5Util.md5Encrypt32Lower(newPass));
+
     }
 
     @Override
@@ -346,13 +348,18 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
      * @return
      */
     private static boolean matchPhoneNumber(String phoneNumber) {
-        String regex = "1[358][0-9]{9}";
+        String regex = "1[3456789][0-9]{9}";
         if (phoneNumber == null || phoneNumber.length() <= 0) {
             return false;
         }
         return Pattern.matches(regex, phoneNumber);
     }
 
+    public static void main(String[] args) {
+        System.out.println(matchPhoneNumber("17368588652"));
+    }
+
+
     @Override
     public String getVerificationCode(Map<String, Object> params, HttpServletRequest request, HttpServletResponse response) {
         //验证码随机6位数字(验证码)

src/main/java/io/office/modules/manage/service/impl/TimescodeRegiServiceImpl.java

@@ -76,7 +76,7 @@ public class TimescodeRegiServiceImpl extends ServiceImpl<TimescodeRegiDao, Time
      * @return
      */
     private static boolean matchPhoneNumber(String phoneNumber) {
-        String regex = "1[358][0-9]{9}";
+        String regex = "1[3456789][0-9]{9}";
         if(phoneNumber==null||phoneNumber.length()<=0){
             return false;
         }
@@ -84,14 +84,7 @@ public class TimescodeRegiServiceImpl extends ServiceImpl<TimescodeRegiDao, Time
     }
 
     public static void main(String[] args) {
-        long l = System.currentTimeMillis();
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        long l2 = System.currentTimeMillis();
-        System.out.println((l2-l)/1000+"秒");
+        System.out.println(matchPhoneNumber("17368588652"));
     }
 
     @Override