Merge branch 'revert-7f9ce9b9' into 'master'

Revert "Merge branch 'Test' into 'master'"



This reverts merge request !34



See merge request !35

mooctest-user-job/pom.xml

@@ -11,13 +11,5 @@
 
     <artifactId>mooctest-user-job</artifactId>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring.boot.version}</version>
-        </dependency>
-    </dependencies>
-
 
 </project>

mooctest-user-job/src/main/java/cn/iselab/mooctest/user/Application.java

@@ -1,7 +1,56 @@
 package cn.iselab.mooctest.user;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.MessageSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
+import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
+import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
+import org.springframework.boot.autoconfigure.cloud.CloudAutoConfiguration;
+import org.springframework.boot.autoconfigure.dao.PersistenceExceptionTranslationAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.solr.SolrRepositoriesAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration;
+import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
+import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
+import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration;
+import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration;
+import org.springframework.boot.autoconfigure.hateoas.HypermediaAutoConfiguration;
+import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration;
+import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.JndiDataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.XADataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration;
+import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
+import org.springframework.boot.autoconfigure.jms.JndiConnectionFactoryAutoConfiguration;
+import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration;
+import org.springframework.boot.autoconfigure.jms.hornetq.HornetQAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
+import org.springframework.boot.autoconfigure.mail.MailSenderAutoConfiguration;
+import org.springframework.boot.autoconfigure.mobile.DeviceDelegatingViewResolverAutoConfiguration;
+import org.springframework.boot.autoconfigure.mobile.DeviceResolverAutoConfiguration;
+import org.springframework.boot.autoconfigure.mobile.SitePreferenceAutoConfiguration;
+import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
+import org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.reactor.ReactorAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.FallbackWebSecurityAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
+import org.springframework.boot.autoconfigure.social.FacebookAutoConfiguration;
+import org.springframework.boot.autoconfigure.social.LinkedInAutoConfiguration;
+import org.springframework.boot.autoconfigure.social.SocialWebAutoConfiguration;
+import org.springframework.boot.autoconfigure.social.TwitterAutoConfiguration;
+import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
+import org.springframework.boot.autoconfigure.velocity.VelocityAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.*;
+import org.springframework.boot.autoconfigure.websocket.WebSocketAutoConfiguration;
 
 /**
  * @Author ROKG
@@ -9,7 +58,64 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @Date: Created in 下午7:12 2018/2/12
  * @Modified By:
  */
