diff --git a/.DS_Store b/.DS_Store index 08d6616..f43198d 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/jnpf-admin/.DS_Store b/jnpf-admin/.DS_Store index cce69c9..82750fd 100644 Binary files a/jnpf-admin/.DS_Store and b/jnpf-admin/.DS_Store differ diff --git a/jnpf-admin/src/main/resources/application-dev.yml b/jnpf-admin/src/main/resources/application-dev.yml index ab9402a..75ff155 100644 --- a/jnpf-admin/src/main/resources/application-dev.yml +++ b/jnpf-admin/src/main/resources/application-dev.yml @@ -14,14 +14,22 @@ spring: virtual: {enabled: true} exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: - db-type: MySQL - host: mariadb - port: 3306 - username: root - password: 2213 + # db-type: MySQL + # host: mariadb + # port: 3306 + # username: root + # password: 2213 + # db-name: j62 + # db-schema: null + # prepare-url: null + db-type: PostgreSQL + host: postgres + port: 5432 + username: dacli + password: dacli123 db-name: j62 - db-schema: null - prepare-url: null + db-schema: public + prepare-url: null dynamic: primary: master strict: true @@ -49,17 +57,16 @@ spring: statementPrepareAfterLogEnabled: false statementPrepareCallAfterLogEnabled: false statementParameterSetLogEnabled: false - datasource: - sswportal: - url: 'jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/sswportal?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC' - username: ${spring.datasource.username} - password: ${spring.datasource.password} - driver-class-name: com.mysql.cj.jdbc.Driver - jxcj: - url: 'jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/jxcj?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC' - username: ${spring.datasource.username} - password: ${spring.datasource.password} - driver-class-name: com.mysql.cj.jdbc.Driver + sswportal: + url: 'jdbc:postgresql://${spring.datasource.host}:${spring.datasource.port}/sswportal?useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC' + username: ${spring.datasource.username} + password: ${spring.datasource.password} + driver-class-name: org.postgresql.Driver + jxcj: + url: 'jdbc:postgresql://${spring.datasource.host}:${spring.datasource.port}/jxcj?useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC' + username: ${spring.datasource.username} + password: ${spring.datasource.password} + driver-class-name: org.postgresql.Driver redis: redisson: config: |