wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-18 11:06:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：同步2.1版本

Browse Source
This commit is contained in:
Jerry
2021-12-16 21:49:09 +08:00
parent 81bb8ea64e
commit c76388f593
552 changed files with 5641 additions and 2583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/resources/application.yml
View File

@@ -1,7 +1,7 @@
logging:
level:
# 这里设置的日志级别优先于log4j2.xml文件Loggers中的日志级别。
com.flow.demo: info
com.orangeforms: info
server:
port: 8082
@@ -46,8 +46,8 @@ spring:
db-history-used: true
mybatis-plus:
mapper-locations: classpath:com/flow/demo/webadmin/*/dao/mapper/*Mapper.xml,com/flow/demo/common/log/dao/mapper/*Mapper.xml,com/flow/demo/common/online/dao/mapper/*Mapper.xml,com/flow/demo/common/flow/dao/mapper/*Mapper.xml
type-aliases-package: com.flow.demo.webadmin.*.model,com.flow.demo.common.log.model,com.flow.demo.common.online.model,com.flow.demo.common.flow.model
mapper-locations: classpath:com/orangeforms/webadmin/*/dao/mapper/*Mapper.xml,com/orangeforms/common/log/dao/mapper/*Mapper.xml,com/orangeforms/common/online/dao/mapper/*Mapper.xml,com/orangeforms/common/flow/dao/mapper/*Mapper.xml
type-aliases-package: com.orangeforms.webadmin.*.model,com.orangeforms.common.log.model,com.orangeforms.common.online.model,com.orangeforms.common.flow.model
global-config:
db-config:
logic-delete-value: -1
@@ -80,7 +80,7 @@ redis:
# master-slave:
# 每个节点逗号分隔，第一个为主节点，其余为从节点。同时每个节点前必须以redis://开头。
# address: redis://localhost:6379,redis://localhost:6378,...
address: redis://localhost:6380
address: redis://localhost:6379
# 链接超时，单位毫秒。
timeout: 6000
# 单位毫秒。分布式锁的超时检测时长。
@@ -227,7 +227,7 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
druid:
main:
url: jdbc:mysql://localhost:3306/zzdemo-online-activiti?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://localhost:3306/zzdemo-online?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
username: root
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver

12
orange-demo-activiti/orange-demo-activiti-service/application-webadmin/src/main/resources/log4j2.xml
View File

@@ -53,28 +53,28 @@
<root level="${OUTPUT_LOG_LEVEL}">
<AppenderRef ref="console"/>
</root>
<AsyncLogger name="com.flow.demo" additivity="false" level="info">
<AsyncLogger name="com.orangeforms" additivity="false" level="info">
<AppenderRef ref="console"/>
<AppenderRef ref="file_log"/>
</AsyncLogger>
<!-- 这里将dao的日志级别设置为DEBUG，是为了SQL语句的输出 -->
<AsyncLogger name="com.flow.demo.webadmin.app.dao" additivity="false" level="debug">
<AsyncLogger name="com.orangeforms.webadmin.app.dao" additivity="false" level="debug">
<AppenderRef ref="console"/>
<AppenderRef ref="file_log"/>
</AsyncLogger>
<AsyncLogger name="com.flow.demo.webadmin.upms.dao" additivity="false" level="debug">
<AsyncLogger name="com.orangeforms.webadmin.upms.dao" additivity="false" level="debug">
<AppenderRef ref="console"/>
<AppenderRef ref="file_log"/>
</AsyncLogger>
<AsyncLogger name="com.flow.demo.common.log.dao" additivity="false" level="debug">
<AsyncLogger name="com.orangeforms.common.log.dao" additivity="false" level="debug">
<AppenderRef ref="console"/>
<AppenderRef ref="file_log"/>
</AsyncLogger>
<AsyncLogger name="com.flow.demo.common.online.dao" additivity="false" level="debug">
<AsyncLogger name="com.orangeforms.common.online.dao" additivity="false" level="debug">
<AppenderRef ref="console"/>
<AppenderRef ref="file_log"/>
</AsyncLogger>
<AsyncLogger name="com.flow.demo.common.flow.dao" additivity="false" level="debug">
<AsyncLogger name="com.orangeforms.common.flow.dao" additivity="false" level="debug">
<AppenderRef ref="console"/>
<AppenderRef ref="file_log"/>
</AsyncLogger>