Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

official_backend/src/main/resources/application.properties

@@ -27,8 +27,11 @@ spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
 spring.servlet.multipart.resolve-lazily=false
 
+spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,classpath:/templates/
+
+
 #文件上传路径
-upload.path=D:/ysofficial/upload/
+upload.path=D:/mould/upload/
 
 #文件下载路径
-download.path=D:/ysofficial/download/
+download.path=D:/mould/download/

website/src/main/java/com/hssx/website/service/impl/ArticleServiceImpl.java

@@ -40,7 +40,9 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
     @Override
     public Model getList(Model model) {
         List<Article> articles = articleMapper.selectList(new QueryWrapper<Article>()
-                .eq("type", "case").orderByAsc("position"));
+                .eq("type", "case")
+                .eq("sticky", 1)
+                .orderByAsc("position"));
         model.addAttribute("articles", articles);
         List<Cooperations> cooperations = cooperationsMapper.selectList(new QueryWrapper<Cooperations>().orderByAsc("id"));
         model.addAttribute("cooperations", cooperations);

website/src/main/resources/templates/index.html

@@ -141,8 +141,8 @@
             <div class="heading text-center">
                 <h2>客户说</h2>
             </div>
-            <p class="lead">We have worked with many clients and we always like to hear they come out from the
-                cooperation happy and satisfied. Have a look what our clients said about us.</p>
+            <p class="lead">塑维智造是一款云端制造协同系统，通过数据和算法让生产更加高效。基于数据聚合、多角色协同、可视化分析、
+                智能决策四大亮点，帮助企业缩短生产周期、降低库存积压、提升产能利用率、透明化制造流程，实现数据驱动下的精益制造。</p>
             <!-- Carousel Start-->
             <ul class="owl-carousel testimonials list-unstyled equal-height">
                 <li class="item">