Merge branch 'master' of /home/zjm/桌面/20200302/notes2.0 with conflicts.

notes-attendance/src/main/java/com/zjty/tynotes/attendance/controller/ApprovalController.java

@@ -56,7 +56,6 @@ public class ApprovalController {
                 return ok("删除审批成功");
             }
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("删除审批失败，错误内容{}:",e.getMessage());
         }
         return ok("删除审批失败");
@@ -77,7 +76,6 @@ public class ApprovalController {
             ApprovalInformation approvalInformation1 = approvalInformationService.auditApproval(userId,approvalStatus,approvalInformation);
             return ok(approvalInformation1);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("审核审批失败，错误内容{}:",e.getMessage());
         }
         return ok("审核审批失败");
@@ -91,7 +89,6 @@ public class ApprovalController {
             PageResponse<ApprovalInformation> pageResponse = approvalInformationService.findAllApproval(pageRequest);
             return ok(pageResponse);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("查找自身提交的审批失败，错误内容{}:",e.getMessage());
         }
         return ok("查找自身提交的审批失败");
@@ -104,7 +101,6 @@ public class ApprovalController {
             PageResponse<ApprovalInformation> approvalInformations = approvalInformationService.findAllAuditApproval(pageRequest);
             return ok(approvalInformations);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("查找所有我审核的审批失败，错误内容{}:",e.getMessage());
         }
         return ok("查找所有我审核的审批失败");
@@ -138,7 +134,6 @@ public class ApprovalController {
             PageResponse<WorkoverAppro> pageResponse = approvalInformationService.findAllSubmitWorkOverApproval(pageRequest);
             return ok(pageResponse);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("查找所有我提交的加班审批失败，错误内容{}:",e.getMessage());
         }
         return ok("查找所有我提交的加班审批失败");
@@ -147,14 +142,13 @@ public class ApprovalController {
     @ApiOperation(value = "查找所有我审核的加班审批")
     @PostMapping("/findAllAuditWorkOverApproval")
     public ResponseEntity findAllAuditWorkOverApproval(@RequestBody PageRequestAtten pageRequest) {
-        try {
+//        try {
             PageResponse<WorkoverAppro> pageResponse = approvalInformationService.findAllAuditWorkOverApproval(pageRequest);
             return ok(pageResponse);
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger.error("查找所有我审核的加班审批失败，错误内容{}:",e.getMessage());
-        }
-        return ok("查找所有我审核的加班审批失败");
+//        } catch (Exception e) {
+//            logger.error("查找所有我审核的加班审批失败，错误内容{}:",e.getMessage());
+//        }
+//        return ok("查找所有我审核的加班审批失败");
     }
 
     @ApiOperation(value = "申请单的选择部门")
@@ -164,7 +158,6 @@ public class ApprovalController {
             List<Department> pageResponse = approvalInformationService.findSelectDepartment();
             return ok(pageResponse);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error("查找可选择部门失败，错误内容{}:",e.getMessage());
         }
         return ok("查找可选择部门失败");

notes-attendance/src/main/java/com/zjty/tynotes/attendance/entity/vo/request/PageRequestAtten.java

@@ -32,4 +32,12 @@ public class PageRequestAtten {
      * 访问人员id
      */
     private String id;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
 }

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

 package com.zjty.tynotes.union;
 
-import org.apache.catalina.connector.Connector;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
-import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
@@ -23,8 +19,8 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
         "com.zjty.tynotes.redis",
         "com.zjty.tynotes.weekly",
         "com.zjty.tynotes.misc",
-        "com.zjty.tynotes.union"
-//        , "com.zjty.tynotes.attendance"
+        "com.zjty.tynotes.union",
+        "com.zjty.tynotes.attendance"
 })
 @EnableCaching
 @EnableScheduling
@@ -33,21 +29,21 @@ 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;
+//    }
 
 }

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

@@ -4,13 +4,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

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/notes2