-@SpringBootApplication()
+@SpringBootApplication(exclude = {
+        ActiveMQAutoConfiguration.class,
+        AopAutoConfiguration.class,
+        BatchAutoConfiguration.class,
+        CloudAutoConfiguration.class,
+        DataSourceAutoConfiguration.class,
+        DataSourceTransactionManagerAutoConfiguration.class,
+        DeviceDelegatingViewResolverAutoConfiguration.class,
+        DeviceResolverAutoConfiguration.class,
+        DispatcherServletAutoConfiguration.class,
+        ElasticsearchRepositoriesAutoConfiguration.class,
+        EmbeddedServletContainerAutoConfiguration.class,
+        ErrorMvcAutoConfiguration.class,
+        FacebookAutoConfiguration.class,
+        FallbackWebSecurityAutoConfiguration.class,
+        FlywayAutoConfiguration.class,
+        FreeMarkerAutoConfiguration.class,
+        GroovyTemplateAutoConfiguration.class,
+        GsonAutoConfiguration.class,
+        HibernateJpaAutoConfiguration.class,
+        HornetQAutoConfiguration.class,
+        HttpEncodingAutoConfiguration.class,
+        HttpMessageConvertersAutoConfiguration.class,
+        HypermediaAutoConfiguration.class,
+        IntegrationAutoConfiguration.class,
+        JacksonAutoConfiguration.class,
+        JerseyAutoConfiguration.class,
+        JmsAutoConfiguration.class,
+        JmxAutoConfiguration.class,
+        JndiConnectionFactoryAutoConfiguration.class,
+        JndiDataSourceAutoConfiguration.class,
+        JpaRepositoriesAutoConfiguration.class,
+        LinkedInAutoConfiguration.class,
+        LiquibaseAutoConfiguration.class,
+        MailSenderAutoConfiguration.class,
+        MessageSourceAutoConfiguration.class,
+        MongoAutoConfiguration.class,
+        MongoRepositoriesAutoConfiguration.class,
+        MultipartAutoConfiguration.class,
+        MustacheAutoConfiguration.class,
+        PersistenceExceptionTranslationAutoConfiguration.class,
+        RabbitAutoConfiguration.class,
+        ReactorAutoConfiguration.class,
+        RepositoryRestMvcAutoConfiguration.class,
+        SecurityAutoConfiguration.class,
+        ServerPropertiesAutoConfiguration.class,
+        SitePreferenceAutoConfiguration.class,
+        SocialWebAutoConfiguration.class,
+        SolrAutoConfiguration.class,
+        SolrRepositoriesAutoConfiguration.class,
+        SpringDataWebAutoConfiguration.class,
+        ThymeleafAutoConfiguration.class,
+        TwitterAutoConfiguration.class,
+        VelocityAutoConfiguration.class,
+        WebMvcAutoConfiguration.class,
+        WebSocketAutoConfiguration.class,
+        XADataSourceAutoConfiguration.class
+})
 public class Application {
 
     public static void main(String[] args){

mooctest-user-server/pom.xml

@@ -12,7 +12,7 @@
     <artifactId>mooctest-user-server</artifactId>
 
     <properties>
-        <spring.boot.version>2.1.1.RELEASE</spring.boot.version>
+        <spring.boot.version>1.3.8.RELEASE</spring.boot.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -37,6 +37,11 @@
             <!--<version>0.0.1</version>-->
         <!--</dependency>-->
         <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <version>${spring.boot.version}</version>
@@ -44,7 +49,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
-            <version>${spring.boot.version}</version>
+            <version>1.3.8.RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -55,7 +60,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
-            <version>${spring.boot.version}</version>
+            <version>1.3.8.RELEASE</version>
         </dependency>
         <!-- SMS dependency -->
         <dependency>
@@ -67,13 +72,19 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <artifactId>spring-boot-starter-redis</artifactId>
-            <version>${spring.boot.version}</version>
+            <version>1.3.8.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session-data-redis</artifactId>
-            <version>2.1.7.RELEASE</version>
+            <version>1.1.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.nekohtml</groupId>
@@ -91,11 +102,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
-<!--        <dependency>-->
+        <dependency>
-<!--            <groupId>org.apache.logging.log4j</groupId>-->
+            <groupId>org.apache.logging.log4j</groupId>
-<!--            <artifactId>log4j-web</artifactId>-->
+            <artifactId>log4j-web</artifactId>
-<!--            <version>2.4.1</version>-->
+            <version>2.4.1</version>
-<!--        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
@@ -216,7 +227,7 @@
         <dependency>
             <groupId>com.lmax</groupId>
             <artifactId>disruptor</artifactId>
-            <version>3.4.2</version>
+            <version>3.3.2</version>
         </dependency>
         <dependency>
             <groupId>net.dongliu</groupId>
@@ -259,18 +270,13 @@
             <artifactId>aliyun-sdk-oss</artifactId>
             <version>2.8.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20160810</version>
-        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
-                <version>Greenwich.SR2</version>
+                <version>Brixton.SR7</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/Application.java

@@ -2,10 +2,12 @@ package cn.iselab.mooctest.user;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.MessageSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
+import org.springframework.boot.autoconfigure.cloud.CloudAutoConfiguration;
 import org.springframework.boot.autoconfigure.dao.PersistenceExceptionTranslationAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration;
@@ -23,15 +25,28 @@ import org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration;
 import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
 import org.springframework.boot.autoconfigure.jms.JndiConnectionFactoryAutoConfiguration;
 import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration;
+import org.springframework.boot.autoconfigure.jms.hornetq.HornetQAutoConfiguration;
 import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
 import org.springframework.boot.autoconfigure.mail.MailSenderAutoConfiguration;
+import org.springframework.boot.autoconfigure.mobile.DeviceDelegatingViewResolverAutoConfiguration;
+import org.springframework.boot.autoconfigure.mobile.DeviceResolverAutoConfiguration;
+import org.springframework.boot.autoconfigure.mobile.SitePreferenceAutoConfiguration;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
 import org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration;
+import org.springframework.boot.autoconfigure.reactor.ReactorAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.FallbackWebSecurityAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
+import org.springframework.boot.autoconfigure.social.FacebookAutoConfiguration;
+import org.springframework.boot.autoconfigure.social.LinkedInAutoConfiguration;
+import org.springframework.boot.autoconfigure.social.SocialWebAutoConfiguration;
+import org.springframework.boot.autoconfigure.social.TwitterAutoConfiguration;
 import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration;
-import org.springframework.boot.web.servlet.MultipartConfigFactory;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
+import org.springframework.boot.autoconfigure.velocity.VelocityAutoConfiguration;
+import org.springframework.boot.autoconfigure.websocket.WebSocketAutoConfiguration;
+import org.springframework.boot.context.embedded.MultipartConfigFactory;
 import org.springframework.context.annotation.Bean;
-import org.springframework.util.unit.DataSize;
 
 import javax.servlet.MultipartConfigElement;
 
@@ -45,11 +60,17 @@ import javax.servlet.MultipartConfigElement;
         ActiveMQAutoConfiguration.class,
         AopAutoConfiguration.class,
         BatchAutoConfiguration.class,
+        CloudAutoConfiguration.class,
+        DeviceDelegatingViewResolverAutoConfiguration.class,
+        DeviceResolverAutoConfiguration.class,
         ElasticsearchRepositoriesAutoConfiguration.class,
+        FacebookAutoConfiguration.class,
+        FallbackWebSecurityAutoConfiguration.class,
         FlywayAutoConfiguration.class,
         FreeMarkerAutoConfiguration.class,
         GroovyTemplateAutoConfiguration.class,
         GsonAutoConfiguration.class,
+        HornetQAutoConfiguration.class,
         HypermediaAutoConfiguration.class,
         IntegrationAutoConfiguration.class,
         JerseyAutoConfiguration.class,
@@ -57,16 +78,26 @@ import javax.servlet.MultipartConfigElement;
         JmxAutoConfiguration.class,
         JndiConnectionFactoryAutoConfiguration.class,
         JndiDataSourceAutoConfiguration.class,
+        LinkedInAutoConfiguration.class,
         LiquibaseAutoConfiguration.class,
         MailSenderAutoConfiguration.class,
+        MessageSourceAutoConfiguration.class,
         MongoAutoConfiguration.class,
         MongoRepositoriesAutoConfiguration.class,
         MustacheAutoConfiguration.class,
         PersistenceExceptionTranslationAutoConfiguration.class,
         RabbitAutoConfiguration.class,
+        ReactorAutoConfiguration.class,
         RepositoryRestMvcAutoConfiguration.class,
+        SecurityAutoConfiguration.class,
+        SitePreferenceAutoConfiguration.class,
+        SocialWebAutoConfiguration.class,
         SolrAutoConfiguration.class,
         SolrRepositoriesAutoConfiguration.class,
+        // ThymeleafAutoConfiguration.class,
+        TwitterAutoConfiguration.class,
+        VelocityAutoConfiguration.class,
+        WebSocketAutoConfiguration.class,
         XADataSourceAutoConfiguration.class,
 })
 @MapperScan("cn.iselab.mooctest.user.mapper")
