diff --git a/pom.xml b/pom.xml
index 369968e..b2f0fc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
mysql
mysql-connector-java
- 8.0.28
+ 8.0.28
@@ -107,6 +107,14 @@
2.3.2
+
+
+ commons-codec
+ commons-codec
+ 1.15
+
+
+
diff --git a/src/main/java/app/netlify/laptopso1vn/DAO/UserDao.java b/src/main/java/app/netlify/laptopso1vn/DAO/UserDao.java
index 39c97a4..e5c9155 100644
--- a/src/main/java/app/netlify/laptopso1vn/DAO/UserDao.java
+++ b/src/main/java/app/netlify/laptopso1vn/DAO/UserDao.java
@@ -4,6 +4,7 @@
import javax.persistence.NoResultException;
+import org.apache.commons.codec.digest.DigestUtils;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
@@ -64,7 +65,7 @@ public KhachHangEntity postUserRegister(@Valid FormRegister formRegister) {
}
KhachHangEntity khachHangEntity = new KhachHangEntity(formRegister.getEmail(),
formRegister.getUsername(),
- formRegister.getPassword());
+ DigestUtils.md5Hex(formRegister.getPassword()));
session.save(khachHangEntity);
session.getTransaction().commit();
return khachHangEntity;
diff --git a/src/main/java/app/netlify/laptopso1vn/FILTER/AdminFilter.java b/src/main/java/app/netlify/laptopso1vn/FILTER/AdminFilter.java
index a4caf79..bd4ec12 100644
--- a/src/main/java/app/netlify/laptopso1vn/FILTER/AdminFilter.java
+++ b/src/main/java/app/netlify/laptopso1vn/FILTER/AdminFilter.java
@@ -7,12 +7,9 @@
import java.util.StringTokenizer;
import javax.annotation.Priority;
-import javax.inject.Singleton;
import javax.ws.rs.Priorities;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
@@ -20,12 +17,9 @@
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.Provider;
-import app.netlify.laptopso1vn.EXCEPTION.LoginException;
-import app.netlify.laptopso1vn.FORM.FormLogin;
import app.netlify.laptopso1vn.MODEL.AdminModel;
-import app.netlify.laptopso1vn.MODEL.UserModel;
import app.netlify.laptopso1vn.SERVICE.AdminService;
-import app.netlify.laptopso1vn.SERVICE.UserService;
+
@@ -76,8 +70,6 @@ public void filter(ContainerRequestContext requestContext) throws IOException {
SecurityContext oldContext = requestContext.getSecurityContext();
requestContext.setSecurityContext(new AdminSecurityContext(oldContext.isSecure()));
}
-
-
}
}
diff --git a/src/main/java/app/netlify/laptopso1vn/MODEL/AdminModel.java b/src/main/java/app/netlify/laptopso1vn/MODEL/AdminModel.java
index 03ab3bf..3ad5cb6 100644
--- a/src/main/java/app/netlify/laptopso1vn/MODEL/AdminModel.java
+++ b/src/main/java/app/netlify/laptopso1vn/MODEL/AdminModel.java
@@ -12,6 +12,7 @@ public class AdminModel {
private String sdt;
private String email;
private String username;
+ private String password;
public AdminModel() {
}
@@ -24,32 +25,17 @@ public AdminModel(AdminEntity adminEntity) {
this.sdt = adminEntity.getSdt();
this.email = adminEntity.getEmail();
this.username = adminEntity.getUsername();
- }
-
- public AdminModel(String maad, String ho, String ten, String diachi, String sdt, String email, String username) {
- super();
- this.maad = maad;
- this.ho = ho;
- this.ten = ten;
- this.diachi = diachi;
- this.sdt = sdt;
- this.email = email;
- this.username = username;
+ this.password = adminEntity.getPassword();
}
-
- public AdminModel(String ho, String ten, String diachi, String sdt, String email, String username) {
- super();
- this.ho = ho;
- this.ten = ten;
- this.diachi = diachi;
- this.sdt = sdt;
- this.email = email;
- this.username = username;
+ public String getPassword() {
+ return password;
}
-
+ public void setPassword(String password) {
+ this.password = password;
+ }
public String getMaad() {
return maad;
diff --git a/src/main/java/app/netlify/laptopso1vn/MODEL/UserModel.java b/src/main/java/app/netlify/laptopso1vn/MODEL/UserModel.java
index 5ca91ab..9316b47 100644
--- a/src/main/java/app/netlify/laptopso1vn/MODEL/UserModel.java
+++ b/src/main/java/app/netlify/laptopso1vn/MODEL/UserModel.java
@@ -17,8 +17,16 @@ public class UserModel {
private String email;
private String sdt;
private String username;
+ private String password;
private List roles = new ArrayList();
+
+
+ public UserModel() {
+ }
+
+
+
public UserModel(KhachHangEntity userEntity) {
this.makh = userEntity.getMakh();
this.ho = userEntity.getHo();
@@ -27,19 +35,24 @@ public UserModel(KhachHangEntity userEntity) {
this.email = userEntity.getEmail();
this.sdt = userEntity.getSdt();
this.username = userEntity.getUsername();
- roles.add(Laptopso1vnUtil.ADMIN_ROLE);
+ this.password = userEntity.getPassword();
+ roles.add(Laptopso1vnUtil.USER_ROLE);
}
- public UserModel(int makh, String ho, String ten, String diachi, String email, String sdt) {
- super();
- this.makh = makh;
- this.ho = ho;
- this.ten = ten;
- this.diachi = diachi;
- this.email = email;
- this.sdt = sdt;
- }
+
+ public String getPassword() {
+ return password;
+ }
+
+
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+
+
public List getRoles() {
return roles;
}
@@ -92,6 +105,18 @@ public String getSdt() {
public void setSdt(String sdt) {
this.sdt = sdt;
}
+
+ @Override
+ public int hashCode() {
+ // TODO Auto-generated method stub
+ return super.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ // TODO Auto-generated method stub
+ return super.equals(obj);
+ }
diff --git a/src/main/java/app/netlify/laptopso1vn/Test.java b/src/main/java/app/netlify/laptopso1vn/Test.java
new file mode 100644
index 0000000..fc526da
--- /dev/null
+++ b/src/main/java/app/netlify/laptopso1vn/Test.java
@@ -0,0 +1,16 @@
+package app.netlify.laptopso1vn;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import org.apache.commons.codec.digest.DigestUtils;
+
+public class Test {
+
+ public static void main(String[] args) throws NoSuchAlgorithmException {
+ String Url = "your_url";
+
+ System.out.println( DigestUtils.md5Hex( Url ) );
+ }
+}