提交到本地

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/PaperStructController.java

@@ -166,7 +166,7 @@ public class PaperStructController extends ControllerSupport {
         User user = getAccessUser();
         //AccessUser user = (AccessUser) request.getAttribute("accessUser");
         if(user != null){
-            quesNameDtos = paperStructService.getQuesNameList(user.getOrgId().toString(),courseNo,quesType);
+            quesNameDtos = paperStructService.getQuesNameList(user.getRootOrgId().toString(),courseNo,quesType);
         }
         return new ResponseEntity(quesNameDtos, HttpStatus.OK);
     }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/temp/DdCollegeUtilService.java

@@ -2,7 +2,6 @@ package cn.com.qmth.examcloud.core.questions.service.temp;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -18,6 +17,7 @@ import java.util.regex.Pattern;
 import org.apache.commons.lang3.StringUtils;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -64,6 +64,7 @@ import cn.com.qmth.examcloud.core.questions.service.temp.vo.TestQuestionInfo;
 public class DdCollegeUtilService {
 
 	@Autowired
+	@Qualifier("secondaryJdbcTemplate")
 	private JdbcTemplate jdbcTemplate;
 	
 	@Autowired
@@ -200,6 +201,13 @@ public class DdCollegeUtilService {
     	return questions;
     }
     
+    //测试oracle的连接
+    public int testCount(){
+    	String sql = "select count(*) from QUESTION_CONTENT";
+    	int count = this.jdbcTemplate.queryForObject(sql, Integer.class);
+    	return count;
+    }
+    
     /**
      * 根据父ID查询子题
      * @param parentId

examcloud-core-questions-starter/pom.xml

@@ -22,6 +22,15 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/com.oracle/ojdbc6 -->
+		<dependency>
+		    <groupId>com.oracle</groupId>
+		    <artifactId>ojdbc6</artifactId>
+		    <version>11.2.0.4.0-atlassian-hosted</version>
+		    <scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 	<build>

examcloud-core-questions-starter/src/main/java/cn/com/qmth/examcloud/core/questions/starter/mongo/NativeMongoConfig.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.core.questions.starter.mongo;
 
-import cn.com.qmth.examcloud.core.questions.dao.entity.PaperDetailUnit;
-
 import com.mongodb.MongoClient;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;

examcloud-core-questions-starter/src/main/resources/application-dev.properties

@@ -20,15 +20,19 @@ upyun.zipDirectory=paperZipDirectory
 upyun.radioType=mp3,wma
 
 
-spring.datasource.url=jdbc:mysql://192.168.10.30:3306/exam_cloud_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
-spring.datasource.validation-query=SELECT 1 FROM DUAL
-spring.datasource.test-on-borrow=true
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.primary.url=jdbc:mysql://192.168.10.30:3306/exam_cloud_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+spring.datasource.primary.username=root
+spring.datasource.primary.password=root
+spring.datasource.primary.validation-query=SELECT 1 FROM DUAL
+spring.datasource.primary.test-on-borrow=true
+spring.datasource.primary.driver-class-name=com.mysql.jdbc.Driver
 spring.jpa.show-sql=false
 spring.jpa.hibernate.ddl-auto=update
 
+spring.datasource.secondary.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl
+spring.datasource.secondary.username=root
+spring.datasource.secondary.password=root
+spring.datasource.secondary.driver-class-name=oracle.jdbc.OracleDriver
 
 spring.rabbitmq.host=192.168.10.30
 spring.rabbitmq.port=5672