diff --git a/src/main/java/com/ffii/lioner/config/WebConfig.java b/src/main/java/com/ffii/lioner/config/WebConfig.java index 942651f..df9ce86 100644 --- a/src/main/java/com/ffii/lioner/config/WebConfig.java +++ b/src/main/java/com/ffii/lioner/config/WebConfig.java @@ -20,8 +20,10 @@ public class WebConfig implements WebMvcConfigurer { "http://localhost", // If you test locally via Nginx at http://localhost "http://127.0.0.1", // Sometimes browsers resolve localhost to 127.0.0.1 "http://10.40.0.4", - "http://20.2.170.164", // IP cloud - "http://localhost:3000" // If you ever run React dev server directly + "http://20.2.170.164", + "https://20.2.170.164", + "http://localhost:3000", + "https://forms.lioner.com" // Add any other specific domains/IPs/ports where your frontend will be hosted ) .allowedMethods("GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS") // **** IMPORTANT: Add OPTIONS **** diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1726a72..cd49fab 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,38 +1,46 @@ server: - servlet: - contextPath: /api - encoding: - charset: UTF-8 - enabled: true - force: true - port: 8090 - error: - include-message: always - tomcat: - connection-timeout: 300000 + servlet: + contextPath: /api + encoding: + charset: UTF-8 + enabled: true + force: true + port: 8090 + error: + include-message: always + tomcat: + connection-timeout: 300000 + ssl: # <--- This 'ssl' is correctly indented under 'server' + enabled: true # <--- CORRECTED: Use colon, not equals, and remove "server.ssl." prefix + key-store: classpath:keystore.p12 + key-store-type: PKCS12 + key-store-password: Mms1234 + key-alias: lionerapp + key-password: Mms1234 + spring: - datasource: - jdbc-url: jdbc:mysql://localhost:3306/lionerdb?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8 - username: root - password: cFDp7988vc+$] - - servlet: - multipart: - max-file-size: 500MB - max-request-size: 600MB - jpa: - hibernate: - naming: - physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl - database-platform: org.hibernate.dialect.MySQL8Dialect - properties: - hibernate: - dialect: - storage_engine: innodb - messages: - basename: i18n/messages - use-code-as-default-message: true - fallback-to-system-locale: false + datasource: + jdbc-url: jdbc:mysql://localhost:3306/lionerdb?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8 + username: root + password: cFDp7988vc+$] + + servlet: + multipart: + max-file-size: 500MB + max-request-size: 600MB + jpa: + hibernate: + naming: + physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + database-platform: org.hibernate.dialect.MySQL8Dialect + properties: + hibernate: + dialect: + storage_engine: innodb + messages: + basename: i18n/messages + use-code-as-default-message: true + fallback-to-system-locale: false logging: - config: 'classpath:log4j2.yml' \ No newline at end of file + config: 'classpath:log4j2.yml' \ No newline at end of file diff --git a/src/main/resources/keystore.p12 b/src/main/resources/keystore.p12 new file mode 100644 index 0000000..67f352d Binary files /dev/null and b/src/main/resources/keystore.p12 differ diff --git a/ssl/forms.crt b/ssl/forms.crt new file mode 100644 index 0000000..91ba0b7 --- /dev/null +++ b/ssl/forms.crt @@ -0,0 +1,38 @@ +-----BEGIN CERTIFICATE----- +MIIGmjCCBYKgAwIBAgIIQerMBUzpywUwDQYJKoZIhvcNAQELBQAwgbQxCzAJBgNV +BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRow +GAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UECxMkaHR0cDovL2NlcnRz +LmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMTMwMQYDVQQDEypHbyBEYWRkeSBTZWN1 +cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMjUwNzAzMDIxMjAyWhcN +MjYwODA0MDIxMjAyWjAbMRkwFwYDVQQDExBmb3Jtcy5saW9uZXIuY29tMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo9YutD78l2TE42O6aiqdzawfOa6/ +kFmUauytS2uFEQW/fwbfKdXHVV9VRt7CD6mYZivu6PvSP5mbNfq1TxFHOzbyKR+H +V/Xwvcpfp/dtAGvhqzKBbqpKuEGMCQp1X7aVFk071md4hUf+zHjslcULdt1EwnA/ +GSPbh+PB2wYLJPBJPWqS4/di/KI5IKYNinlHPgU3DWaAPmX2n/vTy8Uw151RyjnS +9HoR34kpkoLqQtxVOf3xA1YkmuTlph6iYfoCmdH424iY6ekCTHDgfytf0qOP2Gx7 +t1c9w0DIvtuCHE4zV8r0nrUhjsTE4YkywuK1yBaVOyg4bUKAyhxZZByHhwIDAQAB +o4IDRjCCA0IwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB +BQUHAwIwDgYDVR0PAQH/BAQDAgWgMDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9j +cmwuZ29kYWRkeS5jb20vZ2RpZzJzMS01MjUzNi5jcmwwXQYDVR0gBFYwVDBIBgtg +hkgBhv1tAQcXATA5MDcGCCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdv +ZGFkZHkuY29tL3JlcG9zaXRvcnkvMAgGBmeBDAECATB2BggrBgEFBQcBAQRqMGgw +JAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmdvZGFkZHkuY29tLzBABggrBgEFBQcw +AoY0aHR0cDovL2NlcnRpZmljYXRlcy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5L2dk +aWcyLmNydDAfBgNVHSMEGDAWgBRAwr0njsw0gzCiM9f7bLPwtCyAzjAxBgNVHREE +KjAoghBmb3Jtcy5saW9uZXIuY29tghR3d3cuZm9ybXMubGlvbmVyLmNvbTAdBgNV +HQ4EFgQU69p3NOnspM8rycVnLcG7+/9tr/YwggF8BgorBgEEAdZ5AgQCBIIBbASC +AWgBZgB1ANdtfRDRp/V3wsfpX9cAv/mCyTNaZeHQswFzF8DIxWl3AAABl84OJaAA +AAQDAEYwRAIgKD2s7Ygazm8fB2mF3ebFeS7hATDydP1Jn/M/IgW4vagCIEkJjXEl +QSAQ3pa4iN3U2y2HeUTWZZS7iWg85Bpy/ZMhAHYAyzj3FYl8hKFEX1vB3fvJbvKa +Wc1HCmkFhbDLFMMUWOcAAAGXzg4mjwAABAMARzBFAiEA6vSQbHmlpDzklI08rEU0 +kVLCEvAOJcLx2xDcQRW0aZgCIDacsNH1Me5LreQj3LsAjRJH9gRF6AFryz/aNW9z +RVgZAHUAdNudWPfUfp39eHoWKpkcGM9pjafHKZGMmhiwRQ26RLwAAAGXzg4omAAA +BAMARjBEAiAg4+bfCiWGMFPWekrKkwKbotwm3zVpnzAhH1F5mIZWSgIgfaa9Mjeb +AUPKY5lIBkyKetr83C9Woat6ItzmeaqinaMwDQYJKoZIhvcNAQELBQADggEBAEXU +2bbCCMY4nNosCGOwWpdBDqla67TLjZOpSEL5p/YIHU1gJ8F4PguwE3R/JqVhaAJr +sJOl8ilzvjVeqWN+ejuAmysNvi9ViAA+5E3ywDAN1MVxTJLYMHwDr5PhK7YBAm0X +Amrh+JvS7UywhFjmmKx8CQj0XLkLkwgGsdQd4hpnMqV061j0FaCByPPRFPI2o3Fr +3f7o1aPyRTq6nvaPncRnlq3hVqmqH7gOWU6xy9BsqeQfd2sW6T3AiNb63IgjUcJA +Fa19dDLKOzJzzyD0QBlwX0lY26ub3yv540Zx/WHTfOq2+UQKGwa4uTSw7GozoRQW +JK8I0tHtyTLOS5+vuyU= +-----END CERTIFICATE----- diff --git a/ssl/forms.key b/ssl/forms.key new file mode 100644 index 0000000..ef13f2e --- /dev/null +++ b/ssl/forms.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCj1i60PvyXZMTj +Y7pqKp3NrB85rr+QWZRq7K1La4URBb9/Bt8p1cdVX1VG3sIPqZhmK+7o+9I/mZs1 ++rVPEUc7NvIpH4dX9fC9yl+n920Aa+GrMoFuqkq4QYwJCnVftpUWTTvWZ3iFR/7M +eOyVxQt23UTCcD8ZI9uH48HbBgsk8Ek9apLj92L8ojkgpg2KeUc+BTcNZoA+Zfaf ++9PLxTDXnVHKOdL0ehHfiSmSgupC3FU5/fEDViSa5OWmHqJh+gKZ0fjbiJjp6QJM +cOB/K1/So4/YbHu3Vz3DQMi+24IcTjNXyvSetSGOxMThiTLC4rXIFpU7KDhtQoDK +HFlkHIeHAgMBAAECggEALd1XPMFHP/CHR6rS9EaS35FYOnMnkHbrXBV+m9bxLOdB +iQN49MKyZz1lZ44ToIPXNH8HBjT80i4jq7RQDl7lZHfIyedYIbEpYFAngCN9YblR +tvXQExVcDoHW/G7vlchMqy4a2rYjoJgbhc0yWekMAQ4HYjE/EMAfhEanrbNe6kth +YcfMKy+XwGi9kJkGoouWGEMvX1S+5WrY3gZNWkUQdg5WbdfuaaTziUKk4RV8w0rH +uOZ/PQ3bQSuQ8Ow9khPluKCjpU1mFVggHNf00qlLRvAPTFyHPhUA64RAxjnsYXL5 +tuWNdCjAdJuAg7I0hSbtShkZR77MoFsd4OkKTY4UgQKBgQDO6hkYpTcmOEGMohq5 +SNWy7c7lr6lbwtPmHHXgtpOz7zDpdw9uGjcTpnNNElqI6pxfLu7fJ1gkGud1vhEv +EaLVY7wNeCj3l5kTKpEK1XboNsFVwhR/aZceZm1do8trvAqLU/VdIFwSrx0SoYZz +D3BtTEzg1S626aM3Ex+7kWXXBwKBgQDKs/jzE6FvhfooLnE3+njy+EP/WoOPS5vM +1yw8imQRCa2AV+7GCA8x2TGSPkcQ/vP9jgDl3q8VPdv9H8moKmpBBmpAVq6fiDZP +E+t2b1B9jMf73LtMiRPrwT9jLGIszulW2Ty5m3A0nsHkevRokdGmYlEwYqcOSHSb +iAxGxasrgQKBgQCaTXdjqqmi5eb0Ils9e3Rp1/An10S7+mGdQ/IgHuetEp3uLOyj +1gbmr4Vin2JGonb0gIKAhc20NyAO7SvRZxyAd7zgapBae4IbCe5aHvBqoZKyCmbQ +0YRxlj7OyvxDHlrapkTfKueew1ox76TdH1FfILxgGnqYy0j9JFTQwtAodwKBgBrU +1dg/OfhMML/O3fe99PKcgEu1zIJUTMxBkz50RyimMkwx145pFLHRgSlNixSp2twu +RtomruBN7ufDpGrZKnVvBvN7ReQiIKY5CcsEkw/7aaFiJ3zLDFMBooVbI6ewv9xa +Jxqeg6zDcwDucZnB65FtpDeWZ2yRlLXdvVpE4hKBAoGAAZ+j0JR9ppbZS+G0ULmA +8p1WHRgjOh7jBtK7ukorQFC1wddcKzV3f6M2a9VFgC3+NjLwQ2yHjmcBj+xH3WA9 +CfafW6mSwu4DKVe2s8jChJeqH5B8LmItWcVbSMOdMAPVODcZeskq4FKAMarGxfA9 +omNzZC9UBIGfLHcFt49lV9Q= +-----END PRIVATE KEY----- diff --git a/ssl/keystore.p12 b/ssl/keystore.p12 new file mode 100644 index 0000000..67f352d Binary files /dev/null and b/ssl/keystore.p12 differ