合并分支 'gwj' 到 'master'

notes-attendance/pom.xml

@@ -61,7 +61,19 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- 钉钉接口依赖调用 -->
+        <!--<dependency>-->
+            <!--<groupId>com.ding</groupId>-->
+            <!--<artifactId>ding</artifactId>-->
+            <!--<version>1.0</version>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>com.ding</groupId>-->
+            <!--<artifactId>ding</artifactId>-->
+            <!--<version>1.1</version>-->
+        <!--</dependency>-->
+
+        <!--&lt;!&ndash; 钉钉接口依赖调用 &ndash;&gt;-->
         <dependency>
             <groupId>com.dingtalk</groupId>
             <artifactId>2</artifactId>
@@ -79,22 +91,25 @@
         </dependency>
 
     </dependencies>
-    <build>
-        <plugins>
-            <!--打包插件-->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+    <!--<build>-->
+        <!--<plugins>-->
+            <!--&lt;!&ndash;打包插件&ndash;&gt;-->
+            <!--<plugin>-->
+                <!--<groupId>org.springframework.boot</groupId>-->
+                <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
+                <!--&lt;!&ndash;<configuration>&ndash;&gt;-->
+                    <!--&lt;!&ndash;<executable>true</executable>&ndash;&gt;-->
+                <!--&lt;!&ndash;</configuration>&ndash;&gt;-->
                 <!--<configuration>-->
-                    <!--<executable>true</executable>-->
+                    <!--<includeSystemScope>true</includeSystemScope>-->
                 <!--</configuration>-->
-            </plugin>
-            <!--跳过测试插件-->
-            <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-surefire-plugin</artifactId>-->
-                <!--<version>2.20</version>-->
             <!--</plugin>-->
-        </plugins>
-    </build>
+            <!--&lt;!&ndash;跳过测试插件&ndash;&gt;-->
+            <!--&lt;!&ndash;<plugin>&ndash;&gt;-->
+                <!--&lt;!&ndash;<groupId>org.apache.maven.plugins</groupId>&ndash;&gt;-->
+                <!--&lt;!&ndash;<artifactId>maven-surefire-plugin</artifactId>&ndash;&gt;-->
+                <!--&lt;!&ndash;<version>2.20</version>&ndash;&gt;-->
+            <!--&lt;!&ndash;</plugin>&ndash;&gt;-->
+        <!--</plugins>-->
+    <!--</build>-->
 </project>

notes-misc/pom.xml

@@ -75,6 +75,7 @@
             <artifactId>easypoi-annotation</artifactId>
             <version>3.2.0</version>
         </dependency>
+
     </dependencies>
 
     <build>

notes-union/pom.xml

@@ -126,6 +126,8 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <executable>true</executable>
+                    <fork>true</fork>
+                    <includeSystemScope>true</includeSystemScope><!--添加此项-->
                 </configuration>
             </plugin>
             <!--跳过测试插件-->
@@ -137,9 +139,29 @@
                     <skipTests>true</skipTests>    <!--默认关掉单元测试 -->
                 </configuration>
             </plugin>
-        </plugins>
-    </build>
 
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-jar-plugin</artifactId>-->
+                <!--<version>3.1.0</version>-->
+                <!--<configuration>-->
+                    <!--<webResources>-->
+                        <!--&lt;!&ndash;配置第三方jar包打包的路径&ndash;&gt;-->
+                        <!--<resource>-->
+                            <!--<directory>src/main/resources/lib/</directory>-->
+                            <!--<targetPath>WEB-INF/lib/</targetPath>-->
+                            <!--<includes>-->
+                                <!--<include>**/*.jar</include>-->
+                            <!--</includes>-->
+                        <!--</resource>-->
+                    <!--</webResources>-->
+                    <!--&lt;!&ndash; maven打包的时候告诉maven不需要web.xml,否刚会报找不到web.xml错误 &ndash;&gt;-->
+                    <!--<failOnMissingWebXml>false</failOnMissingWebXml>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
 
+        </plugins>
+
+    </build>
 
 </project>
\ No newline at end of file

notes-union/src/main/java/com/zjty/tynotes/union/UnionApplication.java

 package com.zjty.tynotes.union;
 
+import com.zjty.tynotes.attendance.dao.AttendanceDetailsDao;
 import javafx.application.Application;
 import org.apache.catalina.connector.Connector;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -47,21 +49,25 @@ public class UnionApplication
         SpringApplication.run(UnionApplication.class, args);
     }
 //    开始支持http
-//    @Bean
-//    public ServletWebServerFactory servletContainer() {
-//        TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
-//        tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
-//        return tomcat;
-//    }
-//
-//    private Connector  createHTTPConnector() {
-//        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
-//        //同时启用http（8080）、https（8443）两个端口
-//        connector.setScheme("http");
-//        connector.setSecure(false);
-//        connector.setPort(8084);
-//        connector.setRedirectPort(8289);
-//        return connector;
-//    }
+    @Bean
+    public ServletWebServerFactory servletContainer() {
+        TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
+        tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
+        return tomcat;
+    }
+
+    private Connector  createHTTPConnector() {
+        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
+        //同时启用http（8080）、https（8443）两个端口
+        connector.setScheme("http");
+        connector.setSecure(false);
+        connector.setPort(8084);
+        connector.setRedirectPort(8289);
+        return connector;
+    }
+
+
+    @Autowired
+    private AttendanceDetailsDao attendanceDetailsDao;
 
 }

notes-union/src/main/resources/application.properties

@@ -3,13 +3,13 @@ spring.application.name=workbook
 ## https端口号.
 server.port=8289
 # 证书的路径.
-#server.ssl.key-store=classpath:2586377_workbook.zjtys.com.cn.pfx
-## 证书密码，请修改为您自己证书的密码.
-#server.ssl.key-store-password=bMEPW9BG
-## 秘钥库类型
-#server.ssl.keyStoreType=PKCS12
-## 证书别名
-#server.ssl.keyAlias= alias
+server.ssl.key-store=classpath:2586377_workbook.zjtys.com.cn.pfx
+# 证书密码，请修改为您自己证书的密码.
+server.ssl.key-store-password=bMEPW9BG
+# 秘钥库类型
+server.ssl.keyStoreType=PKCS12
+# 证书别名
+server.ssl.keyAlias= alias
 
 #mongodb configuration
 spring.data.mongodb.uri=mongodb://localhost:27017/notes5