qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/个税版本' into release/个税&业务线 

# Conflicts:
#	resource/WEB-INF/prop/hrmSalary.properties
This commit is contained in:
钱涛 2026-01-16 14:46:55 +08:00
parent c0389245d4 84c504be59
commit b3531e4c9e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/WEB-INF/prop/hrmSalary.properties
View File

@ -1,5 +1,5 @@
log=false log=false
defaultCloseNonStandard149=true defaultCloseNonStandard149=true
AESEncryptScrect=990EB004A1C862721C1513AE90038C9E AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
version=3.0.2.2510.01 version=3.0.2.2510.01.t
openFormulaForcedEditing=false openFormulaForcedEditing=false

9
src/com/engine/salary/util/SalaryTokenUtil.java
View File

@ -141,13 +141,16 @@ public class SalaryTokenUtil {
// 对秘钥进行加密传输，防止篡改数据 // 对秘钥进行加密传输，防止篡改数据
secret = rsa.encrypt(null, (String) (datas.get("secrit")), null, "utf-8", spk, false); secret = rsa.encrypt(null, (String) (datas.get("secrit")), null, "utf-8", spk, false);
// secret存库 // secret存库
String date = SalaryDateUtil.getFormatLocalDateTime(LocalDateTime.now()); 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')", 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); IdGenerator.generate(), "SALARY_TOKEN_SECRET", secret, "token", "basic",0,0,date,date);
rs.execute(sql); rs.execute(sql);
log.info("GetToken regist secret , sql: {}", sql); log.info("GetToken regist secret , sql: {}", sql);
// 保存spk // 保存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); IdGenerator.generate(), "SALARY_TOKEN_SPK", spk, "spk", "basic",0,0,date,date);
rs.execute(sql); rs.execute(sql);
log.info("GetToken regist spk , sql: {}", sql); log.info("GetToken regist spk , sql: {}", sql);