From a85f6b7512f78e276b87ff39199dba44ee5fb598 Mon Sep 17 00:00:00 2001 From: ssw Date: Thu, 2 Jul 2026 20:15:44 +0800 Subject: [PATCH] auto(8d008ee41e9e): session end @ 2026-07-02T20:15:42 (+1f) --- .DS_Store | Bin 8196 -> 6148 bytes jnpf-admin/.DS_Store | Bin 6148 -> 6148 bytes .../src/main/resources/application-dev.yml | 43 ++++++++++-------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.DS_Store b/.DS_Store index 08d66167d6068977d3f5a4ba174e55d39529b9a2..f43198d8a378b1a12a55b09c5bc413725a69b91a 100644 GIT binary patch delta 127 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$Snnu2Z`mRPZkjWzOi8!6Qk7R zBLdZv9}9_Yo+EUTX)>!=&*q=(d>n$zK(#<1zzrl^L1t_${LVa?U&a$;A_Eh|bdZG% Ko8x)rFarQ4ei#@4 literal 8196 zcmeHM&ubGw6n@i&Cat0#JVX>+MM1?z>d{kLlY=Lf-W0_AXwn}^HZ&|lSdDV6#oGaV)QP0@T$G&H$Tk2&F*IPB8AM9ofr0fZ{~a7%?6y0jq#jz$#!B*a-^Y%$6+` zaqerc?X3b20 zKd&5`W@r_&HmL&T3fO^lDA~ABb4z9)VUfjA;4;5di;m&EPxPN%i5i>d(0N>0d#?9F zC=ae~9G2&H@~PUJN#x}sqYT|ZUmMEm-cVLk*hNb!V%@)+Rn9~{KhI)w>+0QUy%Iwh zZ#AMYoVA%}TJdOs`38QKz^TQxjYe@!`EUI*cfP2nEMz>c>u6*MzZq)bucMwcscv2F zTOY&8_hqmQ#c__u+-ryWTZ&@@*3&Nz>*G14RzEf1xr+5K(W;MQ=Ia4)3}86F?-#p= z-{^G>!Fk+9;e5REO}Th{tS;RgUfqY)FbwB)d-KwtrzS8KU)fPOA1~oxN=gp&YU4c+ zw&#WroYVdv^~(?RlN>;KN=2i5d?cH3X_Gq9w5{8yWM2Y0^#%-1hi diff --git a/jnpf-admin/.DS_Store b/jnpf-admin/.DS_Store index cce69c9ca0c35a1aeabaf73a5e6ccef5347c245a..82750fde6d56ac5905219817b8f105d43dc73ca2 100644 GIT binary patch delta 82 zcmZoMXfc=|#>B`mF;Q%yo}wrR0|Nsi1A_pAVQ_MOZUKB)qu~2NHo}wTR0|Nsi1A_oVPP$=ma(-^XW#} zVweiE(&xSi%XOBCg%BSF!FUWvc3)BNN`v8b!W+>h) k#8}I^nVo~51L#tqi@q~Y<`=Q#06G+i7#KDOh-_g70Pr9#*8l(j 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: |