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

official_backend/src/main/java/com/hssx/ysofficial/service/impl/ArticleServiceImpl.java

@@ -32,9 +32,6 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
     @Value("${upload.path}")
     private String uploadPath;
 
-    @Value("${download.path}")
-    private String downloadPath;
-
     @Resource
     private ArticleMapper articleMapper;
 

official_backend/src/main/java/com/hssx/ysofficial/service/impl/BannerPicturesServiceImpl.java

@@ -31,9 +31,6 @@ public class BannerPicturesServiceImpl extends ServiceImpl<BannerPicturesMapper,
     @Value("${upload.path}")
     private String uploadPath;
 
-    @Value("${download.path}")
-    private String downloadPath;
-
     @Resource
     private BannerPicturesMapper bannerPicturesMapper;
 

official_backend/src/main/java/com/hssx/ysofficial/service/impl/CooperationsServiceImpl.java

@@ -30,9 +30,6 @@ public class CooperationsServiceImpl extends ServiceImpl<CooperationsMapper, Coo
     @Value("${upload.path}")
     private String uploadPath;
 
-    @Value("${download.path}")
-    private String downloadPath;
-
     @Resource
     private CooperationsMapper cooperationsMapper;
 

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

@@ -0,0 +1,37 @@
+#服务端配置
+server.port=8088
+server.servlet.context-path=/
+server.tomcat.uri-encoding=UTF-8
+server.tomcat.max-http-post-size=-1
+server.max-http-header-size=102400
+server.connection-timeout=18000000s
+
+#Mybatis-plus
+mybatis-plus.type-aliases-package=com.hssx.ysofficial.entity/*
+mybatis-plus.mapper-locations=mapper/*.xml
+
+#数据库
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.username=root
+spring.datasource.password=Hssx2019.!
+#spring.datasource.password=p011430seya1026
+spring.datasource.hikari.max-lifetime=60000
+spring.datasource.hikari.IdleTimeout=60000
+spring.datasource.hikari.ConnectionTimeout=60000
+spring.datasource.hikari.ValidationTimeout=3000
+spring.datasource.hikari.LoginTimeout=5
+
+spring.servlet.multipart.enabled=true
+spring.servlet.multipart.file-size-threshold=0
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=100MB
+spring.servlet.multipart.resolve-lazily=false
+
+#文件上传路径
+#upload.path=D:/mould/upload/
+upload.path=E:/staticproject/website/upload
+
+#文件下载路径
+download.path=D:/mould/download/

official_backend/src/main/resources/application.properties

@@ -12,9 +12,11 @@ mybatis-plus.mapper-locations=mapper/*.xml
 
 #数据库
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://111.231.87.63:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
-spring.datasource.password=p011430seya1026
+spring.datasource.password=Hssx2019.!
+#spring.datasource.password=p011430seya1026
 spring.datasource.hikari.max-lifetime=60000
 spring.datasource.hikari.IdleTimeout=60000
 spring.datasource.hikari.ConnectionTimeout=60000
@@ -28,7 +30,8 @@ spring.servlet.multipart.max-request-size=100MB
 spring.servlet.multipart.resolve-lazily=false
 
 #文件上传路径
-upload.path=D:/ysofficial/upload/
+#upload.path=D:/mould/upload/
+upload.path=E:/staticproject/website/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/application-prod.properties

@@ -1,6 +1,6 @@
 # ####################################################################################################
 # 服务端配置
-server.port=9099
+server.port=9096
 server.servlet.context-path=/
 server.tomcat.uri-encoding=UTF-8
 server.tomcat.max-http-post-size=-1
@@ -16,9 +16,9 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 # 云模服务器对应的数据库
 #spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 # 我们测试的自己服务器数据库
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
-spring.datasource.password=p011430seya1026
+spring.datasource.password=Hssx2019.!
 #spring.datasource.druid.test-on-borrow=true
 #spring.datasource.druid.test-while-idle=true
 # ####################################################################################################

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

@@ -97,7 +97,7 @@
                                                 </div>
                                                 <div class="text">
                                                     <p class="d-sm-block">04 May 2018</p>
-                                                    <p class="buttons"><a href="portfolio-detail.html" class="btn btn-template-outlined-white">查看</a></p>
+                                                    <p class="buttons"><a href="job1.html" class="btn btn-template-outlined-white">查看</a></p>
                                                 </div>
                                             </div>
                                         </div>
@@ -114,7 +114,7 @@
                                                 </div>
                                                 <div class="text">
                                                     <p class="d-sm-block">04 May 2018</p>
-                                                    <p class="buttons"><a href="portfolio-detail.html" class="btn btn-template-outlined-white">查看</a></p>
+                                                    <p class="buttons"><a href="job2.html" class="btn btn-template-outlined-white">查看</a></p>
                                                 </div>
                                             </div>
                                         </div>
@@ -131,7 +131,7 @@
                                                 </div>
                                                 <div class="text">
                                                     <p class="d-sm-block">04 May 2018</p>
-                                                    <p class="buttons"><a href="portfolio-detail.html" class="btn btn-template-outlined-white">查看</a></p>
+                                                    <p class="buttons"><a href="job3.html" class="btn btn-template-outlined-white">查看</a></p>
                                                 </div>
                                             </div>
                                         </div>
@@ -148,7 +148,7 @@
                                                 </div>
                                                 <div class="text">
                                                     <p class="d-sm-block">04 May 2018</p>
-                                                    <p class="buttons"><a href="portfolio-detail.html" class="btn btn-template-outlined-white">查看</a></p>
+                                                    <p class="buttons"><a href="job4.html" class="btn btn-template-outlined-white">查看</a></p>
                                                 </div>
                                             </div>
                                         </div>
@@ -282,34 +282,27 @@
         <script src="vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
         <script src="vendor/jquery.scrollto/jquery.scrollTo.min.js"></script>
         <script src="js/front.js"></script>
-    <script>
-        $(function(){
-            //按钮单击时执行
-            $("#sub").click(function(){
-                //Ajax调用处理
-                console.log(1111)
-                var name = $("#name").val();
-                var phone = $("#phone").val();
-                var comment = $("#message").val();
-                $.ajax({
-                    type: "POST",
-                    url: "/add",
-                    data: {name:name,phone:phone,comment:comment},
-                    dataType: "json",
-                    success: function(result){
-                        if(name == "" || phone == ""){
-                            alert("姓名和手机号不可为空！");
-                            return;
-                        }
-                        if(result.code == "ok"){
-                            console.log(result.data)
-                                alert("添加成功！");
-                        }
+        <script>
+            $(function(){
+                $("#sub").click(function(){
+                    var name = $("#name").val();
+                    var phone = $("#phone").val();
+                    var comment = $("#message").val();
+                    if(name == "" || phone == "" || comment == ""){
+                        alert("请填写完整信息");
+                    }else{
+                        $.post("/add", {
+                            name: name,
+                            phone: phone,
+                            comment: comment
+                        }, function (response) {
+                            if(response.code == "ok"){
+                                alert("留言成功");
+                            }
+                        })
                     }
                 });
-
             });
-        });
-    </script>
+        </script>
     </body>
 </html>

website/src/main/resources/templates/css/custom.css

@@ -109,4 +109,15 @@ footer.main-footer a {
 
 .about #message {
     resize: none;
+}
+
+/*公司优势内的图片固定缩放为100%*/
+/*.target-content img{*/
+    /*max-width: 100%;*/
+    /*height: auto;*/
+/*}*/
+
+/*职业详情的正文颜色*/
+.job-detail{
+    color: #555;
 }

