From 6c71e1a962a773e3f67485228e7b1e1154f58c21 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 20 Nov 2023 16:28:50 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?minio=E5=92=8Credis=20=EF=BC=8C=E5=B1=8F=E8=94=BDactuator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/config/shiro/ShiroConfig.java | 4 +- .../jero/config/shiro/filters/JwtFilter.java | 2 +- .../src/main/resources/application-dev.yml | 2 + .../src/main/resources/application-prod.yml | 10 +- .../src/main/resources/application-test.yml | 124 ++++++++++++++---- 5 files changed, 107 insertions(+), 35 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index dfdceea0..a2eba271 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -94,7 +94,6 @@ public class ShiroConfig { filterChainDefinitionMap.put("/sys/common/pdf/**", "anon");//pdf预览 filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件 filterChainDefinitionMap.put("/", "anon"); - filterChainDefinitionMap.put("/doc.html", "anon"); filterChainDefinitionMap.put("/**/*.js", "anon"); filterChainDefinitionMap.put("/**/*.css", "anon"); filterChainDefinitionMap.put("/**/*.html", "anon"); @@ -111,12 +110,13 @@ public class ShiroConfig { //filterChainDefinitionMap.put("/druid/**", "anon"); if ("false".equals(production)){ + filterChainDefinitionMap.put("/doc.html", "anon"); filterChainDefinitionMap.put("/swagger-ui.html", "anon"); filterChainDefinitionMap.put("/swagger**/**", "anon"); filterChainDefinitionMap.put("/webjars/**", "anon"); filterChainDefinitionMap.put("/v2/**", "anon"); } - + filterChainDefinitionMap.put("/actuator", "anon"); //积木报表排除 filterChainDefinitionMap.put("/jmreport/**", "anon"); filterChainDefinitionMap.put("/**/*.js.map", "anon"); diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java index 167b5404..4fc69bfe 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/filters/JwtFilter.java @@ -48,7 +48,7 @@ public class JwtFilter extends BasicHttpAuthenticationFilter { executeLogin(request, response); return true; } catch (Exception e) { - throw new AuthenticationException("Token失效，请重新登录", e); + throw new AuthenticationException("Token失效，请重新登录"); } } diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index 70a9fe49..f54d2031 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -14,6 +14,8 @@ server: mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* management: + server: + port: -1 endpoints: #关闭actuator监控 enabled-by-default: false diff --git a/laws-single-startup/src/main/resources/application-prod.yml b/laws-single-startup/src/main/resources/application-prod.yml index 73703c4e..ddcf2b92 100644 --- a/laws-single-startup/src/main/resources/application-prod.yml +++ b/laws-single-startup/src/main/resources/application-prod.yml @@ -14,6 +14,8 @@ server: mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* management: + server: + port: -1 endpoints: #关闭actuator监控 enabled-by-default: false @@ -149,8 +151,8 @@ spring: #driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: - database: 8 - host: 10.186.40.105 + database: 6 + host: 10.186.16.129 lettuce: pool: max-active: 8 #最大连接数据库连接数,设 0 为没有限制 @@ -158,7 +160,7 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 100ms - password: 'nb!ydy%cGm82' + password: 'VIpbG5w1!ufh' port: 20260 #rabbitmq 配置 rabbitmq: @@ -243,7 +245,7 @@ jero: minio: minio_url: http://grp-minio.yf-grp:9000 minio_name: root - minio_pass: bpm@2023 + minio_pass: Grp2kvs@!dd bucketName: laws-sinotruk #大屏报表参数设置 jmreport: diff --git a/laws-single-startup/src/main/resources/application-test.yml b/laws-single-startup/src/main/resources/application-test.yml index 7d0d14e3..bf6dd3e8 100644 --- a/laws-single-startup/src/main/resources/application-test.yml +++ b/laws-single-startup/src/main/resources/application-test.yml @@ -14,16 +14,19 @@ server: mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* management: + server: + port: -1 endpoints: - web: - exposure: - include: metrics,httptrace + #关闭actuator监控 + enabled-by-default: false spring: servlet: multipart: max-file-size: 500MB max-request-size: 500MB + messages: + basename: i18n/messages mail: host: smtp.163.com username: test@163.com @@ -99,7 +102,7 @@ spring: datasource: druid: stat-view-servlet: - enabled: true + enabled: false loginUsername: druid loginPassword: druid allow: @@ -113,7 +116,7 @@ spring: min-idle: 5 maxActive: 20 # 配置获取连接等待超时的时间 - maxWait: 60000 + maxWait: 300000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 timeBetweenEvictionRunsMillis: 60000 # 配置一个连接在池中最小生存的时间，单位是毫秒 @@ -126,15 +129,16 @@ spring: poolPreparedStatements: true maxPoolPreparedStatementPerConnectionSize: 20 # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 - filters: stat,wall,slf4j + filters: stat,slf4j + # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000;druid.stat.logSlowSql\=true datasource: master: - url: jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - username: root - password: 123456 - driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:p6spy:mysql://10.186.40.44:8921/laws_sinotrunk_grp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true + username: law_dev + password: Lawdev!@#1234 + driver-class-name: com.p6spy.engine.spy.P6SpyDriver # url: jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai # username: root # password: 123456 @@ -147,8 +151,8 @@ spring: #driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: - database: 3 - host: 121.36.69.172 + database: 8 + host: 10.186.40.105 lettuce: pool: max-active: 8 #最大连接数据库连接数,设 0 为没有限制 @@ -156,8 +160,8 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 100ms - password: 'hzwlsoft.com' - port: 4780 + password: 'nb!ydy%cGm82' + port: 20260 #rabbitmq 配置 rabbitmq: host: 121.36.69.172 @@ -188,22 +192,33 @@ mybatis-plus: id-type: ASSIGN_ID # 默认数据库表下划线命名 table-underline: true - configuration: + # configuration: # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 返回类型为Map,显示null对应的字段 - call-setters-on-nulls: true +# call-setters-on-nulls: true #jero专用配置 jero: # 签名密钥串(前后端要一致，正式发布请自行修改) signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a # 本地：local\Minio：minio\阿里云：alioss - uploadType: local + uploadType: minio + backUrl: http://localhost:3000 + backUrlPhone: http://localhost:3000 + #拆分图片展示地址 + splitUrl: http://laws-test.sinotruk.com/laws-sinotruk/sys/split/file/getImage?fileName= path: #文件上传根目录 设置 - upload: D://opt//upFiles + upload: /app/opt/upFiles #webapp文件路径 - webapp: D://opt//webapp + webapp: /app/opt/webapp + uploadCos: 1 + #导出pdf临时文件路径 设置 + exportPdfTempPath: D://opt//exportTemp/ + #导出excel临时文件路径 设置 + exportExcelTempPath: D://opt//exportExcelTemp + #仿宋体字体文件路径 设置 + simfangFontFilePath: D://opt//simfangFontFilePath//simfang.ttf shiro: excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储配置 @@ -228,10 +243,10 @@ jero: file-view-domain: 127.0.0.1:8012 # minio文件上传 minio: - minio_url: http://minio.jero.com - minio_name: ?? - minio_pass: ?? - bucketName: otatest + minio_url: http://grp-minio.yf-grp:9000 + minio_name: root + minio_pass: bpm@2023 + bucketName: laws-sinotruk #大屏报表参数设置 jmreport: mode: dev @@ -272,13 +287,13 @@ jero: # 文件限制后缀黑名单 fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA # 跨站白名单 - whiteUrls: localhost:3000,localhost:8080 + whiteUrls: localhost:3000,localhost:8080,localhost:62345,laws-test.sinotruk.com # xss白名单 xssExcludedPages: /login,/updatePassword # cors白名单 notFilter: # origin地址 - originIp: http://localhost:3000 + originIp: http://localhost:3000,http://localhost:62345,http://laws-test.sinotruk.com # 加密默认值 password: pbe: @@ -295,11 +310,13 @@ logging: level: com.jero.modules.system.mapper : info #swagger +swagger: + enabled: false knife4j: #开启增强配置 enable: true #开启生产环境屏蔽，为true，则knife4j无法访问 - production: false + production: true basic: enable: false username: jero @@ -330,5 +347,56 @@ justauth: prefix: 'demo::' timeout: 1h +file: + downloadUrl: a + split: + path: /opt/onlyoffice/file/splitImage/ + sourceFilePath: /app/onlyoffice/DOCX.docx + path: /app/onlyoffice/file/ + +iam: + bimRemoteUser: srmsIam + bimRemotePwd: srmsIam2023 + # bimRemoteUser: bbcadmin + # bimRemotePwd: P@ssw0rd + bpmcAppkey: test + +# Hiwork集成 +hiwork: + ip: http://task-test.sinotruk.com/ + # 异构系统标识 + sysCode: test + # 统一待办集成 + todoUrl: taskapi/task.basedata/integrationCall/workflowIntegration + # 统一消息集成 + messageUrl: taskapi/task.basedata/notice/noticeCalls/send + # 是否发送消息 + isSend: false + +# 汽车标准数字化平台ASMS +asms: + host: http://standard.catarc.org.cn/ + # 测试账号用户名 + username: ceshi + # 测试账号密码 + password: Catarc@333 + # token过期时间（单位：小时） + expire: 48 + +# 单点登录配置(所有配置信息需要协调注册，现在都为假) +oauth: + # 客户端应用注册ID--客户申请的：SRMS + clientId: SRMS + # 客户端应用注册密钥 客户申请的：58a1001438de462193bec307826463c2 + clientSecret: 58a1001438de462193bec307826463c2 + # 授权码验证 + grantType: authorization_code + # 通过授权码获取accessToken请求地址 + accessTokenUrl: https://iam-uat.sinotruk.com:7011/idp/oauth2/getToken + # 通过accessToken获取账号信息请求地址 + userInfoUrl: https://iam-uat.sinotruk.com:7011/idp/oauth2/getUserInfo + # 防止跨站请求伪造（CSRF）标识（暂时不用） + state: zhongQi + # 起草部门部门名称 -draftDepartName: 起草部门 +draftDepartName: 流程与标准化 \ No newline at end of file