添加搜索条件，新增pom引入包（mongo,redis等）
This commit is contained in:
Renpc-kilig
parent
fbef882f30
commit
916e488b89
38
pom.xml
38
pom.xml
@ -93,11 +93,6 @@
|
||||
<artifactId>login-oauth2-client</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ink.wgink</groupId>
|
||||
<artifactId>module-dictionary</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>ink.wgink</groupId>
|
||||
@ -114,6 +109,39 @@
|
||||
<artifactId>module-dictionary</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</dependency>-->
|
||||
|
||||
<dependency>
|
||||
<groupId>ink.wgink</groupId>
|
||||
<artifactId>redis-cache</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>ink.wgink</groupId>
|
||||
<artifactId>mongo-module-dictionary</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
|
||||
<!-- mongodb start -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-mongodb</artifactId>
|
||||
</dependency>
|
||||
<!-- mongodb end -->
|
||||
|
||||
<!-- redis start -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-redis</artifactId>
|
||||
</dependency>
|
||||
<!-- redis end -->
|
||||
|
||||
<!-- session share start -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.session</groupId>
|
||||
<artifactId>spring-session-data-redis</artifactId>
|
||||
</dependency>
|
||||
<!-- session share end -->
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
||||
@ -1,11 +1,17 @@
|
||||
server:
|
||||
port: 8081
|
||||
url: http://127.0.0.1:8081/systembase
|
||||
url: http://192.168.0.111:8081/systembase
|
||||
# url: http://192.168.31.53:8081/systembase
|
||||
system-title: 信息系统
|
||||
system-sub-title: 信息系统
|
||||
nav-page: http://192.168.0.155:7011/usercenter
|
||||
# nav-page: http://49.233.36.36:58091/usercenter
|
||||
servlet:
|
||||
context-path: /systembase
|
||||
|
||||
access-control:
|
||||
role-permission: false
|
||||
|
||||
spring:
|
||||
login-url: /oauth/login
|
||||
login-failure: /oauth/login?error
|
||||
@ -25,7 +31,8 @@ spring:
|
||||
max-request-size: 1GB
|
||||
datasource:
|
||||
druid:
|
||||
url: jdbc:mysql://127.0.0.1:3306/db_cloud_systembase?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
|
||||
# url: jdbc:mysql://49.233.36.36:58083/db_base?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
|
||||
url: jdbc:mysql://192.168.0.151:3306/db_base?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
|
||||
db-type: mysql
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
username: root
|
||||
@ -57,6 +64,21 @@ spring:
|
||||
connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
# 合并多个DruidDataSource的监控数据
|
||||
use-global-data-source-stat: true
|
||||
data:
|
||||
mongodb:
|
||||
uri: mongodb://smartcity:smartcity@192.168.0.156:27017/smartcity
|
||||
redis:
|
||||
database: 6
|
||||
host: 192.168.0.156
|
||||
port: 6379
|
||||
password: 666
|
||||
timeout: 3000ms
|
||||
jedis:
|
||||
pool:
|
||||
max-active: 8
|
||||
max-wait: 1ms
|
||||
max-idle: 8
|
||||
min-idle: 0
|
||||
|
||||
mybatis:
|
||||
config-location: classpath:mybatis/mybatis-config.xml
|
||||
@ -88,4 +110,28 @@ file:
|
||||
max-file-count: 6
|
||||
# 图片输出压缩质量，大于0，默认0.4
|
||||
image-output-quality: 0.4
|
||||
# 媒体最大时长（单位：秒）
|
||||
# 媒体最大时长（单位：秒）
|
||||
|
||||
api-path:
|
||||
# user-center: http://49.233.36.36:58091/usercenter
|
||||
user-center: http://192.168.0.155:7011/usercenter
|
||||
|
||||
# 安全
|
||||
security:
|
||||
oauth2:
|
||||
# oauth-server: http://49.233.36.36:58091/usercenter
|
||||
oauth-server: http://192.168.0.155:7011/usercenter
|
||||
oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
|
||||
client:
|
||||
client-id: b19a65b0bba84c7eb2a1e7ac5b72b2cf
|
||||
client-secret: ZXBNOWVOcXM2QkZqYlJvOVBsb25ncVJFbE5ZWjZlS0ZqbTFCdnFBZzgvemxIdG9KZmEyTjJIRnI0dG1McEdEVA==
|
||||
user-authorization-uri: ${security.oauth2.oauth-server}/oauth2_client/authorize
|
||||
access-token-uri: ${security.oauth2.oauth-server}/oauth2_client/token
|
||||
grant-type: authorization_code
|
||||
resource:
|
||||
jwt:
|
||||
key-uri: ${security.oauth2.oauth-server}/oauth2_client/token_key
|
||||
token-info-uri: ${security.oauth2.oauth-server}/oauth2_client/check_token
|
||||
user-info-uri: ${security.oauth2.oauth-server}/user
|
||||
authorization:
|
||||
check-token-access: ${security.oauth2.oauth-server}/oauth2_client/token_key
|
||||
@ -240,8 +240,9 @@
|
||||
t1.is_delete = 0
|
||||
<if test="keywords != null and keywords != ''">
|
||||
AND (
|
||||
<!-- 这里添加其他条件 -->
|
||||
t1.id LIKE CONCAT('%', #{keywords}, '%')
|
||||
t1.homicide_name LIKE CONCAT('%', #{keywords}, '%')
|
||||
OR
|
||||
t1.homicide_code LIKE CONCAT('%', #{keywords}, '%')
|
||||
)
|
||||
</if>
|
||||
<if test="startTime != null and startTime != ''">
|
||||
|
||||
@ -376,8 +376,7 @@
|
||||
t1.is_delete = 0
|
||||
<if test="keywords != null and keywords != ''">
|
||||
AND (
|
||||
<!-- 这里添加其他条件 -->
|
||||
t1.id LIKE CONCAT('%', #{keywords}, '%')
|
||||
t1.security_area LIKE CONCAT('%', #{keywords}, '%')
|
||||
)
|
||||
</if>
|
||||
<if test="startTime != null and startTime != ''">
|
||||
|
||||
@ -318,8 +318,7 @@
|
||||
t1.is_delete = 0
|
||||
<if test="keywords != null and keywords != ''">
|
||||
AND (
|
||||
<!-- 这里添加其他条件 -->
|
||||
t1.id LIKE CONCAT('%', #{keywords}, '%')
|
||||
t1.place_name LIKE CONCAT('%', #{keywords}, '%')
|
||||
)
|
||||
</if>
|
||||
<if test="startTime != null and startTime != ''">
|
||||
|
||||
@ -493,7 +493,9 @@
|
||||
<if test="keywords != null and keywords != ''">
|
||||
AND (
|
||||
<!-- 这里添加其他条件 -->
|
||||
t1.id LIKE CONCAT('%', #{keywords}, '%')
|
||||
t1.license_num LIKE CONCAT('%', #{keywords}, '%')
|
||||
OR
|
||||
t1.logistics_enterprise_name LIKE CONCAT('%', #{keywords}, '%')
|
||||
)
|
||||
</if>
|
||||
<if test="startTime != null and startTime != ''">
|
||||
|
||||
@ -268,8 +268,7 @@
|
||||
t1.is_delete = 0
|
||||
<if test="keywords != null and keywords != ''">
|
||||
AND (
|
||||
<!-- 这里添加其他条件 -->
|
||||
t1.id LIKE CONCAT('%', #{keywords}, '%')
|
||||
t1.rural_name LIKE CONCAT('%', #{keywords}, '%')
|
||||
)
|
||||
</if>
|
||||
<if test="startTime != null and startTime != ''">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user