Просмотр исходного кода

邮件正则判断

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 6
Родитель
Сommit
3f3d3e51f4

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1317,7 +1317,7 @@ where super_id is null ) e on e.order_no=a.order_no
   	</if>
   	<if test="specially == 1">
   	and a.process_status =1  and a.order_status=1
-  	and c.department_id in
+  	and a.order_dep in
   	<foreach close=")" collection="deps" item="deps" open="(" separator=",">
 	 #{deps.id}
   	</foreach>

+ 10 - 0
src/main/java/com/goafanti/common/utils/SendEmailUtil.java

@@ -4,6 +4,8 @@ import java.io.UnsupportedEncodingException;
 import java.security.GeneralSecurityException;
 import java.util.Date;
 import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.mail.Authenticator;
 import javax.mail.Message;
@@ -132,6 +134,14 @@ public class SendEmailUtil {
 			Transport.send(msg);
 		}
 	}
+	
+	public static boolean isEmail(String email){
+    	//邮箱正则表达式
+        String pattern = "^[a-zA-Z][\\w\\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\\w\\.-]*[a-zA-Z0-9]\\.[a-zA-Z][a-zA-Z\\.]*[a-zA-Z]$";
+        Pattern p = Pattern.compile(pattern);
+        Matcher m = p.matcher(email);
+        return m.matches();
+    }
 
 	
 }

+ 16 - 9
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -16,6 +16,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
@@ -634,14 +636,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 		AdminListBo a2 = adminMapper.getDeptNameByAid(b.getSalesmanId());
 			//发送驳回邮件
-							//String subject, String address, String deptname, String sender,
-			//String content , String orderNo,String date ,String dunStatusName,Integer type
-			EmailBo bo = new EmailBo("催收通知", b.getEmail(), a.getDepartmentName(), a.getName(),
-					"", orderNo,new SimpleDateFormat("yyyy-MM-dd").format(ob.getCreateTime()),ob.getDunTypeName(),a2.getName(),b.getUserName(),1);
-			if(StringUtils.isNotBlank(b.getEmail())) {
-				SendEmailUtil.getInstance().patentSend(bo);
-			}
-			LoggerUtils.debug(logger, "=========================================发送邮件成功");
+		
+		    
+		    if(SendEmailUtil.isEmail(b.getEmail())) {
+		    	 EmailBo bo = new EmailBo("催收通知", b.getEmail(), a.getDepartmentName(), a.getName(),
+							"", orderNo,new SimpleDateFormat("yyyy-MM-dd").format(ob.getCreateTime()),ob.getDunTypeName(),a2.getName(),b.getUserName(),1);
+					if(StringUtils.isNotBlank(b.getEmail())) {
+						SendEmailUtil.getInstance().patentSend(bo);
+					}
+					LoggerUtils.debug(logger, "=========================================发送邮件成功"); 
+		     }
+			
 
 	}
 
@@ -1137,7 +1142,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			n.setAid(string);
 			nlist.add(n);
 			Admin admin = adminMapper.selectAllByid(string);
-			if(admin!=null&&StringUtils.isNotBlank(admin.getEmail()))adminIds+=admin.getEmail()+",";
+			if(admin!=null&&SendEmailUtil.isEmail(admin.getEmail()))adminIds+=admin.getEmail()+",";
 		}
 		if(!nlist.isEmpty())noticeMapper.insertBatch(nlist);
 		if(StringUtils.isNotBlank(adminIds)) {
@@ -1152,7 +1157,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				}
 		}
 		
+		
 	}
+    
 
 
 

+ 7 - 5
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -207,11 +207,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Override
 	public TOrderTaskDetailBo orderTaskDetail(String id) {
 		TOrderTaskDetailBo t=tOrderTaskMapper.getOrderTaskDetail(id);
-		t.setOutsourceName("****");
-		t.setOutsourcePrice("****");
-		t.setDeclareUser("****");
-		t.setDeclarePwd("****");
-		t.setCertificateNumber("****");
+		if(TokenManager.hasRole(AFTConstants.SALESMAN)) {
+			t.setOutsourceName("****");
+			t.setOutsourcePrice("****");
+			t.setDeclareUser("****");
+			t.setDeclarePwd("****");
+			t.setCertificateNumber("****");
+		}
 		return t;
 	}
 

+ 10 - 10
src/main/resources/props/config_local.properties

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-#jdbc.username=dev
-#jdbc.password=123456
+jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.username=dev
+jdbc.password=123456
 #测试
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20191218?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=aftdev
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20191218?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570
@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.27
-#avatar.host=//sb.jishutao.com
+static.host=//sb.jishutao.com/1.1.27
+avatar.host=//sb.jishutao.com
 
 #连测试
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.27
+#avatar.host=//static.jishutao.com
+#static.host=//static.jishutao.com/1.1.27
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/1.1.26
+static.host=//static.jishutao.com/1.1.27
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload