chenken 8 жил өмнө
parent
commit
6186ae8018

+ 5 - 0
cqb-paper/pom.xml

@@ -28,5 +28,10 @@
             <artifactId>cqb-base</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.qmth.cqb</groupId>
+            <artifactId>cqb-flow-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>

+ 9 - 0
cqb-starter/src/main/java/com/qmth/cqb/AccessControlConfig.java

@@ -1,7 +1,9 @@
 package com.qmth.cqb;
 
 import cn.com.qmth.examcloud.common.uac.AccessCtrlInterceptor;
+
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
@@ -24,4 +26,11 @@ public class AccessControlConfig extends WebMvcConfigurerAdapter {
                 .addPathPatterns("/**")
                 .excludePathPatterns("/**/swagger-ui.html#/**");
     }
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowedMethods("GET", "HEAD", "POST", "PUT", "PATCH", "DELETE", "OPTIONS", "TRACE")
+                .allowedHeaders("*");
+    }
 }

+ 2 - 18
cqb-starter/src/main/java/com/qmth/cqb/App.java

@@ -20,8 +20,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
  *
  */
 @SpringBootApplication
-@EnableEurekaClient
-@EnableFeignClients
+//@EnableEurekaClient
+//@EnableFeignClients
 @EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class})
 public class App {
 
@@ -42,20 +42,4 @@ public class App {
         resolver.setMaxUploadSize(200*1024*1024);//上传文件大小 50M 50*1024*1024
         return resolver;
     }
-
-    @Bean
-    public WebMvcConfigurer corsConfigurer() {
-        return new WebMvcConfigurerAdapter() {
-            public void addCorsMappings(CorsRegistry registry) {
-                registry.addMapping("/**");
-
-//                registry.addMapping("/**")
-//                        .allowedOrigins("*")
-//                        .allowedMethods("GET", "HEAD", "POST", "PUT", "PATCH", "DELETE", "OPTIONS", "TRACE")
-//                        .allowedHeaders("*")
-//                        .exposedHeaders("access_token", "credentials", "refresh_token")
-//                        .allowCredentials(true).maxAge(3600);
-            }
-        };
-    }
 }

+ 1 - 1
cqb-starter/src/main/resources/application-dev.properties

@@ -1,6 +1,6 @@
 spring.data.mongodb.uri=mongodb://192.168.1.99:27017/comm-ques-bank
 spring.data.mongodb.grid-fs-database=comm-ques-bank
-eureka.client.serviceUrl.defaultZone=http://192.168.1.161:1111/eureka/
+eureka.client.serviceUrl.defaultZone=http://192.168.1.99:1111/eureka/
 
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.database=MYSQL

+ 1 - 1
cqb-starter/src/test/java/com/qmth/cqb/FlowTest.java

@@ -53,7 +53,7 @@ public class FlowTest{
 	@Deployment
 	public void testDeploy() throws Exception{
 		 //流程文件名不能使用中文
-		 comProcessService.deployProcess("B-register-v1.0.bpmn", "D:/workflow_diagrams");
+		 comProcessService.deployProcess("importPaperAduit.bpmn", "导入试卷流程");
 	}
 	 @Test 
 	public void testQueryAllTask(){