This commit is contained in:
2026-10-17 09:45:00 +03:30
parent dd39844c02
commit 3f72861b64
8 changed files with 79 additions and 35 deletions

View File

@@ -406,31 +406,30 @@ public class Initializer {
sipUserGroupsRepository.save(userGroup);
}
for (int i = 1001; i <= 1050; i++) {
if (sipUsersRepository.findByUid(String.valueOf(i)).isPresent()) {
continue;
if (sipUsersRepository.count() == 0) {
for (int i = 1001; i <= 1050; i++) {
var user = new TblSipUser();
user.setAcl("");
user.setUid(String.valueOf(i));
user.setPassword(GlobalTools.getRandomString(12));
if (i > 1024)
user.setSipProfile(profileWebrtc);
else
user.setSipProfile(profileU);
user.setSipUserGroup(userGroup);
user.setCallerIdName(i + "");
user.setCallerIdNumber(String.valueOf(i));
user.setOutboundCallerIdName("[uid]");
user.setOutboundCallerIdNumber(appName + "-[uid]");
var conflicts = dialableNumberConflictService.validateSipUser(user.getUid(), null);
if (conflicts.isEmpty()) {
sipUsersRepository.save(user);
} else {
plineTools.plineLogger("Default SIP User UID conflicts with another dialable number ("
+ user.getUid() + "): " + String.join(", ", conflicts));
}
}
var user = new TblSipUser();
user.setAcl("");
user.setUid(String.valueOf(i));
user.setPassword(GlobalTools.getRandomString(12));
if (i > 1024)
user.setSipProfile(profileWebrtc);
else
user.setSipProfile(profileU);
user.setSipUserGroup(userGroup);
user.setCallerIdName(i + "");
user.setCallerIdNumber(String.valueOf(i));
user.setOutboundCallerIdName("[uid]");
user.setOutboundCallerIdNumber(appName + "-[uid]");
var conflicts = dialableNumberConflictService.validateSipUser(user.getUid(), null);
if (conflicts.isEmpty()) {
sipUsersRepository.save(user);
} else {
plineTools.plineLogger("Default SIP User UID conflicts with another dialable number ("
+ user.getUid() + "): " + String.join(", ", conflicts));
}
}
}
// This block can run again when any default SIP entity is missing.
// Keep default media initialization idempotent and preserve customer files.

View File

@@ -223,7 +223,7 @@ public class SipFileGenerator {
}
private void createSipTrunks() {
int[] trunkLicense = new int[] { licenseService.getLimit("sip_trunk") };
int[] trunkLicense = new int[] { licenseService.getLimit("sip_trunk") };
var listTrunks = sipTrunkRepository.findAllEnableProfiles(true);
String path = plineTools.getConfigPath() + "sip-trunks/";
@@ -233,7 +233,7 @@ public class SipFileGenerator {
int[] cntTrunk = new int[] { 0 };
listTrunks.forEach(x -> {
if (trunkLicense[0] >= 0 && cntTrunk[0]++ >= trunkLicense[0]) {
if (trunkLicense[0] >= 0 && cntTrunk[0]++ >= trunkLicense[0]) {
return;
}
@@ -392,6 +392,12 @@ public class SipFileGenerator {
}
plineTools.writeInfoFile("sip-trunks", "sip-trunk-" + x.getId(), ics);
});
if (listTrunks.isEmpty()) {
InfoConfiguration info = new InfoConfiguration();
info.setBanner(true);
plineTools.writeInfoFile("sip-trunks", "sip-trunk-0", info);
}
}
private void createSip() {
@@ -408,7 +414,7 @@ public class SipFileGenerator {
private void createSipUsers() {
int[] sipUserLicense = new int[] { licenseService.getLimit("sip_users") };
int[] sipUserLicense = new int[] { licenseService.getLimit("sip_users") };
var listExtensions = sipUsersRepository.findAllEnableProfiles(true);
String path = plineTools.getConfigPath() + "sip-users/";
@@ -418,7 +424,7 @@ public class SipFileGenerator {
int[] cntSipUser = new int[] { 0 };
listExtensions.forEach(x -> {
if (sipUserLicense[0] >= 0 && cntSipUser[0]++ >= sipUserLicense[0]) {
if (sipUserLicense[0] >= 0 && cntSipUser[0]++ >= sipUserLicense[0]) {
return;
}
List<InfoConfiguration> ics = new ArrayList<>();
@@ -483,4 +489,4 @@ public class SipFileGenerator {
});
}
}
}