website/src/main/resources/templates/css/style.blue.css

@@ -527,11 +527,11 @@ table {
   font-size: 0.9rem;
 }
 
-table img {
-  min-width: 50px !important;
-  max-width: 50px !important;
-  height: 50px;
-}
+/*table img {*/
+  /*min-width: 50px !important;*/
+  /*max-width: 50px !important;*/
+  /*height: 50px;*/
+/*}*/
 
 table input[type="number"] {
   max-width: 50px;
@@ -663,7 +663,7 @@ header.nav-holder.sticky {
 }
 
 #navbar {
-  background: #0188fb;
+  background: #467fbf;
   padding-top: 0;
   padding-bottom: 0;
 }

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

@@ -40,7 +40,7 @@
     <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
 </head>
 <body>
-<div id="all">
+<div id="all" class="indexHead">
     <!-- Navbar Start-->
     <header class="nav-holder make-sticky">
         <div id="navbar" role="navigation" class="navbar navbar-expand-lg">
@@ -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">

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

@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>塑维</title>
+        <meta name="keywords" content="MES,MES系统,MES软件,制造执行系统,生产管理系统,生产协同,制造协同,生产流程管理,精益制造,智能制造,生产数字化,制造信息化"/>
+        <meta name="description" content="塑维智造是一款云端制造协同系统，通过数据和算法让生产更加高效。基于数据聚合、多角色协同、可视化分析、智能决策四大亮点，帮助企业缩短生产周期、降低库存积压、提升产能利用率、透明化制造流程，实现数据驱动下的精益制造。"/>
+        <meta name="description" content="">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="robots" content="all,follow">
+        <!-- Bootstrap CSS-->
+        <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.min.css">
+        <!-- Font Awesome CSS-->
+        <link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css">
+        <!-- Google fonts - Roboto-->
+        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,700">
+        <!-- Bootstrap Select-->
+        <link rel="stylesheet" href="vendor/bootstrap-select/css/bootstrap-select.min.css">
+        <!-- owl carousel-->
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.carousel.css">
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.theme.default.css">
+        <!-- theme stylesheet-->
+        <link rel="stylesheet" href="css/style.blue.css" id="theme-stylesheet">
+        <!-- Custom stylesheet - for your changes-->
+        <link rel="stylesheet" href="css/custom.css">
+        <!-- Favicon and apple touch icons-->
+        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+        <link rel="apple-touch-icon" href="img/apple-touch-icon.png">
+        <link rel="apple-touch-icon" sizes="57x57" href="img/apple-touch-icon-57x57.png">
+        <link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon-72x72.png">
+        <link rel="apple-touch-icon" sizes="76x76" href="img/apple-touch-icon-76x76.png">
+        <link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon-114x114.png">
+        <link rel="apple-touch-icon" sizes="120x120" href="img/apple-touch-icon-120x120.png">
+        <link rel="apple-touch-icon" sizes="144x144" href="img/apple-touch-icon-144x144.png">
+        <link rel="apple-touch-icon" sizes="152x152" href="img/apple-touch-icon-152x152.png">
+        <!-- Tweaks for older IEs--><!--[if lt IE 9]>
+            <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+            <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
+    </head>
+    <body>
+        <div id="all" class="about">
+            <!-- Navbar Start-->
+            <header class="nav-holder make-sticky">
+                <div id="navbar" role="navigation" class="navbar navbar-expand-lg">
+                <div class="container">
+                    <a href="index.html" class="navbar-brand home">
+                        <img src="img/logo.png" style="width:187px;" alt="Universal logo" class="d-none d-md-inline-block">
+                        <img src="img/logo-small.png" alt="Universal logo" class="d-inline-block d-md-none">
+                    </a>
+                    <button type="button" data-toggle="collapse" data-target="#navigation" class="navbar-toggler btn-template-outlined"><span class="sr-only">Toggle navigation</span><i class="fa fa-align-justify"></i></button>
+                    <div id="navigation" class="navbar-collapse collapse">
+                        <ul class="nav navbar-nav ml-auto">
+                            <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">产品优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown active"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                        </ul>
+                    </div>
+                </div>
+                </div>
+            </header>
+            <!-- Navbar End-->
+            <div id="content">
+                <div class="container">
+                    <section class="bar">
+                        <!-- Image box with hover-->
+                        <div class="heading">
+                            <h2>后端工程师-Java</h2>
+                        </div>
+                        <div>
+                            <p class="job-detail">1.要会Java</p>
+                            <p class="job-detail">2.要会Java</p>
+                            <p class="job-detail">3.要会Java</p>
+                            <p class="job-detail">4.要会Java</p>
+                            <p class="job-detail">5.要会Java</p>
+                            <p class="job-detail">6.要会Java</p>
+                            <p class="job-detail">7.要会Java</p>
+                            <p class="job-detail">8.要会Java</p>
+                            <p class="job-detail">9.要会Java</p>
+                        </div>
+                    </section>
+                </div>
+            </div>
+            <!-- FOOTER -->
+            <footer class="main-footer">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-3">
+                            <h4 class="h6">联系我们</h4>
+                            <p class="text-uppercase">
+                                <br>电话: 400-1086-011
+                                <br>网址：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                                <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
+                            </p>
+                        </div>
+                        <div class="col-lg-3">
+                            <h4 class="h6">塑维产品</h4>
+                            <p class="text-uppercase">
+                                <br>百度: <a href="http://www.baidu.com" target="_blank">www.baidu.com</a>
+                                <br>官网：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                                <br>云模：<a href="http://118.190.47.230:9098/#/login" target="_blank">www.yunsu.com</a>
+                            </p>
+                        </div>
+                        <div class="col-lg-3">
+                            <h4 class="h6">官方微信公众号</h4>
+                            <ul class="list-inline photo-stream">
+                                <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </footer>
+        </div>
+        <!-- Javascript files-->
+        <script src="vendor/jquery/jquery.min.js"></script>
+        <script src="vendor/popper.js/umd/popper.min.js"> </script>
+        <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+        <script src="vendor/jquery.cookie/jquery.cookie.js"> </script>
+        <script src="vendor/waypoints/lib/jquery.waypoints.min.js"> </script>
+        <script src="vendor/jquery.counterup/jquery.counterup.min.js"> </script>
+        <script src="vendor/owl.carousel/owl.carousel.min.js"></script>
+        <script src="vendor/owl.carousel2.thumbs/owl.carousel2.thumbs.min.js"></script>
+        <script src="js/jquery.parallax-1.1.3.js"></script>
+        <script src="vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
+        <script src="vendor/jquery.scrollto/jquery.scrollTo.min.js"></script>
+        <script src="js/front.js"></script>
+    </body>
+</html>

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

