Commit 01cdaf861a7dd062e0656b687b094de685d10a6e

Authored by zhangdaiscott
1 parent 585bdb95

还原无修改代码

jeecg-boot/jeecg-boot-module-system/src/main/resources/application-dev.yml
... ... @@ -131,7 +131,7 @@ spring:
131 131 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
132 132 datasource:
133 133 master:
134   - url: jdbc:mysql://127.0.0.1:3306/jeecg-boot-os-re?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
  134 + url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
135 135 username: root
136 136 password: root
137 137 driver-class-name: com.mysql.cj.jdbc.Driver
... ... @@ -173,6 +173,8 @@ mybatis-plus:
173 173 #jeecg专用配置
174 174 minidao :
175 175 base-package: org.jeecg.modules.jmreport.*
  176 + #DB类型(mysql | postgresql | oracle | sqlserver| other)
  177 + db-type: mysql
176 178 jeecg :
177 179 # 签名密钥串(前后端要一致,正式发布请自行修改)
178 180 signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/application-sqlserver2017.yml deleted
1   -server:
2   - port: 8080
3   - tomcat:
4   - max-swallow-size: -1
5   - error:
6   - include-exception: true
7   - include-stacktrace: ALWAYS
8   - include-message: ALWAYS
9   - servlet:
10   - context-path: /jeecg-boot
11   - compression:
12   - enabled: true
13   - min-response-size: 1024
14   - mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
15   -
16   -management:
17   - endpoints:
18   - web:
19   - exposure:
20   - include: "*" #暴露所有节点
21   - endpoint:
22   - health:
23   - show-details: ALWAYS #显示详细信息
24   -spring:
25   - servlet:
26   - multipart:
27   - max-file-size: 10MB
28   - max-request-size: 10MB
29   - mail:
30   - host: smtp.163.com
31   - username: jeecgos@163.com
32   - password: ??
33   - properties:
34   - mail:
35   - smtp:
36   - auth: true
37   - starttls:
38   - enable: true
39   - required: true
40   - ## quartz定时任务,采用数据库方式
41   - quartz:
42   - job-store-type: jdbc
43   - initialize-schema: embedded
44   - #设置自动启动,默认为 true
45   - auto-startup: true
46   - #启动时更新己存在的Job
47   - overwrite-existing-jobs: true
48   - properties:
49   - org:
50   - quartz:
51   - scheduler:
52   - instanceName: MyScheduler
53   - instanceId: AUTO
54   - jobStore:
55   - class: org.quartz.impl.jdbcjobstore.JobStoreTX
56   - driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
57   - tablePrefix: QRTZ_
58   - isClustered: true
59   - misfireThreshold: 60000
60   - clusterCheckinInterval: 10000
61   - threadPool:
62   - class: org.quartz.simpl.SimpleThreadPool
63   - threadCount: 10
64   - threadPriority: 5
65   - threadsInheritContextClassLoaderOfInitializingThread: true
66   - #json 时间戳统一转换
67   - jackson:
68   - date-format: yyyy-MM-dd HH:mm:ss
69   - time-zone: GMT+8
70   - jpa:
71   - open-in-view: false
72   - database-platform: org.hibernate.dialect.SQLServerDialect
73   - activiti:
74   - check-process-definitions: false
75   - #启用作业执行器
76   - async-executor-activate: false
77   - #启用异步执行器
78   - job-executor-activate: false
79   - aop:
80   - proxy-target-class: true
81   - #配置freemarker
82   - freemarker:
83   - # 设置模板后缀名
84   - suffix: .ftl
85   - # 设置文档类型
86   - content-type: text/html
87   - # 设置页面编码格式
88   - charset: UTF-8
89   - # 设置页面缓存
90   - cache: false
91   - prefer-file-system-access: false
92   - # 设置ftl文件路径
93   - template-loader-path:
94   - - classpath:/templates
95   - # 设置静态文件路径,js,css等
96   - mvc:
97   - static-path-pattern: /**
98   - resource:
99   - static-locations: classpath:/static/,classpath:/public/
100   - autoconfigure:
101   - exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
102   - datasource:
103   - druid:
104   - stat-view-servlet:
105   - enabled: true
106   - loginUsername: admin
107   - loginPassword: 123456
108   - allow:
109   - web-stat-filter:
110   - enabled: true
111   - dynamic:
112   - druid: # 全局druid参数,绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
113   - # 连接池的配置信息
114   - # 初始化大小,最小,最大
115   - initial-size: 5
116   - min-idle: 5
117   - maxActive: 20
118   - # 配置获取连接等待超时的时间
119   - maxWait: 60000
120   - # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
121   - timeBetweenEvictionRunsMillis: 60000
122   - # 配置一个连接在池中最小生存的时间,单位是毫秒
123   - minEvictableIdleTimeMillis: 300000
124   - validationQuery: SELECT 1
125   - testWhileIdle: true
126   - testOnBorrow: false
127   - testOnReturn: false
128   - # 打开PSCache,并且指定每个连接上PSCache的大小
129   - poolPreparedStatements: true
130   - maxPoolPreparedStatementPerConnectionSize: 20
131   - # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
132   - filters: stat,slf4j
133   - # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
134   - connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
135   - datasource:
136   - master:
137   - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
138   - url: jdbc:sqlserver://192.168.1.199:1433;SelectMethod=cursor;DatabaseName=jeecgboot
139   - username: jeecgboot
140   - password: jeecgboot@459
141   - # 多数据源配置
142   - #multi-datasource1:
143   - #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
144   - #username: root
145   - #password: root
146   - #driver-class-name: com.mysql.cj.jdbc.Driver
147   - #redis 配置
148   - redis:
149   - database: 0
150   - host: 127.0.0.1
151   - lettuce:
152   - pool:
153   - max-active: 8 #最大连接数据库连接数,设 0 为没有限制
154   - max-idle: 8 #最大等待连接中的数量,设 0 为没有限制
155   - max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
156   - min-idle: 0 #最小等待连接中的数量,设 0 为没有限制
157   - shutdown-timeout: 100ms
158   - password: ''
159   - port: 6379
160   -#mybatis plus 设置
161   -mybatis-plus:
162   - mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
163   - global-config:
164   - # 关闭MP3.0自带的banner
165   - banner: false
166   - db-config:
167   - #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
168   - id-type: ASSIGN_ID
169   - # 默认数据库表下划线命名
170   - table-underline: true
171   - configuration:
172   - # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用
173   - #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
174   - # 返回类型为Map,显示null对应的字段
175   - call-setters-on-nulls: true
176   -#jeecg专用配置
177   -jeecg :
178   - # 本地:local\Minio:minio\阿里云:alioss
179   - uploadType: local
180   - path :
181   - #文件上传根目录 设置
182   - upload: D://opt//upFiles
183   - #webapp文件路径
184   - webapp: D://opt//webapp
185   - shiro:
186   - excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
187   - #阿里云oss存储配置
188   - oss:
189   - endpoint: oss-cn-beijing.aliyuncs.com
190   - accessKey: LTAI4FhA4KZEycF26R2yTCCf
191   - secretKey: WPfrly5k6BAXlZxyGMw1cp2ZHMyeWr
192   - bucketName: jeecgdev
193   - staticDomain: https://static.jeecg.com
194   - # ElasticSearch 6设置
195   - elasticsearch:
196   - cluster-name: jeecg-ES
197   - cluster-nodes: 127.0.0.1:9200
198   - check-enabled: false
199   - # 表单设计器配置
200   - desform:
201   - # 主题颜色(仅支持 16进制颜色代码)
202   - theme-color: "#1890ff"
203   - # 文件、图片上传方式,可选项:qiniu(七牛云)、system(跟随系统配置)
204   - upload-type: system
205   - # 在线预览文件服务器地址配置
206   - file-view-domain: 127.0.0.1:8012
207   - # minio文件上传
208   - minio:
209   - minio_url: http://minio.jeecg.com
210   - minio_name: admin
211   - minio_pass: jeecg@oss321
212   - bucketName: otatest
213   - #大屏报表参数设置
214   - jmreport:
215   - mode: dev
216   - #是否需要校验token
217   - is_verify_token: false
218   - #必须校验方法
219   - verify_methods: remove,delete,save,add,update
220   - #Wps在线文档
221   - wps:
222   - domain: https://wwo.wps.cn/office/
223   - appid: ??
224   - appsecret: ??
225   - #xxl-job配置
226   - xxljob:
227   - enabled: false
228   - adminAddresses: http://127.0.0.1:9080/xxl-job-admin
229   - appname: ${spring.application.name}
230   - accessToken: ''
231   - address: 127.0.0.1:30007
232   - ip: 127.0.0.1
233   - port: 30007
234   - logPath: logs/jeecg/job/jobhandler/
235   - logRetentionDays: 30
236   - #自定义路由配置 yml nacos database
237   - route:
238   - config:
239   - data-id: jeecg-gateway-router
240   - group: DEFAULT_GROUP
241   - data-type: yml
242   - #分布式锁配置
243   - redisson:
244   - address: 127.0.0.1:6379
245   - password:
246   - type: STANDALONE
247   - enabled: true
248   -#cas单点登录
249   -cas:
250   - prefixUrl: http://cas.example.org:8443/cas
251   -#Mybatis输出sql日志
252   -logging:
253   - level:
254   - org.jeecg.modules.system.mapper : info
255   -#enable swagger
256   -swagger:
257   - enable: true
258   - production: false
259   - basic:
260   - enable: false
261   - username: jeecg
262   - password: jeecg1314
263   -#第三方登录
264   -justauth:
265   - enabled: true
266   - type:
267   - GITHUB:
268   - client-id: 0277e675495f14a4a183
269   - client-secret: 4681b5153f7158bcdb9b781d8374841d5f51af04
270   - redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
271   - WECHAT_ENTERPRISE:
272   - client-id: wwc2a8c8b19c201bcc
273   - client-secret: Z6VtKLr3dSzuq8zxTaWacGexQW6qxVK8AHrI2ARDv9c
274   - redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
275   - agent-id: 1000002
276   - DINGTALK:
277   - client-id: dingoa33vjqxrbyidnmgwo
278   - client-secret: RK1020ctw9mRRElz7oMjfHY12BuYVvjP99iraxu76cq9CIB0gyqeb5FJw_OEBnXA
279   - redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
280   - WECHAT_OPEN:
281   - client-id: ??
282   - client-secret: ??
283   - redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
284   - cache:
285   - type: default
286   - prefix: 'demo::'
287   - timeout: 1h