From 43183a467ad8a90e5f4870beb2b1f44f2963e074 Mon Sep 17 00:00:00 2001 From: zhangdaiscott <zhangdaiscott@163.com> Date: Thu, 17 Sep 2020 19:23:05 +0800 Subject: [PATCH] 解决，找不到jeecg-cloud-module在其子目录config下有两个配置文件 #1754 --- jeecg-boot/jeecg-cloud-module/config/bootstrap.yml | 16 ++++++++++++++++ jeecg-boot/jeecg-cloud-module/config/jeecg-cloud-application-beta.yml | 237 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ jeecg-boot/jeecg-cloud-module/config/jeecg-cloud-gateway-beta.yml | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 292 insertions(+), 0 deletions(-) create mode 100644 jeecg-boot/jeecg-cloud-module/config/bootstrap.yml create mode 100644 jeecg-boot/jeecg-cloud-module/config/jeecg-cloud-application-beta.yml create mode 100644 jeecg-boot/jeecg-cloud-module/config/jeecg-cloud-gateway-beta.yml diff --git a/jeecg-boot/jeecg-cloud-module/config/bootstrap.yml b/jeecg-boot/jeecg-cloud-module/config/bootstrap.yml new file mode 100644 index 0000000..368e681 --- /dev/null +++ b/jeecg-boot/jeecg-cloud-module/config/bootstrap.yml @@ -0,0 +1,16 @@ +server: + port: 8080 +spring: + application: + name: jeecg-system + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + config: + file-extension: yml + server-addr: 127.0.0.1:8848 + shared-dataids: jeecg-cloud-application-beta.yml +feign: + sentinel: + enabled: true \ No newline at end of file diff --git a/jeecg-boot/jeecg-cloud-module/config/jeecg-cloud-application-beta.yml b/jeecg-boot/jeecg-cloud-module/config/jeecg-cloud-application-beta.yml new file mode 100644 index 0000000..df998c0 --- /dev/null +++ b/jeecg-boot/jeecg-cloud-module/config/jeecg-cloud-application-beta.yml @@ -0,0 +1,237 @@ +server: + tomcat: + max-swallow-size: -1 + servlet: + context-path: / + compression: + enabled: true + min-response-size: 1024 + mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* + +management: + endpoints: + web: + exposure: + include: metrics,httptrace + +spring: + servlet: + multipart: + max-file-size: 10MB + max-request-size: 10MB + mail: + host: smtp.163.com + username: jeecgos@163.com + password: ?? + properties: + mail: + smtp: + auth: true + starttls: + enable: true + required: true + ## quartz定时任务,采用数据库方式 + quartz: + job-store-type: jdbc + initialize-schema: embedded + #设置自动启动，默认为 true + auto-startup: true + #启动时更新己存在的Job + overwrite-existing-jobs: true + properties: + org: + quartz: + scheduler: + instanceName: MyScheduler + instanceId: AUTO + jobStore: + class: org.quartz.impl.jdbcjobstore.JobStoreTX + driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate + tablePrefix: QRTZ_ + isClustered: true + misfireThreshold: 60000 + clusterCheckinInterval: 10000 + threadPool: + class: org.quartz.simpl.SimpleThreadPool + threadCount: 10 + threadPriority: 5 + threadsInheritContextClassLoaderOfInitializingThread: true + #json 时间戳统一转换 + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + aop: + proxy-target-class: true + activiti: + check-process-definitions: false + #启用作业执行器 + async-executor-activate: false + #启用异步执行器 + job-executor-activate: false + jpa: + open-in-view: false + #配置freemarker + freemarker: + # 设置模板后缀名 + suffix: .ftl + # 设置文档类型 + content-type: text/html + # 设置页面编码格式 + charset: UTF-8 + # 设置页面缓存 + cache: false + prefer-file-system-access: false + # 设置ftl文件路径 + template-loader-path: + - classpath:/templates + # 设置静态文件路径，js,css等 + mvc: + static-path-pattern: /** + resource: + static-locations: classpath:/static/,classpath:/public/ + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + druid: + stat-view-servlet: + enabled: true + loginUsername: admin + loginPassword: 123456 + allow: + web-stat-filter: + enabled: true + dynamic: + druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置) + # 连接池的配置信息 + # 初始化大小，最小，最大 + initial-size: 5 + min-idle: 5 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + # 打开PSCache，并且指定每个连接上PSCache的大小 + poolPreparedStatements: true + maxPoolPreparedStatementPerConnectionSize: 20 + # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 + filters: stat,wall,slf4j + # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 + 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 + username: root + password: root + driver-class-name: com.mysql.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 + #username: root + #password: root + #driver-class-name: com.mysql.cj.jdbc.Driver + #redis 配置 + redis: + database: 0 + host: 127.0.0.1 + lettuce: + pool: + max-active: 8 #最大连接数据库连接数,设 0 为没有限制 + max-idle: 8 #最大等待连接中的数量,设 0 为没有限制 + max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 + min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 + shutdown-timeout: 100ms + password: '' + port: 6379 +#mybatis plus 设置 +mybatis-plus: + mapper-locations: classpath*:org/jeecg/modules/**/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: 4 + # 默认数据库表下划线命名 + table-underline: true + configuration: + # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + # 返回类型为Map,显示null对应的字段 + call-setters-on-nulls: true +#jeecg专用配置 +jeecg : + # 本地：local\Minio：minio\阿里云：alioss + uploadType: local + path : + #文件上传根目录 设置 + upload: D://opt//upFiles + #webapp文件路径 + webapp: D://opt//webapp + #短信秘钥 + sms: + accessKeyId: ?? + accessKeySecret: ?? + shiro: + excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** + #阿里云oss存储配置 + oss: + endpoint: oss-cn-beijing.aliyuncs.com + accessKey: ?? + secretKey: ?? + bucketName: jeecgos + staticDomain: ?? + # ElasticSearch 6设置 + elasticsearch: + cluster-name: jeecg-ES + cluster-nodes: 127.0.0.1:9200 + check-enabled: false + # 表单设计器配置 + desform: + # 主题颜色（仅支持 16进制颜色代码） + theme-color: "#1890ff" + # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置） + upload-type: system + # 在线预览文件服务器地址配置 + file-view-domain: 127.0.0.1:8012 + # minio文件上传 + minio: + minio_url: http://minio.jeecg.com + minio_name: ?? + minio_pass: ?? + bucketName: otatest + #大屏报表参数设置 + jmreport: + #是否需要校验token + is_verify_token: false + #必须校验方法 + verify_methods: remove,delete,save,add,update + #Wps在线文档 + wps: + domain: https://wwo.wps.cn/office/ + appid: ?? + appsecret: ?? +#Mybatis输出sql日志 +logging: + level: + org.jeecg.modules.online.auth.mapper: debug + org.jeecg.modules.online.cgform.mapper: debug + #org.jeecg.modules.system.mapper: debug +#cas单点登录 +cas: + prefixUrl: http://cas.example.org:8443/cas +#enable swagger +swagger: + enable: true +#大屏报表参数设置 +jmreport: + #是否需要校验token + is_verify_token: false + # 必须校验方法 + verify_methods: remove,delete,save,add,update \ No newline at end of file diff --git a/jeecg-boot/jeecg-cloud-module/config/jeecg-cloud-gateway-beta.yml b/jeecg-boot/jeecg-cloud-module/config/jeecg-cloud-gateway-beta.yml new file mode 100644 index 0000000..8c6a524 --- /dev/null +++ b/jeecg-boot/jeecg-cloud-module/config/jeecg-cloud-gateway-beta.yml @@ -0,0 +1,39 @@ +spring: + redis: + host: 127.0.0.1 + password: '' + port: 6379 + cloud: + gateway: + discovery: + locator: + enabled: true + globalcors: + cors-configurations: + '[/**]': + allowCredentials: true + allowedOrigins: "*" + allowedMethods: "*" + allowedHeaders: "*" + routes: + - id: jeecg-online + uri: lb://jeecg-online + predicates: + - Path=/online/** + - id: jeecg-demo + uri: lb://jeecg-demo + predicates: + - Path=/mock/**,/big/**,/test/**,/dlglong/** + - id: jeecg-system + uri: lb://jeecg-system + predicates: + - Path=/sys/**,/online/**,/api/**,/bigscreen/**,/webSocketApi/**,/message/**,/filemanage/**,/email/**,/oa/im/**,/metting/**,/officialdoc/**,/eoa/plan/**,/sign/**,/biz/extBizLeave/**,/designform/**,/desform/**,/lib/**,/tinymce/**,/unpkg/**,/app/joa/**,/joa/**,/filedisk/**,/oa/im/**,/im/**,/desform/**,/process/**,/designer/**,/cms/**,/chat/eoaCmsMenu/**,/act/**,/plug-in/**,/design/report/**,/jmreport/bigscreen/**,/bigscreen/**,/jmreport/desreport_/**,/actuator/** + - id: jeecg-cloud-websocket + uri: lb:ws://jeecg-system + predicates: + - Path=/websocket/** +management: + endpoints: + web: + exposure: + include: metrics,httptrace \ No newline at end of file -- libgit2 0.22.2