@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>塑维</title>
+        <meta name="keywords" content="MES,MES系统,MES软件,制造执行系统,生产管理系统,生产协同,制造协同,生产流程管理,精益制造,智能制造,生产数字化,制造信息化"/>
+        <meta name="description" content="塑维智造是一款云端制造协同系统，通过数据和算法让生产更加高效。基于数据聚合、多角色协同、可视化分析、智能决策四大亮点，帮助企业缩短生产周期、降低库存积压、提升产能利用率、透明化制造流程，实现数据驱动下的精益制造。"/>
+        <meta name="description" content="">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="robots" content="all,follow">
+        <!-- Bootstrap CSS-->
+        <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.min.css">
+        <!-- Font Awesome CSS-->
+        <link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css">
+        <!-- Google fonts - Roboto-->
+        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,700">
+        <!-- Bootstrap Select-->
+        <link rel="stylesheet" href="vendor/bootstrap-select/css/bootstrap-select.min.css">
+        <!-- owl carousel-->
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.carousel.css">
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.theme.default.css">
+        <!-- theme stylesheet-->
+        <link rel="stylesheet" href="css/style.blue.css" id="theme-stylesheet">
+        <!-- Custom stylesheet - for your changes-->
+        <link rel="stylesheet" href="css/custom.css">
+        <!-- Favicon and apple touch icons-->
+        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+        <link rel="apple-touch-icon" href="img/apple-touch-icon.png">
+        <link rel="apple-touch-icon" sizes="57x57" href="img/apple-touch-icon-57x57.png">
+        <link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon-72x72.png">
+        <link rel="apple-touch-icon" sizes="76x76" href="img/apple-touch-icon-76x76.png">
+        <link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon-114x114.png">
+        <link rel="apple-touch-icon" sizes="120x120" href="img/apple-touch-icon-120x120.png">
+        <link rel="apple-touch-icon" sizes="144x144" href="img/apple-touch-icon-144x144.png">
+        <link rel="apple-touch-icon" sizes="152x152" href="img/apple-touch-icon-152x152.png">
+        <!-- Tweaks for older IEs--><!--[if lt IE 9]>
+            <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+            <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
+    </head>
+    <body>
+        <div id="all" class="about">
+            <!-- Navbar Start-->
+            <header class="nav-holder make-sticky">
+                <div id="navbar" role="navigation" class="navbar navbar-expand-lg">
+                <div class="container">
+                    <a href="index.html" class="navbar-brand home">
+                        <img src="img/logo.png" style="width:187px;" alt="Universal logo" class="d-none d-md-inline-block">
+                        <img src="img/logo-small.png" alt="Universal logo" class="d-inline-block d-md-none">
+                    </a>
+                    <button type="button" data-toggle="collapse" data-target="#navigation" class="navbar-toggler btn-template-outlined"><span class="sr-only">Toggle navigation</span><i class="fa fa-align-justify"></i></button>
+                    <div id="navigation" class="navbar-collapse collapse">
+                        <ul class="nav navbar-nav ml-auto">
+                            <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">产品优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown active"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                        </ul>
+                    </div>
+                </div>
+                </div>
+            </header>
+            <!-- Navbar End-->
+            <div id="content">
+                <div class="container">
+                    <section class="bar">
+                        <!-- Image box with hover-->
+                        <div class="heading">
+                            <h2>移动开发工程师-REACTNATIVE</h2>
+                        </div>
+                        <div>
+                            <p class="job-detail">1.要会REACTNATIVE</p>
+                            <p class="job-detail">2.要会REACTNATIVE</p>
+                            <p class="job-detail">3.要会REACTNATIVE</p>
+                            <p class="job-detail">4.要会REACTNATIVE</p>
+                            <p class="job-detail">5.要会REACTNATIVE</p>
+                            <p class="job-detail">6.要会REACTNATIVE</p>
+                            <p class="job-detail">7.要会REACTNATIVE</p>
+                            <p class="job-detail">8.要会REACTNATIVE</p>
+                            <p class="job-detail">9.要会REACTNATIVE</p>
+                        </div>
+                    </section>
+                </div>
+            </div>
+            <!-- FOOTER -->
+            <footer class="main-footer">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-3">
+                            <h4 class="h6">联系我们</h4>
+                            <p class="text-uppercase">
+                                <br>电话: 400-1086-011
+                                <br>网址：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                                <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
+                            </p>
+                        </div>
+                        <div class="col-lg-3">
+                            <h4 class="h6">塑维产品</h4>
+                            <p class="text-uppercase">
+                                <br>百度: <a href="http://www.baidu.com" target="_blank">www.baidu.com</a>
+                                <br>官网：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                                <br>云模：<a href="http://118.190.47.230:9098/#/login" target="_blank">www.yunsu.com</a>
+                            </p>
+                        </div>
+                        <div class="col-lg-3">
+                            <h4 class="h6">官方微信公众号</h4>
+                            <ul class="list-inline photo-stream">
+                                <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </footer>
+        </div>
+        <!-- Javascript files-->
+        <script src="vendor/jquery/jquery.min.js"></script>
+        <script src="vendor/popper.js/umd/popper.min.js"> </script>
+        <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+        <script src="vendor/jquery.cookie/jquery.cookie.js"> </script>
+        <script src="vendor/waypoints/lib/jquery.waypoints.min.js"> </script>
+        <script src="vendor/jquery.counterup/jquery.counterup.min.js"> </script>
+        <script src="vendor/owl.carousel/owl.carousel.min.js"></script>
+        <script src="vendor/owl.carousel2.thumbs/owl.carousel2.thumbs.min.js"></script>
+        <script src="js/jquery.parallax-1.1.3.js"></script>
+        <script src="vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
+        <script src="vendor/jquery.scrollto/jquery.scrollTo.min.js"></script>
+        <script src="js/front.js"></script>
+    </body>
+</html>

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

