diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties index f3380b545..169cd1853 100644 --- a/resource/WEB-INF/prop/hrmSalary.properties +++ b/resource/WEB-INF/prop/hrmSalary.properties @@ -1,5 +1,5 @@ log=false defaultCloseNonStandard149=true AESEncryptScrect=990EB004A1C862721C1513AE90038C9E -version=3.0.2.2510.01 +version=3.0.2.2510.01.t openFormulaForcedEditing=false \ No newline at end of file diff --git a/src/com/engine/salary/util/SalaryTokenUtil.java b/src/com/engine/salary/util/SalaryTokenUtil.java index ec19d9ace..57553dd45 100644 --- a/src/com/engine/salary/util/SalaryTokenUtil.java +++ b/src/com/engine/salary/util/SalaryTokenUtil.java @@ -141,13 +141,16 @@ public class SalaryTokenUtil { // 对秘钥进行加密传输,防止篡改数据 secret = rsa.encrypt(null, (String) (datas.get("secrit")), null, "utf-8", spk, false); // secret存库 - String date = SalaryDateUtil.getFormatLocalDateTime(LocalDateTime.now()); - sql = String.format("insert into hrsa_salary_sys_conf(id, conf_key, conf_value, title, module, order_weight, delete_type, create_time, update_time) values (%s,'%s','%s','%s','%s',%s,%s,'%s','%s')", + String date = "'"+SalaryDateUtil.getFormatLocalDateTime(LocalDateTime.now())+"'"; + if(rs.getDBType().equalsIgnoreCase("oracle")){ + date = String.format("to_date(%s,'yyyy-mm-dd hh24:mi:ss')", date); + } + sql = String.format("insert into hrsa_salary_sys_conf(id, conf_key, conf_value, title, module, order_weight, delete_type, create_time, update_time) values (%s,'%s','%s','%s','%s',%s,%s,%s,%s)", IdGenerator.generate(), "SALARY_TOKEN_SECRET", secret, "token", "basic",0,0,date,date); rs.execute(sql); log.info("GetToken regist secret , sql: {}", sql); // 保存spk - sql = String.format("insert into hrsa_salary_sys_conf(id, conf_key, conf_value, title, module, order_weight, delete_type, create_time, update_time) values (%s,'%s','%s','%s','%s',%s,%s,'%s','%s')", + sql = String.format("insert into hrsa_salary_sys_conf(id, conf_key, conf_value, title, module, order_weight, delete_type, create_time, update_time) values (%s,'%s','%s','%s','%s',%s,%s,%s,%s)", IdGenerator.generate(), "SALARY_TOKEN_SPK", spk, "spk", "basic",0,0,date,date); rs.execute(sql); log.info("GetToken regist spk , sql: {}", sql);