kangaroo-and-rabbit/archidata
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[DEV] correct now in sqlite and wrint time in jwt token

Browse Source
This commit is contained in:
Edouard DUPIN 2023-02-12 23:55:22 +01:00
parent 124b24e059
commit 956c120b47
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/org/kar/archidata/SqlWrapper.java
View File

@ -498,7 +498,8 @@ public class SqlWrapper {
query.append(name); query.append(name);
query.append("` = "); query.append("` = ");
if (updateTime) { if (updateTime) {
query.append(" now(3) "); query.append(getDBNow());
query.append(" ");
} else { } else {
query.append("? "); query.append("? ");
} }
@ -968,7 +969,7 @@ public class SqlWrapper {
try { try {
// prepare the request: // prepare the request:
String query = "INSERT INTO " + tableName + "_link_" + table + " (create_date, modify_date, " + tableName + "_id, " + table + "_id)" + String query = "INSERT INTO " + tableName + "_link_" + table + " (create_date, modify_date, " + tableName + "_id, " + table + "_id)" +
" VALUES (now(3), now(3), ?, ?)"; " VALUES (" + getDBNow() + ", " + getDBNow() + ", ?, ?)";
PreparedStatement ps = entry.connection.prepareStatement(query, PreparedStatement ps = entry.connection.prepareStatement(query,
Statement.RETURN_GENERATED_KEYS); Statement.RETURN_GENERATED_KEYS);
int iii = 1; int iii = 1;
@ -1002,7 +1003,7 @@ public class SqlWrapper {
public static void removeLink(Class<?> clazz, long localKey, String table, long remoteKey) throws Exception { public static void removeLink(Class<?> clazz, long localKey, String table, long remoteKey) throws Exception {
String tableName = getTableName(clazz); String tableName = getTableName(clazz);
DBEntry entry = new DBEntry(GlobalConfiguration.dbConfig); DBEntry entry = new DBEntry(GlobalConfiguration.dbConfig);
String query = "UPDATE `" + tableName + "_link_" + table + "` SET `modify_date`=now(3), `deleted`=true WHERE `" + tableName + "_id` = ? AND `" + table + "_id` = ?"; String query = "UPDATE `" + tableName + "_link_" + table + "` SET `modify_date`=" + getDBNow() + ", `deleted`=true WHERE `" + tableName + "_id` = ? AND `" + table + "_id` = ?";
try { try {
PreparedStatement ps = entry.connection.prepareStatement(query); PreparedStatement ps = entry.connection.prepareStatement(query);
int iii = 1; int iii = 1;
@ -1060,14 +1061,21 @@ public class SqlWrapper {
new WhereCondition("id", "=", id) new WhereCondition("id", "=", id)
)); ));
} }
public static String getDBNow() {
if (!ConfigBaseVariable.getDBType().equals("sqlite")) {
return "now(3)";
}
return "DATE()";
}
public static int setDeleteWhere(Class<?> clazz, List<WhereCondition> condition) throws Exception { public static int setDeleteWhere(Class<?> clazz, List<WhereCondition> condition) throws Exception {
String tableName = getTableName(clazz); String tableName = getTableName(clazz);
DBEntry entry = new DBEntry(GlobalConfiguration.dbConfig); DBEntry entry = new DBEntry(GlobalConfiguration.dbConfig);
StringBuilder query = new StringBuilder(); StringBuilder query = new StringBuilder();
query.append("UPDATE `"); query.append("UPDATE `");
query.append(tableName); query.append(tableName);
query.append("` SET `modify_date`=now(3), `deleted`=true "); query.append("` SET `modify_date`=");
query.append(getDBNow());
query.append(", `deleted`=true ");
whereAppendQuery(query, tableName, condition, false); whereAppendQuery(query, tableName, condition, false);
try { try {
PreparedStatement ps = entry.connection.prepareStatement(query.toString()); PreparedStatement ps = entry.connection.prepareStatement(query.toString());
@ -1093,7 +1101,9 @@ public class SqlWrapper {
StringBuilder query = new StringBuilder(); StringBuilder query = new StringBuilder();
query.append("UPDATE `"); query.append("UPDATE `");
query.append(tableName); query.append(tableName);
query.append("` SET `modify_date`=now(3), `deleted`=false "); query.append("` SET `modify_date`=");
query.append(getDBNow());
query.append(", `deleted`=false ");
whereAppendQuery(query, tableName, condition, false); whereAppendQuery(query, tableName, condition, false);
try { try {
PreparedStatement ps = entry.connection.prepareStatement(query.toString()); PreparedStatement ps = entry.connection.prepareStatement(query.toString());

2
src/org/kar/archidata/util/JWTWrapper.java
View File

@ -142,7 +142,7 @@ public class JWTWrapper {
.claim("application", application) .claim("application", application)
.issuer(isuer) .issuer(isuer)
.issueTime(new Date()) .issueTime(new Date())
.expirationTime(new Date(new Date().getTime() - 60 * timeOutInMunites * 1000 /* millisecond */)) // Do not ask why we need a "-" here ... this have no meaning .expirationTime(new Date(new Date().getTime() + 60 * timeOutInMunites * 1000 /* millisecond */)) // Do not ask why we need a "-" here ... this have no meaning
.build(); .build();
SignedJWT signedJWT = new SignedJWT(new JWSHeader.Builder(JWSAlgorithm.RS256).type(JOSEObjectType.JWT)/*.keyID(rsaJWK.getKeyID())*/.build(), claimsSet); SignedJWT signedJWT = new SignedJWT(new JWSHeader.Builder(JWSAlgorithm.RS256).type(JOSEObjectType.JWT)/*.keyID(rsaJWK.getKeyID())*/.build(), claimsSet);