diff --git a/UMASS_sample/Contact Us _ UMass Amherst.html b/UMASS_sample/Contact Us _ UMass Amherst.html index cd117393..a07fb277 100644 --- a/UMASS_sample/Contact Us _ UMass Amherst.html +++ b/UMASS_sample/Contact Us _ UMass Amherst.html @@ -1,2500 +1,3148 @@ - - - - - - - - - - - - - - - - - - - + - Contact Us : UMass Amherst - - - - + + - - - - + + + + + + + + + + + + + + + + + - - - + Contact Us : UMass Amherst + + + + - + + + + -
+ + + + + + + + + +
-

The University of Massachusetts Amherst

- -
-
-
- - -
-
- - -
-
- -
- -
- - - - - - -
- +
  • +
    + + +
    + + Info For + +
    - - -
    - - -
    - -
    - -
    -
    -
    -
    - - - - -
    -
    -
    - - - - -
    -
    - - - - - - - -
    - - -

    - Contact Us -

    - - -
    - - -
    - -
    -
    -
    - -
    - -
    -
    - -
    • +
  • + Alumni - -
    - - Directories - -
    - -
    - - Frequently Used Phone Numbers - -
    +
    • +
  • + Athletics - -
    - - Frequently Contacted Departments - -
    - -
    • + +
  • + Giving + + +
    • +
  • + Libraries + + +
    • + + + + + +
    + + +
    +
    - - +
    +
    + + University of Massachusetts Amherst + University of Massachusetts Amherst + +
    -
    +
    +
    +
    - - - - -
    -
    - - - - - - - -
    - - -

    - Contact Us -

    - - -
    - - -
    - - - -
    -
    -
    -
    - - - - - - -
    - - -

    General Information

    - - -
    - - - - - -
    -
    - -
    -

    For General Campus Inquiries, please call the main switchboard at 413-545-0111. If on campus, dial 0. Operators are available from 8:00 a.m. to 5:00 p.m., Monday through Friday. 

    - -

    In an emergency dial 911 (if on campus, 5-3111).
    - 

    - -

    Directions, Parking & Maps

    - -

    Find directions to campus, parking information, and campus maps.

    - -
     
    - -
    - -
    - - - - -
    -
    - - -
    -
    -
    -
    - - - - - - -
    - - -

    Directories

    - - -
    - - - - - - - - - - - - - - - - - - - - -
    -
    -
    +
    + + +
  • +
    + Admissions + & Aid + +
    + +
    + + Admissions & Aid + + +
    + +
    • +
  • +
    + Campus Life + +
    + +
    + + Campus Life + + +
    + +
    • +
  • +
    + Why + UMass? + +
    + +
    + + Why UMass? + + +
    + +
    • +
  • +
    + Research + +
    + +
    + + Research + + +
    + +
    • +
  • +
    + News + & Events + +
    + +
    + + News & Events + + +
    + +
    • + + + + + +
    + + + + +
    + + +
    + +
    + +
  • + Alumni - - +
    • +
  • + Athletics - -
    • -
    + +
  • + Giving -
    • -
    -
    -
    - - - - - - -
    - - -

    Frequently Used Phone Numbers

    - - -
    - - - + +
  • + Libraries -
    -
    +
    • + -
    -
    Main Switchboard413-545-0111
    TTY/TTD413-577-0005
    Emergency Closing Hotline413-545-3630
    Fine Arts Center Box Office413-545-2511
    UMass Athletics Ticket Office866-UMASS-TIX
    Mullins Center Box Office413-545-3001
    Campus Center Information413-577-8212
     
    -
    - -
    - - - - -
    - + - -
    -
    -
    + - - - - - -
    - - -

    Frequently Contacted Departments

    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - -
    - - - - - -
    -
    - - - -
    - -

    - Undergraduate Admissions -

    - - - -
    -

    mail@admissions.umass.edu(link sends email)
    (413) 545-0222

    -
    - - - - - - - - -
    - - - - - Read more +
    +
    + +
    - - -
    - - -
    - - - - - -
    -
    - - - -
    - -

    - Graduate Admissions -

    - - - -
    -

    gradadm@grad.umass.edu(link sends email)
    (413) 545-0722

    -
    - - - - - - - - -
    - - - - - Read more - - -
    - - -
    - - -
    - - - - - -
    -
    - - - -
    - -

    - Financial Aid -

    - - - -
    -

    finaid@finaid.umass.edu(link sends email)
    (413) 545-0801

    -
    - - - - - - - - -
    - - - - - Read more - - -
    - - -
    - - -
    - - - - - -
    -
    - - - -
    - -

    - New Student Orientation & Transitions -

    - - - -
    -

    newstudent@umass.edu(link sends email)
    413-545-2621

    -
    - - - - - - - - -
    - - - - - Read more - - -
    - - -
    - - -
    - - - - - -
    -
    - - - -
    - -

    - Residential Life -

    - - - -
    -

    Residential Service Desk Request(link is external)

    -
    - - - - - - - - -
    - - - - - Read more - - -
    - - -
    - - -
    - - - - - -
    -
    - - - -
    - -

    - Information Technology -

    - - - -
    -

    IT Tech Help

    -
    - - - - - - - - -
    - - - - - Read more - - -
    - - -
    - - -
    - - - - - -
    -
    - - - -
    - -

    - Accessibility -

    - - - -
    -

    Report Accessibility Issues(link is external)

    -
    - - - - - - - - -
    - - - - - Read more - - -
    - - -
    - - -
    - - - - - -
    -
    - - - -
    - -

    - News & Events -

    - - - -
    -

    scoop@admin.umass.edu(link sends email)
    (413) 545-0444

    -
    - - - - - - - - -
    - - - - - Read more - - -
    - - -
    - - -
    - - - - - -
    -
    - - - -
    - -

    - University Health Services -

    - - - -
    -

    uhs@umass.edu(link sends email)
    (413) 577-5000

    -
    - - - - - - - - -
    - - - - - Read more - - -
    - - -
    - - -
    - - - - - -
    -
    - - - -
    - -

    - Office of Equity and Inclusion -

    - - - -
    -

    Climate Incident Report Form

    -
    - - - - - - - - -
    - - - - - Read more - - -
    - - -
    - - -
    - - - - - -
    -
    - - - -
    - -

    - Title IX Coordinator -

    - - - -
    -

    TitleIXCoordinator@umass.edu(link sends email)
    (413) 545-3464

    -
    - - - - - - - - -
    - - - - - Read more - - -
    - - -
    - - -
    - - - - - -
    -
    - - - -
    - -

    - UMass Amherst Police Department -

    - - - -
    -

    umpd@admin.umass.edu(link sends email)
    413-545-2121
    Anonymous witness form

    -
    - - - - - - - - -
    - - - - - Read more - - -
    - - -
    - - -
    - - -
    - -
    - - - - - - - -
    - - - - + + + + +
    +
    +
    +
    + + University of Massachusetts Amherst + University of Massachusetts Amherst + +
    + + +
    +
    +
    + + +
    + + +
    + + + + + +
    + + + +
    +
    +
    + + + + +
    + +
    + +
    + + + + + + +
    + + +
    + + + +
    + + +
    + +
    + +
    +
    +
    +
    + + + + +
    +
    +
    + + + + +
    +
    + + + + + + + +
    + + +

    + Contact Us +

    + + +
    + + +
    +
    + +
    +
    +
    + +
    + +
    +
    + + + +
    + + + + + +
    +
    + + + + + + + +
    + + +

    + Contact Us +

    + + +
    + + +
    +
    + + + +
    +
    +
    +
    + + + + + + +
    + + +

    General Information

    + + +
    + + + + + +
    +
    + +
    +

    For General Campus Inquiries, please call the main switchboard at 413-545-0111. + If on campus, dial 0. Operators are available from 8:00 a.m. to 5:00 p.m., + Monday through Friday. 

    + +

    In an emergency dial 911 (if on campus, + 5-3111).
    +   +

    + +

    Directions, Parking & Maps

    + +

    Find + directions to campus, parking information, and campus maps.

    + +
     
    + +
    + +
    +
    + + + + +
    +
    + + +
    +
    +
    +
    + + + + + + +
    + + +

    Directories

    + + +
    + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +
    + +
    + + + + + +
    + + + + + UMass Search + + +
    + + + + + + +
    + + + + + Sites A-Z + + +
    + + + + + + +
    + + + + + People Finder + + +
    + +
    +
    +
    + + + + + + + +
    +
    + + +
    +
    +
    +
    + + + + + + +
    + + +

    Frequently Used Phone Numbers

    + + +
    + + + + + +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Main Switchboard413-545-0111
    TTY/TTD413-577-0005
    Emergency Closing Hotline413-545-3630
    Fine Arts Center Box Office413-545-2511
    UMass Athletics Ticket Office866-UMASS-TIX
    Mullins Center Box Office413-545-3001
    Campus Center Information413-577-8212
    +
     
    +
    + +
    +
    + + + + +
    +
    + + +
    +
    +
    +
    + + + + + + +
    + + +

    Frequently Contacted Departments

    + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + + + + + +
    + + + + + +
    +
    + + + +
    + +

    + Undergraduate Admissions +

    + + + +
    +

    mail@admissions.umass.edu + (link sends email) + + +
    (413) 545-0222

    +
    + + + + + + + + +
    + + + + + Read more + + +
    + + +
    + + +
    +
    + + + + + +
    +
    + + + +
    + +

    + Graduate Admissions +

    + + + +
    +

    gradadm@grad.umass.edu + (link sends email) + + +
    (413) 545-0722

    +
    + + + + + + + + +
    + + + + + Read more + + +
    + + +
    + + +
    +
    + + + + + +
    +
    + + + +
    + +

    + Financial Aid +

    + + + +
    +

    finaid@finaid.umass.edu + (link sends email) + + +
    (413) 545-0801

    +
    + + + + + + + + +
    + + + + + Read more + + +
    + + +
    + + +
    +
    + + + + + +
    +
    + + + +
    + +

    + New Student Orientation & Transitions +

    + + + +
    +

    newstudent@umass.edu + (link sends email) + + +
    413-545-2621

    +
    + + + + + + + + +
    + + + + + Read more + + +
    + + +
    + + +
    +
    + + + + + +
    +
    + + + +
    + +

    + Residential Life +

    + + + +
    +

    Residential Service Desk Request + (link is external) + + + + +

    +
    + + + + + + + + +
    + + + + + Read more + + +
    + + +
    + + +
    +
    + + + + + +
    +
    + + + +
    + +

    + Information Technology +

    + + + +
    +

    IT Tech Help

    +
    + + + + + + + + +
    + + + + + Read more + + +
    + + +
    + + +
    +
    + + + + + +
    +
    + + + +
    + +

    + Accessibility +

    + + + +
    +

    Report Accessibility Issues + (link is external) + + + + +

    +
    + + + + + + + + +
    + + + + + Read more + + +
    + + +
    + + +
    +
    + + + + + +
    +
    + + + +
    + +

    + News & Events +

    + + + +
    +

    scoop@admin.umass.edu + (link sends email) + + +
    (413) 545-0444

    +
    + + + + + + + + +
    + + + + + Read more + + +
    + + +
    + + +
    +
    + + + + + +
    +
    + + + +
    + +

    + University Health Services +

    + + + +
    +

    uhs@umass.edu + (link sends email) + + +
    (413) 577-5000

    +
    + + + + + + + + +
    + + + + + Read more + + +
    + + +
    + + +
    +
    + + + + + +
    +
    + + + +
    + +

    + Office of Equity and Inclusion +

    + + + +
    +

    Climate + Incident Report Form

    +
    + + + + + + + + +
    + + + + + Read more + + +
    + + +
    + + +
    +
    + + + + + +
    +
    + + + +
    + +

    + Title IX Coordinator +

    + + + +
    +

    TitleIXCoordinator@umass.edu + (link sends email) + + +
    (413) 545-3464

    +
    + + + + + + + + +
    + + + + + Read more + + +
    + + +
    + + +
    +
    + + + + + +
    +
    + + + +
    + +

    + UMass Amherst Police Department +

    + + + +
    +

    umpd@admin.umass.edu + (link sends email) + + +
    413-545-2121
    Anonymous + witness form

    +
    + + + + + + + + +
    + + + + + Read more + + +
    + + +
    + + +
    +
    + + +
    + +
    +
    + + + + + + + +
    +
    + + +
    +
    + + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + + + +
    + +
    +
    + +
    + + +
    +
    +
    -
    - - - - -
    - -
    -
    - -
    - - - -
    - -
    -
    - -
    - - - - - - - - - - -
    + - - - - - - - + + + + - \ No newline at end of file + +
    +
    + + + \ No newline at end of file diff --git a/UMASS_sample/Flex Finish _ UMass Flex _ UMass Amherst.html b/UMASS_sample/Flex Finish _ UMass Flex _ UMass Amherst.html index 58737977..db38097e 100644 --- a/UMASS_sample/Flex Finish _ UMass Flex _ UMass Amherst.html +++ b/UMASS_sample/Flex Finish _ UMass Flex _ UMass Amherst.html @@ -316,7 +316,7 @@
    - + University of Massachusetts Amherst @@ -1336,7 +1336,7 @@ diff --git a/UMASS_sample/Schools & Colleges _ UMass Amherst.html b/UMASS_sample/Schools & Colleges _ UMass Amherst.html index 2eeb3261..4cba3691 100644 --- a/UMASS_sample/Schools & Colleges _ UMass Amherst.html +++ b/UMASS_sample/Schools & Colleges _ UMass Amherst.html @@ -309,7 +309,7 @@
    - + University of Massachusetts Amherst @@ -1329,7 +1329,7 @@
    - + University of Massachusetts Amherst diff --git a/UMASS_sample/UMass 4+1 Accelerated Master's Degree Programs _ UMass Amherst.html b/UMASS_sample/UMass 4+1 Accelerated Master's Degree Programs _ UMass Amherst.html index 055e9353..6dc94b67 100644 --- a/UMASS_sample/UMass 4+1 Accelerated Master's Degree Programs _ UMass Amherst.html +++ b/UMASS_sample/UMass 4+1 Accelerated Master's Degree Programs _ UMass Amherst.html @@ -313,7 +313,7 @@
    - + University of Massachusetts Amherst @@ -1333,7 +1333,7 @@ diff --git a/UMASS_sample/UMass Amherst _ UMass Amherst.html b/UMASS_sample/UMass Amherst _ UMass Amherst.html index d7b009cc..5c0ba019 100644 --- a/UMASS_sample/UMass Amherst _ UMass Amherst.html +++ b/UMASS_sample/UMass Amherst _ UMass Amherst.html @@ -304,7 +304,7 @@
    - + University of Massachusetts Amherst @@ -1323,7 +1323,7 @@ diff --git a/UMASS_sample/Undergraduate Study _ UMass Amherst.html b/UMASS_sample/Undergraduate Study _ UMass Amherst.html index 44b961dd..452a106b 100644 --- a/UMASS_sample/Undergraduate Study _ UMass Amherst.html +++ b/UMASS_sample/Undergraduate Study _ UMass Amherst.html @@ -312,7 +312,7 @@
    - + University of Massachusetts Amherst @@ -1332,7 +1332,7 @@ diff --git a/sisvietnamvn/README.md b/sisvietnamvn/README.md index 5088e7dd..86dad935 100644 --- a/sisvietnamvn/README.md +++ b/sisvietnamvn/README.md @@ -186,46 +186,67 @@ To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`) - [Node.js](https://nodejs.org/) - [NPM](https://www.npmjs.com/) -#Structure +## Deployment Guide (Ubuntu server + aaPanel + Docker) -Using NGINX (via aaPanel) with Tomcat is a very common and recommended setup. In this architecture, NGINX acts as a Reverse Proxy. It handles incoming internet traffic (ports 80 and 443 for SSL) and forwards the requests to your Tomcat application running in the background (usually on port 8080). +### 1. Build the WAR file (on Windows) +To deploy this application to an external Tomcat server, you need to build a `.war` file. +Run the following command on your Windows PC to build the production-ready `.war` file: +```powershell +./gradlew -Pprod -Pwar clean bootWar +``` +Alternatively, you can use the built-in npm script: +```powershell +npm run java:war:prod +``` +The generated `.war` file will be located at `build/libs/sisvietnamvn-0.0.1-SNAPSHOT.war`. -Here is the step-by-step guide to setting this up in aaPanel: +### 2. Standalone Tomcat 10 using Docker Compose (on Ubuntu Server) +Since this project uses Java 21, it requires **Tomcat 10.1**. You can set this up on your Ubuntu server using Docker Compose. -Step 1: Start your Tomcat/Spring Boot App -Make sure your application is running. By default, your project seems to run on port 8080. +Create a folder for Tomcat, and add a `docker-compose.yml` file: +```yaml +version: '3.8' -If using embedded Tomcat: Run your .jar file in the background (e.g., nohup java -jar your-app.jar --spring.profiles.active=prod &). -If using standalone Tomcat: Ensure Tomcat is started and the app is deployed. -Step 2: Configure the Website in aaPanel -Log in to your aaPanel dashboard. -Go to the Website menu on the left sidebar. -Click Add site (if you haven't already). -Enter your domain name (e.g., sisvietnam.vn). -For PHP version, select Static (since Java handles the backend, you don't need PHP). -Click Submit to create the site. -Step 3: Set up the Reverse Proxy -In the Website list, click on the Settings button for your newly created domain. -In the settings window, click on the Reverse proxy tab on the left. -Click Add reverse proxy and fill in the details: -Proxy name: Give it any name (e.g., TomcatProxy). -Target URL: Enter http://127.0.0.1:8080 (Change 8080 if your app is running on a different port). -Sent Domain: Leave it as $host (the default). -Click Submit. -Step 4: Configure Spring Boot to Trust the Proxy (Crucial) -Because NGINX sits in front of your app, Tomcat will think all requests are coming from 127.0.0.1 instead of the user's real IP, and it might get confused about http vs https (which breaks redirects and security). +services: + tomcat: + image: tomcat:10.1-jdk21 + container_name: my-tomcat-server + ports: + - "8080:8080" + environment: + - TZ=Asia/Ho_Chi_Minh + volumes: + - ./webapps:/usr/local/tomcat/webapps + - ./logs:/usr/local/tomcat/logs + restart: unless-stopped +``` -To fix this, you need to tell your Spring Boot app to read the headers forwarded by NGINX. Open your src/main/resources/config/application-prod.yml (or application.yml) and add: +Create the required folders and start the server: +```bash +mkdir webapps logs +docker compose up -d +``` -yaml -server: - forward-headers-strategy: framework -(Note: JHipster usually configures this automatically for the prod profile, but it is good to double-check). +### 3. Deploy the application +After running the build command successfully, your .war file is located here: +d:\website_sisvietnam_moi\website_sisvietnam.vn\sisvietnamvn\build\libs\sisvietnamvn-0.0.1-SNAPSHOT.war +(Inside your project folder, look for the build folder, then open the libs folder). +This sisvietnamvn-0.0.1-SNAPSHOT.war file is the one you need to upload to your Ubuntu server and rename to ROOT.war inside the Tomcat webapps folder. -Summary of How it Works Now: -A user visits https://your-domain.com. -NGINX (aaPanel) receives the request on port 443. -NGINX forwards the request to http://127.0.0.1:8080. -Tomcat (Java) processes the request and sends the HTML/JSON back to NGINX. -NGINX sends the response back to the user. -You can also use aaPanel's built-in SSL manager to easily apply Let's Encrypt certificates to your NGINX site, and your Tomcat backend won't need to worry about SSL certificates at all! \ No newline at end of file +Upload the `.war` file you built in Step 1 to the server. +Place it inside the `webapps/` folder you just created and rename it to `ROOT.war` (so it serves on the root path `/`). Tomcat will automatically detect and deploy it. + +### 4. Configure NGINX Reverse Proxy (aaPanel) +Using NGINX (via aaPanel) with Tomcat is a highly recommended setup. NGINX acts as a Reverse Proxy, handling internet traffic (ports 80 and 443 for SSL) and forwarding it to Tomcat on port 8080. + +1. **Add Site**: Go to aaPanel -> Website -> Add site. Enter your domain (e.g., `sisvietnam.vn`) and select **Static** for the PHP version. +2. **Setup Reverse Proxy**: Click "Settings" for the new site -> "Reverse proxy" -> "Add reverse proxy". + - **Proxy name**: `TomcatProxy` + - **Target URL**: `http://127.0.0.1:8080` + - **Sent Domain**: `$host` +3. **Spring Boot Proxy Trust**: Ensure Spring Boot knows it is behind a proxy so it can read client IPs and HTTP schemes correctly. In `src/main/resources/config/application-prod.yml`, verify this exists: + ```yaml + server: + forward-headers-strategy: framework + ``` +4. **SSL**: Use aaPanel's built-in SSL manager to apply Let's Encrypt certificates to your NGINX site. Your Tomcat backend won't need to worry about SSL certificates. \ No newline at end of file diff --git a/sisvietnamvn/src/main/resources/config/application-prod.yml b/sisvietnamvn/src/main/resources/config/application-prod.yml index 749c7b16..2afcae8b 100644 --- a/sisvietnamvn/src/main/resources/config/application-prod.yml +++ b/sisvietnamvn/src/main/resources/config/application-prod.yml @@ -26,14 +26,13 @@ management: enabled: false spring: - devtools: - restart: - enabled: false - livereload: - enabled: false datasource: type: com.zaxxer.hikari.HikariDataSource - url: jdbc:oracle:thin:@localhost:1521:xe + # BEFORE: jdbc:oracle:thin:@oracle-db:1521:xe + # AFTER (notice the slash instead of the colon!): + url: jdbc:oracle:thin:@oracle-db:1521/XEPDB1 + username: sisvietnamvn + password: my_secure_password123 hikari: poolName: Hikari auto-commit: false @@ -90,6 +89,8 @@ jhipster: security: authentication: jwt: + # This is a securely generated base64 secret required for production tokens + base64-secret: OTMzNWRiNGQ4YTk2OWUxZmE2NDg3NTE1MTQ4ZGI1NmM1NjRiMDk0ODhkYzg3OGJmZTc4ZTA2NmU1ZmZlZjQxYmFhZjZhMjFjMzFlMjllYWViOWFlMjdhYjY1NDQxNTVlOGRiMTEwNTFiNWM4NGNiZGMyODRlNmZhZGVkNWFiNDk= # Token is valid 24 hours token-validity-in-seconds: 86400 token-validity-in-seconds-for-remember-me: 2592000 diff --git a/sisvietnamvn/src/main/resources/templates/flex-finish.html b/sisvietnamvn/src/main/resources/templates/flex-finish.html index f7274ee5..82ccbc55 100644 --- a/sisvietnamvn/src/main/resources/templates/flex-finish.html +++ b/sisvietnamvn/src/main/resources/templates/flex-finish.html @@ -1,4 +1,4 @@ - + @@ -455,7 +455,7 @@

    Business + href="#">Business Administration

    - @@ -631,4 +631,4 @@ - \ No newline at end of file + diff --git a/sisvietnamvn/src/main/resources/templates/fragments/footer.html b/sisvietnamvn/src/main/resources/templates/fragments/footer.html index f03348c7..49ca938a 100644 --- a/sisvietnamvn/src/main/resources/templates/fragments/footer.html +++ b/sisvietnamvn/src/main/resources/templates/fragments/footer.html @@ -16,10 +16,10 @@
    - @@ -122,7 +122,7 @@