sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: sxyanzhu:498e0d76935219bf601f41b9262215c1b44e819b
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release
...
compare: sxyanzhu:61e7eca11297e7273a3d2eab712aa30beb70062d
Branches Tags
sxyanzhu:dev_caq
sxyanzhu:dev
sxyanzhu:dev_xds
sxyanzhu:main
sxyanzhu:release

2 Commits
498e0d7693 ... 61e7eca112

Author SHA1 Message Date
姜玉琦 61e7eca112 提交代码 2024-09-06 13:50:54 +08:00
姜玉琦 bc98dcc24c 提交 2024-09-05 00:35:06 +08:00
10 changed files with 30 additions and 21 deletions
Show Stats Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -49,7 +49,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://62.234.3.186:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 url: jdbc:mysql://42.193.7.8:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: root username: root
password: Sxyanzhu@cf123 password: Sxyanzhu@cf123
#url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 #url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8

6
ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -57,9 +57,9 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 url: jdbc:mysql://42.193.7.8:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: root username: root
password: hadoopspring123 password: Sxyanzhu@cf123
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭
@ -117,7 +117,7 @@ spring:
# 端口，默认为6379 # 端口，默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 1 database: 0
# 密码 # 密码
password: 123456 password: 123456
# 连接超时时间 # 连接超时时间

2
ruoyi-admin/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<property name="log.path" value="D:/soft/java/logs/admin" /> <property name="log.path" value="/usr/logs/admin" />
<!-- 彩色日志 --> <!-- 彩色日志 -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/> <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>

2
ruoyi-wechat/src/main/resources/application-druid.yml
View File

@ -51,7 +51,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://62.234.3.186:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 url: jdbc:mysql://42.193.7.8:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: root username: root
password: Sxyanzhu@cf123 password: Sxyanzhu@cf123
# 从库数据源 # 从库数据源

10
ruoyi-wechat/src/main/resources/application-prod.yml
View File

@ -58,9 +58,9 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 url: jdbc:mysql://42.193.7.8:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: root username: root
password: hadoopspring123 password: Sxyanzhu@cf123
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭
@ -115,13 +115,13 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
host: 192.168.126.20 host: 127.0.0.1
# 端口，默认为6379 # 端口，默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 1 database: 0
# 密码 # 密码
password: aDlasdasasdjHjasasdkqmewqe password: 123456
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: lettuce:

2
ruoyi-wechat/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<property name="log.path" value="D:/soft/java/logs/wechat" /> <property name="log.path" value="/usr/logs/wechat" />
<!-- 彩色日志 --> <!-- 彩色日志 -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/> <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>

13
sql/SQL集合.txt
View File

@ -56,13 +56,23 @@ CREATE VIEW vw_flow_all AS (
ru.user_id AS startUserId, ru.user_id AS startUserId,
ru.nick_name AS startUserName, ru.nick_name AS startUserName,
rd.dept_name AS startDeptName, rd.dept_name AS startDeptName,
ht.* RES.PROC_INST_ID_,
IFNULL(hr.ID_,ht.taskId) as taskId,
IFNULL(hr.NAME_,ht.taskName) as taskName,
IF(hr.ID_ IS NULL, ht.assigneeId, tu.user_id) as assigneeId,
IF(hr.ID_ IS NULL, ht.assigneeName, tu.nick_name) as assigneeName,
IF(hr.ID_ IS NULL, ht.assigneeDeptName, td.dept_name) as assigneeDeptName,
IF(hr.ID_ IS NULL, ht.taskComType, 0) as taskComType
FROM FROM
ACT_HI_PROCINST RES ACT_HI_PROCINST RES
LEFT OUTER JOIN ACT_RE_PROCDEF DEF ON RES.PROC_DEF_ID_ = DEF.ID_ LEFT OUTER JOIN ACT_RE_PROCDEF DEF ON RES.PROC_DEF_ID_ = DEF.ID_
LEFT OUTER JOIN sur_project sp ON RES.BUSINESS_KEY_ = sp.id LEFT OUTER JOIN sur_project sp ON RES.BUSINESS_KEY_ = sp.id
LEFT JOIN sys_user ru ON ru.user_id = RES.START_USER_ID_ LEFT JOIN sys_user ru ON ru.user_id = RES.START_USER_ID_
LEFT JOIN sys_dept rd ON rd.dept_id = ru.dept_id LEFT JOIN sys_dept rd ON rd.dept_id = ru.dept_id
LEFT JOIN act_ru_task hr ON hr.PROC_INST_ID_ = RES.PROC_INST_ID_
LEFT JOIN act_ru_actinst ra ON ra.TASK_ID_ = hr.ID_ AND ra.PROC_INST_ID_ = RES.PROC_INST_ID_
LEFT JOIN sys_user tu ON tu.user_id = ra.ASSIGNEE_
LEFT JOIN sys_dept td ON td.dept_id = tu.dept_id
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
ht.ID_ AS taskId, ht.ID_ AS taskId,
@ -87,7 +97,6 @@ LEFT JOIN (
PROC_INST_ID_ PROC_INST_ID_
) )
GROUP BY ht.PROC_INST_ID_ GROUP BY ht.PROC_INST_ID_
) ht ON ht.PROC_INST_ID_ = RES.PROC_INST_ID_ ) ht ON ht.PROC_INST_ID_ = RES.PROC_INST_ID_
) )

2
yanzhu-deviceApi/src/main/resources/application-druid.yml
View File

@ -51,7 +51,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://62.234.3.186:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 url: jdbc:mysql://42.193.7.8:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: root username: root
password: Sxyanzhu@cf123 password: Sxyanzhu@cf123
# 从库数据源 # 从库数据源

10
yanzhu-deviceApi/src/main/resources/application-prod.yml
View File

@ -58,9 +58,9 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 url: jdbc:mysql://42.193.7.8:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: root username: root
password: hadoopspring123 password: Sxyanzhu@cf123
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭
@ -115,13 +115,13 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
host: 192.168.126.20 host: 127.0.0.1
# 端口，默认为6379 # 端口，默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 1 database: 0
# 密码 # 密码
password: aDlasdasasdjHjasasdkqmewqe password: 123456
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: lettuce:

2
yanzhu-deviceApi/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<property name="log.path" value="D:/soft/java/logs/device" /> <property name="log.path" value="/usr/logs/device" />
<!-- 彩色日志 --> <!-- 彩色日志 -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/> <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>