From 916e488b89f2a1810a2d6a48931a60cb0f8aede6 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Tue, 30 Nov 2021 16:25:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=96=B0=E5=A2=9Epom=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E5=8C=85=EF=BC=88mongo,redis=E7=AD=89=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 38 ++++++++++++-- src/main/resources/application-test.yml | 52 +++++++++++++++++-- .../mapper/homicide/homicide-mapper.xml | 5 +- .../key-area-check-renovation-mapper.xml | 3 +- .../mapper/keyplace/key-place-mapper.xml | 3 +- .../logisticssafe/logistics-safe-mapper.xml | 4 +- .../publicvideo/public-video-mapper.xml | 3 +- 7 files changed, 91 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index e989956..896f8aa 100644 --- a/pom.xml +++ b/pom.xml @@ -93,11 +93,6 @@ login-oauth2-client 1.0-SNAPSHOT - - ink.wgink - module-dictionary - 1.0-SNAPSHOT - ink.wgink @@ -114,6 +109,39 @@ module-dictionary 1.0-SNAPSHOT --> + + + ink.wgink + redis-cache + 1.0-SNAPSHOT + + + + ink.wgink + mongo-module-dictionary + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-data-mongodb + + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + + org.springframework.session + spring-session-data-redis + + diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 1177a72..d8bf1f2 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -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 - # 媒体最大时长（单位：秒） \ No newline at end of file + # 媒体最大时长（单位：秒） + +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 \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/homicide/homicide-mapper.xml b/src/main/resources/mybatis/mapper/homicide/homicide-mapper.xml index fe9696a..7ddace6 100644 --- a/src/main/resources/mybatis/mapper/homicide/homicide-mapper.xml +++ b/src/main/resources/mybatis/mapper/homicide/homicide-mapper.xml @@ -240,8 +240,9 @@ t1.is_delete = 0 AND ( - - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.homicide_name LIKE CONCAT('%', #{keywords}, '%') + OR + t1.homicide_code LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/src/main/resources/mybatis/mapper/keyareacheckrenovation/key-area-check-renovation-mapper.xml b/src/main/resources/mybatis/mapper/keyareacheckrenovation/key-area-check-renovation-mapper.xml index 5e577ca..7c4b56c 100644 --- a/src/main/resources/mybatis/mapper/keyareacheckrenovation/key-area-check-renovation-mapper.xml +++ b/src/main/resources/mybatis/mapper/keyareacheckrenovation/key-area-check-renovation-mapper.xml @@ -376,8 +376,7 @@ t1.is_delete = 0 AND ( - - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.security_area LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/src/main/resources/mybatis/mapper/keyplace/key-place-mapper.xml b/src/main/resources/mybatis/mapper/keyplace/key-place-mapper.xml index 16dd522..695d90e 100644 --- a/src/main/resources/mybatis/mapper/keyplace/key-place-mapper.xml +++ b/src/main/resources/mybatis/mapper/keyplace/key-place-mapper.xml @@ -318,8 +318,7 @@ t1.is_delete = 0 AND ( - - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.place_name LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/src/main/resources/mybatis/mapper/logisticssafe/logistics-safe-mapper.xml b/src/main/resources/mybatis/mapper/logisticssafe/logistics-safe-mapper.xml index b2ce2c0..284423d 100644 --- a/src/main/resources/mybatis/mapper/logisticssafe/logistics-safe-mapper.xml +++ b/src/main/resources/mybatis/mapper/logisticssafe/logistics-safe-mapper.xml @@ -493,7 +493,9 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.license_num LIKE CONCAT('%', #{keywords}, '%') + OR + t1.logistics_enterprise_name LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/src/main/resources/mybatis/mapper/publicvideo/public-video-mapper.xml b/src/main/resources/mybatis/mapper/publicvideo/public-video-mapper.xml index cb715d0..0c6e86e 100644 --- a/src/main/resources/mybatis/mapper/publicvideo/public-video-mapper.xml +++ b/src/main/resources/mybatis/mapper/publicvideo/public-video-mapper.xml @@ -268,8 +268,7 @@ t1.is_delete = 0 AND ( - - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.rural_name LIKE CONCAT('%', #{keywords}, '%') )