Commit 2da642facf359a48713809ee2bbcea6c57d028cd
1 parent
d32ff51b
添加达梦数据库连接支持
Signed-off-by: TanYibin <5491541@qq.com>
Showing
5 changed files
with
36 additions
and
16 deletions
huaheng-wms-core/pom.xml
@@ -52,6 +52,11 @@ | @@ -52,6 +52,11 @@ | ||
52 | <artifactId>ECharts</artifactId> | 52 | <artifactId>ECharts</artifactId> |
53 | <version>3.0.0.5</version> | 53 | <version>3.0.0.5</version> |
54 | </dependency> | 54 | </dependency> |
55 | + <dependency> | ||
56 | + <groupId>com.dameng</groupId> | ||
57 | + <artifactId>DmJdbcDriver18</artifactId> | ||
58 | + <version>8.1.2.192</version> | ||
59 | + </dependency> | ||
55 | <!-- jeewx api --> | 60 | <!-- jeewx api --> |
56 | <dependency> | 61 | <dependency> |
57 | <groupId>org.jeecgframework</groupId> | 62 | <groupId>org.jeecgframework</groupId> |
huaheng-wms-core/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
@@ -182,12 +182,12 @@ | @@ -182,12 +182,12 @@ | ||
182 | 182 | ||
183 | 183 | ||
184 | <select id="getWarehouseByUserName" resultType="java.util.HashMap"> | 184 | <select id="getWarehouseByUserName" resultType="java.util.HashMap"> |
185 | - SELECT r.`name`, r.code | 185 | + SELECT r.name, r.code |
186 | FROM sys_user u | 186 | FROM sys_user u |
187 | LEFT JOIN sys_user_warehouse ur ON u.id = ur.userId | 187 | LEFT JOIN sys_user_warehouse ur ON u.id = ur.userId |
188 | LEFT JOIN warehouse r ON ur.warehouseCode = r.code | 188 | LEFT JOIN warehouse r ON ur.warehouseCode = r.code |
189 | WHERE u.username = #{username,jdbcType=VARCHAR} | 189 | WHERE u.username = #{username,jdbcType=VARCHAR} |
190 | - AND r.`enable` = 1 | 190 | + AND r.enable = 1 |
191 | </select> | 191 | </select> |
192 | 192 | ||
193 | </mapper> | 193 | </mapper> |
huaheng-wms-core/src/main/resources/application-dev.yml
@@ -136,11 +136,16 @@ spring: | @@ -136,11 +136,16 @@ spring: | ||
136 | password: 123456 | 136 | password: 123456 |
137 | driver-class-name: com.mysql.cj.jdbc.Driver | 137 | driver-class-name: com.mysql.cj.jdbc.Driver |
138 | # 多数据源配置 | 138 | # 多数据源配置 |
139 | - #multi-datasource1: | ||
140 | - #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai | ||
141 | - #username: root | ||
142 | - #password: root | ||
143 | - #driver-class-name: com.mysql.cj.jdbc.Driver | 139 | + # multi-datasource1: |
140 | + # url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai | ||
141 | + # username: root | ||
142 | + # password: root | ||
143 | + # driver-class-name: com.mysql.cj.jdbc.Driver | ||
144 | + # # 达梦数据库链接驱动 | ||
145 | + # url: jdbc:dm://192.168.225.128:5236?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true | ||
146 | + # username: WMS4 | ||
147 | + # password: 123456 | ||
148 | + # driver-class-name: dm.jdbc.driver.DmDriver | ||
144 | #redis 配置 | 149 | #redis 配置 |
145 | redis: | 150 | redis: |
146 | database: 0 | 151 | database: 0 |
huaheng-wms-core/src/main/resources/application-prod.yml
@@ -141,6 +141,11 @@ spring: | @@ -141,6 +141,11 @@ spring: | ||
141 | #username: root | 141 | #username: root |
142 | #password: root | 142 | #password: root |
143 | #driver-class-name: com.mysql.cj.jdbc.Driver | 143 | #driver-class-name: com.mysql.cj.jdbc.Driver |
144 | + # # 达梦数据库链接驱动 | ||
145 | + # url: jdbc:dm://192.168.225.128:5236?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true | ||
146 | + # username: WMS4 | ||
147 | + # password: 123456 | ||
148 | + # driver-class-name: dm.jdbc.driver.DmDriver | ||
144 | #redis 配置 | 149 | #redis 配置 |
145 | redis: | 150 | redis: |
146 | database: 0 | 151 | database: 0 |
huaheng-wms-core/src/main/resources/application-test.yml
@@ -136,11 +136,16 @@ spring: | @@ -136,11 +136,16 @@ spring: | ||
136 | password: hhsoftware | 136 | password: hhsoftware |
137 | driver-class-name: com.mysql.cj.jdbc.Driver | 137 | driver-class-name: com.mysql.cj.jdbc.Driver |
138 | # 多数据源配置 | 138 | # 多数据源配置 |
139 | - #multi-datasource1: | ||
140 | - #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai | ||
141 | - #username: root | ||
142 | - #password: root | ||
143 | - #driver-class-name: com.mysql.cj.jdbc.Driver | 139 | + # multi-datasource1: |
140 | + # url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai | ||
141 | + # username: root | ||
142 | + # password: root | ||
143 | + # driver-class-name: com.mysql.cj.jdbc.Driver | ||
144 | + # # 达梦数据库链接驱动 | ||
145 | + # url: jdbc:dm://192.168.225.128:5236?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true | ||
146 | + # username: WMS4 | ||
147 | + # password: 123456 | ||
148 | + # driver-class-name: dm.jdbc.driver.DmDriver | ||
144 | #redis 配置 | 149 | #redis 配置 |
145 | redis: | 150 | redis: |
146 | database: 0 | 151 | database: 0 |
@@ -191,7 +196,7 @@ jeecg: | @@ -191,7 +196,7 @@ jeecg: | ||
191 | #webapp文件路径 | 196 | #webapp文件路径 |
192 | webapp: /opt/webapp | 197 | webapp: /opt/webapp |
193 | shiro: | 198 | shiro: |
194 | - excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/test/test**,/api/wms/**,/sys/cas/client/validateLogin | 199 | + excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/sys/getWarehouseByUserCode,/api/wms/**,/sys/cas/client/validateLogin |
195 | #阿里云oss存储和大鱼短信秘钥配置 | 200 | #阿里云oss存储和大鱼短信秘钥配置 |
196 | oss: | 201 | oss: |
197 | accessKey: ?? | 202 | accessKey: ?? |
@@ -274,10 +279,10 @@ cas: | @@ -274,10 +279,10 @@ cas: | ||
274 | #Mybatis输出sql日志 | 279 | #Mybatis输出sql日志 |
275 | logging: | 280 | logging: |
276 | level: | 281 | level: |
277 | - org.jeecg.common: DEBUG | ||
278 | - org.jeecg.modules: DEBUG | 282 | + org.jeecg.common: INFO |
279 | org.jeecg.modules.wms: DEBUG | 283 | org.jeecg.modules.wms: DEBUG |
280 | - org.jeecg.config.shiro: DEBUG | 284 | + org.jeecg.config.shiro: INFO |
285 | + org.jeecg.utils: INFO | ||
281 | #swagger | 286 | #swagger |
282 | knife4j: | 287 | knife4j: |
283 | #开启增强配置 | 288 | #开启增强配置 |