手机加密2

deploy.sh

@@ -83,13 +83,13 @@ deploy_jar() {
 # 部署 fs-admin
 #deploy_jar "$LOCAL_FS_ADMIN_JAR" "fs-admin"
 
-deploy_jar "$LOCAL_FS_API_JAR" "fs-api"
+#deploy_jar "$LOCAL_FS_API_JAR" "fs-api"
 
 # 部署 fs-company
 #deploy_jar "$LOCAL_FS_COMPANY_JAR" "fs-company"
 
 # 部署 fs-user-app
-#deploy_jar "$LOCAL_FS_USER_APP_JAR" "fs-user-app"
+deploy_jar "$LOCAL_FS_USER_APP_JAR" "fs-user-app"
 
 echo "Deployment completed."
 

fs-service-system/src/main/java/com/fs/common/service/impl/SmsServiceImpl.java

@@ -39,6 +39,10 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+
+import static com.fs.until.PhoneUtil.decryptPhone;
+import static com.fs.until.PhoneUtil.encryptPhone;
 
 @Service
 public class SmsServiceImpl implements ISmsService
@@ -419,6 +423,10 @@ public class SmsServiceImpl implements ISmsService
         // 通知类的不加 退订回T 只有营销类的加
         //最多500个手机号
         try {
+            Pattern PHONE_PATTERN = Pattern.compile("^1\\d{10}$");
+            if (PHONE_PATTERN.matcher(order.getUserPhone().trim()).matches()){
+                order.setUserPhone(decryptPhone(order.getUserPhone()));
+            }
             if(temp.getTempType().equals(1)){
                 urls = url1+"sms?action=send&account="+account1+"&password="+password1+"&mobile="+order.getUserPhone()+"&content="+ URLEncoder.encode(sign+content, "UTF-8")+"&extno="+code1+"&rt=json";
             }

fs-service-system/src/main/java/com/fs/express/impl/FsStoreDeliversServiceImpl.java

@@ -26,8 +26,11 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static com.fs.until.PhoneUtil.decryptPhone;
+
 /**
  * 物流信息查询类
  * @author xdd
@@ -169,6 +172,10 @@ public class FsStoreDeliversServiceImpl implements FsStoreDeliversService {
             fsStoreDeliversMapper.insert(deliveryDTO);
 
             //新增的要订阅快递鸟监控
+            Pattern PHONE_PATTERN = Pattern.compile("^1\\d{10}$");
+            if (PHONE_PATTERN.matcher(fsStoreOrder.getUserPhone().trim()).matches()){
+                fsStoreOrder.setUserPhone(decryptPhone(fsStoreOrder.getUserPhone()));
+            }
             String lastFourNum = PhoneUtils.getLastFourNum(fsStoreOrder.getUserPhone());
             expressService.subscribeEspress(deliveryDTO.getOrderCode(),
                     deliveryDTO.getDeliverSn(),

fs-service-system/src/main/java/com/fs/store/mapper/FsUserMapper.java

@@ -202,5 +202,5 @@ public interface FsUserMapper
 
     List<FsUser> getUserList(@Param("lastId") Long lastId, @Param("limit") int limit);
 
-    int batchUpdatePhone(@Param("subList") List<FsUser> subList);
+    int batchUpdatePhone(@Param("list") List<FsUser> subList);
 }

fs-service-system/src/main/java/com/fs/store/service/impl/FsExpressServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -47,6 +48,8 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Base64Utils;
 
+import static com.fs.until.PhoneUtil.decryptPhone;
+
 /**
  * 快递公司Service业务层处理
  *
@@ -272,6 +275,10 @@ public class FsExpressServiceImpl implements IFsExpressService
 
             String lastFourNumber = "";
             if (order.getDeliverySn().equals(ShipperCodeEnum.SF.getValue())) {
+                Pattern PHONE_PATTERN = Pattern.compile("^1\\d{10}$");
+                if (PHONE_PATTERN.matcher(order.getUserPhone().trim()).matches()){
+                    order.setUserPhone(decryptPhone(order.getUserPhone()));
+                }
                 lastFourNumber = order.getUserPhone();
                 if (lastFourNumber.length() == 11) {
                     lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -11,6 +11,7 @@ import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
@@ -110,6 +111,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import static com.fs.store.constants.StoreConstants.DELIVERY;
+import static com.fs.until.PhoneUtil.encryptPhone;
 
 /**
  * 订单Service业务层处理
@@ -839,6 +841,10 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             storeOrder.setOrderCode(orderSn);
             storeOrder.setRealName(address.getRealName());
             storeOrder.setUserPhone(address.getPhone());
+            Pattern PHONE_PATTERN = Pattern.compile("^1\\d{10}$");
+            if (PHONE_PATTERN.matcher(storeOrder.getUserPhone().trim()).matches()){
+                storeOrder.setUserPhone(encryptPhone(storeOrder.getUserPhone()));
+            }
             storeOrder.setUserAddress(address.getProvince() + " " + address.getCity() +
                     " " + address.getDistrict() + " " + address.getDetail().trim());
             storeOrder.setCartId(cartIds);
@@ -1625,6 +1631,10 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             storeOrder.setOrderCode(orderSn);
             storeOrder.setRealName(address.getRealName());
             storeOrder.setUserPhone(address.getPhone());
+            Pattern PHONE_PATTERN = Pattern.compile("^1\\d{10}$");
+            if (PHONE_PATTERN.matcher(storeOrder.getUserPhone().trim()).matches()){
+                storeOrder.setUserPhone(encryptPhone(storeOrder.getUserPhone()));
+            }
             storeOrder.setUserAddress(address.getProvince() + " " + address.getCity() +
                     " " + address.getDistrict() + " " + address.getDetail());
 

fs-user-app/src/main/resources/application.yml

@@ -74,7 +74,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
+    active: pro
     include: config
   # 文件上传
   servlet: