Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
G3G4X5X6 committed Jul 8, 2024
1 parent e2080e3 commit 9397cc2
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions buildNumber.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#maven.buildNumber.plugin properties file
#Sat Jul 06 14:40:42 CST 2024
buildNumber=143
#Mon Jul 08 09:25:22 CST 2024
buildNumber=144
4 changes: 2 additions & 2 deletions ultimate-app/buildNumber.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#maven.buildNumber.plugin properties file
#Sat Jul 06 14:40:48 CST 2024
buildNumber=179
#Mon Jul 08 09:25:33 CST 2024
buildNumber=180
5 changes: 3 additions & 2 deletions ultimate-app/src/main/java/com/g3g4x5x6/AppConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Properties;


@Slf4j
Expand Down Expand Up @@ -125,11 +126,11 @@ public static void saveSettingsProperties() {
try {
StringBuilder settingsText = new StringBuilder();
BufferedReader reader = new BufferedReader(new FileReader(getPropertiesPath()));
String line = "";
String line;
while ((line = reader.readLine()) != null) {
if (!line.startsWith("#") && !line.isBlank()) {
String key = line.strip().split("=")[0];
line = key + "=" + (App.properties.getProperty(key) != null ? App.properties.getProperty(key) : line.strip().split("=")[1]);
line = key + "=" + App.properties.getProperty(key, "");
}
settingsText.append(line).append("\n");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ public class VaultUtil {
private static String secretKey = AppConfig.getProperty("ssh.session.secret.key");

static {
if (secretKey.equals("")) {
if (secretKey.isEmpty()) {
//随机生成密钥
byte[] key = SecureUtil.generateKey(SymmetricAlgorithm.AES.getValue()).getEncoded();
secretKey = bytesToHex(key);
AppConfig.setProperty("ssh.session.secret.key", secretKey);
AppConfig.saveSettingsProperties();
log.debug("secretKey: " + secretKey);
log.debug("secretKey: {}", secretKey);
}
}

Expand Down
4 changes: 2 additions & 2 deletions ultimate-editor/buildNumber.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#maven.buildNumber.plugin properties file
#Sat Jul 06 14:40:43 CST 2024
buildNumber=147
#Mon Jul 08 09:25:26 CST 2024
buildNumber=148

0 comments on commit 9397cc2

Please sign in to comment.