diff --git a/pom.xml b/pom.xml index 64463b2c..bb3ff152 100644 --- a/pom.xml +++ b/pom.xml @@ -18,16 +18,6 @@ http://maven.apache.org - - com.geekq - miaosha-common - 0.0.1-SNAPSHOT - - - com.geekq - miaosha-admin-api - 0.0.1-SNAPSHOT - com.github.sgroschupf @@ -116,7 +106,7 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 1.3.1 + 1.3.2 org.slf4j diff --git a/src/main/java/com/geekq/miaosha/GeekQMainApplication.java b/src/main/java/com/geekq/miaosha/GeekQMainApplication.java index 0ba799f6..891346de 100644 --- a/src/main/java/com/geekq/miaosha/GeekQMainApplication.java +++ b/src/main/java/com/geekq/miaosha/GeekQMainApplication.java @@ -7,8 +7,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; -@ImportResource({"classpath:dubbo/applicationContext-dubbo-consumer.xml"}) -@ComponentScan(basePackages={"com.geekq.admin.*","com.geekq.miaosha.*"}) @SpringBootApplication @EnableScheduling public class GeekQMainApplication { diff --git a/src/main/java/com/geekq/miaosha/controller/LoginController.java b/src/main/java/com/geekq/miaosha/controller/LoginController.java index 33fecad3..d7fda570 100644 --- a/src/main/java/com/geekq/miaosha/controller/LoginController.java +++ b/src/main/java/com/geekq/miaosha/controller/LoginController.java @@ -5,7 +5,6 @@ import com.geekq.miaosha.redis.redismanager.RedisLua; import com.geekq.miaosha.service.MiaoShaUserService; import com.geekq.miaosha.vo.LoginVo; -import com.geekq.admin.service.OrdersService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -28,11 +27,9 @@ public class LoginController { @Autowired private MiaoShaUserService userService; @Reference - private OrdersService ordersService ; @RequestMapping("/to_login") public String tologin(LoginVo loginVo, Model model) { logger.info(loginVo.toString()); - ordersService.createOrder("111"); //未完成 RedisLua.vistorCount(COUNTLOGIN); String count = RedisLua.getVistorCount(COUNTLOGIN).toString(); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6c07bc26..62ff291b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -24,9 +24,9 @@ log4j.logger.java.sql.PreparedStatement=DEBUG mybatis.type-aliases-package=com.geekq.miaosha.domain #开启驼峰转换 configuration config-location 不能同時存在 如果要走流程 请 放开注释 mybatis.configuration.map-underscore-to-camel-case=true -#mybatis.mapperLocations = classpath:com/geekq/miaosha/dao/*.xml +mybatis.mapperLocations = classpath:com/geekq/miaosha/dao/*.xml -mybatis.mapperLocations=classpath:mybatis/mapper/*.xml +#mybatis.mapperLocations=classpath:mybatis/mapper/*.xml #配置xml方式 因为与 mybatis.configuration.map-underscore-to-camel-case 仅用于测试 #mybatis.config-location=classpath:mybatis/mybatis-config.xml