diff --git a/agileboot-boot-start/pom.xml b/agileboot-boot-start/pom.xml index 7b39de9..f8f2106 100644 --- a/agileboot-boot-start/pom.xml +++ b/agileboot-boot-start/pom.xml @@ -26,8 +26,7 @@ com.agileboot - wol-auth - 1.0.0 + wol-common-satoken diff --git a/agileboot-boot-start/src/main/resources/application-dev.yml b/agileboot-boot-start/src/main/resources/application-dev.yml index 6645816..ba1f58c 100644 --- a/agileboot-boot-start/src/main/resources/application-dev.yml +++ b/agileboot-boot-start/src/main/resources/application-dev.yml @@ -1,57 +1,71 @@ # 数据源配置 spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver - druid: - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 设置白名单,不填则允许所有访问 - allow: - url-pattern: /druid/* - # 控制台管理用户名和密码 - login-username: agileboot - login-password: 123456 - filter: - stat: - enabled: true - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true - dynamic: - primary: master - strict: false - druid: - # 初始连接数 - initialSize: 5 - # 最小连接池数量 - minIdle: 10 - # 最大连接池数量 - maxActive: 20 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间,单位是毫秒 - minEvictableIdleTimeMillis: 300000 - # 配置一个连接在池中最大生存的时间,单位是毫秒 - maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - datasource: - master: - url: jdbc:mysql://mysql2.sqlpub.com:3307/agileboot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&sslMode=REQUIRED - username: ENC(s4kjpEsplGGLeV3YRNvJpJhDSOAO0tEf) - password: ENC(hg/hxmducWsI8u83/eXgAi8yHBDFbB5z0xzwNtBejPc=) + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单,不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: agileboot + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true + dynamic: + primary: master + strict: false + druid: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间,单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间,单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + datasource: + master: + url: jdbc:mysql://mysql2.sqlpub.com:3307/agileboot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&sslMode=REQUIRED + username: ENC(s4kjpEsplGGLeV3YRNvJpJhDSOAO0tEf) + password: ENC(hg/hxmducWsI8u83/eXgAi8yHBDFbB5z0xzwNtBejPc=) + + + data: + redis: + database: 1 + host: 47.94.178.59 + port: 6379 + password: 'jjt@1234' + + +sa-token: + # 是否输出操作日志 + is-log: true + token-name: Authorization jasypt: - encryptor: - password: ${JASYPT_ENCRYPTOR_PASSWORD:} \ No newline at end of file + encryptor: + password: ${JASYPT_ENCRYPTOR_PASSWORD:} diff --git a/agileboot-common/wol-common-satoken/pom.xml b/agileboot-common/wol-common-satoken/pom.xml index 05c9cca..8974613 100644 --- a/agileboot-common/wol-common-satoken/pom.xml +++ b/agileboot-common/wol-common-satoken/pom.xml @@ -28,17 +28,17 @@ ${satoken.version} - - - - - + + cn.dev33 + sa-token-redis-template + ${satoken.version} + - - - - + + org.apache.commons + commons-pool2 +