diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index d6f0350..972e069 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -10,12 +10,18 @@
4.0.0
jar
ruoyi-admin
-
web服务入口
-
+
+ 8.1.1.193
+
+
+ com.dameng
+ DmJdbcDriver18
+ ${dameng-jdbc-driver.version}
+
org.projectlombok
@@ -34,7 +40,7 @@
knife4j-openapi2-spring-boot-starter
-
+
mysql
mysql-connector-java
@@ -77,15 +83,15 @@
-
- org.apache.maven.plugins
- maven-war-plugin
- 3.1.0
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ 3.1.0
false
${project.artifactId}
-
-
+
+
${project.artifactId}
diff --git a/ruoyi-admin/src/main/resources/application-dm.yml b/ruoyi-admin/src/main/resources/application-dm.yml
new file mode 100644
index 0000000..b7b8e24
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/application-dm.yml
@@ -0,0 +1,62 @@
+# 数据源配置
+spring:
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: dm.jdbc.driver.DmDriver
+ druid:
+ # 主库数据源
+ master:
+ url: jdbc:dm://localhost:5236/SZYJ?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ #url: jdbc:dm://localhost:5236/JCDBA?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: SZYJ
+ password: Qu8tDy25Jknx
+ # 从库数据源
+ slave:
+ # 从数据源开关/默认关闭
+ enabled: false
+ url:
+ username:
+ password:
+ # 初始连接数
+ initialSize: 5
+ # 最小连接池数量
+ minIdle: 10
+ # 最大连接池数量
+ maxActive: 20
+ # 配置获取连接等待超时的时间
+ maxWait: 60000
+ # 配置连接超时时间
+ connectTimeout: 30000
+ # 配置网络超时时间
+ socketTimeout: 60000
+ # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+ timeBetweenEvictionRunsMillis: 60000
+ # 配置一个连接在池中最小生存的时间,单位是毫秒
+ minEvictableIdleTimeMillis: 300000
+ # 配置一个连接在池中最大生存的时间,单位是毫秒
+ maxEvictableIdleTimeMillis: 900000
+ # 配置检测连接是否有效
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: true
+ # 设置白名单,不填则允许所有访问
+ allow:
+ url-pattern: /druid/*
+ # 控制台管理用户名和密码
+ login-username: ruoyi
+ login-password: 123456
+ filter:
+ stat:
+ enabled: true
+ # 慢SQL记录
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 951efa6..0edbee1 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -59,7 +59,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
- active: internet
+ active: dm
# 文件上传
servlet:
multipart:
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
index e608e42..f728500 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time
- from sys_job_log
+ from SZYJ.sys_job_log
- delete from sys_job_log where job_log_id = #{jobLogId}
+ delete from SZYJ.sys_job_log where job_log_id = #{jobLogId}
- delete from sys_job_log where job_log_id in
+ delete from SZYJ.sys_job_log where job_log_id in
#{jobLogId}
- truncate table sys_job_log
+ truncate table SZYJ.sys_job_log
- insert into sys_job_log(
+ insert into SZYJ.sys_job_log(
job_log_id,
job_name,
job_group,
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
index 5605c44..26c85c3 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark
- from sys_job
+ from SZYJ.sys_job
- delete from sys_job where job_id = #{jobId}
+ delete from SZYJ.sys_job where job_id = #{jobId}
- delete from sys_job where job_id in
+ delete from SZYJ.sys_job where job_id in
#{jobId}
- update sys_job
+ update SZYJ.sys_job
job_name = #{jobName},
job_group = #{jobGroup},
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- insert into sys_job(
+ insert into SZYJ.sys_job(
job_id,
job_name,
job_group,
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
index ca39f47..49a583c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark
- from sys_config
+ from SZYJ.sys_config
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- insert into sys_config (
+ insert into SZYJ.sys_config (
config_name,
config_key,
config_value,
@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- update sys_config
+ update SZYJ.sys_config
config_name = #{configName},
config_key = #{configKey},
@@ -104,11 +104,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from sys_config where config_id = #{configId}
+ delete from SZYJ.sys_config where config_id = #{configId}
- delete from sys_config where config_id in
+ delete from SZYJ.sys_config where config_id in
#{configId}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index cf439f6..c1bd27c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
- from sys_dept d
+ from SZYJ.sys_dept d