@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>塑维</title>
+        <meta name="keywords" content="MES,MES系统,MES软件,制造执行系统,生产管理系统,生产协同,制造协同,生产流程管理,精益制造,智能制造,生产数字化,制造信息化"/>
+        <meta name="description" content="塑维智造是一款云端制造协同系统，通过数据和算法让生产更加高效。基于数据聚合、多角色协同、可视化分析、智能决策四大亮点，帮助企业缩短生产周期、降低库存积压、提升产能利用率、透明化制造流程，实现数据驱动下的精益制造。"/>
+        <meta name="description" content="">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="robots" content="all,follow">
+        <!-- Bootstrap CSS-->
+        <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.min.css">
+        <!-- Font Awesome CSS-->
+        <link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css">
+        <!-- Google fonts - Roboto-->
+        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,700">
+        <!-- Bootstrap Select-->
+        <link rel="stylesheet" href="vendor/bootstrap-select/css/bootstrap-select.min.css">
+        <!-- owl carousel-->
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.carousel.css">
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.theme.default.css">
+        <!-- theme stylesheet-->
+        <link rel="stylesheet" href="css/style.blue.css" id="theme-stylesheet">
+        <!-- Custom stylesheet - for your changes-->
+        <link rel="stylesheet" href="css/custom.css">
+        <!-- Favicon and apple touch icons-->
+        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+        <link rel="apple-touch-icon" href="img/apple-touch-icon.png">
+        <link rel="apple-touch-icon" sizes="57x57" href="img/apple-touch-icon-57x57.png">
+        <link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon-72x72.png">
+        <link rel="apple-touch-icon" sizes="76x76" href="img/apple-touch-icon-76x76.png">
+        <link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon-114x114.png">
+        <link rel="apple-touch-icon" sizes="120x120" href="img/apple-touch-icon-120x120.png">
+        <link rel="apple-touch-icon" sizes="144x144" href="img/apple-touch-icon-144x144.png">
+        <link rel="apple-touch-icon" sizes="152x152" href="img/apple-touch-icon-152x152.png">
+        <!-- Tweaks for older IEs--><!--[if lt IE 9]>
+            <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+            <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
+    </head>
+    <body>
+        <div id="all" class="about">
+            <!-- Navbar Start-->
+            <header class="nav-holder make-sticky">
+                <div id="navbar" role="navigation" class="navbar navbar-expand-lg">
+                <div class="container">
+                    <a href="index.html" class="navbar-brand home">
+                        <img src="img/logo.png" style="width:187px;" alt="Universal logo" class="d-none d-md-inline-block">
+                        <img src="img/logo-small.png" alt="Universal logo" class="d-inline-block d-md-none">
+                    </a>
+                    <button type="button" data-toggle="collapse" data-target="#navigation" class="navbar-toggler btn-template-outlined"><span class="sr-only">Toggle navigation</span><i class="fa fa-align-justify"></i></button>
+                    <div id="navigation" class="navbar-collapse collapse">
+                        <ul class="nav navbar-nav ml-auto">
+                            <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">产品优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown active"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                        </ul>
+                    </div>
+                </div>
+                </div>
+            </header>
+            <!-- Navbar End-->
+            <div id="content">
+                <div class="container">
+                    <section class="bar">
+                        <!-- Image box with hover-->
+                        <div class="heading">
+                            <h2>MES高级需求分析师</h2>
+                        </div>
+                        <div>
+                            <p class="job-detail">1.要会分析需求</p>
+                            <p class="job-detail">2.要会分析需求</p>
+                            <p class="job-detail">3.要会分析需求</p>
+                            <p class="job-detail">4.要会分析需求</p>
+                            <p class="job-detail">5.要会分析需求</p>
+                            <p class="job-detail">6.要会分析需求</p>
+                            <p class="job-detail">7.要会分析需求</p>
+                            <p class="job-detail">8.要会分析需求</p>
+                            <p class="job-detail">9.要会分析需求</p>
+                        </div>
+                    </section>
+                </div>
+            </div>
+            <!-- FOOTER -->
+            <footer class="main-footer">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-3">
+                            <h4 class="h6">联系我们</h4>
+                            <p class="text-uppercase">
+                                <br>电话: 400-1086-011
+                                <br>网址：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                                <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
+                            </p>
+                        </div>
+                        <div class="col-lg-3">
+                            <h4 class="h6">塑维产品</h4>
+                            <p class="text-uppercase">
+                                <br>百度: <a href="http://www.baidu.com" target="_blank">www.baidu.com</a>
+                                <br>官网：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                                <br>云模：<a href="http://118.190.47.230:9098/#/login" target="_blank">www.yunsu.com</a>
+                            </p>
+                        </div>
+                        <div class="col-lg-3">
+                            <h4 class="h6">官方微信公众号</h4>
+                            <ul class="list-inline photo-stream">
+                                <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </footer>
+        </div>
+        <!-- Javascript files-->
+        <script src="vendor/jquery/jquery.min.js"></script>
+        <script src="vendor/popper.js/umd/popper.min.js"> </script>
+        <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+        <script src="vendor/jquery.cookie/jquery.cookie.js"> </script>
+        <script src="vendor/waypoints/lib/jquery.waypoints.min.js"> </script>
+        <script src="vendor/jquery.counterup/jquery.counterup.min.js"> </script>
+        <script src="vendor/owl.carousel/owl.carousel.min.js"></script>
+        <script src="vendor/owl.carousel2.thumbs/owl.carousel2.thumbs.min.js"></script>
+        <script src="js/jquery.parallax-1.1.3.js"></script>
+        <script src="vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
+        <script src="vendor/jquery.scrollto/jquery.scrollTo.min.js"></script>
+        <script src="js/front.js"></script>
+    </body>
+</html>

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

