合并分支 'fix_bug_first_stage' 到 'master'

Fix bug first stage

查看合并请求 laws-nio/laws-weilai!66

jero-boot/db/蔚来标准sql/first_bug_fix_record.sql

@@ -36,3 +36,7 @@ ALTER TABLE `project_laws_inventory`
 MODIFY COLUMN `design_deliverable_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '设计符合性确认-交付物类型' AFTER `remark`,
 MODIFY COLUMN `prehomo_deliverable_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'prehomo确认-交付物类型' AFTER `design_due_date`,
 MODIFY COLUMN `verify_deliverable_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '验证符合性确认-交付物类型' AFTER `prehomo_due_date`;
+
+-- 2022年7月9日通知标题长度    已同步正式环境
+ALTER TABLE `laws_weilai`.`sys_announcement`
+    MODIFY COLUMN `titile` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `id`;

jero-boot/jero-boot-module-system/src/main/java/com/jero/config/init/TomcatFactoryConfig.java

@@ -38,9 +38,9 @@ public class TomcatFactoryConfig {
     }
 
     //TODO 配置https证书  部署服务器的时候解开。
-   /* @Value("${server.port-https}")
+   /* @Value("${server.port}")
     private String serverPortHttp;
-    @Value("${server.port}")
+    @Value("${server.port-https}")
     private String serverPortHttps;
     @Bean
     public TomcatServletWebServerFactory tomcatFactory() {