diff --git a/lib/arcsoft-sdk-face-3.0.0.0-2025-linux.jar b/lib/arcsoft-sdk-face-3.0.0.0-2025-linux.jar new file mode 100644 index 0000000..3091a2e Binary files /dev/null and b/lib/arcsoft-sdk-face-3.0.0.0-2025-linux.jar differ diff --git a/src/main/java/com/bonus/gzrn/rnbmw/basic/controller/MassSmsController.java b/src/main/java/com/bonus/gzrn/rnbmw/basic/controller/MassSmsController.java index 7b7401d..ffd4cf7 100644 --- a/src/main/java/com/bonus/gzrn/rnbmw/basic/controller/MassSmsController.java +++ b/src/main/java/com/bonus/gzrn/rnbmw/basic/controller/MassSmsController.java @@ -149,7 +149,7 @@ public class MassSmsController { phoneStr = getString(phoneList, phoneStr); try { String url = "http://api.ktsms.cn/sms_token?ddtkey=bonus&secretkey=KtyBns@Admin2023!"; - String msg ="【产业工人管理平台】" + bean.getContent(); + String msg ="【博诺思】" + bean.getContent(); String details = url+"&mobile="+ phoneStr + "&content=" + msg; HttpRequest.post(details).execute(false).body(); System.out.println("短信群发接口成功:" + details); @@ -166,7 +166,7 @@ public class MassSmsController { for (List list : lists) { phoneStr = getString(list, phoneStr); String url = "http://api.ktsms.cn/sms_token?ddtkey=bonus&secretkey=KtyBns@Admin2023!"; - String msg ="【产业工人管理平台】" + bean.getContent(); + String msg ="【博诺思】" + bean.getContent(); String details = url+"&mobile="+ phoneStr + "&content=" + msg; HttpRequest.post(details).execute(false).body(); try { diff --git a/src/main/java/com/bonus/gzrn/rnbmw/basic/controller/SubContractorController.java b/src/main/java/com/bonus/gzrn/rnbmw/basic/controller/SubContractorController.java index 87b7474..4b255cd 100644 --- a/src/main/java/com/bonus/gzrn/rnbmw/basic/controller/SubContractorController.java +++ b/src/main/java/com/bonus/gzrn/rnbmw/basic/controller/SubContractorController.java @@ -233,7 +233,7 @@ public class SubContractorController { String Files = "/data/gz_real_name/" + mkdirsName + "/"; // linux 系统路径 String os = System.getProperty("os.name"); if (os.toLowerCase().startsWith("win")) { - Files = "D://files/" + mkdirsName; + Files = "D:/gz/gz_real_name/" + mkdirsName; } String path = Files + "/" + DateTimeHelper.getYear(new Date()) + "/" + DateTimeHelper.getMonth(new Date()) + "/"+DateTimeHelper.getDay()+"/" + fileName; diff --git a/src/main/java/com/bonus/gzrn/rnbmw/push/task/AttendanceReviewTask.java b/src/main/java/com/bonus/gzrn/rnbmw/push/task/AttendanceReviewTask.java index 034474e..8410a82 100644 --- a/src/main/java/com/bonus/gzrn/rnbmw/push/task/AttendanceReviewTask.java +++ b/src/main/java/com/bonus/gzrn/rnbmw/push/task/AttendanceReviewTask.java @@ -53,7 +53,7 @@ public class AttendanceReviewTask { // listThree.add(att); String url = "http://api.ktsms.cn/sms_token?ddtkey=bonus&secretkey=KtyBns@Admin2023!"; for (int i = 0; i < listThree.size(); i++) { - String msg ="【产业工人管理平台】" + + String msg ="【博诺思】" + listThree.get(i).getName()+"："+listThree.get(i).getProjectName() + "工程提醒您，无电子考勤即无工资。" + "您在本工程已连续三日未打电子考勤，已被管理平台列为暂时离场人员。" + diff --git a/src/main/java/com/bonus/gzrn/rnbmw/push/task/CertificateWarningTask.java b/src/main/java/com/bonus/gzrn/rnbmw/push/task/CertificateWarningTask.java index ad2b936..9ad08c9 100644 --- a/src/main/java/com/bonus/gzrn/rnbmw/push/task/CertificateWarningTask.java +++ b/src/main/java/com/bonus/gzrn/rnbmw/push/task/CertificateWarningTask.java @@ -42,7 +42,7 @@ public class CertificateWarningTask { List strList = dao.getCertificateWarningByThirtyDays(); for (WorkerCertificateUploadBean bean:strList) { num++; - String msg = "【产业工人管理平台】提醒您，"+bean.getName()+"，你的--" + + String msg = "【博诺思】提醒您，"+bean.getName()+"，你的--" + ""+bean.getCertificateName()+"--（证件）将于"+bean.getStopDate()+"过期,请尽快更新证件信息"; String uri = url+"&mobile="+ bean.getPhone() + "&content=" + msg; HttpRequest.post(uri).execute(false).body(); @@ -79,7 +79,7 @@ public class CertificateWarningTask { // }else{ // noCertificate.append(bean.getPostName()); // } -// String msg = "【产业工人管理平台】提醒您，"+bean.getName()+"，你从事的--" + +// String msg = "【博诺思】提醒您，"+bean.getName()+"，你从事的--" + // ""+bean.getPostName()+"（岗位）--缺少 "+noCertificate.toString()+" 证件,请尽快上传证件"; // String uri = url+"&mobile="+ bean.getPhone() + "&content=" + msg; // HttpRequest.post(uri).execute(false).body(); diff --git a/src/main/java/com/bonus/gzrn/rnbmw/push/task/MassSmsTask.java b/src/main/java/com/bonus/gzrn/rnbmw/push/task/MassSmsTask.java index 7ba171b..4b14a2f 100644 --- a/src/main/java/com/bonus/gzrn/rnbmw/push/task/MassSmsTask.java +++ b/src/main/java/com/bonus/gzrn/rnbmw/push/task/MassSmsTask.java @@ -52,7 +52,7 @@ public class MassSmsTask { phoneStr = getString(phoneList, phoneStr); try { String url = "http://api.ktsms.cn/sms_token?ddtkey=bonus&secretkey=KtyBns@Admin2023!"; - String msg ="【产业工人管理平台】" + bean.getContent(); + String msg ="【博诺思】" + bean.getContent(); String details = url+"&mobile="+ phoneStr + "&content=" + msg; HttpRequest.post(details).execute(false).body(); System.out.println("短信群发接口成功:" + details); @@ -66,7 +66,7 @@ public class MassSmsTask { for (List splitList : lists) { phoneStr = getString(splitList, phoneStr); String url = "http://api.ktsms.cn/sms_token?ddtkey=bonus&secretkey=KtyBns@Admin2023!"; - String msg ="【产业工人管理平台】" + bean.getContent(); + String msg ="【博诺思】" + bean.getContent(); String details = url+"&mobile="+ phoneStr + "&content=" + msg; HttpRequest.post(details).execute(false).body(); try { diff --git a/src/main/java/com/bonus/gzrn/rnbmw/push/task/PersonDataPushTask.java b/src/main/java/com/bonus/gzrn/rnbmw/push/task/PersonDataPushTask.java index ae8e85b..2ee0a77 100644 --- a/src/main/java/com/bonus/gzrn/rnbmw/push/task/PersonDataPushTask.java +++ b/src/main/java/com/bonus/gzrn/rnbmw/push/task/PersonDataPushTask.java @@ -46,7 +46,7 @@ public class PersonDataPushTask { /** * 考勤、入场、合同（开定时器） */ - @Scheduled(cron = "0 10 7,9,11,13,15,17,19,21,23 * * ?")//正式 +// @Scheduled(cron = "0 10 7,9,11,13,15,17,19,21,23 * * ?")//正式 // @Scheduled(fixedRate = 1000*60*15)//测试 @Async public void PushAttendanceInfo(){ diff --git a/src/main/java/com/bonus/gzrn/rnbmw/push/task/PushPersonTask.java b/src/main/java/com/bonus/gzrn/rnbmw/push/task/PushPersonTask.java index 4bb6391..84986bf 100644 --- a/src/main/java/com/bonus/gzrn/rnbmw/push/task/PushPersonTask.java +++ b/src/main/java/com/bonus/gzrn/rnbmw/push/task/PushPersonTask.java @@ -54,7 +54,7 @@ public class PushPersonTask { //通过userid找到手机号 SysUserBean user = personService.selectPhone(userId); String url = "http://api.ktsms.cn/sms_token?ddtkey=bonus&secretkey=KtyBns@Admin2023!"; - String msg = "【产业工人管理平台】" + user.getUserName() + "您好，请进入产业工人管理平台-信息推送，确认相关人员是否进行入场推送操作!"; + String msg = "【博诺思】" + user.getUserName() + "您好，请进入产业工人管理平台-信息推送，确认相关人员是否进行入场推送操作!"; String details = url + "&mobile=" + user.getPhone() + "&content=" + msg; HttpRequest.post(details).execute(false).body(); } diff --git a/src/main/java/com/bonus/gzrn/rnbmw/util/ArcFaceHelper.java b/src/main/java/com/bonus/gzrn/rnbmw/util/ArcFaceHelper.java index 807d1e0..72ac280 100644 --- a/src/main/java/com/bonus/gzrn/rnbmw/util/ArcFaceHelper.java +++ b/src/main/java/com/bonus/gzrn/rnbmw/util/ArcFaceHelper.java @@ -20,17 +20,17 @@ import java.util.List; */ public class ArcFaceHelper { - private static final String APP_ID = "52XE2dQBtdmMsfDMvyKmPCCtcrvJ6oHr2mN3dWt6uoAE"; + private static final String APP_ID = "52XE2dQBtdmMsfDMvyKmPCD1nGBSGQWQGUyJh5z9JhND"; /** * x64 */ - private static final String WIN64_SDK_KEY = "GZ7EyzpdhzPmuBh4GeZckiwjiuuztk5hYbkgbnLAwAS3"; + private static final String WIN64_SDK_KEY = "GggpcEphVxXLXcpEZz6tdC19o3QhbuktDm3YTUhUGr7J"; /** * linux_64 */ - private static final String LINUX64_SDK_KEY = "GZ7EyzpdhzPmuBh4GeZckiwjaoLu4aTEpkcDERQX3jmV"; + private static final String LINUX64_SDK_KEY = "GggpcEphVxXLXcpEZz6tdC19evqXbbhMyYt71DGLwnCp"; private static FaceEngine faceEngine = null; diff --git a/src/main/java/com/bonus/gzrn/rnbmw/util/WarningTask.java b/src/main/java/com/bonus/gzrn/rnbmw/util/WarningTask.java index 8045f01..3269a4a 100644 --- a/src/main/java/com/bonus/gzrn/rnbmw/util/WarningTask.java +++ b/src/main/java/com/bonus/gzrn/rnbmw/util/WarningTask.java @@ -45,7 +45,7 @@ public class WarningTask { }else{ try { String url = "http://api.ktsms.cn/sms_token?ddtkey=bonus&secretkey=KtyBns@Admin2023!"; - String msg ="【产业工人管理平台】"+vo.getUsername() +"您好，您的" + vo.getName() + "证件将于"+vo.getValidEndDate()+"到期，请及时处理。"; + String msg ="【博诺思】"+vo.getUsername() +"您好，您的" + vo.getName() + "证件将于"+vo.getValidEndDate()+"到期，请及时处理。"; String details = url+"&mobile="+ vo.getPhone() + "&content=" + msg; HttpRequest.post(details).execute(false).body(); log.info( vo.getPhone()+"发送成功"); @@ -73,7 +73,7 @@ public class WarningTask { }else{ try { String url = "http://api.ktsms.cn/sms_token?ddtkey=bonus&secretkey=KtyBns@Admin2023!"; - String msg ="【产业工人管理平台】"+vo.getUsername() +"您好，您的" + vo.getName() + "证件将于"+vo.getReviewDate()+"进行复审"; + String msg ="【博诺思】"+vo.getUsername() +"您好，您的" + vo.getName() + "证件将于"+vo.getReviewDate()+"进行复审"; String details = url+"&mobile="+ vo.getPhone() + "&content=" + msg; HttpRequest.post(details).execute(false).body(); log.info( vo.getPhone()+"发送成功"); diff --git a/src/main/resources/static/js/public.js b/src/main/resources/static/js/public.js index cf9f264..ba77bc3 100644 --- a/src/main/resources/static/js/public.js +++ b/src/main/resources/static/js/public.js @@ -1,9 +1,9 @@ // var dataUrl ="http://10.1.0.142:1918/gzrbmw/"; //测试 -// var dataUrl ="http://" + currentHostname + ":19120/gzrbmw"; +// var dataPath ="http://" + currentHostname + ":19120/hdrbmw"; //正式 -var dataUrl ="http://" + currentHostname + ":1918/gzrbmw"; +var dataPath ="http://" + currentHostname + ":21626/hdrbmw"; var token=localStorage.getItem('token'); $(function() { diff --git a/src/main/resources/static/js/registration.js b/src/main/resources/static/js/registration.js index c100528..abfcda5 100644 --- a/src/main/resources/static/js/registration.js +++ b/src/main/resources/static/js/registration.js @@ -592,7 +592,7 @@ function findMsg(){ random+=parseInt(Math.random()*(9+1),10); } - var content="【产业工人管理平台】您注册的验证码为："+random+",有效期为3分钟，若非本人操作，请勿泄露。"; + var content="【博诺思】您注册的验证码为："+random+",有效期为3分钟，若非本人操作，请勿泄露。"; $.ajax({ type: 'POST', url:"http://api.ktsms.cn/sms_token", diff --git a/src/main/resources/static/js/resetPwd.js b/src/main/resources/static/js/resetPwd.js index 806b0da..840f152 100644 --- a/src/main/resources/static/js/resetPwd.js +++ b/src/main/resources/static/js/resetPwd.js @@ -149,7 +149,7 @@ function findMsg(){ for(var i=0;i<4;i++){ random+=parseInt(Math.random()*(9+1),10); } - var content="【产业工人管理平台】您的验证码为:"+random+",有效期为5分钟,若非本人操作，请勿泄露。"; + var content="【博诺思】您的验证码为:"+random+",有效期为5分钟,若非本人操作，请勿泄露。"; $.ajax({ type: 'POST', url:"http://api.ktsms.cn/sms_token", diff --git a/src/main/resources/static/js/work/push/infoPush.js b/src/main/resources/static/js/work/push/infoPush.js index d2d8217..8f5d2aa 100644 --- a/src/main/resources/static/js/work/push/infoPush.js +++ b/src/main/resources/static/js/work/push/infoPush.js @@ -309,7 +309,7 @@ function initRstUi(proId) { // window.open(data.obj, '人社厅'); if(data.res=="1"){ // 定义新的 href - var newHref = '../../gzrbmw/css/bootstrap-table/bootstrap-combined.css'; + var newHref = '../../hdrbmw/css/bootstrap-table/bootstrap-combined.css'; // 使用正则表达式替换 href 属性 var pattern = /href="(\/collect-api\/l-css\/bootstrap-combined\.css|https:\/\/ldyg\.guizhou\.gov\.cn\/collect-api\/l-css\/bootstrap-combined\.css)"/g; var updatedPage = data.obj.replace(pattern, `href="${newHref}"`); diff --git a/src/main/resources/static/js/work/sysMag/usersAudit.js b/src/main/resources/static/js/work/sysMag/usersAudit.js index 40bf5d7..c4da600 100644 --- a/src/main/resources/static/js/work/sysMag/usersAudit.js +++ b/src/main/resources/static/js/work/sysMag/usersAudit.js @@ -322,9 +322,9 @@ function findMsg(){ var url = "http://api.ktsms.cn/sms_token?ddtkey=bonus&secretkey=KtyBns@Admin2023!"; var content; if (examineStatus == "1") { - content = "【产业工人管理平台】审核通过，手机号：" + phone + ",用户名：" + userName + ",密码：GZsbd@123456"; + content = "【博诺思】审核通过，手机号：" + phone + ",用户名：" + userName + ",密码：GZsbd@123456"; } else if (examineStatus == "2") { - content = "【产业工人管理平台】审核未通过，未通过原因：" + examineRemark + ""; + content = "【博诺思】审核未通过，未通过原因：" + examineRemark + ""; } var userPhone = phone;