@@ -74,15 +105,16 @@ public class Application {
 
     public static void main(String[] args){
         SpringApplication application = new SpringApplication(Application.class);
+        application.setWebEnvironment(true);
         application.run(args);
     }
     @Bean
     public MultipartConfigElement multipartConfigElement() {
         MultipartConfigFactory factory = new MultipartConfigFactory();
         //单个文件最大
-        factory.setMaxFileSize(DataSize.ofMegabytes(10)); //KB,MB
+        factory.setMaxFileSize("10240KB"); //KB,MB
         /// 设置总上传数据总大小
-        factory.setMaxRequestSize(DataSize.ofMegabytes(100));
+        factory.setMaxRequestSize("102400KB");
         return factory.createMultipartConfig();
     }
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/configure/ErrorPageConfig.java

@@ -1,8 +1,9 @@
 package cn.iselab.mooctest.user.configure;
 
-import org.springframework.boot.web.server.ErrorPage;
+import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
-import org.springframework.boot.web.server.ErrorPageRegistrar;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
-import org.springframework.boot.web.server.ErrorPageRegistry;
+import org.springframework.boot.context.embedded.ErrorPage;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpStatus;
 
@@ -11,13 +12,21 @@ import org.springframework.http.HttpStatus;
  * @Date: 2018.12.27 14:54
  */
 @Configuration
-public class ErrorPageConfig implements ErrorPageRegistrar {
+public class ErrorPageConfig {
 
-    @Override
+    @Bean
-    public void registerErrorPages(ErrorPageRegistry registry) {
+    public EmbeddedServletContainerCustomizer containerCustomizer(){
-        ErrorPage errorPage400 = new ErrorPage(HttpStatus.BAD_REQUEST, "/error-400");
+        return new EmbeddedServletContainerCustomizer() {
-        ErrorPage errorPage404 = new ErrorPage(HttpStatus.NOT_FOUND, "/error-404");
+            @Override
-        ErrorPage errorPage500 = new ErrorPage(HttpStatus.INTERNAL_SERVER_ERROR, "/error-500");
+            public void customize(ConfigurableEmbeddedServletContainer configurableEmbeddedServletContainer) {
-        registry.addErrorPages(errorPage400,errorPage404,errorPage500);
+                ErrorPage errorPage400 = new ErrorPage(HttpStatus.BAD_REQUEST, "/error-400");
+                ErrorPage errorPage404 = new ErrorPage(HttpStatus.NOT_FOUND, "/error-404");
+                ErrorPage errorPage500 = new ErrorPage(HttpStatus.INTERNAL_SERVER_ERROR, "/error-500");
+                configurableEmbeddedServletContainer.addErrorPages(
+                        errorPage400,
+                        errorPage404,
+                        errorPage500);
+            }
+        };
     }
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/configure/RedisSessionConfiguration.java

@@ -23,8 +23,7 @@ public class RedisSessionConfiguration {
         DefaultCookieSerializer serializer = new DefaultCookieSerializer();
 //        serializer.setCookieName("SESSION");
         serializer.setCookiePath("/");
-        serializer.setDomainName("mooctest.net");
+        serializer.setDomainName(".mooctest.net");
-        serializer.setUseBase64Encoding(false);
 //        serializer.setDomainNamePattern("^.+?\\.(\\w+\\.[a-z]+)$");
         return serializer;
     }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/dao/BankAccountInfoDao.java → mooctest-user-server/src/main/java/cn/iselab/mooctest/user/mapper/BankAccountInfoDao.java

@@ -1,10 +1,11 @@
-package cn.iselab.mooctest.user.dao;
+package cn.iselab.mooctest.user.mapper;
 
 import cn.iselab.mooctest.user.model.BankAccountInfo;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.CrudRepository;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 /**
  * @Description: 作用描述

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/dao/User2IntegralDao.java → mooctest-user-server/src/main/java/cn/iselab/mooctest/user/mapper/User2IntegralDao.java

@@ -1,4 +1,4 @@
-package cn.iselab.mooctest.user.dao;
+package cn.iselab.mooctest.user.mapper;
 
 import cn.iselab.mooctest.user.model.User2Integral;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/dao/User2MedalDao.java → mooctest-user-server/src/main/java/cn/iselab/mooctest/user/mapper/User2MedalDao.java

@@ -1,4 +1,4 @@
-package cn.iselab.mooctest.user.dao;
+package cn.iselab.mooctest.user.mapper;
 
 import cn.iselab.mooctest.user.model.User2Medal;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/dao/UserThirdPartyDao.java → mooctest-user-server/src/main/java/cn/iselab/mooctest/user/mapper/UserThirdPartyDao.java

@@ -1,4 +1,4 @@
-package cn.iselab.mooctest.user.dao;
+package cn.iselab.mooctest.user.mapper;
 
 import cn.iselab.mooctest.user.model.UserThirdParty;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/dao/VerifyCodeDao.java → mooctest-user-server/src/main/java/cn/iselab/mooctest/user/mapper/VerifyCodeDao.java

@@ -1,4 +1,4 @@
-package cn.iselab.mooctest.user.dao;
+package cn.iselab.mooctest.user.mapper;
 
 import cn.iselab.mooctest.user.model.VerifyCode;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/ThirdPartyAuthService.java

@@ -3,6 +3,7 @@ package cn.iselab.mooctest.user.service;
 
 import cn.iselab.mooctest.user.data.UserInfo;
 import cn.iselab.mooctest.user.model.UserThirdParty;
+import org.json.JSONObject;
 
 import java.util.List;
 

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/impl/BankAccountInfoServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.iselab.mooctest.user.service.impl;
 
-import cn.iselab.mooctest.user.dao.BankAccountInfoDao;
+import cn.iselab.mooctest.user.mapper.BankAccountInfoDao;
 import cn.iselab.mooctest.user.model.BankAccountInfo;
 import cn.iselab.mooctest.user.service.BankAccountInfoService;
 import org.springframework.beans.factory.annotation.Autowired;

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/impl/IntegralServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.iselab.mooctest.user.service.impl;
 
 import cn.iselab.mooctest.user.mapper.IntegralMapper;
-import cn.iselab.mooctest.user.dao.User2IntegralDao;
+import cn.iselab.mooctest.user.mapper.User2IntegralDao;
 import cn.iselab.mooctest.user.mapper.UserIntegralMapper;
 import cn.iselab.mooctest.user.model.Integral;
 import cn.iselab.mooctest.user.model.User2Integral;

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/impl/MedalServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.iselab.mooctest.user.service.impl;
 
 import cn.iselab.mooctest.user.mapper.MedalMapper;
-import cn.iselab.mooctest.user.dao.User2MedalDao;
+import cn.iselab.mooctest.user.mapper.User2MedalDao;
 import cn.iselab.mooctest.user.model.Medal;
 import cn.iselab.mooctest.user.model.User2Medal;
 import cn.iselab.mooctest.user.service.MedalService;

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/impl/ThirdPartyAuthServiceImpl.java

@@ -1,7 +1,8 @@
 package cn.iselab.mooctest.user.service.impl;
 
+import cn.iselab.mooctest.user.configure.ThirdPartyAuthConfiguration;
 import cn.iselab.mooctest.user.data.UserInfo;
-import cn.iselab.mooctest.user.dao.UserThirdPartyDao;
+import cn.iselab.mooctest.user.mapper.UserThirdPartyDao;
 import cn.iselab.mooctest.user.model.UserThirdParty;
 import cn.iselab.mooctest.user.service.ThirdPartyAuthService;
 import org.json.JSONObject;

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/service/impl/VerifyCodeServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.iselab.mooctest.user.service.impl;
 
-import cn.iselab.mooctest.user.dao.VerifyCodeDao;
+import cn.iselab.mooctest.user.mapper.VerifyCodeDao;
 import cn.iselab.mooctest.user.model.VerifyCode;
 import cn.iselab.mooctest.user.service.VerifyCodeService;
 import org.springframework.beans.factory.annotation.Autowired;

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/UserController.java

@@ -53,10 +53,6 @@ public class UserController extends BaseController {
         return userLogic.save(userDTO);
     }
 
-    @RequestMapping(value = UrlConstants.API + "users", method = RequestMethod.GET)
-    public List<UserDTO> getUserByIdList(@RequestBody List<Long> ids) {
-        return userLogic.findAll(ids);
-    }
 
     @RequestMapping(value = UrlConstants.API + "login", method = RequestMethod.POST)
     public ResponseResult<UserDTO> checkLogin(@RequestBody UserDTO user, HttpServletRequest request, HttpServletResponse response){
@@ -135,6 +131,4 @@ public class UserController extends BaseController {
         modelAndView.addObject("message", result.getMsg());
         return modelAndView;
     }
-
-
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/impl/IntegralLogicImpl.java

@@ -5,6 +5,7 @@ import cn.iselab.mooctest.rpc.user.data.AddIntegralDTO;
 import cn.iselab.mooctest.rpc.user.data.IntegralCaughtDTO;
 import cn.iselab.mooctest.rpc.user.data.UserIntegralDTO;
 import cn.iselab.mooctest.user.configure.IntegralMap;
+import cn.iselab.mooctest.user.mapper.User2IntegralDao;
 import cn.iselab.mooctest.user.model.Integral;
 import cn.iselab.mooctest.user.model.User2Integral;
 import cn.iselab.mooctest.user.model.UserIntegral;
@@ -15,6 +16,7 @@ import cn.iselab.mooctest.user.web.wrapper.IntegralCaughtWrapper;
 import cn.iselab.mooctest.user.web.wrapper.UserIntegralWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Timestamp;
 import java.util.List;

mooctest-user-server/src/test/java/cn/iselab/mooctest/user/service/impl/IntegralServiceImplTest.java

@@ -1,6 +1,6 @@
 package cn.iselab.mooctest.user.service.impl;
 
-import cn.iselab.mooctest.user.dao.User2IntegralDao;
+import cn.iselab.mooctest.user.mapper.User2IntegralDao;
 import cn.iselab.mooctest.user.mapper.UserIntegralMapper;
 import cn.iselab.mooctest.user.service.IntegralService;
 import org.junit.Before;

pom.xml

@@ -10,7 +10,7 @@
     <version>0.0.1</version>
 
     <properties>
-        <spring.boot.version>2.1.1.RELEASE</spring.boot.version>
+        <spring.boot.version>1.3.8.RELEASE</spring.boot.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
@@ -27,11 +27,11 @@
             <artifactId>commons-lang</artifactId>
             <version>1.0.1</version>
         </dependency>
-<!--        <dependency>-->
+        <dependency>
-<!--            <groupId>cn.iselab</groupId>-->
+            <groupId>cn.iselab</groupId>
-<!--            <artifactId>commons-spring</artifactId>-->
+            <artifactId>commons-spring</artifactId>
-<!--            <version>1.0.4</version>-->
+            <version>1.0.4</version>
-<!--        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>com.taocoder</groupId>
             <artifactId>ourea-core</artifactId>