lijilei 3 éve
szülő
commit
3c3f1643a2

+ 19 - 0
book-dao/src/main/java/com/book/dao/config/BaseConfig.java

@@ -0,0 +1,19 @@
+package com.book.dao.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * created in 2021/8/22
+ * Project: book-store
+ *
+ * @author win7
+ */
+
+public class BaseConfig {
+ @Bean
+ @ConfigurationProperties(prefix = "mybatis.configuration")
+ public org.apache.ibatis.session.Configuration configuration(){
+  return new org.apache.ibatis.session.Configuration();
+ }
+}

+ 5 - 2
book-dao/src/main/java/com/book/dao/config/CpsDataSourceConfig.java

@@ -18,7 +18,9 @@ import javax.sql.DataSource;
 
 @Configuration
 @MapperScan(basePackages = "com.book.dao.cps.mapper", sqlSessionTemplateRef = "cpsSqlSessionTemplate")
-public class CpsDataSourceConfig {
+public class CpsDataSourceConfig extends BaseConfig{
+
+
 
     @Bean(name = "cpsDataSource")
     @ConfigurationProperties(prefix = "spring.datasource.cps")
@@ -29,9 +31,10 @@ public class CpsDataSourceConfig {
 
     @Bean(name = "cpsSqlSessionFactory")
     @Primary
-    public SqlSessionFactory statementSqlSessionFactory(@Qualifier("cpsDataSource") DataSource dataSource) throws Exception {
+    public SqlSessionFactory statementSqlSessionFactory(@Qualifier("cpsDataSource") DataSource dataSource,org.apache.ibatis.session.Configuration configuration) throws Exception {
         SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
         bean.setDataSource(dataSource);
+        bean.setConfiguration(configuration);
         bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/cps/*.xml"));
         return bean.getObject();
     }

+ 2 - 1
book-dao/src/main/java/com/book/dao/config/CpsshardDataSourceConfig.java

@@ -25,8 +25,9 @@ public class CpsshardDataSourceConfig {
     }
 
     @Bean(name = "cpsshardSqlSessionFactory")
-    public SqlSessionFactory cpsshardSqlSessionFactory(@Qualifier("cpsshardDataSource") DataSource dataSource) throws Exception {
+    public SqlSessionFactory cpsshardSqlSessionFactory(@Qualifier("cpsshardDataSource") DataSource dataSource,org.apache.ibatis.session.Configuration configuration) throws Exception {
         SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+        bean.setConfiguration(configuration);
         bean.setDataSource(dataSource);
          bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/cpsshard/*.xml"));
        return bean.getObject();

+ 2 - 1
book-dao/src/main/java/com/book/dao/config/PolarDataSourceConfig.java

@@ -26,9 +26,10 @@ public class PolarDataSourceConfig {
     }
 
     @Bean(name = "polarSqlSessionFactory")
-    public SqlSessionFactory polarSqlSessionFactory(@Qualifier("polarDataSource") DataSource dataSource) throws Exception {
+    public SqlSessionFactory polarSqlSessionFactory(@Qualifier("polarDataSource") DataSource dataSource,org.apache.ibatis.session.Configuration configuration) throws Exception {
         SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
         bean.setDataSource(dataSource);
+        bean.setConfiguration(configuration);
          bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/polar/*.xml"));
        return bean.getObject();
     }

+ 1 - 1
book-push/src/main/java/com/book/push/Application.java

@@ -10,7 +10,7 @@ import org.springframework.context.annotation.ComponentScan;
  * @author win7
  */
 @SpringBootApplication
-@Slf4j
+//@Slf4j
 @ComponentScan({"com.book.dao","com.book.push"})
 public class Application {
     public static void main(String[] args) {

+ 7 - 2
book-push/src/main/java/com/book/push/controller/BookIndexController.java

@@ -15,6 +15,7 @@ import lombok.AllArgsConstructor;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.open.api.WxOpenService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,7 +26,7 @@ import javax.servlet.http.HttpServletRequest;
 /**
  * @author
  */
-@AllArgsConstructor
+//@AllArgsConstructor
 @RestController
 @RequestMapping("/index")
 public class BookIndexController {
@@ -34,6 +35,8 @@ public class BookIndexController {
     @Autowired
     private WxThirdPartService thirdPartService;
 
+    @Value("${book.debug}")
+    private Boolean debug;
 
     /**
      * //FIXME
@@ -49,7 +52,9 @@ public class BookIndexController {
         String contextUrl = url.delete(url.length() - request.getRequestURI().length(), url.length()).toString();
         String[] split = contextUrl.split("\\.");
         String appid = split[0];
-
+        if (debug){
+            appid = "wx75b8899af31a7c93";
+        }
 
         AdminConfig adminConfig = adminConfigService.selectByAppid(appid);
         String redirect_url = String.format(UrlCons.OAUTH2_REDIRECT_URL_LOGIN,contextUrl).replace("{appid}", appid);

+ 5 - 4
book-push/src/main/java/com/book/push/controller/WxRedirectController.java

@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 @Controller
 @RequestMapping("/wx/redirect/{appid}")
 public class WxRedirectController {
-    public static final Logger logger = LoggerFactory.getLogger(WxRedirectController.class);
+//    public static final Logger logger = LoggerFactory.getLogger(WxRedirectController.class);
     @Autowired
     private UserService userService;
     @Autowired
@@ -49,6 +49,7 @@ public class WxRedirectController {
     @Autowired
     private UserSilentService userSilentService;
 
+
     /**
      * //FIXME
      * 前端页面url
@@ -68,7 +69,7 @@ public class WxRedirectController {
 
         String[] s = state.split("_");
         if (s.length != 2 ) {
-            logger.error("静默登录state错误");
+//            logger.error("静默登录state错误");
 //            String frontUrl = getFrontUrl(ophost, page, userAdminId, userAdminId);
             return "error";
         }
@@ -130,7 +131,7 @@ public class WxRedirectController {
 
             }
         } catch (WxErrorException e) {
-            logger.error(e.getMessage());
+//            logger.error(e.getMessage());
             e.printStackTrace();
             String frontUrl = getFrontUrl(adminConfig.getAppid(),ophost, state, 0, "");
             return "redirect:" + frontUrl;
@@ -224,7 +225,7 @@ public class WxRedirectController {
     public String slient(@PathVariable String appid, @RequestParam String code, @RequestParam String state, ModelMap map) {
         String[] s = state.split("_");
         if (s.length != 3 ) {
-            logger.error("静默登录state错误");
+//            logger.error("静默登录state错误");
 //            String frontUrl = getFrontUrl(ophost, "page", userAdminId, userAdminId);
             return "error";
         }

+ 7 - 0
book-push/src/main/resources/application-dev.yml

@@ -2,6 +2,7 @@ server:
   port: 8080
 
 book:
+  debug: true
   redis:
     host: 127.0.0.1
     port: 6379
@@ -123,6 +124,12 @@ spring:
           deny: # 默认即可
           reset-enable: true
 
+
+mybatis:
+  configuration:
+    map-underscore-to-camel-case: true
+
+
 # 设置debug模式下打印mysql
 logging:
   level: