From bc2180a138454ef48f023f303d697f164b0554c3 Mon Sep 17 00:00:00 2001 From: wangchengjun <616865598@qq.com> Date: Mon, 28 Mar 2022 11:49:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=81=E6=BC=94=E7=A4=BA?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 148 ++++++++++---- .../src/main/resources/application-test.yml | 189 ++++++++++++------ 2 files changed, 243 insertions(+), 94 deletions(-) diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml index 3b58f5f1b..100922224 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8008 tomcat: max-swallow-size: -1 error: @@ -14,19 +14,19 @@ server: mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* management: - endpoints: - web: - exposure: - include: metrics,httptrace + endpoints: + web: + exposure: + include: metrics,httptrace spring: servlet: - multipart: - max-file-size: 10MB - max-request-size: 10MB + multipart: + max-file-size: 500MB + max-request-size: 500MB mail: - host: smtp.163.com - username: test@163.com + host: smtp.qq.com + username: 1299338037@qq.com password: ?? properties: mail: @@ -131,9 +131,14 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 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 + # url: jdbc:mysql://10.0.3.44: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:mysql://10.10.10.44:3306/laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false + url: jdbc:mysql://121.36.69.172:3307/laws_weilai_zhn?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: root + password: hzwlsoft.com driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -142,9 +147,12 @@ spring: #password: root #driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 + main: + # 解决@FeignClient注解 value/name 值重复报错 此值默认是false + allow-bean-definition-overriding: true redis: - database: 0 - host: 127.0.0.1 + database: 2 + host: 121.36.69.172 lettuce: pool: max-active: 8 #最大连接数据库连接数,设 0 为没有限制 @@ -152,7 +160,7 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 100ms - password: '' + password: 'hzwlsoft.com' port: 4780 #mybatis plus 设置 mybatis-plus: @@ -165,37 +173,34 @@ mybatis-plus: id-type: ASSIGN_ID # 默认数据库表下划线命名 table-underline: true - logic-delete-field: delFlag #默认deleted - logic-delete-value: 1 - logic-not-delete-value: 0 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 #jero专用配置 jero : # 本地：local\Minio：minio\阿里云：alioss - uploadType: alioss + uploadType: local path : #文件上传根目录 设置 - upload: /opt/jero-boot/upload + upload: /data/DeploymentPackage/laws-weilai/upFiles #webapp文件路径 - webapp: /opt/jero-boot/webapp + webapp: /data/DeploymentPackage/laws-weilai/webapp shiro: - excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** + excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储配置 oss: endpoint: oss-cn-beijing.aliyuncs.com accessKey: ?? secretKey: ?? bucketName: jeroos - staticDomain: https://static.jero.com - # ElasticSearch 设置 + staticDomain: ?? + # ElasticSearch 6设置 elasticsearch: - cluster-name: jero-ES - cluster-nodes: 111.225.222.176:9200 - check-enabled: true + cluster-name: elasticsearch + cluster-nodes: 121.36.69.172:9200 + check-enabled: false # 表单设计器配置 desform: # 主题颜色（仅支持 16进制颜色代码） @@ -203,7 +208,7 @@ jero : # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置） upload-type: system # 在线预览文件服务器地址配置 - file-view-domain: http://fileview.jero.com + file-view-domain: 127.0.0.1:8012 # minio文件上传 minio: minio_url: http://minio.jero.com @@ -212,18 +217,18 @@ jero : bucketName: otatest #大屏报表参数设置 jmreport: - mode: prod + mode: dev #数据字典是否可以全局看到 saas: false #是否需要校验token - is_verify_token: true + is_verify_token: false #必须校验方法 verify_methods: remove,delete,save,add,update #Wps在线文档 wps: domain: https://wwo.wps.cn/office/ - appid: true - appsecret: true + appid: ?? + appsecret: ?? #xxl-job配置 xxljob: enabled: false @@ -235,7 +240,7 @@ jero : port: 30007 logPath: logs/jero/job/jobhandler/ logRetentionDays: 30 - #自定义路由配置 yml nacos database + #自定义路由配置 yml nacos database route: config: data-id: jero-gateway-router @@ -262,7 +267,7 @@ logging: knife4j: production: false basic: - enable: true + enable: false username: jero password: jero.com #第三方登录 @@ -283,10 +288,77 @@ justauth: client-secret: true redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/dingtalk/callback WECHAT_OPEN: - client-id: true - client-secret: true + client-id: ?? + client-secret: ?? redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/wechat_open/callback cache: type: default prefix: 'demo::' - timeout: 1h \ No newline at end of file + timeout: 1h +# 云端OCR识别集成配置参数 +OCR: + #请求OCR转换接口 + #handleFileUrl: http://sws.trans-cosmos.com.cn/WebService.asmx/FileConversion + handleFileUrl: http://61.136.1.103:8091/WebService.asmx/FileConversion + # OCR回调接口地址 配置客户本地的IP及端口号 + callBackUrl: http://139.9.235.66:8012/local-tool/ocr/ocrHandleResult + # OCR认证用户 + userId: dayuzhou1234 + # OCR认证编码 + authCode: 123456 + # OCR接口公钥 + publicKey: EC4KKA6ZDTCPAOCRBC5M + # OCR文件存储路径 + ocrPath: /data/DeploymentPackage/laws_weilai/APPSOFT/LAWSOCRDEMO/OCRFILE/ + # OCR文件下载地址 + ocrDownPath: http://139.9.235.66:9020/downfile/ + # OCR接口超时时间 + times: 20 + # OCR转换类型 + convertType: BOTH +ribbon: + eureka: + enabled: true + #ribbon的超时时间 + ReadTimeout: 120000 + ConnectTimeout: 300000 +#hystrix的超时时间 +hystrix: + command: + default: + execution: + timeout: + enabled: true + isolation: + thread: + timeoutInMilliseconds: 300000 +## eureka注册中心 +eureka: + client: + #是否将自己注册到Eureka Server上，默认为true + register-with-eureka: true + ##是否从Eureka Server上获取注册信息，默认为true + fetch-registry: true + service-url: + defaultZone: http://127.0.0.1:8007/eureka/ +## people 2.0 +people: + appId: 100679 + # 访问域名 CN TEST版 + host: http://napoleon-fab-test.nioint.com + # 访问域名 CN PROD版 + # host: http://napoleon.nioint.com + # appSecret CN TEST版 + secret: CDf2D9404C6ac1B0f7c3e3845ae0282a + # appSecret CN PROD版 + # secret: 7C3F03170E3ea489df04Ce8DEC7Df4f7 +Feishu: + appId: cli_a16d47ca9f381013 + appSecret: DSfCrj70xku2VUjqwHBIuuY6HZnz7ppe + getTenantAccessTokenUrl: https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal + batchSendMessageUrl: https://open.feishu.cn/open-apis/message/v4/batch_send/ +# local-tool +local-tool: + uri: http://139.9.235.66:8012 +opensso: + redirectUri: http%3A%2F%2F139.9.235.66%3A8010 diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml index ac7de9c86..90df0691d 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-test.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8101 tomcat: max-swallow-size: -1 error: @@ -14,19 +14,19 @@ server: mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* management: - endpoints: - web: - exposure: - include: metrics,httptrace + endpoints: + web: + exposure: + include: metrics,httptrace spring: servlet: - multipart: - max-file-size: 10MB - max-request-size: 10MB + multipart: + max-file-size: 10MB + max-request-size: 10MB mail: - host: smtp.163.com - username: test@163.com + host: smtp.qq.com + username: 1299338037@qq.com password: ?? properties: mail: @@ -65,16 +65,16 @@ spring: jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 - aop: - proxy-target-class: true + jpa: + open-in-view: false activiti: check-process-definitions: false #启用作业执行器 async-executor-activate: false #启用异步执行器 job-executor-activate: false - jpa: - open-in-view: false + aop: + proxy-target-class: true #配置freemarker freemarker: # 设置模板后缀名 @@ -130,42 +130,50 @@ spring: # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 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: root - driver-class-name: com.mysql.cj.jdbc.Driver + master: + # url: jdbc:mysql://10.0.3.44: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:mysql://10.10.10.44:3306/laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false + # url: jdbc:mysql://121.36.69.172:3307/laws_weilai?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 # 多数据源配置 #multi-datasource1: - #url: jdbc:mysql://localhost:3306/jero-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - #username: root - #password: root - #driver-class-name: com.mysql.cj.jdbc.Driver + #url: jdbc:mysql://localhost:3306/jero-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + #username: root + #password: root + #driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 + main: + # 解决@FeignClient注解 value/name 值重复报错 此值默认是false + allow-bean-definition-overriding: true redis: - database: 0 - host: 192.168.1.199 - lettuce: - pool: - max-active: 8 #最大连接数据库连接数,设 0 为没有限制 - max-idle: 8 #最大等待连接中的数量,设 0 为没有限制 - max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 - min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 - shutdown-timeout: 100ms - password: '' - port: 4780 + database: 3 + host: 121.36.69.172 + lettuce: + pool: + max-active: 8 #最大连接数据库连接数,设 0 为没有限制 + max-idle: 8 #最大等待连接中的数量,设 0 为没有限制 + max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 + min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 + shutdown-timeout: 100ms + password: 'hzwlsoft.com' + port: 4780 #mybatis plus 设置 mybatis-plus: - mapper-locations: classpath*:com/jero/**/xml/*Mapper.xml - global-config: + mapper-locations: classpath*:com/jero/**/xml/*Mapper.xml + global-config: # 关闭MP3.0自带的banner banner: false db-config: - #主键类型 + #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)"; id-type: ASSIGN_ID # 默认数据库表下划线命名 table-underline: true - configuration: + configuration: # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 返回类型为Map,显示null对应的字段 @@ -176,22 +184,22 @@ jero : uploadType: local path : #文件上传根目录 设置 - upload: D://opt//upFiles + upload: /data/DeploymentPackage/laws_weilai/upFiles #webapp文件路径 - webapp: D://opt//webapp + webapp: /data/DeploymentPackage/laws_weilai/webapp shiro: - excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** + excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储配置 oss: endpoint: oss-cn-beijing.aliyuncs.com accessKey: ?? secretKey: ?? bucketName: jeroos - staticDomain: https://static.jero.com - # ElasticSearch 设置 + staticDomain: ?? + # ElasticSearch 6设置 elasticsearch: cluster-name: jero-ES - cluster-nodes: ?? + cluster-nodes: 127.0.0.1:9200 check-enabled: false # 表单设计器配置 desform: @@ -200,7 +208,7 @@ jero : # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置） upload-type: system # 在线预览文件服务器地址配置 - file-view-domain: http://127.0.0.1:8012 + file-view-domain: 127.0.0.1:8012 # minio文件上传 minio: minio_url: http://minio.jero.com @@ -209,7 +217,7 @@ jero : bucketName: otatest #大屏报表参数设置 jmreport: - mode: prod + mode: dev #数据字典是否可以全局看到 saas: false #是否需要校验token @@ -232,7 +240,7 @@ jero : port: 30007 logPath: logs/jero/job/jobhandler/ logRetentionDays: 30 - #自定义路由配置 yml nacos database + #自定义路由配置 yml nacos database route: config: data-id: jero-gateway-router @@ -248,13 +256,13 @@ jero : fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin # 跨站白名单 whiteUrls: +#cas单点登录 +cas: + prefixUrl: http://cas.example.org:8443/cas #Mybatis输出sql日志 logging: level: com.jero.modules.system.mapper : info -#cas单点登录 -cas: - prefixUrl: http://cas.example.org:8443/cas #swagger knife4j: production: false @@ -267,17 +275,17 @@ justauth: enabled: true type: GITHUB: - client-id: ?? - client-secret: ?? + client-id: true + client-secret: true redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/github/callback WECHAT_ENTERPRISE: - client-id: ?? - client-secret: ?? + client-id: true + client-secret: true redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/wechat_enterprise/callback agent-id: 1000002 DINGTALK: - client-id: ?? - client-secret: ?? + client-id: true + client-secret: true redirect-uri: http://sso.test.com:8080/jero-boot/sys/thirdLogin/dingtalk/callback WECHAT_OPEN: client-id: ?? @@ -287,3 +295,72 @@ justauth: type: default prefix: 'demo::' timeout: 1h +# 云端OCR识别集成配置参数 +OCR: + #请求OCR转换接口 + #handleFileUrl: http://sws.trans-cosmos.com.cn/WebService.asmx/FileConversion + handleFileUrl: http://61.136.1.103:8091/WebService.asmx/FileConversion + # OCR回调接口地址 配置客户本地的IP及端口号 + callBackUrl: http://139.9.235.66:9022/local-tool/ocr/ocrHandleResult + # OCR认证用户 + userId: dayuzhou1234 + # OCR认证编码 + authCode: 123456 + # OCR接口公钥 + publicKey: EC4KKA6ZDTCPAOCRBC5M + # OCR文件存储路径 + ocrPath: /data/DeploymentPackage/laws_weilai/APPSOFT/LAWSOCRDEMO/OCRFILE/ + # OCR文件下载地址 + ocrDownPath: http://139.9.235.66:9020/downfile/ + # OCR接口超时时间 + times: 20 + # OCR转换类型 + convertType: BOTH +ribbon: + eureka: + enabled: true + #ribbon的超时时间 + ReadTimeout: 120000 + ConnectTimeout: 300000 +#hystrix的超时时间 +hystrix: + command: + default: + execution: + timeout: + enabled: true + isolation: + thread: + timeoutInMilliseconds: 300000 +## eureka注册中心 +eureka: + client: + #是否将自己注册到Eureka Server上，默认为true + register-with-eureka: true + ##是否从Eureka Server上获取注册信息，默认为true + fetch-registry: true + service-url: + defaultZone: http://127.0.0.1:8123/eureka/ +## people 2.0 +people: + appId: 100679 + # 访问域名 CN TEST版 + host: http://napoleon-fab-test.nioint.com + # 访问域名 CN PROD版 + # host: http://napoleon.nioint.com + # appSecret CN TEST版 + secret: CDf2D9404C6ac1B0f7c3e3845ae0282a + # appSecret CN PROD版 + # secret: 7C3F03170E3ea489df04Ce8DEC7Df4f7 + ## Feishu +Feishu: + appId: cli_a16d47ca9f381013 + appSecret: DSfCrj70xku2VUjqwHBIuuY6HZnz7ppe + getTenantAccessTokenUrl: https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal + batchSendMessageUrl: https://open.feishu.cn/open-apis/message/v4/batch_send/ +## 单点登录 +opensso: + # 测试 TEST版 + redirectUri: http%3A%2F%2F139.9.235.66%3A8010 +local-tool: + uri: http://139.9.235.66:9022 \ No newline at end of file