...

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/swufe/CommonGainScoreController.java

@@ -1,13 +1,8 @@
 package cn.com.qmth.examcloud.exchange.outer.api.controller.swufe;
 
-import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
-import cn.com.qmth.examcloud.exchange.base.response.FailureBaseResponse;
-import cn.com.qmth.examcloud.exchange.base.response.SuccessBaseResponse;
-import cn.com.qmth.examcloud.exchange.dao.ExamScoreRepo;
-import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
-import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
-import io.swagger.annotations.ApiOperation;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -18,14 +13,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-
-
-
-
-
-import javax.servlet.http.HttpServletRequest;
-
-import java.util.List;
+import cn.com.qmth.examcloud.commons.web.security.bean.User;
+import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.base.response.FailureBaseResponse;
+import cn.com.qmth.examcloud.exchange.base.response.SuccessBaseResponse;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
+import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 公共-获取成绩接口
@@ -38,9 +32,6 @@ import java.util.List;
 @RequestMapping("${$rmp.cloud.exchange.outer}/score")
 public class CommonGainScoreController  extends ControllerSupport{
 
-    @Autowired
-    private ExamScoreRepo examScoreRepo;
-    
     @Autowired
     private OutletScoreService outletScoreService;
 

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/ScoreController.java

@@ -1,12 +1,8 @@
 package cn.com.qmth.examcloud.exchange.outer.api.controller.sydx;
 
-import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
-import cn.com.qmth.examcloud.exchange.base.response.FailureBaseResponse;
-import cn.com.qmth.examcloud.exchange.dao.ExamScoreRepo;
-import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
-import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
-import io.swagger.annotations.ApiOperation;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -17,9 +13,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-
-import java.util.List;
+import cn.com.qmth.examcloud.commons.web.security.bean.User;
+import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.exchange.base.response.FailureBaseResponse;
+import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
+import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * 石油大学专用-获取成绩接口
@@ -32,9 +31,6 @@ import java.util.List;
 @RequestMapping("${$rmp.cloud.exchange.outer}/sydx/score")
 public class ScoreController  extends ControllerSupport{
 
-    @Autowired
-    private ExamScoreRepo examScoreRepo;
-    
     @Autowired
     private OutletScoreService outletScoreService;
 

examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/DemoDao.java

@@ -1,5 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao;
-
-public interface DemoDao {
-
-}

examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/ExamScoreRepo.java

@@ -1,40 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import cn.com.qmth.examcloud.exchange.dao.bean.ExamScore;
-import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
-
-import java.util.List;
-
-/**
- * Created by yuanpan on 2017/4/26.
- */
-@Repository
-public interface ExamScoreRepo extends JpaRepository<ExamScore, Long> {
-
-    //    @Query(nativeQuery = true, value = "select \n" +
-//            "s.id `score_id`, stu.`name` `student_name`, stu.student_code,stu.identity_number,\n" +
-//            "s.total_score,s.objective_score,s.subjective_score,\n" +
-//            "stu.course_name,stu.course_code,stu.remark `student_remark`,\n" +
-//            "r.end_time\n" +
-//            "from oe_exam_score s \n" +
-//            "left join oe_exam_record r on s.exam_record_id = r.id\n" +
-//            "left join ecs_exam_student stu on stu.id = r.exam_student_id\n" +
-//            "left join ecs_exam e on e.id = r.batch_id\n" +
-//            "where e.remark = ?1 and stu.remark = ?2 and e.org_id = ?3")
-//    List<Object> findOutletScoreByRemark(String examRemark, String examStuRemark, Long examOrgId);
-
-    List<OutletScore> sydxQuery(String examRemark, String examStuRemark, Long examOrgId);
-
-    List<OutletScore> sydxGet(Long scoreId);
-    
-    /**
-     * 按身份证号查询成绩
-     * @param identityNumber 身份证号
-     * @return
-     */
-    List<OutletScore> sydxQueryScoreByIdentityNumber(List<String> identityNumbers, Long examOrgId);
-    
-}

examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/DemoDaoImpl.java

@@ -1,7 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao.impl;
-
-import cn.com.qmth.examcloud.exchange.dao.DemoDao;
-
-public class DemoDaoImpl implements DemoDao {
-
-}

examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/ExamRecordDaoImpl.java

@@ -4,7 +4,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Component;
@@ -22,7 +21,6 @@ import cn.com.qmth.examcloud.exchange.dao.ExamRecordDao;
 @Component("examRecordDao")
 public class ExamRecordDaoImpl implements ExamRecordDao {
 	
-	@Autowired
 	private JdbcTemplate jdbcTemplate;
 
 	@Override

examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/ExamScoreDaoImpl.java

@@ -4,7 +4,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Component;
@@ -21,7 +20,6 @@ import cn.com.qmth.examcloud.exchange.dao.ExamScoreDao;
 @Component("examScoreDao")
 public class ExamScoreDaoImpl implements ExamScoreDao{
 	
-	@Autowired
 	private JdbcTemplate jdbcTemplate;
 
 	@Override

examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/OutletScoreDaoImpl.java

@@ -7,7 +7,6 @@ import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Repository;
@@ -29,7 +28,6 @@ public class OutletScoreDaoImpl implements OutletScoreDao{
 
 	private static final Logger log = LoggerFactory.getLogger(OutletScoreDaoImpl.class);
 	
-	@Autowired
 	public JdbcTemplate jdbcTemplate;
 	
 	@Override

examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/scorePush/SydxScorePushServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamRecordDto;
 import cn.com.qmth.examcloud.commons.base.util.JsonUtil;
-import cn.com.qmth.examcloud.exchange.dao.ExamScoreRepo;
 import cn.com.qmth.examcloud.exchange.dao.OutletScoreDao;
 import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
@@ -47,9 +46,6 @@ public class SydxScorePushServiceImpl implements ScorePushService{
     @Value("${sydx.pushscore.url.port}")
     private String pushUrlPort;
 
-    @Autowired
-    private ExamScoreRepo examScoreRepo;
-    
     @Autowired
     private OutletScoreService outletScoreService;
     

examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/scorePush/XncdScorePushServiceImpl.java

@@ -23,7 +23,6 @@ import org.springframework.stereotype.Service;
 import cn.com.qmth.examcloud.common.dto.oe.marking.ExamRecordDto;
 import cn.com.qmth.examcloud.common.dto.oe.marking.PushScoreActionEnum;
 import cn.com.qmth.examcloud.exchange.base.util.OutletUtils;
-import cn.com.qmth.examcloud.exchange.dao.ExamScoreRepo;
 import cn.com.qmth.examcloud.exchange.dao.bean.OutletScore;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
 import cn.com.qmth.examcloud.exchange.outer.service.ScorePushService;
@@ -39,9 +38,6 @@ public class XncdScorePushServiceImpl  implements ScorePushService{
 
 	private static final Logger log = LoggerFactory.getLogger(XncdScorePushServiceImpl.class);
 	
-    @Autowired
-    private ExamScoreRepo examScoreRepo;
-    
     @Autowired
     private OutletScoreService outletScoreService;
     

examcloud-exchange-starter/src/main/java/cn/com/qmth/examcloud/exchange/ExchangeApp.java

@@ -5,6 +5,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.MultipartAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
@@ -33,6 +35,10 @@ import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClientImpl;
 import cn.com.qmth.examcloud.commons.web.support.CustomResponseErrorHandler;
 
+/**
+ * Exchange不连接除Redis外的任何数据库. 说明 by wangwei
+ *
+ */
 @ComponentScan(basePackages = {"cn.com.qmth"})
 @SpringBootApplication
 @EnableEurekaClient
@@ -40,7 +46,8 @@ import cn.com.qmth.examcloud.commons.web.support.CustomResponseErrorHandler;
 @EnableAsync
 @EnableFeignClients
 @EnableDiscoveryClient
-@EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class})
+@EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class,
+		DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
 public class ExchangeApp {
 
 	private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(ExchangeApp.class);

examcloud-exchange-starter/src/main/resources/application-dev.properties

@@ -1,7 +1,3 @@
-spring.datasource.url=jdbc:mysql://db-host:3306/exam_cloud_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
-
 spring.redis.host=redis-host
 spring.redis.port=6379
 

examcloud-exchange-starter/src/main/resources/application-prod.properties

@@ -1,8 +1,3 @@
-spring.datasource.url=jdbc:mysql://rds7b2sll8un5kz99s0i122.mysql.rds.aliyuncs.com:3306/exam_cloud?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=exam_cloud
-spring.datasource.password=examcloud123!@#
-
-
 spring.redis.host=r-wz97e520d2701e54555.redis.rds.aliyuncs.com
 spring.redis.port=6379
 spring.redis.password=Qmth87863577

examcloud-exchange-starter/src/main/resources/application-test.properties

@@ -1,7 +1,3 @@
-spring.datasource.url=jdbc:mysql://db-host:3306/exam_cloud_test?useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=root
-spring.datasource.password=root
-
 spring.redis.host=redis-host
 spring.redis.port=6379
 

examcloud-exchange-starter/src/main/resources/application.properties

@@ -3,14 +3,8 @@ spring.profiles.active=dev
 spring.application.name=EC-EXCHANGE
 server.port=8007
 
-spring.datasource.validation-query=SELECT 1 FROM DUAL
-spring.datasource.test-on-borrow=true
-
 server.max-http-header-size=1048576
 
-spring.jpa.show-sql=false
-spring.jpa.hibernate.ddl-auto=update
-
 hystrix.command.default.execution.timeout.enabled=false
 
 $rmp.cloud.exchange.inner=/api/exchange/inner