diff --git a/src/main/java/com/gcc/erppostdata/common/MySchduler.java b/src/main/java/com/gcc/erppostdata/common/MySchduler.java index d693c67..247e7eb 100644 --- a/src/main/java/com/gcc/erppostdata/common/MySchduler.java +++ b/src/main/java/com/gcc/erppostdata/common/MySchduler.java @@ -6,6 +6,8 @@ import com.gcc.erppostdata.petregistration.PetQueryBank; import com.gcc.erppostdata.repo.CommunityHallLogRepo; import com.gcc.erppostdata.repo.CoworkLogRepo; import com.gcc.erppostdata.repo.PetLogRepo; +import com.gcc.erppostdata.repo.SwimLogRepo; +import com.gcc.erppostdata.swimmingpool.SwimQueryBank; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; @@ -38,53 +40,78 @@ public class MySchduler { @Autowired CoworkQueryBank coworkQueryBank; + @Autowired + SwimLogRepo swimLogRepo; + + @Autowired + SwimQueryBank swimQueryBank; + @Scheduled(fixedRate = 3600000) // Runs every 1 hour public void hourlyScheduled() { -// try { -// oneHourCmhSch(); -// } catch (Exception e) { -// System.err.println("Error in oneHourCmhSch: " + e.getMessage()); -// e.printStackTrace(); -// } -// -// try { -// oneHourPetSch(); -// } catch (Exception e) { -// System.err.println("Error in oneHourPetSch: " + e.getMessage()); -// e.printStackTrace(); -// } - - try{ - oneHourCoworkSch(); + try { oneHourCmhSch(); + } catch (Exception e) { + System.err.println("Error in oneHourCmhSch: " + e.getMessage()); + e.printStackTrace(); + } + + try { oneHourPetSch(); + } catch (Exception e) { + System.err.println("Error in oneHourPetSch: " + e.getMessage()); + e.printStackTrace(); + } + + try{ oneHourCoworkSch(); }catch (Exception e){ System.err.println("Error in oneHourCowork: " + e.getMessage()); } - } + try { oneHourSwimSch(); + } catch (Exception e) { + System.err.println("Error in oneHourSwn: " + e.getMessage()); + e.printStackTrace(); + } + } +//------------------------------------------------------------------------- @Scheduled(fixedRate = 10800000) // Runs every 1 hour public void threeHoursScheduled() { - try { - threeHourCmhSch(); + try { threeHourCmhSch(); } catch (Exception e) { System.err.println("Error in oneHourCmhSch: " + e.getMessage()); e.printStackTrace(); } - try { - threeHourPetSch(); + try { threeHourPetSch(); } catch (Exception e) { System.err.println("Error in oneHourPetSch: " + e.getMessage()); e.printStackTrace(); } - } + try { threeHourCoworkSch(); + } catch (Exception e) { + System.err.println("Error in oneHourPetSch: " + e.getMessage()); + e.printStackTrace(); + } + try { threeHourSwimSch(); + } catch (Exception e) { + System.err.println("Error in oneHourSwim: " + e.getMessage()); + e.printStackTrace(); + } + } + +//--------------------------------------------------------------------- @Transactional public void oneHourCmhSch() { System.out.println("community Hourly Post data"+new Date()); - int lastBookingIdInserted = communityHallLogRepo.getLastBookingIdInserted(); + int lastBookingIdInserted = 0; + try { + lastBookingIdInserted = communityHallLogRepo.getLastBookingIdInserted(); + } + catch (Exception e) { + System.err.println("Error in communityHallLogRepo: " + e.getMessage()); + } System.out.println("community Hall lastBookingIdInserted:---->"+lastBookingIdInserted); queryBank.hourlyPushData( lastBookingIdInserted); @@ -104,7 +131,13 @@ public class MySchduler { @Transactional public void oneHourPetSch() { System.out.println("Pet Hourly Post data"+new Date()); - int lastUniqueIdInserted = petLogRepo.getLastUniqueIdInserted(); + int lastUniqueIdInserted = 0; + try { + lastUniqueIdInserted = petLogRepo.getLastUniqueIdInserted(); + } + catch (Exception e) { + System.err.println("Error in petLogRepo: " + e.getMessage()); + } System.out.println("Pet License lastUniqueIdInserted:--->"+lastUniqueIdInserted); petQueryBank.hourlyPushData(lastUniqueIdInserted); } @@ -125,7 +158,14 @@ public class MySchduler { @Transactional public void oneHourCoworkSch() { System.out.println("Cowork Hourly Post data: " + new Date()); - coworkQueryBank.PushAllData(); // or .hourlyPushData(...) if applicable + int lastUniqueIdInserted = 0; + try { + lastUniqueIdInserted = coworkLogRepo.getLastBookingIdInserted(); + } + catch (Exception e) { + System.err.println("Error in coworkLogRepo: " + e.getMessage()); + } + coworkQueryBank.hourlyPushData(lastUniqueIdInserted); // or .hourlyPushData(...) if applicable } @Transactional @@ -140,4 +180,30 @@ public class MySchduler { } } + + @Transactional + public void oneHourSwimSch() { + System.out.println("Swimming Pool Hourly Post data: " + new Date()); + System.out.println("Cowork Hourly Post data: " + new Date()); + int lastUniqueIdInserted = 0; + try { + lastUniqueIdInserted = swimLogRepo.getLastBookingIdInserted(); + } + catch (Exception e) { + System.err.println("Error in coworkLogRepo: " + e.getMessage()); + } + swimQueryBank.hourlyPushData(lastUniqueIdInserted); + } + + @Transactional + public void threeHourSwimSch() { + System.out.println("Swimming Pool Three Hour Post data: " + new Date()); + List> dataByStatus = swimLogRepo.getDataByStatus("0"); + for (Map data : dataByStatus) { + swimQueryBank.resendPushData( + data.get("unique_receipt_id").toString(), + data.get("id").toString() + ); + } + } } diff --git a/src/main/java/com/gcc/erppostdata/communityhall/CmhQueryBank.java b/src/main/java/com/gcc/erppostdata/communityhall/CmhQueryBank.java index 2df8309..91b8ec9 100644 --- a/src/main/java/com/gcc/erppostdata/communityhall/CmhQueryBank.java +++ b/src/main/java/com/gcc/erppostdata/communityhall/CmhQueryBank.java @@ -13,7 +13,7 @@ public class CmhQueryBank { " tr.txansaction_id, " + " tr.tpsl_txn_id, " + " tr.amount, " + - " tr.date, " + + " DATE_FORMAT(STR_TO_DATE(tr.date, '%d-%m-%Y'),'%d/%m/%Y') as trans_date, " + " bk.booking_status, " + " bk.hall_amount, " + " bk.deposit_amount, " + @@ -40,7 +40,7 @@ public class CmhQueryBank { " tr.txansaction_id, " + " tr.tpsl_txn_id, " + " tr.amount, " + - " tr.date, " + + " DATE_FORMAT(STR_TO_DATE(tr.date, '%d-%m-%Y'),'%d/%m/%Y') as trans_date, " + " bk.booking_status, " + " bk.hall_amount, " + " bk.deposit_amount, " + @@ -65,7 +65,7 @@ public class CmhQueryBank { " tr.txansaction_id, " + " tr.tpsl_txn_id, " + " tr.amount, " + - " tr.date, " + + " DATE_FORMAT(STR_TO_DATE(tr.date, '%d-%m-%Y'),'%d/%m/%Y') as trans_date, " + " bk.booking_status, " + " bk.hall_amount, " + " bk.deposit_amount, " + diff --git a/src/main/java/com/gcc/erppostdata/config/AppConfig.java b/src/main/java/com/gcc/erppostdata/config/AppConfig.java index 8103f07..26ef5fd 100644 --- a/src/main/java/com/gcc/erppostdata/config/AppConfig.java +++ b/src/main/java/com/gcc/erppostdata/config/AppConfig.java @@ -12,6 +12,8 @@ public class AppConfig { private String password; private String petDb; private String cmhDb; + private String mulPDb; + private String swimDb; public String getErpUrl() { return erpUrl; @@ -52,4 +54,20 @@ public class AppConfig { public void setCmhDb(String cmhDb) { this.cmhDb = cmhDb; } + + public String getMulPDb() { + return mulPDb; + } + + public void setMulPDb(String mulPDb) { + this.mulPDb = mulPDb; + } + + public String getSwimDb() { + return swimDb; + } + + public void setSwimDb(String swimDb) { + this.swimDb = swimDb; + } } diff --git a/src/main/java/com/gcc/erppostdata/config/DatabaseConfig.java b/src/main/java/com/gcc/erppostdata/config/DatabaseConfig.java index 2bde677..698e886 100644 --- a/src/main/java/com/gcc/erppostdata/config/DatabaseConfig.java +++ b/src/main/java/com/gcc/erppostdata/config/DatabaseConfig.java @@ -21,16 +21,17 @@ import javax.sql.DataSource; @EnableTransactionManagement public class DatabaseConfig { -// @Autowired -// private AppConfig appConfig; + @Autowired + private AppConfig appConfig; - String chDb="communityhall_live";//communityhall_live - String petDb="gcc_pets"; - - String mulPDb="coworkspace"; - - String userName="root"; - String password="root"; +// String chDb="communityhall_live";//communityhall_live +// String petDb="gcc_pets"; +// +// String mulPDb="coworkspace"; +// String swimDb="swimtesting"; +// +// String userName="root"; +// String password="root"; // String chDb= appConfig.getCmhDb(); // String petDb= appConfig.getPetDb(); @@ -52,12 +53,12 @@ public class DatabaseConfig { @Primary @Bean(name = "mysqlPetRegistrationDataSource") public DataSource mysqlPetRegistrationDataSource() { - System.out.println(); + System.out.println("AppConfig :---"+appConfig.getPetDb()); return DataSourceBuilder.create() - .url("jdbc:mysql://localhost:3306/"+DatabaseConfig.this.petDb) - .username(DatabaseConfig.this.userName) - .password(DatabaseConfig.this.password) + .url("jdbc:mysql://localhost:3306/"+appConfig.getPetDb()) + .username(appConfig.getUsername()) + .password(appConfig.getPassword()) .driverClassName("com.mysql.cj.jdbc.Driver") .build(); } @@ -94,12 +95,12 @@ public class DatabaseConfig { @Bean(name = "mysqlCommunityHallDataSource") public DataSource mysqlCommunityHallDataSource() { - System.out.println("User Name:- "+DatabaseConfig.this.userName); - System.out.println("Password :- "+DatabaseConfig.this.password); + System.out.println("User Name:- "+appConfig.getUsername()); + System.out.println("Password :- "+appConfig.getPassword()); return DataSourceBuilder.create() - .url("jdbc:mysql://localhost:3306/"+DatabaseConfig.this.chDb) - .username(DatabaseConfig.this.userName) - .password(DatabaseConfig.this.password) + .url("jdbc:mysql://localhost:3306/"+appConfig.getCmhDb()) + .username(appConfig.getUsername()) + .password(appConfig.getPassword()) .driverClassName("com.mysql.cj.jdbc.Driver") .build(); } @@ -126,9 +127,9 @@ public class DatabaseConfig { public DataSource mysqlSwimmingPoolDataSource() { DriverManagerDataSource dataSource = new DriverManagerDataSource(); dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver"); - dataSource.setUrl("jdbc:mysql://localhost:3306/swimtesting"); - dataSource.setUsername("root"); - dataSource.setPassword("root"); + dataSource.setUrl("jdbc:mysql://localhost:3306/"+appConfig.getSwimDb()); + dataSource.setUsername(appConfig.getUsername()); + dataSource.setPassword(appConfig.getPassword()); return dataSource; } @@ -136,9 +137,9 @@ public class DatabaseConfig { public DataSource mysqlmudhalvarpadaipagamDataSource() { DriverManagerDataSource dataSource = new DriverManagerDataSource(); dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver"); - dataSource.setUrl("jdbc:mysql://localhost:3306/"+this.mulPDb); - dataSource.setUsername(this.userName); - dataSource.setPassword(this.password); + dataSource.setUrl("jdbc:mysql://localhost:3306/"+appConfig.getMulPDb()); + dataSource.setUsername(appConfig.getUsername()); + dataSource.setPassword(appConfig.getPassword()); return dataSource; } @@ -147,8 +148,8 @@ public class DatabaseConfig { DriverManagerDataSource dataSource = new DriverManagerDataSource(); dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver"); dataSource.setUrl("jdbc:mysql://localhost:3306/erppostdata"); - dataSource.setUsername(this.userName); - dataSource.setPassword(this.password); + dataSource.setUsername(appConfig.getUsername()); + dataSource.setPassword(appConfig.getPassword()); return dataSource; } diff --git a/src/main/java/com/gcc/erppostdata/repo/CoworkLogRepo.java b/src/main/java/com/gcc/erppostdata/repo/CoworkLogRepo.java index 5635198..04e49bc 100644 --- a/src/main/java/com/gcc/erppostdata/repo/CoworkLogRepo.java +++ b/src/main/java/com/gcc/erppostdata/repo/CoworkLogRepo.java @@ -68,7 +68,7 @@ public class CoworkLogRepo { } public int getLastBookingIdInserted() { - String sql = "SELECT uniqueId FROM cowork_post_data ORDER BY uniqueId DESC LIMIT 1"; + String sql = "SELECT unique_receipt_id FROM cowork_post_data ORDER BY unique_receipt_id DESC LIMIT 1"; return jdbcTemplate.queryForObject(sql, Integer.class); } diff --git a/src/main/java/com/gcc/erppostdata/repo/SwimLogRepo.java b/src/main/java/com/gcc/erppostdata/repo/SwimLogRepo.java new file mode 100644 index 0000000..a1be471 --- /dev/null +++ b/src/main/java/com/gcc/erppostdata/repo/SwimLogRepo.java @@ -0,0 +1,64 @@ +package com.gcc.erppostdata.repo; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Repository; + +import javax.sql.DataSource; +import java.util.List; +import java.util.Map; + +@Repository +public class SwimLogRepo { + + @Autowired + private JdbcTemplate jdbcTemplate; + + @Autowired + public void setDataSource(@Qualifier("mysqlerpPostData") DataSource dataSource) { + this.jdbcTemplate = new JdbcTemplate(dataSource); + } + + public int insert(Map data) { + String sql = "INSERT INTO swimming_post_data (" + + "mobile, assessment_no, collection_type, mstr_code_one, split_amount_one, " + + "total_transaction_amount, total_transaction_code, transaction_date, " + + "transaction_no, transaction_ref_no, unique_receipt_id, booking_id, " + + "user_name, status, response) " + + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + + return jdbcTemplate.update(sql, + data.get("PARTYMOBILE"), + data.get("ASSESSMENTNO"), + data.get("COLLECTION_TYPE"), + data.get("MSTRCODEONE"), + data.get("SPLITAMOUNTONE"), + data.get("TOTALTRANSACTIONAMOUNT"), + data.get("TOTALTRANSACTIONCODE"), + data.get("TRANSACTIONDATE"), + data.get("TRANSACTIONNO"), + data.get("TRANSACTIONREFNO"), + data.get("UNIQUERECEIPTID"), + data.get("UNIQUERECEIPTID"), + data.get("PARTYNAME"), + data.get("status"), + data.get("response") + ); + } + + public int updateLog(String status, String response, String id) { + String sql = "UPDATE swimming_post_data SET status = ?, response = ? WHERE id = ?"; + return jdbcTemplate.update(sql, status, response, id); + } + + public List> getDataByStatus(String status) { + String sql = "SELECT * FROM swimming_post_data WHERE status = ?"; + return jdbcTemplate.queryForList(sql, status); + } + + public int getLastBookingIdInserted() { + String sql = "SELECT unique_receipt_id FROM swimming_post_data ORDER BY unique_receipt_id DESC LIMIT 1"; + return jdbcTemplate.queryForObject(sql, Integer.class); + } +} diff --git a/src/main/java/com/gcc/erppostdata/swimmingpool/SWPostData.java b/src/main/java/com/gcc/erppostdata/swimmingpool/SWPostData.java new file mode 100644 index 0000000..586b89b --- /dev/null +++ b/src/main/java/com/gcc/erppostdata/swimmingpool/SWPostData.java @@ -0,0 +1,174 @@ +package com.gcc.erppostdata.swimmingpool; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.gcc.erppostdata.config.AppConfig; +import com.gcc.erppostdata.repo.SwimLogRepo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +import javax.sql.DataSource; +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLEncoder; +import java.time.LocalDate; +import java.util.*; + +@Component +public class SWPostData { + + @Autowired + private AppConfig appConfig; + + @Autowired + private SwimLogRepo swimLogRepo; + + @Autowired + public void setDataSource(@Qualifier("mysqlSwimmingPoolDataSource") DataSource dataSource) { + this.jdbcTemplate = new JdbcTemplate(dataSource); + } + + private JdbcTemplate jdbcTemplate; + + public void fetchSwimData(String sql, String id) { + System.out.println("SQL: " + sql); + + List> results = jdbcTemplate.queryForList(sql); + List> swimDataList = new ArrayList<>(); + + System.out.println("Records fetched: " + results.size()); + + for (Map row : results) { + try { + Map data = new TreeMap<>(); + + // Safe value extraction + String bookingId = row.get("bookingid") != null ? row.get("bookingid").toString() : ""; + String paymentId = row.get("payment_id") != null ? row.get("payment_id").toString() : ""; + String paymentDate = row.get("paymentdate") != null ? row.get("paymentdate").toString() : ""; + String name = row.get("name") != null ? row.get("name").toString() : ""; + String mobile = row.get("mobile_no") != null ? row.get("mobile_no").toString() : ""; + String amountStr = row.get("amount") != null ? row.get("amount").toString() : "0"; + String orderid = row.get("orderid") != null ? row.get("orderid").toString() : ""; + + double amount = 0; + try { + amount = Double.parseDouble(amountStr); + } catch (NumberFormatException e) { + System.err.println("Invalid amount for bookingId: " + bookingId); + } + + String assessmentNo = LocalDate.now().getYear() + "/SWIM/" + bookingId; + + data.put("serviceId", "getOtherCollection"); + data.put("COLLECTION_TYPE", "Swimming Pool"); + data.put("TOTALTRANSACTIONCODE", "450310000"); + data.put("ASSESSMENTNO", assessmentNo); + data.put("UNIQUERECEIPTID", bookingId); + data.put("TRANSACTIONNO", orderid); + data.put("TRANSACTIONREFNO", paymentId); + data.put("TRANSACTIONDATE", paymentDate); + data.put("TOTALTRANSACTIONAMOUNT", amount); + data.put("MSTRCODEONE", "020"); + data.put("SPLITAMOUNTONE", amountStr); + data.put("PARTYNAME", name); + data.put("PARTYMOBILE", mobile); + data.put("PARTYADDRESS", "NA"); + data.put("bookingId", bookingId); + + postDataToERP(data, id); + + } catch (Exception e) { + System.err.println("Error processing row: " + row); + e.printStackTrace(); + } + } + } + + + private void postDataToERP(Map data, String id) { + try { + StringBuilder encodedUrl = new StringBuilder(appConfig.getErpUrl()); + boolean firstParam = true; + + for (Map.Entry entry : data.entrySet()) { + if (!firstParam) encodedUrl.append("&"); + firstParam = false; + String key = URLEncoder.encode(entry.getKey(), "UTF-8"); + String value = URLEncoder.encode(String.valueOf(entry.getValue()), "UTF-8"); + encodedUrl.append(key).append("=").append(value); + } + + String finalUrl = encodedUrl.toString(); + System.out.println("Final Encoded URL: " + finalUrl); + + HttpURLConnection connection = (HttpURLConnection) new URL(finalUrl).openConnection(); + connection.setRequestMethod("GET"); + int responseCode = connection.getResponseCode(); + System.out.println("Response Code: " + responseCode); + + StringBuilder response = new StringBuilder(); + BufferedReader in = new BufferedReader(new InputStreamReader( + responseCode == 200 ? connection.getInputStream() : connection.getErrorStream() + )); + String inputLine; + while ((inputLine = in.readLine()) != null) response.append(inputLine); + in.close(); + + System.out.println("ERP Response: " + response); + + if (id != null) { + updateLog(data, response, id); + } else { + saveLog(data, response); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + private void saveLog(Map map, StringBuilder response) throws JsonProcessingException { + logToRepo(map, response); + } + + private void updateLog(Map map, StringBuilder response, String id) throws JsonProcessingException { + logToRepo(map, response, id); + } + + private void logToRepo(Map map, StringBuilder response) throws JsonProcessingException { + logToRepo(map, response, null); + } + + private void logToRepo(Map map, StringBuilder response, String id) throws JsonProcessingException { + String statusCode = "0"; + if (response != null) { + ObjectMapper objectMapper = new ObjectMapper(); + Map res = objectMapper.readValue(response.toString(), Map.class); + String msg = String.valueOf(res.get("Message")); + String status = String.valueOf(res.getOrDefault("ResultStatus", "")); + + if ("Connection Failure".equals(msg)) { + statusCode = "2"; + } else if ("Already Updated this collection".equals(msg) && "false".equals(status)) { + statusCode = "1"; + } else if ("Failure".equals(msg) && "false".equals(status)) { + statusCode = "2"; + } else if ("true".equals(status)) { + statusCode = "1"; + } + } + + map.put("status", statusCode); + map.put("response", response.toString()); + + if (id != null) { + swimLogRepo.updateLog(statusCode, response.toString(), id); + } else { + swimLogRepo.insert(map); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/gcc/erppostdata/swimmingpool/SwimQueryBank.java b/src/main/java/com/gcc/erppostdata/swimmingpool/SwimQueryBank.java new file mode 100644 index 0000000..8b242af --- /dev/null +++ b/src/main/java/com/gcc/erppostdata/swimmingpool/SwimQueryBank.java @@ -0,0 +1,41 @@ +package com.gcc.erppostdata.swimmingpool; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class SwimQueryBank { + + @Autowired + private SWPostData swPostData; + + public void PushAllData() { + String sql = "SELECT bd.id AS bookingid,bd.orderid AS orderid, bd.name, p.amount, " + + "DATE_FORMAT(p.paymentdate, '%d/%m/%Y') AS paymentdate, " + + "p.payment_id, p.payment_status, bd.mobile_no " + + "FROM booking_details bd " + + "JOIN payment p ON bd.orderid = p.order_id " + + "WHERE p.payment_status = 'paid'"; + swPostData.fetchSwimData(sql, null); + } + + public void hourlyPushData(int lastId) { + String sql = "SELECT bd.id AS bookingid,bd.orderid AS orderid, bd.name, p.amount, " + + "DATE_FORMAT(p.paymentdate, '%d/%m/%Y') AS paymentdate, " + + "p.payment_id, p.payment_status, bd.mobile_no " + + "FROM booking_details bd " + + "JOIN payment p ON bd.orderid = p.order_id " + + "WHERE p.payment_status = 'paid' AND bd.id > " + lastId + " LIMIT 1000"; + swPostData.fetchSwimData(sql, null); + } + + public void resendPushData(String uniqueId, String id) { + String sql = "SELECT bd.id AS bookingid,bd.orderid AS orderid, bd.name, p.amount, " + + "DATE_FORMAT(p.paymentdate, '%d/%m/%Y') AS paymentdate, " + + "p.payment_id, p.payment_status, bd.mobile_no " + + "FROM booking_details bd " + + "JOIN payment p ON bd.orderid = p.order_id " + + "WHERE p.payment_status = 'paid' AND bd.id = " + uniqueId; + swPostData.fetchSwimData(sql, id); + } +} diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 6ec4a6d..3d7d98b 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -5,3 +5,5 @@ app.password=root app.petDb=gcc_pets app.cmhDb=communityhalldemo +app.mulPDb=coworkspace +app.swimDb=swimtesting diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 94475bd..8651e06 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -4,4 +4,6 @@ app.username=root app.password=gccroot app.petDb=gcc_pets -app.cmhDb=communityhall_live \ No newline at end of file +app.cmhDb=communityhall_live +app.mulPDb=coworkingspace +app.swimDb=swimmingpool \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5ec012c..fef7616 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -8,5 +8,5 @@ spring.application.name=erppostdata #spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect #spring.jpa.hibernate.ddl-auto=update -spring.profiles.active=dev +spring.profiles.active=prod server.port=8067