Skip to content

Commit 72f0c28

Browse files
vanitha1822vanitha1822
authored
Fix the OpenKM Issue (#389)
* fix: remove km in application.properties * fix: update all the properties to fetch from env * fix: update path * fix: KM issue * fix: get file from km * fix: build issue * fix: build issue * fix: remove unwanted imports * fix: build issue * fix: remove commented line * Enable KM configuration in common_example.properties Uncomment KM configuration properties for OpenKM.
1 parent eec7cfe commit 72f0c28

11 files changed

Lines changed: 113 additions & 69 deletions

File tree

‎src/main/environment/common_example.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ km-root-path=/okm:personal/users/
2525
km-guest-user=guest
2626
km-guest-password=guest
2727

28+
tempFilePath=/tmp
29+
2830
# CTI Config
2931
cti-server-ip=10.208.122.99
3032
cti-logger_base_url=http://10.208.122.99/logger

‎src/main/java/com/iemr/common/CommonApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
@SpringBootApplication
4343
@EnableScheduling
44-
@EnableAsync
44+
@EnableAsync(proxyTargetClass = true)
4545
public class CommonApplication extends SpringBootServletInitializer {
4646

4747
@Bean

‎src/main/java/com/iemr/common/service/cti/CTIServiceImpl.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.slf4j.Logger;
2727
import org.slf4j.LoggerFactory;
2828
import org.springframework.beans.factory.annotation.Autowired;
29+
import org.springframework.context.annotation.Lazy;
2930
import org.springframework.scheduling.annotation.Async;
3031
import org.springframework.stereotype.Service;
3132

@@ -90,6 +91,7 @@ public class CTIServiceImpl implements CTIService {
9091
@Autowired
9192
private BeneficiaryCallRepository beneficiaryCallRepository;
9293

94+
@Lazy
9395
@Autowired
9496
private CTIService ctiService;
9597

‎src/main/java/com/iemr/common/service/feedback/FeedbackServiceImpl.java‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.slf4j.Logger;
3737
import org.slf4j.LoggerFactory;
3838
import org.springframework.beans.factory.annotation.Autowired;
39+
import org.springframework.beans.factory.annotation.Value;
3940
import org.springframework.scheduling.annotation.Async;
4041
import org.springframework.stereotype.Service;
4142

@@ -104,6 +105,19 @@ public class FeedbackServiceImpl implements FeedbackService {
104105
private Logger logger = LoggerFactory.getLogger(FeedbackServiceImpl.class);
105106
// private ExecutorService executor = Executors.newCachedThreadPool();
106107

108+
109+
@Value("${km-base-path}")
110+
private String dmsPath;
111+
112+
@Value("${km-guest-user}")
113+
private String userName;
114+
115+
@Value("${km-guest-password}")
116+
private String userPassword;
117+
118+
@Value("${km-base-protocol}")
119+
private String dmsProtocol;
120+
107121
@Autowired
108122
private T_EpidemicOutbreakRepo t_EpidemicOutbreakRepo;
109123

@@ -736,10 +750,7 @@ private String getFilePath(KMFileManager kmFileManager) {
736750
String fileUIDAsURI = null;
737751
if (kmFileManager != null && kmFileManager.getFileUID() != null) {
738752
String fileUID = kmFileManager.getFileUID();
739-
String dmsPath = ConfigProperties.getPropertyByName("km-base-path");
740-
String dmsProtocol = ConfigProperties.getPropertyByName("km-base-protocol");
741-
String userName = ConfigProperties.getPropertyByName("km-guest-user");
742-
String userPassword = ConfigProperties.getPassword("km-guest-user");
753+
743754
fileUIDAsURI = dmsProtocol + "://" + userName + ":" + userPassword + "@" + dmsPath + "/Download?uuid="
744755
+ fileUID;
745756
}

‎src/main/java/com/iemr/common/service/notification/NotificationServiceImpl.java‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.slf4j.Logger;
3939
import org.slf4j.LoggerFactory;
4040
import org.springframework.beans.factory.annotation.Autowired;
41+
import org.springframework.beans.factory.annotation.Value;
4142
import org.springframework.stereotype.Service;
4243

4344
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -70,6 +71,19 @@ public class NotificationServiceImpl implements NotificationService
7071

7172
private EmailService emailService;
7273

74+
75+
@Value("${km-base-path}")
76+
private String dmsPath;
77+
78+
@Value("${km-guest-user}")
79+
private String userName;
80+
81+
@Value("${km-guest-password}")
82+
private String userPassword;
83+
84+
@Value("${km-base-protocol}")
85+
private String dmsProtocol;
86+
7387
@Autowired
7488
public void setEmailService(EmailService emailService)
7589
{
@@ -415,10 +429,7 @@ private String getFilePath(KMFileManager kmFileManager)
415429
if (kmFileManager != null && kmFileManager.getFileUID() != null)
416430
{
417431
String fileUID = kmFileManager.getFileUID();
418-
String dmsPath = ConfigProperties.getPropertyByName("km-base-path");
419-
String dmsProtocol = ConfigProperties.getPropertyByName("km-base-protocol");
420-
String userName = ConfigProperties.getPropertyByName("km-guest-user");
421-
String userPassword = ConfigProperties.getPassword("km-guest-user");
432+
422433
fileUIDAsURI =
423434
dmsProtocol + "://" + userName + ":" + userPassword + "@" + dmsPath + "/Download?uuid=" + fileUID;
424435
}

‎src/main/java/com/iemr/common/service/scheme/SchemeServiceImpl.java‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.slf4j.Logger;
3131
import org.slf4j.LoggerFactory;
3232
import org.springframework.beans.factory.annotation.Autowired;
33+
import org.springframework.beans.factory.annotation.Value;
3334
import org.springframework.stereotype.Service;
3435

3536
import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -59,6 +60,18 @@ public class SchemeServiceImpl implements SchemeService {
5960

6061
private KMFileManagerService kmFileManagerService;
6162

63+
@Value("${km-api-base-protocol}")
64+
private String dmsProtocol;
65+
66+
@Value("${km-api-base-url}")
67+
private String dmsPath;
68+
69+
@Value("${km-guest-user}")
70+
private String userName;
71+
72+
@Value("${km-guest-password}")
73+
private String userPassword;
74+
6275
@Autowired
6376
public void setKmFileManagerService(KMFileManagerService kmFileManagerService) {
6477
this.kmFileManagerService = kmFileManagerService;
@@ -104,16 +117,13 @@ public String getFilePath(KMFileManager kmFileManager) {
104117
String fileUIDAsURI = null;
105118
if (kmFileManager != null && kmFileManager.getFileUID() != null) {
106119
String fileUID = kmFileManager.getFileUID();
107-
String dmsPath = ConfigProperties.getPropertyByName("km-base-path");
108-
String dmsProtocol = ConfigProperties.getPropertyByName("km-base-protocol");
109-
String userName = ConfigProperties.getPropertyByName("km-guest-user");
110-
String userPassword = ConfigProperties.getPassword("km-guest-user");
120+
111121
fileUIDAsURI = dmsProtocol + "://" + userName + ":" + userPassword + "@" + dmsPath + "/Download?uuid="
112122
+ fileUID;
113123
}
114-
// return fileUIDAsURI;
115-
String message = kmFileManager.getFileUID() ;
116-
return message;
124+
return fileUIDAsURI;
125+
// String message = kmFileManager.getFileUID() ;
126+
// return message;
117127
}
118128

119129
@Override

‎src/main/java/com/iemr/common/service/services/CommonServiceImpl.java‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,19 @@
6464
public class CommonServiceImpl implements CommonService {
6565

6666
private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
67+
68+
@Value("${km-base-path}")
69+
private String dmsPath;
70+
71+
@Value("${km-guest-user}")
72+
private String userName;
6773

74+
@Value("${km-guest-password}")
75+
private String userPassword;
76+
77+
@Value("${km-base-protocol}")
78+
private String dmsProtocol;
79+
6880
private static final String FILE_PATH = "filePath";
6981

7082
/**
@@ -177,10 +189,6 @@ private String getFilePath(String fileUID)
177189
{
178190
String fileUIDAsURI = null;
179191

180-
String dmsPath = ConfigProperties.getPropertyByName("km-base-path");
181-
String dmsProtocol = ConfigProperties.getPropertyByName("km-base-protocol");
182-
String userName = ConfigProperties.getPropertyByName("km-guest-user");
183-
String userPassword = ConfigProperties.getPassword("km-guest-user");
184192
fileUIDAsURI =
185193
dmsProtocol + "://" + userName + ":" + userPassword + "@" + dmsPath + "/Download?uuid=" + fileUID;
186194

@@ -233,12 +241,13 @@ public List<SubCategoryDetails> getSubCategoryFilesWithURL(String request) throw
233241
SubCategoryDetails subCategory = subCategoriesList.get(index);
234242
if (subCategory.getSubCatFilePath() != null && subCategory.getSubCatFilePath().length() > 0) {
235243
String subCatFilePath = subCategory.getSubCatFilePath();
236-
String dmsPath = ConfigProperties.getPropertyByName("km-base-path");
237-
String dmsProtocol = ConfigProperties.getPropertyByName("km-base-protocol");
238-
String userName = ConfigProperties.getPropertyByName("km-guest-user");
239-
String userPassword = ConfigProperties.getPassword("km-guest-user");
240244
String fileUIDAsURI = dmsProtocol + "://" + userName + ":" + userPassword + "@" + dmsPath
241245
+ "/Download?uuid=" + subCategory.getSubCatFilePath();
246+
logger.info("file url="+fileUIDAsURI);
247+
logger.info("file path="+subCategory.getSubCatFilePath());
248+
logger.info("dms Path="+dmsPath);
249+
logger.info("subcatfilePath="+subCatFilePath);
250+
242251
subCategory.setSubCatFilePath(fileUIDAsURI);
243252
subCategoriesList.get(index).setFileManger(kmFileManagerRepository
244253
.getKMFileLists(subCategoryDetails.getProviderServiceMapID(), subCatFilePath));

‎src/main/java/com/iemr/common/utils/IEMRApplBeans.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
@Configuration
4141
public class IEMRApplBeans
4242
{
43-
@Bean
44-
public KMService getOpenKMService()
45-
{
46-
KMService kmService = new OpenKMServiceImpl();
47-
return kmService;
48-
}
43+
// @Bean
44+
// public KMService getOpenKMService()
45+
// {
46+
// KMService kmService = new OpenKMServiceImpl();
47+
// return kmService;
48+
// }
4949

5050
@Bean
5151
public Validator getVaidator()

‎src/main/java/com/iemr/common/utils/JwtAuthenticationUtil.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
import com.iemr.common.data.users.User;
1515
import com.iemr.common.repository.users.IEMRUserRepositoryCustom;
16-
import com.iemr.common.service.users.IEMRAdminUserServiceImpl;
1716
import com.iemr.common.utils.exception.IEMRException;
1817

1918
import io.jsonwebtoken.Claims;
@@ -32,9 +31,6 @@ public class JwtAuthenticationUtil {
3231
private IEMRUserRepositoryCustom iEMRUserRepositoryCustom;
3332
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
3433

35-
@Autowired
36-
private IEMRAdminUserServiceImpl iEMRAdminUserServiceImpl;
37-
3834
public JwtAuthenticationUtil(CookieUtil cookieUtil, JwtUtil jwtUtil) {
3935
this.cookieUtil = cookieUtil;
4036
this.jwtUtil = jwtUtil;

‎src/main/java/com/iemr/common/utils/km/openkm/OpenKMServiceImpl.java‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -46,44 +46,47 @@
4646
import com.openkm.sdk4j.exception.VirusDetectedException;
4747
import com.openkm.sdk4j.exception.WebserviceException;
4848

49-
import org.glassfish.jersey.client.ClientConfig;
50-
import org.glassfish.jersey.client.ClientProperties;
51-
import org.glassfish.jersey.client.JerseyClientBuilder;
49+
import jakarta.annotation.PostConstruct;
50+
5251
import org.slf4j.Logger;
5352
import org.slf4j.LoggerFactory;
53+
import org.springframework.beans.factory.annotation.Value;
54+
import org.springframework.context.annotation.Primary;
55+
import org.springframework.stereotype.Service;
56+
57+
@Service
5458
public class OpenKMServiceImpl implements KMService {
55-
// private ConfigProperties configProperties;
56-
//
57-
// @Autowired
58-
// public void setConfigProperties(ConfigProperties configProperties)
59-
// {
60-
// this.configProperties = configProperties;
61-
// }
59+
6260
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
63-
private static String url;
64-
private static String username;
65-
private static String password;
66-
private static String kmRootPath;
67-
private static String guestUser;
68-
private static String guestPassword;
61+
@Value("${km-base-url}")
62+
private String url;
63+
64+
@Value("${km-username}")
65+
private String username;
66+
67+
@Value("${km-password}")
68+
private String password;
69+
70+
@Value("${km-root-path}")
71+
private String kmRootPath;
72+
73+
@Value("${km-guest-user}")
74+
private String guestUser;
75+
76+
@Value("${km-guest-password}")
77+
private String guestPassword;
6978

7079
public OpenKMServiceImpl() {
7180
}
7281

73-
private static OKMWebservices connector = null;
82+
private OKMWebservices connector;
7483

84+
@PostConstruct
7585
public void init() {
76-
if (connector == null) {
77-
url = ConfigProperties.getPropertyByName("km-base-url");
78-
username = ConfigProperties.getPropertyByName("km-username");
79-
password = ConfigProperties.getPropertyByName("km-password");
80-
kmRootPath = ConfigProperties.getPropertyByName("km-root-path");
81-
guestUser = ConfigProperties.getPropertyByName("km-guest-user");
82-
guestPassword = ConfigProperties.getPropertyByName("km-guest-password");
83-
connector = OpenKMConnector.initialize(url, username, password);
86+
logger.info("KM URL=",url);
87+
connector = OpenKMConnector.initialize(url, username, password);
8488

85-
}
86-
}
89+
}
8790

8891
@Override
8992
public String getDocumentRoot() {

0 commit comments

Comments
 (0)