From d75970a3e2e6e6c0b4a8590cf39b2134e6c11ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E5=90=91=E6=96=8C?= <574110378@qq.com> Date: Fri, 22 Sep 2023 17:12:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 53 +++++++++---------- .../src/main/resources/application.yml | 2 +- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index 50a8d0e..9a86f11 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8020 tomcat: max-swallow-size: -1 error: @@ -7,7 +7,7 @@ server: include-stacktrace: ALWAYS include-message: ALWAYS servlet: - context-path: /jeecg-boot + context-path: /ocr compression: enabled: true min-response-size: 1024 @@ -26,7 +26,7 @@ spring: max-request-size: 10MB mail: host: smtp.163.com - username: ?? + username: jeecgos@163.com password: ?? properties: mail: @@ -111,14 +111,14 @@ spring: # 初始化大小，最小，最大 initial-size: 5 min-idle: 5 - maxActive: 1000 + maxActive: 20 # 配置获取连接等待超时的时间 maxWait: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 timeBetweenEvictionRunsMillis: 60000 # 配置一个连接在池中最小生存的时间，单位是毫秒 minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL + validationQuery: SELECT 1 testWhileIdle: true testOnBorrow: false testOnReturn: false @@ -131,10 +131,14 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://127.0.0.1:3306/ocr?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: root + password: stqpvqk/.6:H driver-class-name: com.mysql.cj.jdbc.Driver + # url: jdbc:mysql://127.0.0.1:3306/jeecg-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 # 多数据源配置 #multi-datasource1: #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai @@ -143,8 +147,9 @@ spring: #driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: - database: 0 + database: 3 host: 127.0.0.1 + # host: 47.103.213.109 port: 6379 password: '' #mybatis plus 设置 @@ -173,31 +178,30 @@ jeecg: signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a # 签名拦截接口 signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys - #local\minio\alioss - uploadType: alioss + #local、minio、alioss + uploadType: local # 前端访问地址 domainUrl: pc: http://localhost:3100 app: http://localhost:8051 path: #文件上传根目录 设置 - upload: /data/ocr/upload + upload: /data/ocr/upFiles #webapp文件路径 - webapp: /opt/jeecg-boot/webapp + webapp: /opt/webapp shiro: - excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo + excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 oss: accessKey: ?? secretKey: ?? endpoint: oss-cn-beijing.aliyuncs.com bucketName: jeecgdev - staticDomain: https://static.jeecg.com - # ElasticSearch 设置 + # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES cluster-nodes: 127.0.0.1:9200 - check-enabled: true + check-enabled: false # 在线预览文件服务器地址配置 file-view-domain: http://fileview.jeecg.com # minio文件上传 @@ -208,17 +212,9 @@ jeecg: bucketName: otatest #大屏报表参数设置 jmreport: - mode: prod + mode: dev #数据字典是否进行saas数据隔离，自己看自己的字典 saas: false - #是否开启租户模式 Support By v1.5.5+ - openTenant: false - #安全模式(敏感接口校验、saas模式下不允许使用平台数据源) - #safeMode: true - #是否需要校验token - is_verify_token: true - #必须校验方法 - verify_methods: remove,delete,save,add,update #xxl-job配置 xxljob: enabled: false @@ -250,7 +246,7 @@ knife4j: #开启生产环境屏蔽 production: false basic: - enable: true + enable: false username: jeecg password: jeecg1314 #第三方登录 @@ -303,5 +299,6 @@ third-app: agent-id: ?? system: project: - env: customer_prod - fileReviewUrlPrefix: http://47.103.213.109:8072/files \ No newline at end of file + env: customer_test + enableHandleTask: true + fileReviewUrlPrefix: http://localhost:8071/files \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application.yml index 678c3e7..691f1e0 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application.yml @@ -3,4 +3,4 @@ spring: name: jeecg-system profiles: # active: '@profile.name@' - active: dev \ No newline at end of file + active: prod \ No newline at end of file