'commit'

src/main/java/Tools/TestUnit/ModifyIdCardAndTel.java

@@ -50,8 +50,8 @@ public class ModifyIdCardAndTel {
                     String idcard_code=rs.get(i).getStr("idcard_code");
                     String telephone=rs.get(i).getStr("telephone");
 
-                    String aes_idcard_code= MysqlAesUtil.Encrypt(idcard_code);
+                    String aes_idcard_code= idcard_code;
-                    String aes_telephone=MysqlAesUtil.Encrypt(telephone);
+                    String aes_telephone=telephone;
 
                     batchSqlList.add("update t_sys_loginperson set idcard_code='"+aes_idcard_code+"',telephone='"+aes_telephone+"' where person_id='"+person_id+"'");
                 }

src/main/java/Tools/mysql/InitOrgPerson.java

@@ -100,7 +100,7 @@ public class InitOrgPerson {
         record.set("b_use", 1);
         record.set("create_time", CommonUtil.GetCurrentTimeString());
         record.set("sort_id", sort_id);
-        String idcard_code = MysqlAesUtil.Encrypt("-1");
+        String idcard_code = "-1";
         record.set("idcard_code", idcard_code);
         record.set("original_pwd", original_pwd);
         record.set("xb", 1);

src/main/java/Tools/mysql/clearDataBase.java

@@ -131,7 +131,7 @@ public class clearDataBase {
         record.set("b_use", 1);
         record.set("create_time", CommonUtil.GetCurrentTimeString());
         record.set("sort_id", sort_id);
-        String idcard_code = MysqlAesUtil.Encrypt("-1");
+        String idcard_code = "-1";
         record.set("idcard_code", idcard_code);
         record.set("original_pwd", original_pwd);
         record.set("xb", 1);

src/main/java/com/dsideal/FengHuang/ExcelImportTemplate/StudentImportExcelUtil.java

@@ -535,7 +535,7 @@ public class StudentImportExcelUtil {
             record.set("xb", rs.get(i).getStr("xb_id"));
             record.set("mz", rs.get(i).getStr("mz_id"));
             //对身份证号进行加密处理
-            String idcard_code = MysqlAesUtil.Encrypt(rs.get(i).getStr("idcard_code"));
+            String idcard_code = rs.get(i).getStr("idcard_code");
             record.set("idcard_code", idcard_code);
             //根据身份证号换算出生日期
             Map<String, String> m = IDCardUtil.getBirAgeSex(rs.get(i).getStr("idcard_code"));
@@ -829,7 +829,7 @@ public class StudentImportExcelUtil {
             record.set("mz_id", mapMz.get(mz_name));
             record.set("zzmm_id", mapZzmm.get(zzmm_name));
             record.set("idcard_code", idcard_code);
-            record.set("idcard_code_aes", MysqlAesUtil.Encrypt(idcard_code));
+            record.set("idcard_code_aes", idcard_code);
             record.set("xjh", xjh);
             record.set("xjfh", xjfh);
             record.set("source", mapSource.get(source));

src/main/java/com/dsideal/FengHuang/LoginPerson/Model/LoginPersonModel.java

@@ -137,7 +137,7 @@ public class LoginPersonModel {
         int flag = 0;
         try {
             String sql = Db.getSql("loginPerson.getIdCardIsExist");
-            List<Record> list = Db.find(sql, MysqlAesUtil.Encrypt(id_card));
+            List<Record> list = Db.find(sql, id_card);
             if (list.size() > 0) {
                 flag = 1;
             }
@@ -160,7 +160,7 @@ public class LoginPersonModel {
         int flag = 0;
         try {
             String sql = Db.getSql("loginPerson.getIdCardIsExistByPersonId");
-            List<Record> list = Db.find(sql, MysqlAesUtil.Encrypt(id_card), person_id);
+            List<Record> list = Db.find(sql, id_card, person_id);
             if (list.size() > 0) {
                 flag = 1;
             }
@@ -184,7 +184,7 @@ public class LoginPersonModel {
         try {
             String sql = Db.getSql("loginPerson.getTelephoneIsExist");
             //检查加密后的手机号是不是重复
-            String aes_telephone = MysqlAesUtil.Encrypt(telephone);
+            String aes_telephone = telephone;
             List<Record> list = Db.find(sql, aes_telephone);
             if (list.size() > 0) {
                 flag = 1;
@@ -209,7 +209,7 @@ public class LoginPersonModel {
         try {
             String sql = Db.getSql("loginPerson.getTelephoneIsExistByPersonId");
             //检查加密后的手机号是不是重复
-            String aes_telephone = MysqlAesUtil.Encrypt(telephone);
+            String aes_telephone = telephone;
             List<Record> list = Db.find(sql, aes_telephone, person_id);
             if (list.size() > 0) {
                 flag = 1;

src/main/java/com/dsideal/FengHuang/Student/Controller/StudentController.java

@@ -147,7 +147,6 @@ public class StudentController extends Controller {
             String mainSchoolId = classMap.get("main_school_id").toString();
 
             //对身份证号进行加密
-            id_card= MysqlAesUtil.Encrypt(id_card);
             //操作人
             String operator=getCookie("person_id");
             //客户端ip_address
@@ -415,7 +414,6 @@ public class StudentController extends Controller {
                 }
             }
             //对身份证号进行加密
-            id_card= MysqlAesUtil.Encrypt(id_card);
             //操作人
             String operator=getCookie("person_id");
             //客户端ip_address

src/main/java/com/dsideal/FengHuang/Student/Model/StudentModel.java

@@ -88,11 +88,11 @@ public class StudentModel {
             record.set("person_name", person_name+"家长");
             record.set("xb", xb);
             record.set("mz", mz);
-            record.set("idcard_code",MysqlAesUtil.Encrypt("000000000000000000"));
+            record.set("idcard_code","000000000000000000");
             record.set("birthday", "1970-01-01");
             record.set("create_time", CommonUtil.GetCurrentTimeString());
             record.set("sort_id", sort_id);
-            record.set("telephone", MysqlAesUtil.Encrypt("13000000000"));
+            record.set("telephone", "13000000000");
             record.set("original_pwd", originalPwd);
             record.set("email", "11111@qq.com");
             record.set("b_use", "1");
@@ -262,7 +262,7 @@ public class StudentModel {
             if (list.size() > 0) {
                 Record record=list.get(0);
                 //显示单个人员时，需要将身份证号进行还原出来
-                record.set("idcard_code",MysqlAesUtil.Decrypt(record.getStr("idcard_code")));
+                record.set("idcard_code",record.getStr("idcard_code"));
                 return record;
             } else {
                 return null;

src/main/java/com/dsideal/FengHuang/Teacher/Controller/TeacherController.java

@@ -119,7 +119,7 @@ public class TeacherController extends Controller {
             //将明文密码加密
             String pwd = CommonUtil.getLdapPassword(originalPwd);
             //对身份证号进行一次加密
-            if (!StrKit.isBlank(id_card)) id_card = MysqlAesUtil.Encrypt(id_card);
+            if (!StrKit.isBlank(id_card)) id_card =id_card;
             else id_card = "";
             //操作人
             String operator = getCookie("person_id");
@@ -405,7 +405,7 @@ public class TeacherController extends Controller {
             }
 
             //对身份证号进行一次加密
-            if(!StrKit.isBlank(id_card))id_card = MysqlAesUtil.Encrypt(id_card);
+            if(!StrKit.isBlank(id_card))id_card = id_card;
             else id_card="";
             //操作人
             String operator = getCookie("person_id");

src/main/java/com/dsideal/FengHuang/Teacher/Model/TeacherModel.java

@@ -268,7 +268,7 @@ public class TeacherModel {
         if (list.size() > 0) {
             Record record = list.get(0);
             //显示单个人员时，需要将身份证号进行还原出来
-            record.set("idcard_code", MysqlAesUtil.Decrypt(record.getStr("idcard_code")));
+            record.set("idcard_code",record.getStr("idcard_code"));
             return record;
         } else {
             return null;