diff --git a/src/main/java/com/jflyfox/modules/admin/image/controller/ImageShowController.java b/src/main/java/com/jflyfox/modules/admin/image/controller/ImageShowController.java
index b751bd5bfc5cb849b1ca5c73f7418fd299400640..887db39500f2cfbe979c6ecaa758aff6370350d0 100644
--- a/src/main/java/com/jflyfox/modules/admin/image/controller/ImageShowController.java
+++ b/src/main/java/com/jflyfox/modules/admin/image/controller/ImageShowController.java
@@ -33,7 +33,7 @@ public class ImageShowController extends BaseController {
 
 		// 排序
 		String orderBy = getBaseForm().getOrderBy();
-		if (StrUtils.isEmpty(orderBy)) {
+		if (StrUtils.isEmpty(orderBy) || orderBy.contains("(")) {
 			sql.append(" order by sort,id desc");
 		} else {
 			sql.append(" order by ").append(orderBy);
diff --git a/src/main/java/com/jflyfox/modules/front/controller/PersonController.java b/src/main/java/com/jflyfox/modules/front/controller/PersonController.java
index b439a5b9c8803747c646b54686134027d4e2ffcc..f14cbdede6967f592176620b75eb735ad88a6721 100644
--- a/src/main/java/com/jflyfox/modules/front/controller/PersonController.java
+++ b/src/main/java/com/jflyfox/modules/front/controller/PersonController.java
@@ -23,6 +23,9 @@ import com.jflyfox.util.DateUtils;
 import com.jflyfox.util.StrUtils;
 import com.jflyfox.util.extend.HtmlUtils;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * 个人信息
  * 
@@ -415,7 +418,12 @@ public class PersonController extends BaseProjectController {
 			}
 		}
 
-		if (StrUtils.isNotEmpty(model.getStr("email")) && model.getStr("email").indexOf("@") < 0) {
+		String regEx1 = "^[\\w-_\\.+]*[\\w-_\\.]\\@([\\w]+\\.)+[\\w]+[\\w]$";
+		Pattern p;
+		Matcher m;
+		p = Pattern.compile(regEx1);
+		m = p.matcher(model.getStr("email"));
+		if(!m.matches()){
 			json.put("msg", "email格式错误！");
 			renderJson(json.toJSONString());
 			return;
diff --git a/src/main/java/com/jflyfox/modules/front/controller/RegistController.java b/src/main/java/com/jflyfox/modules/front/controller/RegistController.java
index dfe3d2abf05cf1ae02f632605475ecad6b16726c..bd67f5077bd450c2e6b7443e186c1128a6209428 100644
--- a/src/main/java/com/jflyfox/modules/front/controller/RegistController.java
+++ b/src/main/java/com/jflyfox/modules/front/controller/RegistController.java
@@ -12,6 +12,9 @@ import com.jflyfox.system.user.SysUser;
 import com.jflyfox.system.user.UserCache;
 import com.jflyfox.util.StrUtils;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 @ControllerBind(controllerKey = "/front/regist")
 public class RegistController extends BaseProjectController {
 
@@ -62,7 +65,12 @@ public class RegistController extends BaseProjectController {
 			return;
 		}
 
-		if (StrUtils.isEmpty(key) || key.indexOf("@") < 0) {
+		String regEx1 = "^[\\w-_\\.+]*[\\w-_\\.]\\@([\\w]+\\.)+[\\w]+[\\w]$";
+		Pattern p;
+		Matcher m;
+		p = Pattern.compile(regEx1);
+		m = p.matcher(key);
+		if(!m.matches()) {
 			json.put("msg", "email格式错误！");
 			renderJson(json.toJSONString());
 			return;