Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/ESIPFed/Geoweaver
Browse files Browse the repository at this point in the history
  • Loading branch information
ZihengSun committed Oct 23, 2024
2 parents 3f211c1 + 1a63457 commit 174e940
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .wci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ headline: a lightweight workflow software to easily orchestrate pipelines from P
description: Geoweaver is a web system to allow users to automatically record history and manage complicated scientific workflows in web browsers involving the online spatial data facilities, high-performance computation platforms, and open-source libraries.

documentation:
general: https://esipfed.github.io/Geoweaver/
general: https://geoweaver.dev
installation: https://esipfed.github.io/Geoweaver/docs/install.html
tutorial: https://zihengsun.github.io/Geoweaver/
tutorial: https://geoweaver.dev/guide/
17 changes: 17 additions & 0 deletions src/main/resources/application-mysql.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# MySQL Configuration



###########################################################################
# Add the Database name, User name, password using command Line argument. #
###########################################################################

spring.datasource.url=jdbc:mysql://localhost:3306/${DB_NAME:gw_db}
spring.datasource.username=${DB_USERNAME:gw_user}
spring.datasource.password=${DB_PASSWORD:password}
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.jpa.hibernate.ddl-auto=update
spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect


spring.datasource.hikari.auto-commit=true
6 changes: 3 additions & 3 deletions src/main/resources/application-postgresql.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
# Add the Database name, User name, password by removing the double quote. #
###########################################################################

spring.datasource.url=jdbc:postgresql://localhost:5432/"add the name of DB" #Eg: gw_db
spring.datasource.username="add DB suername" #Eg: gw_user
spring.datasource.password="password" #Eg: password
spring.datasource.url=jdbc:postgresql://localhost:5432/${DB_NAME:gw_db} #Eg: gw_db
spring.datasource.username=${DB_USERNAME:gw_user} #Eg: gw_user
spring.datasource.password=${DB_PASSWORD:password} #Eg: password
spring.datasource.driver-class-name=org.postgresql.Driver
spring.jpa.hibernate.ddl-auto=update
spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/static/js/gw.history.js
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ GW.history = {
targets: [1],
},
{
targets: [3],
targets: '_all',
className: 'wrap-text'
}
],
Expand Down

0 comments on commit 174e940

Please sign in to comment.