Skip to content

Commit

Permalink
ressources externes
Browse files Browse the repository at this point in the history
  • Loading branch information
@khergalant
khergalant committed Sep 3, 2024
1 parent c9c2377 commit 737a2b7
Show file tree
Hide file tree
Showing 28 changed files with 840 additions and 172 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<!-- WS Apogee -->
<apo.ws.version>6.50.01</apo.ws.version>
<apo.ws.prod.version>6.50.01</apo.ws.prod.version>
<apo.ws-utils.version>1.0.3</apo.ws-utils.version>
<apo.ws-utils.version>1.0.4</apo.ws-utils.version>

<!-- Outils -->
<commons.beanutils.version>1.9.4</commons.beanutils.version>
Expand Down
14 changes: 8 additions & 6 deletions src/main/java/fr/univlorraine/ecandidat/config/LaunchAppConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ private void preprocessVersions() {
public void preprocessTemplate() {
try {
logger.info("Generation du report");
// InputStream in = getClass().getResourceAsStream("/template/"+ConstanteUtils.TEMPLATE_DOSSIER+ConstanteUtils.TEMPLATE_EXTENSION);
final InputStream in = MethodUtils.getInputStream(configController.getXDocReportTemplate(ConstanteUtils.TEMPLATE_DOSSIER, null, null));
final IXDocReport report = XDocReportRegistry.getRegistry().loadReport(in, TemplateEngineKind.Velocity);
final ByteArrayOutputStream out = new ByteArrayOutputStream();
Expand Down Expand Up @@ -205,11 +204,14 @@ private void preprocessConfigUrlServicesLocation() {
try {
if (StringUtils.isNotBlank(externalRessource)) {
final String path = externalRessource + ConstanteUtils.EXTERNAL_RESSOURCE_SISCOL_FOLDER + File.separator;
final File fileExternal = new File(path);
if (fileExternal.exists() && fileExternal.isDirectory()) {
logger.info("Definition repertoire des fichiers d'URL Siscol : " + path);
System.setProperty(WSUtils.PROPERTY_FILE_PATH, path);
}
logger.info("Definition repertoire des fichiers d'URL Siscol : " + path);
WSUtils.setPropertyFilePath(path);
//System.setProperty(WSUtils.PROPERTY_FILE_PATH, path);
// final File fileExternal = new File(path);
// if (fileExternal.exists() && fileExternal.isDirectory()) {
// logger.info("Definition repertoire des fichiers d'URL Siscol : " + path);
// System.setProperty(WSUtils.PROPERTY_FILE_PATH, path);
// }
}
} catch (final Exception e) {
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/fr/univlorraine/ecandidat/config/SpringConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,10 @@ public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderCon
@Bean
public ReloadableResourceBundleMessageSource messageSource() {
final ReloadableResourceBundleMessageSource resourceBundleMessageSource = new ReloadableResourceBundleMessageSource();
/* Si on a des ressources externes, on doit avoir 2 fichiers de message custom sinon ils ne seront pas rechargés.. */
/* Tentative de chargement d'un fichier externe */
final File fileExternal = MethodUtils.getExternalResource(externalRessource, ConstanteUtils.EXTERNAL_RESSOURCE_I18N_FOLDER, ConstanteUtils.EXTERNAL_RESSOURCE_I18N_FILE);
final File fileExternal = MethodUtils.getOrCreateExternalResource(externalRessource, ConstanteUtils.EXTERNAL_RESSOURCE_I18N_FOLDER, ConstanteUtils.EXTERNAL_RESSOURCE_I18N_FILE);
MethodUtils.getOrCreateExternalResource(externalRessource, ConstanteUtils.EXTERNAL_RESSOURCE_I18N_FOLDER, ConstanteUtils.EXTERNAL_RESSOURCE_I18N_EN_FILE);
if (fileExternal != null) {
resourceBundleMessageSource.addBasenames("file:" + fileExternal.getPath().replaceAll(".properties", ""));
}
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/fr/univlorraine/ecandidat/controllers/CacheController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.CacheManager;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ReloadableResourceBundleMessageSource;
import org.springframework.stereotype.Component;

import com.vaadin.ui.Notification;
Expand Down Expand Up @@ -63,6 +64,7 @@
import fr.univlorraine.ecandidat.entities.ecandidat.TypeStatut;
import fr.univlorraine.ecandidat.entities.ecandidat.TypeStatutPiece;
import fr.univlorraine.ecandidat.entities.ecandidat.TypeTraitement;
import fr.univlorraine.ecandidat.services.siscol.SiScolGenericService;
import fr.univlorraine.ecandidat.utils.ConcurrentCache;
import fr.univlorraine.ecandidat.utils.ConstanteUtils;
import fr.univlorraine.ecandidat.utils.bean.odf.OdfCtrCand;
Expand All @@ -81,6 +83,10 @@ public class CacheController {
@Resource
private transient ApplicationContext applicationContext;

/* Le service SI Scol */
@Resource(name = "${siscol.implementation}")
private SiScolGenericService siScolService;

@Resource
private transient LoadBalancingController loadBalancingController;
@Resource
Expand Down Expand Up @@ -108,6 +114,8 @@ public class CacheController {
@Resource
private transient ConfigController configController;
@Resource
private transient ReloadableResourceBundleMessageSource messageSource;
@Resource
private transient CacheController self;

@Autowired
Expand Down Expand Up @@ -1142,5 +1150,9 @@ public void invalidConfCache(final Boolean needToPushToCandidat) {
public void invalidRessourcesCache(final Boolean needToPushToCandidat) {
cacheManager.getCache(CacheConfig.CACHE_CONF_RESSOURCE).clear();
loadBalancingController.askToReloadData(ConstanteUtils.CACHE_SPRING_RESSOURCES, needToPushToCandidat);
/* Recharge les fichiers i18n */
messageSource.clearCache();
/* Recharge les fichiers i18n */
siScolService.resetServices();
}
}
4 changes: 1 addition & 3 deletions src/main/java/fr/univlorraine/ecandidat/controllers/CandidatureCtrCandController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,6 @@ public class CandidatureCtrCandController {
private transient ParametreController parametreController;
@Resource
private transient ExportController exportController;
@Resource
private transient ConfigController configController;

/* Le service SI Scol */
@Resource(name = "${siscol.implementation}")
Expand Down Expand Up @@ -1136,7 +1134,7 @@ private OnDemandFile generateExport(final String code,
for (final CandidatCursusInterne cursus : candidat.getCandidatCursusInternes()) {
if (cursus.getAnneeUnivCursusInterne() > annee) {
annee = cursus.getAnneeUnivCursusInterne();
lastEtab = configController.getConfigEtab(locale).getNom().toUpperCase();
lastEtab = applicationContext.getMessage("universite.title", null, UI.getCurrent().getLocale());
lastDiplome = cursus.getLibCursusInterne();
}
}
Expand Down
152 changes: 112 additions & 40 deletions src/main/java/fr/univlorraine/ecandidat/controllers/ConfigController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Base64;
Expand All @@ -36,6 +40,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Component;

import com.vaadin.server.FileResource;
Expand All @@ -44,17 +49,20 @@
import com.vaadin.ui.Notification.Type;
import com.vaadin.ui.UI;

import fr.univlorraine.apowsutils.WSUtils;
import fr.univlorraine.ecandidat.config.CacheConfig;
import fr.univlorraine.ecandidat.entities.ecandidat.Configuration;
import fr.univlorraine.ecandidat.repositories.ConfigurationRepository;
import fr.univlorraine.ecandidat.services.file.FileCustom;
import fr.univlorraine.ecandidat.services.file.FileException;
import fr.univlorraine.ecandidat.services.siscol.SiScolGenericService;
import fr.univlorraine.ecandidat.utils.ByteArrayInOutStream;
import fr.univlorraine.ecandidat.utils.ConstanteUtils;
import fr.univlorraine.ecandidat.utils.CryptoUtils;
import fr.univlorraine.ecandidat.utils.MethodUtils;
import fr.univlorraine.ecandidat.utils.bean.config.ConfigEtab;
import fr.univlorraine.ecandidat.utils.bean.config.ConfigPegaseAuthEtab;
import fr.univlorraine.ecandidat.utils.bean.config.ConfigPegaseUrl;
import fr.univlorraine.ecandidat.utils.bean.presentation.ConfigStaticTablePresentation;
import fr.univlorraine.ecandidat.utils.bean.presentation.SimpleTablePresentation;

/**
Expand Down Expand Up @@ -141,17 +149,18 @@ public void loadConfigCache() {
@Cacheable(value = CacheConfig.CACHE_CONF_RESSOURCE, cacheManager = CacheConfig.CACHE_MANAGER_NAME)
public Properties getPropertiesPegase() {
final Properties properties = new Properties();
final String systemPropertyConfigLoc = System.getProperty(WSUtils.PROPERTY_FILE_PATH);

/* On cherche le fichier de properties dans le filesystem avec le paramètre système PROPERTY_FILE_PATH */
if (systemPropertyConfigLoc != null) {
if (StringUtils.isNotBlank(externalRessource)) {
final String configLocation = externalRessource + ConstanteUtils.EXTERNAL_RESSOURCE_SISCOL_FOLDER + File.separator;
try {
FileInputStream file;
if (Files.isDirectory(Paths.get(systemPropertyConfigLoc))) {
if (Files.isDirectory(Paths.get(configLocation))) {
/* Dans ce cas on est dans un dossier et on recherche configUrlServices.properties dans ce dossier */
file = new FileInputStream(systemPropertyConfigLoc + ConstanteUtils.PROPERTY_FILE_PEGASE_URL);
file = new FileInputStream(configLocation + ConstanteUtils.PROPERTY_FILE_PEGASE_URL);
} else {
/* Dans ce cas le fichier est déclaré */
file = new FileInputStream(systemPropertyConfigLoc);
file = new FileInputStream(configLocation);
}
properties.load(file);
file.close();
Expand Down Expand Up @@ -247,7 +256,7 @@ public byte[] getXDocReportTemplate(final String fileNameDefault, final String c
*/
@Cacheable(value = CacheConfig.CACHE_CONF_RESSOURCE, cacheManager = CacheConfig.CACHE_MANAGER_NAME)
public byte[] getXDocReportTemplate(final String fileNameDefault, final String codeLangue, final String codLangueDefault, final String subPath) {
String resourcePath = File.separator + ConstanteUtils.TEMPLATE_PATH + File.separator;
String resourcePath = ConstanteUtils.TEMPLATE_PATH + File.separator;
if (subPath != null) {
resourcePath = resourcePath + subPath + File.separator;
}
Expand Down Expand Up @@ -279,24 +288,24 @@ public byte[] getXDocReportTemplate(final String fileNameDefault, final String c
/* Recherche dans le classpath */
/* On essaye de trouver le template lié à la langue */
if (codeLangue != null && !codeLangue.equals(codLangueDefault)) {
final InputStream in = MethodUtils.class.getResourceAsStream(resourcePath + fileNameDefault + "_" + codeLangue + extension);
if (in != null) {
try {
logger.debug("Demande de template ClassPath : " + resourcePath + fileNameDefault + "_" + codeLangue + extension);
try {
final InputStream in = new ClassPathResource(resourcePath + fileNameDefault + "_" + codeLangue + extension).getInputStream();
if (in != null) {
logger.debug("Demande de template Classpath : " + resourcePath + fileNameDefault + "_" + codeLangue + extension);
return in.readAllBytes();
} catch (final Exception e) {
}
} catch (final Exception e) {
}
}

/* Template langue non trouvé, on utilise le template par défaut */
final InputStream in = MethodUtils.class.getResourceAsStream(resourcePath + fileNameDefault + extension);
if (in != null) {
try {
try {
final InputStream in = new ClassPathResource(resourcePath + fileNameDefault + extension).getInputStream();
if (in != null) {
logger.debug("Demande de template Classpath : " + resourcePath + fileNameDefault + extension);
return in.readAllBytes();
} catch (final Exception e) {
}
} catch (final Exception e) {
}
String error = "Impossible de trouver le fichier " + fileNameDefault + (codeLangue != null ? ("_" + codeLangue) : "") + extension;
if (codeLangue != null) {
Expand All @@ -320,8 +329,6 @@ public String getConfigurationByCod(final List<Configuration> list, final String
public ConfigEtab loadConfigEtab() {
final List<Configuration> list = configurationRepository.findByCodConfigStartsWith(Configuration.COD_CONFIG_ETAB);
final ConfigEtab config = new ConfigEtab();
config.setNom(getConfigurationByCod(list, Configuration.COD_CONFIG_ETAB_NOM));
config.setCnil(getConfigurationByCod(list, Configuration.COD_CONFIG_ETAB_CNIL));
config.setAssistDocUrl(getConfigurationByCod(list, Configuration.COD_CONFIG_ETAB_ASSIST_DOC_URL));
config.setAssistDocUrlCand(getConfigurationByCod(list, Configuration.COD_CONFIG_ETAB_ASSIST_DOC_URL_CAND));
config.setAssistDocUrlCandEn(getConfigurationByCod(list, Configuration.COD_CONFIG_ETAB_ASSIST_DOC_URL_CAND_EN));
Expand All @@ -340,8 +347,6 @@ public ConfigEtab loadConfigEtab() {
public List<SimpleTablePresentation> getConfigEtabPresentation() {
final List<SimpleTablePresentation> list = new ArrayList<>();
final ConfigEtab config = loadConfigEtab();
list.add(new SimpleTablePresentation(Configuration.COD_CONFIG_ETAB_NOM, applicationContext.getMessage("config.etab.table.nom", null, UI.getCurrent().getLocale()), config.getNom()));
list.add(new SimpleTablePresentation(Configuration.COD_CONFIG_ETAB_CNIL, applicationContext.getMessage("config.etab.table.cnil", null, UI.getCurrent().getLocale()), config.getCnil()));
list.add(new SimpleTablePresentation(Configuration.COD_CONFIG_ETAB_ASSIST_DOC_URL, applicationContext.getMessage("config.etab.table.assistDocUrl", null, UI.getCurrent().getLocale()), config.getAssistDocUrl()));
list.add(new SimpleTablePresentation(Configuration.COD_CONFIG_ETAB_ASSIST_DOC_URL_CAND, applicationContext.getMessage("config.etab.table.assistDocUrlCand", null, UI.getCurrent().getLocale()),
config.getAssistDocUrlCand()));
Expand All @@ -361,12 +366,6 @@ public List<SimpleTablePresentation> getConfigEtabPresentation() {
* @param configPegaseUrl
*/
public void saveConfigEtab(final ConfigEtab config) {
/* Enregistrement du nom */
saveConfigEtabItem(config.getNom(), Configuration.COD_CONFIG_ETAB_NOM);

/* Enregistrement mention CNIL */
saveConfigEtabItem(config.getCnil(), Configuration.COD_CONFIG_ETAB_CNIL);

/* Enregistrement Url assistance */
saveConfigEtabItem(config.getAssistDocUrl(), Configuration.COD_CONFIG_ETAB_ASSIST_DOC_URL);

Expand Down Expand Up @@ -411,20 +410,6 @@ private void saveConfigEtabItem(final String value, final String code) {
@Cacheable(value = CacheConfig.CACHE_CONF_ETAB, cacheManager = CacheConfig.CACHE_MANAGER_NAME)
public ConfigEtab getConfigEtab(final Locale locale) {
final ConfigEtab config = loadConfigEtab();
/* Nom etablissement */
if (StringUtils.isBlank(config.getNom())) {
try {
config.setNom(applicationContext.getMessage("universite.title", null, locale));
} catch (final Exception e) {
}
}
/* Mention cnil page d'accueil */
if (StringUtils.isBlank(config.getCnil())) {
try {
config.setCnil(applicationContext.getMessage("cnil.mention", null, locale));
} catch (final Exception e) {
}
}
/* Page d'assistance */
if (StringUtils.isBlank(config.getAssistDocUrl())) {
config.setAssistDocUrl(assistDocUrl);
Expand Down Expand Up @@ -637,4 +622,91 @@ public ConfigPegaseUrl getConfigPegaseUrl() {
}
}
}

public List<ConfigStaticTablePresentation> getConfigStaticPresentation() {
final List<ConfigStaticTablePresentation> list = new ArrayList<>();

/* Fichier de logo */
list.add(new ConfigStaticTablePresentation(Configuration.COD_CONFIG_ETAB_STATIC_LOGO, ConstanteUtils.EXTERNAL_RESSOURCE_IMG_LOGO_FILE,
applicationContext.getMessage("config.etab.static.logo", null, UI.getCurrent().getLocale()), externalRessource,
ConstanteUtils.EXTERNAL_RESSOURCE_IMG_FOLDER, "png"));

/* Fichier de favicon */
list.add(new ConfigStaticTablePresentation(Configuration.COD_CONFIG_ETAB_STATIC_FAVICON, ConstanteUtils.EXTERNAL_RESSOURCE_IMG_FAV_FILE,
applicationContext.getMessage("config.etab.static.favicon", null, UI.getCurrent().getLocale()), externalRessource,
ConstanteUtils.EXTERNAL_RESSOURCE_IMG_FOLDER, "ico"));

/* Fichier de message */
list.add(new ConfigStaticTablePresentation(Configuration.COD_CONFIG_ETAB_STATIC_MESSAGE, ConstanteUtils.EXTERNAL_RESSOURCE_I18N_FILE,
applicationContext.getMessage("config.etab.static.msg", null, UI.getCurrent().getLocale()), externalRessource,
ConstanteUtils.EXTERNAL_RESSOURCE_I18N_FOLDER, "properties"));

/* Fichier de message langue anglaise */
list.add(new ConfigStaticTablePresentation(Configuration.COD_CONFIG_ETAB_STATIC_MESSAGE_EN, ConstanteUtils.EXTERNAL_RESSOURCE_I18N_EN_FILE,
applicationContext.getMessage("config.etab.static.msg-en", null, UI.getCurrent().getLocale()), externalRessource,
ConstanteUtils.EXTERNAL_RESSOURCE_I18N_FOLDER, "properties"));

/* Fichier de template dossier */
list.add(new ConfigStaticTablePresentation(Configuration.COD_CONFIG_ETAB_STATIC_TEMPLATE_DOSSIER, ConstanteUtils.TEMPLATE_DOSSIER + ConstanteUtils.TEMPLATE_EXTENSION,
applicationContext.getMessage("config.etab.static.dossier", null, UI.getCurrent().getLocale()), externalRessource,
ConstanteUtils.TEMPLATE_PATH, "docx"));

/* Fichier de template de lettre d'admission */
list.add(new ConfigStaticTablePresentation(Configuration.COD_CONFIG_ETAB_STATIC_TEMPLATE_LETTRE_ADM, ConstanteUtils.TEMPLATE_LETTRE_ADM + ConstanteUtils.TEMPLATE_EXTENSION,
applicationContext.getMessage("config.etab.static.lettre-adm", null, UI.getCurrent().getLocale()), externalRessource,
ConstanteUtils.TEMPLATE_PATH, "docx"));

/* Fichier de template de lettre de refus */
list.add(new ConfigStaticTablePresentation(Configuration.COD_CONFIG_ETAB_STATIC_TEMPLATE_LETTRE_REFUS, ConstanteUtils.TEMPLATE_LETTRE_REFUS + ConstanteUtils.TEMPLATE_EXTENSION,
applicationContext.getMessage("config.etab.static.lettre-refus", null, UI.getCurrent().getLocale()), externalRessource,
ConstanteUtils.TEMPLATE_PATH, "docx"));

/* Fichier de config SiScol Apogée */
list.add(new ConfigStaticTablePresentation(Configuration.COD_CONFIG_ETAB_STATIC_SISCOL_CONFIG_APO, ConstanteUtils.WS_APOGEE_PROP_FILE + ConstanteUtils.WS_APOGEE_PROP_EXTENSION,
applicationContext.getMessage("config.etab.static.siscol-config-apo", null, UI.getCurrent().getLocale()), externalRessource,
ConstanteUtils.EXTERNAL_RESSOURCE_SISCOL_FOLDER, "properties"));
return list;
}

public FileCustom createExternalFileFromUpload(final ByteArrayInOutStream file, final ConfigStaticTablePresentation ressourceStatic) throws FileException {
String path = externalRessource
+ (externalRessource.endsWith(File.separator) ? "" : File.separator)
+ File.separator
+ ressourceStatic.getExternalRessourceFolder()
+ File.separator;

/* Creation du chemin de fichiers */
try {
final Path directory = Paths.get(path);
Files.createDirectories(directory);
} catch (final IOException e) {
logger.error("Stockage de fichier - FileSystem : erreur de creation du fichier ", e);
MethodUtils.closeRessource(file);
throw new FileException(applicationContext.getMessage("file.error.create", null, UI.getCurrent().getLocale()), e);
}

path = path + ressourceStatic.getFileName();
OutputStream outputStream = null;
try {
outputStream = new FileOutputStream(path);
file.writeTo(outputStream);
} catch (final Exception e) {
logger.error("Stockage de fichier - FileSystem : erreur de creation du fichier ", e);
throw new FileException(applicationContext.getMessage("file.error.create", null, UI.getCurrent().getLocale()), e);
} finally {
MethodUtils.closeRessource(outputStream);
MethodUtils.closeRessource(file);
}
/* On vérifie que le fichier a bien été créé, sinon, erreur!! */
if (!MethodUtils.checkFileExists(path)) {
throw new FileException(applicationContext.getMessage("file.error.create", null, UI.getCurrent().getLocale()));
}
cacheController.invalidRessourcesCache(true);
return new FileCustom(ressourceStatic.getFileName());
}

public void deleteExternalFile(final ConfigStaticTablePresentation ressourceStatic) {
ressourceStatic.getFile().delete();
cacheController.invalidRessourcesCache(true);
}
}
Loading

0 comments on commit 737a2b7

Please sign in to comment.