WANG 7 år sedan
förälder
incheckning
92b998d816

+ 6 - 0
core-api/src/main/java/cn/com/qmth/examcloud/service/core/api/OrgApi.java

@@ -241,4 +241,10 @@ public class OrgApi {
         }
 
     }
+    
+    @ApiOperation(value = "查询所有学校", notes = "查询所有学校")
+    @GetMapping("/getAllParentOrg")
+    public ResponseEntity getAllParentOrg(){
+    	return new ResponseEntity(orgRepo.findAllParentOrg(), HttpStatus.OK);
+    }
 }

+ 3 - 0
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/repo/OrgRepo.java

@@ -28,4 +28,7 @@ public interface OrgRepo extends JpaRepository<Org,Long>,QueryByExampleExecutor<
 
     @Query(nativeQuery = true,value = "select *from ecs_core_org where parent_id=:parentId and code=:code and enable = 1")
 	Org findFirstByParentIdAndCode(@Param("parentId") Long parentId, @Param("code")String code);
+    
+    @Query(nativeQuery = true,value = "select * from ecs_core_org t where t.parent_id = 0 and t.enable = 1 order by t.id")
+    List<Org> findAllParentOrg();
 }

+ 4 - 1
core-main/src/main/resources/application-dev.properties

@@ -13,4 +13,7 @@ spring.rabbitmq.host=192.168.10.30
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=examcloud
 spring.rabbitmq.password=examcloud
-spring.rabbitmq.listener.acknowledgeMode=MANUAL
+spring.rabbitmq.listener.acknowledgeMode=MANUAL
+
+log.path=D:/Temp/logs/
+log.level=ERROR

+ 29 - 0
core-main/src/main/resources/logback-spring.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true" scan="true" scanPeriod="30 seconds">
+
+	<springProperty scope="context" name="logLevel" source="log.level" />
+	<springProperty scope="context" name="logPath" source="log.path" />
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %m | [%class:%line]%n</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="FILE-STDOUT" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logPath}/console/console.log</file>
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %m | [%class:%line]%n</pattern>
+		</encoder>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${logPath}/console/console.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+	</appender>
+
+	<root level="${logLevel}">
+		<appender-ref ref="STDOUT" />
+		<appender-ref ref="FILE-STDOUT" />
+	</root>
+
+</configuration>