@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>塑维</title>
+        <meta name="keywords" content="MES,MES系统,MES软件,制造执行系统,生产管理系统,生产协同,制造协同,生产流程管理,精益制造,智能制造,生产数字化,制造信息化"/>
+        <meta name="description" content="塑维智造是一款云端制造协同系统，通过数据和算法让生产更加高效。基于数据聚合、多角色协同、可视化分析、智能决策四大亮点，帮助企业缩短生产周期、降低库存积压、提升产能利用率、透明化制造流程，实现数据驱动下的精益制造。"/>
+        <meta name="description" content="">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="robots" content="all,follow">
+        <!-- Bootstrap CSS-->
+        <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.min.css">
+        <!-- Font Awesome CSS-->
+        <link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css">
+        <!-- Google fonts - Roboto-->
+        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,700">
+        <!-- Bootstrap Select-->
+        <link rel="stylesheet" href="vendor/bootstrap-select/css/bootstrap-select.min.css">
+        <!-- owl carousel-->
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.carousel.css">
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.theme.default.css">
+        <!-- theme stylesheet-->
+        <link rel="stylesheet" href="css/style.blue.css" id="theme-stylesheet">
+        <!-- Custom stylesheet - for your changes-->
+        <link rel="stylesheet" href="css/custom.css">
+        <!-- Favicon and apple touch icons-->
+        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+        <link rel="apple-touch-icon" href="img/apple-touch-icon.png">
+        <link rel="apple-touch-icon" sizes="57x57" href="img/apple-touch-icon-57x57.png">
+        <link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon-72x72.png">
+        <link rel="apple-touch-icon" sizes="76x76" href="img/apple-touch-icon-76x76.png">
+        <link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon-114x114.png">
+        <link rel="apple-touch-icon" sizes="120x120" href="img/apple-touch-icon-120x120.png">
+        <link rel="apple-touch-icon" sizes="144x144" href="img/apple-touch-icon-144x144.png">
+        <link rel="apple-touch-icon" sizes="152x152" href="img/apple-touch-icon-152x152.png">
+        <!-- Tweaks for older IEs--><!--[if lt IE 9]>
+            <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+            <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
+    </head>
+    <body>
+        <div id="all" class="about">
+            <!-- Navbar Start-->
+            <header class="nav-holder make-sticky">
+                <div id="navbar" role="navigation" class="navbar navbar-expand-lg">
+                <div class="container">
+                    <a href="index.html" class="navbar-brand home">
+                        <img src="img/logo.png" style="width:187px;" alt="Universal logo" class="d-none d-md-inline-block">
+                        <img src="img/logo-small.png" alt="Universal logo" class="d-inline-block d-md-none">
+                    </a>
+                    <button type="button" data-toggle="collapse" data-target="#navigation" class="navbar-toggler btn-template-outlined"><span class="sr-only">Toggle navigation</span><i class="fa fa-align-justify"></i></button>
+                    <div id="navigation" class="navbar-collapse collapse">
+                        <ul class="nav navbar-nav ml-auto">
+                            <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="product">产品优势 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown active"><a href="about.html">关于我们 <b class="caret"></b></a></li>
+                        </ul>
+                    </div>
+                </div>
+                </div>
+            </header>
+            <!-- Navbar End-->
+            <div id="content">
+                <div class="container">
+                    <section class="bar">
+                        <!-- Image box with hover-->
+                        <div class="heading">
+                            <h2>WEB资深前端工程师-REACT</h2>
+                        </div>
+                        <div>
+                            <p class="job-detail">1.要会REACT</p>
+                            <p class="job-detail">2.要会REACT</p>
+                            <p class="job-detail">3.要会REACT</p>
+                            <p class="job-detail">4.要会REACT</p>
+                            <p class="job-detail">5.要会REACT</p>
+                            <p class="job-detail">6.要会REACT</p>
+                            <p class="job-detail">7.要会REACT</p>
+                            <p class="job-detail">8.要会REACT</p>
+                            <p class="job-detail">9.要会REACT</p>
+                        </div>
+                    </section>
+                </div>
+            </div>
+            <!-- FOOTER -->
+            <footer class="main-footer">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-3">
+                            <h4 class="h6">联系我们</h4>
+                            <p class="text-uppercase">
+                                <br>电话: 400-1086-011
+                                <br>网址：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                                <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
+                            </p>
+                        </div>
+                        <div class="col-lg-3">
+                            <h4 class="h6">塑维产品</h4>
+                            <p class="text-uppercase">
+                                <br>百度: <a href="http://www.baidu.com" target="_blank">www.baidu.com</a>
+                                <br>官网：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                                <br>云模：<a href="http://118.190.47.230:9098/#/login" target="_blank">www.yunsu.com</a>
+                            </p>
+                        </div>
+                        <div class="col-lg-3">
+                            <h4 class="h6">官方微信公众号</h4>
+                            <ul class="list-inline photo-stream">
+                                <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </footer>
+        </div>
+        <!-- Javascript files-->
+        <script src="vendor/jquery/jquery.min.js"></script>
+        <script src="vendor/popper.js/umd/popper.min.js"> </script>
+        <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+        <script src="vendor/jquery.cookie/jquery.cookie.js"> </script>
+        <script src="vendor/waypoints/lib/jquery.waypoints.min.js"> </script>
+        <script src="vendor/jquery.counterup/jquery.counterup.min.js"> </script>
+        <script src="vendor/owl.carousel/owl.carousel.min.js"></script>
+        <script src="vendor/owl.carousel2.thumbs/owl.carousel2.thumbs.min.js"></script>
+        <script src="js/jquery.parallax-1.1.3.js"></script>
+        <script src="vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
+        <script src="vendor/jquery.scrollto/jquery.scrollTo.min.js"></script>
+        <script src="js/front.js"></script>
+    </body>
+</html>

website/src/main/resources/templates/js/front.js

@@ -13,10 +13,9 @@ $(function () {
             $('header.nav-holder.make-sticky').removeClass('sticky');
             $('body').css('padding-top', '0');
         }
-        console.log($(window).scrollTop())
         if($(window).scrollTop() >= $('.owl-stage').height() - 10) {
             $(".indexHead #navbar").css({
-                "background": "#0188fb",
+                "background": "#467fbf",
             })
         } else {
             $(".indexHead #navbar").css({

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

@@ -71,7 +71,7 @@
                                     <h2>为什么选择我们</h2>
                                 </div>
                             </div>
-                            <div class="col-md-12" th:utext="${advantage.content}"></div>
+                            <div class="col-md-12 target-content" th:utext="${advantage.content}"></div>
                         </div>
                     </section>
                 </div>