246

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/AttendanceDetailsServiceImpl.java

@@ -126,8 +126,10 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
                         userAttenVo.setAbsenteeismDay(attendanceDetails.getAbsenteeismDay()+userAttenVo.getAbsenteeismDay());
                     }
                 }
+
                 userAttenVo.computerRealAttendanceDay();
             }
+            System.out.println(attendanceDetailsList.size());
             return userAttenVo;
         } catch (ParseException e) {
             logger.error("时间转换格式错误");

notes-attendance/src/main/java/com/zjty/tynotes/attendance/task/CardTask.java

@@ -65,7 +65,7 @@ public class CardTask {
     /**
      * 定时任务，定时获取打卡信息.计算前天的个人考勤信息情况
      */
-//    @Scheduled(cron = "0 59 23 * * ? ")
+    @Scheduled(cron = "0 59 23 * * ? ")
     public List<CardResult> getCardDetails(){
         List<User> users = pasUserDao.findAll();
         List<User> userList = new ArrayList<>();

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;
 
@@ -19,8 +23,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
@@ -29,21 +33,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,24 +3,24 @@ 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
+spring.data.mongodb.uri=mongodb://192.168.1.246:27017/notes2
 # servlet configuration
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=1000MB
 
-spring.redis.host=localhost
+spring.redis.host=192.168.1.246
 spring.redis.port=6379
 spring.redis.timeout=5000ms
 
 # es configuraiton
-es.ip=localhost
+es.ip=192.168.1.246
 logging.file=./log/note.log