Merge remote-tracking branch 'origin/master'

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldController.java

@@ -30,8 +30,6 @@ import java.util.List;
  */
 @Controller
 @RequestMapping("/mould")
-@Component
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
 @EnableScheduling
 public class MouldController {
     @Autowired

cloud-model/src/test/java/com/hssx/cloudmodel/CloudModelApplicationTests.java

@@ -35,9 +35,9 @@ public class CloudModelApplicationTests {
     public void contextLoads() {
 
         CustomCompany customCompany = new CustomCompany();
-        customCompany.setCompanyId(66);
-        customCompany.setCompanyName("123455");
-        customCompanyMapper.update(customCompany,new QueryWrapper<>(customCompany));
+//        customCompany.setCompanyId(10);
+//        customCompany.setProjectId(4);
+//        customCompanyMapper.update(customCompany,new QueryWrapper<CustomCompany>().eq("company_id",10));
 
 //        User user = new User();
 //        user.setUsername("超级管理员");

website/dabao.cmd

@@ -0,0 +1 @@
+mvn clean package -Dmaven.test.skip=true

website/src/main/java/com/hssx/website/defaultviewconfig/DefaultView.java

@@ -16,8 +16,6 @@ public class DefaultView extends WebMvcConfigurerAdapter {
   private String path;
   @Override
   public void addViewControllers(ViewControllerRegistry registry) {
-    System.out.println("捡来++++++++++222222222222+++++");
-
     /*将项目启动首页后提交给/index的controller来处理*/
     registry.addViewController("/").setViewName("forward:/index");
     registry.setOrder(Ordered.HIGHEST_PRECEDENCE);
@@ -25,7 +23,6 @@ public class DefaultView extends WebMvcConfigurerAdapter {
   }
   @Override
   public void addResourceHandlers(ResourceHandlerRegistry registry) {
-    System.out.println("捡来+++++++++++++++");
     //和页面有关的静态目录都放在项目的static目录下
 //    registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
     //上传的图片在D盘下的OTA目录下，访问路径如：http://localhost:8081/OTA/d3cf0281-bb7f-40e0-ab77-406db95ccf2c.jpg

website/src/main/resources/application-prod.properties

@@ -8,8 +8,13 @@ server.connection-timeout=18000000s
 # ####################################################################################################
 # thymeleaf 配置
 spring.thymeleaf.cache=false
-spring.thymeleaf.jackson.time-zone=GMT+8
-spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.thymeleaf.suffix=.html
+## 模板引擎找寻的静态资源文件夹
+spring.thymeleaf.prefix=classpath:/templates/
+spring.thymeleaf.encoding=UTF-8
+spring.thymeleaf.mode=HTML5
+## 用于静态页面间的跳转（静态资源的存放文件夹）
+spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,classpath:/templates/
 # ####################################################################################################
 # 数据源配置
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
@@ -32,7 +37,6 @@ logging.level.com.hssx.website.mapper = debug
 spring.session.store-type=none
 # ####################################################################################################
 #成功页面跳转
-spring.thymeleaf.prefix=classpath:/static/
 ######################################################################################################
 ## redis 配置
 #spring.redis.host=localhost