Browse Source

新增代码

zdd 3 years ago
parent
commit
6b11c67a41

+ 42 - 0
pom.xml

@@ -27,16 +27,39 @@
     </properties>
 
     <profiles>
+<<<<<<< HEAD
         <profile>
             <id>test</id>
+=======
+        <!--  配置文件  id 名字    properties 参数   -->
+        <profile>
+            <id>dev</id>
+>>>>>>> aa0d156 (新增代码)
             <!--默认激活当前配置-->
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
+<<<<<<< HEAD
                 <profiles.active>test</profiles.active>
                 <!-- Docker 配置 -->
                 <docker.dockerHost>http://172.16.90.64:22375</docker.dockerHost>
+=======
+                <profiles.active>dev</profiles.active>
+                <!--  众多参数配置 -->
+                <!-- Docker 配置 -->
+                <docker.dockerHost>http://172.16.90.201:22375</docker.dockerHost>
+                <docker.serviceId>DockerHub</docker.serviceId>
+                <docker.image.version>1.0.0</docker.image.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>pro</id>
+            <properties>
+                <profiles.active>pro</profiles.active>
+                <!--  众多参数配置 -->
+                <docker.dockerHost>http://139.186.205.160:22375</docker.dockerHost>
+>>>>>>> aa0d156 (新增代码)
                 <docker.serviceId>DockerHub</docker.serviceId>
                 <docker.image.version>1.0.0</docker.image.version>
             </properties>
@@ -169,6 +192,20 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+<<<<<<< HEAD
+=======
+                <!-- 同时发布本地引用包 -->
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+>>>>>>> aa0d156 (新增代码)
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -183,6 +220,7 @@
                 <artifactId>docker-maven-plugin</artifactId>
                 <version>1.2.2</version>
                 <configuration>
+<<<<<<< HEAD
 <!--
                     <serverId>${docker.serviceId}</serverId>
 -->
@@ -191,6 +229,10 @@
                     <imageTags>
                         <imageTag>${docker.image.version}</imageTag>
                     </imageTags>
+=======
+                    <serverId>${docker.serviceId}</serverId>
+                    <dockerHost>${docker.dockerHost}</dockerHost>
+>>>>>>> aa0d156 (新增代码)
                     <imageName>docker.io/${project.artifactId}:${docker.image.version}</imageName>
                     <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
                     <resources>

+ 61 - 0
src/main/java/com/activiti6/Activiti5Application.java

@@ -0,0 +1,61 @@
+package com.activiti6;
+
+import org.activiti.rest.common.application.ContentTypeResolver;
+import org.activiti.rest.common.application.DefaultContentTypeResolver;
+import org.activiti.rest.service.api.RestResponseFactory;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@RestController
+@SpringBootApplication(exclude = {
+        org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration.class,
+        org.activiti.spring.boot.SecurityAutoConfiguration.class,
+})
+@MapperScan("com.activiti6.mapper")
+//@ComponentScan(basePackages = {"org.activiti.rest"})
+public class Activiti5Application extends WebMvcConfigurerAdapter {
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.favorPathExtension(false);
+    }
+
+    public static void main(String[] args) {
+        SpringApplication.run(Activiti5Application.class, args);
+    }
+
+    @Bean
+    public RestResponseFactory createRestResponseFactory() {
+        return new RestResponseFactory();
+    }
+
+    @Bean
+    public ContentTypeResolver createContentTypeResolver() {
+        return new DefaultContentTypeResolver();
+    }
+
+    @Bean
+    public FilterRegistrationBean corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        CorsConfiguration config = new CorsConfiguration();
+        config.setAllowCredentials(true);
+//        config.addAllowedOrigin("http://localhost:8081");
+        config.addAllowedOrigin("*");
+        config.addAllowedHeader("*");
+        config.addAllowedMethod("*");
+        source.registerCorsConfiguration("/**", config); // CORS 配置对所有接口都有效
+        FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
+        bean.setOrder(0);
+        return bean;
+    }
+
+
+}

+ 3 - 3
src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@
 spring:
   #数据源配置
   datasource:
-    url: jdbc:mysql://47.108.115.128:3306/activiti?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-    username: activiti
-    password: 5N6ipwhde7PGeBtf
+    url: jdbc:mysql://47.108.115.128:3306/airposrt_activiti?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    password: zdd755
     type: com.alibaba.druid.pool.DruidDataSource
     #freemarker模板配置
     freemarker:

+ 1 - 1
src/main/resources/application.yml

@@ -1,7 +1,7 @@
 server:
   session:
     timeout: 3600
-  port: 8081
+  port: 11375
 # Spring
 spring:
   jackson: