修改https

notes-job/src/main/java/com/zjty/tynotes/job/basic/service/impl/WorkServiceImpl.java

@@ -7,15 +7,19 @@ import com.zjty.tynotes.job.basic.entity.response.WorkVo;
 import com.zjty.tynotes.job.basic.repository.WorkRepository;
 import com.zjty.tynotes.job.basic.service.ConversionService;
 import com.zjty.tynotes.job.basic.service.WorkService;
+import com.zjty.tynotes.job.basic.utils.WorkingTime;
 import com.zjty.tynotes.job.common.constant.WorkStatus;
 import com.zjty.tynotes.job.common.exception.BadRequestException;
 import com.zjty.tynotes.job.common.exception.NotFoundException;
+import com.zjty.tynotes.pas.entity.vo.HolidayRequest;
+import com.zjty.tynotes.pas.service.ConfigService;
 import com.zjty.tynotes.pas.service.IUserService;
 import com.zjty.tynotes.pas.service.impl.UserServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -49,6 +53,8 @@ public class WorkServiceImpl implements WorkService {
     public WorkServiceImpl(WorkRepository workRepository) {
         this.workRepository = workRepository;
     }
+    @Autowired
+    ConfigService configService;
 
     @Override
     public String add(Work work) {
@@ -121,12 +127,23 @@ public class WorkServiceImpl implements WorkService {
         Work ob = workRepository.findById(taskId).get();
 
         ob.setStatus(status);
-
+        if (status.equals(WorkStatus.ONGOING)){
+//          Float expect= score(ob.getStateTime(),ob.getCompleteTime());
+//          Float practical=score(ob.getStateTime(),ob.getEndTime());
+        }
         workRepository.save(ob);
     }
 
 
-
+private Float score(Date startTime,Date entTime){
+   List<Date> dates= configService.findHolidays(new HolidayRequest(startTime,entTime));
+    try {
+       return WorkingTime.findOperHours(dates,startTime,entTime);
+    } catch (ParseException e) {
+        e.printStackTrace();
+    }
+return null;
+}
 
     @Override
     public void deleteWork(String taskId, int personalWorkload, int workloadCount) {

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

@@ -27,22 +27,22 @@ public class UnionApplication {
     public static void main(String[] args) {
         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(8290);
-// return connector;
-//}
+//    开始支持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;
+}
 
 }

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

@@ -3,14 +3,14 @@ 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/notes

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

@@ -3,14 +3,14 @@ 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/notes

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

@@ -4,14 +4,14 @@ 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/notes