From c14b9a777c3a8925ff2f2f9867f35cd34ba82f39 Mon Sep 17 00:00:00 2001 From: li_she Date: Tue, 27 Jul 2021 16:58:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'src/main/resources/ap?= =?UTF-8?q?plication-dev.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9e79c67..ca78a2a 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://42.192.77.42:13306/gaotao_fast?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai + url: jdbc:mysql://127.0.0.1:13306/gaotao_fast?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai username: root password: GaoTao123823. initial-size: 10 From 6cd2f1ee2038bfb4448173ccea272dc826bc46fb Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Wed, 28 Jul 2021 09:25:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gaotao/config/MybatisPlusConfig.java | 13 ++++++++----- src/main/java/com/gaotao/config/ShiroConfig.java | 1 - src/main/resources/application-test.yml | 2 ++ src/main/resources/application.yml | 2 -- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gaotao/config/MybatisPlusConfig.java b/src/main/java/com/gaotao/config/MybatisPlusConfig.java index 753f0ed..f307b69 100644 --- a/src/main/java/com/gaotao/config/MybatisPlusConfig.java +++ b/src/main/java/com/gaotao/config/MybatisPlusConfig.java @@ -14,12 +14,15 @@ import org.springframework.context.annotation.Configuration; @Configuration public class MybatisPlusConfig { - /** - * 分页插件 - */ + // 引入分页插件 @Bean - public PaginationInterceptor paginationInterceptor() { - return new PaginationInterceptor(); + public PaginationInterceptor paginationInterceptor(){ + PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); + // 设置页面最大页之后 的操作 ,true 回到首页 false 继续请求 + paginationInterceptor.setOverflow(true); + // 设置页面最大单页设置 默认 500条, -1 不设置 + paginationInterceptor.setLimit(1000); + return paginationInterceptor; } } diff --git a/src/main/java/com/gaotao/config/ShiroConfig.java b/src/main/java/com/gaotao/config/ShiroConfig.java index ae34ca2..e9e4b7c 100644 --- a/src/main/java/com/gaotao/config/ShiroConfig.java +++ b/src/main/java/com/gaotao/config/ShiroConfig.java @@ -57,7 +57,6 @@ public class ShiroConfig { filterMap.put("/login", "anon"); filterMap.put("/**", "oauth2"); shiroFilter.setFilterChainDefinitionMap(filterMap); - return shiroFilter; } diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 623a9e5..f3c0e97 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -32,12 +32,14 @@ spring: wall: config: multi-statement-allow: true + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver ##多数据源的配置 #dynamic: # datasource: # slave1: + # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # url: jdbc:sqlserver://localhost:1433;DatabaseName=gaotao_security # username: sa diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b2c3641..6af5f34 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,8 +6,6 @@ server: min-spare-threads: 30 port: 9090 connection-timeout: 5000ms - servlet: - context-path: /xujie-fast spring: # 环境 dev|test|prod From a8e02e5b4a9d44d6567f34ac94b97661b4d17149 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Wed, 28 Jul 2021 09:52:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/logback-spring.xml | 163 ++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 5a6e6bc..2ce4f70 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -3,7 +3,168 @@ + logback + + + + + + + + + + + + + + + + debug + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + ${log.path}/web_debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/web-debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/web_info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/web-info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/web_warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/web-warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/web_error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/web-error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + @@ -18,5 +179,7 @@ + + From 87c623bbb49a855899863fbf9817989f8577192e Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Wed, 28 Jul 2021 17:57:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?button=20=E8=AF=AD=E8=A8=80=E5=88=87?= =?UTF-8?q?=E6=8D=A2=20(=E9=BB=98=E8=AE=A4=E8=AF=AD=E8=A8=80=E4=B8=AD?= =?UTF-8?q?=E6=96=87)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/SysObjectLanguageOthersDao.java | 2 ++ .../impl/SysLanguagePackServiceImpl.java | 8 ++----- src/main/resources/logback-spring.xml | 4 ++-- .../language/SysObjectLanguageOthersDao.xml | 24 +++++++++++++++++++ 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gaotao/modules/language/dao/SysObjectLanguageOthersDao.java b/src/main/java/com/gaotao/modules/language/dao/SysObjectLanguageOthersDao.java index fd758eb..7533342 100644 --- a/src/main/java/com/gaotao/modules/language/dao/SysObjectLanguageOthersDao.java +++ b/src/main/java/com/gaotao/modules/language/dao/SysObjectLanguageOthersDao.java @@ -42,4 +42,6 @@ public interface SysObjectLanguageOthersDao extends BaseMapper **/ List searchLanguageListByLanguageCode(QuerySysLanguagePack querySysLanguagePack); + + List searchFunctionButtonList(SysObjectLanguageOthers sysLanguagePack); } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/language/service/impl/SysLanguagePackServiceImpl.java b/src/main/java/com/gaotao/modules/language/service/impl/SysLanguagePackServiceImpl.java index 077715b..ea33565 100644 --- a/src/main/java/com/gaotao/modules/language/service/impl/SysLanguagePackServiceImpl.java +++ b/src/main/java/com/gaotao/modules/language/service/impl/SysLanguagePackServiceImpl.java @@ -70,12 +70,8 @@ public class SysLanguagePackServiceImpl extends ServiceImpl searchFunctionButtonList(SysObjectLanguageOthers sysLanguagePack) { Map buttonMap = new HashMap<>(); - List list = lambdaQuery() - .eq(sysLanguagePack.getLanguageCode() != null, SysObjectLanguageOthers::getLanguageCode, sysLanguagePack.getLanguageCode()) - .eq(sysLanguagePack.getFunctionId() != null, SysObjectLanguageOthers::getFunctionId, sysLanguagePack.getFunctionId()) - .eq(sysLanguagePack.getObjectId() != null, SysObjectLanguageOthers::getObjectId, sysLanguagePack.getObjectId()) - .eq(sysLanguagePack.getObjectType() != null, SysObjectLanguageOthers::getObjectType, sysLanguagePack.getObjectType()).list(); - for (SysObjectLanguageOthers languagePack : list) { + List languageOthersList = this.baseMapper.searchFunctionButtonList(sysLanguagePack); + for (SysObjectLanguageOthers languagePack : languageOthersList) { buttonMap.put(languagePack.getObjectId(), languagePack.getLanguageValue()); } return buttonMap; diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 2ce4f70..17053a3 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -169,14 +169,14 @@ - + - + diff --git a/src/main/resources/mapper/language/SysObjectLanguageOthersDao.xml b/src/main/resources/mapper/language/SysObjectLanguageOthersDao.xml index c49d23b..2b6a28d 100644 --- a/src/main/resources/mapper/language/SysObjectLanguageOthersDao.xml +++ b/src/main/resources/mapper/language/SysObjectLanguageOthersDao.xml @@ -85,4 +85,28 @@ + \ No newline at end of file