Merge remote-tracking branch 'origin/dev' into dev

framework/core/pom.xml

@@ -62,6 +62,11 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>transmittable-thread-local</artifactId>
+            <version>2.10.2</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

framework/core/src/main/java/com/usoftchina/saas/context/BaseContextHolder.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.context;
 
+import com.alibaba.ttl.TransmittableThreadLocal;
 import com.usoftchina.saas.constant.CommonConstants;
 import com.usoftchina.saas.utils.ObjectUtils;
 
@@ -12,7 +13,8 @@ import java.util.Map;
  */
 public class BaseContextHolder {
 
-    private static final ThreadLocal<Map<String, Object>> threadLocal = new InheritableThreadLocal<>();
+    //private static final ThreadLocal<Map<String, Object>> threadLocal = new InheritableThreadLocal<>();
+    private static final ThreadLocal<Map<String, Object>> threadLocal = new TransmittableThreadLocal<>();
 
     public static void set(String key, Object value) {
         Map<String, Object> map = threadLocal.get();

frontend/saas-portal-web/src/components/conenter/details.vue

@@ -23,9 +23,9 @@
                 </div>
                 <div class="qy-conent">
                     <ul>
-                        <li><span class="qy-biaoti">姓名</span><span>{{content.admin}}</span></li>
+                        <li><span class="qy-biaoti">姓<span style="width:2em;display: inline-block;"></span>名</span><span>{{content.admin}}</span></li>
                         <li><span class="qy-biaoti">手机号</span><span>{{content.adminMobile}}</span></li>
-                        <li><span class="qy-biaoti">邮箱</span><span>{{content.adminEmail}}</span></li>
+                        <li><span class="qy-biaoti">邮<span style="width:2em;display: inline-block;"></span>箱</span><span>{{content.adminEmail}}</span></li>
                     </ul>
                 </div>
             </div>
@@ -48,7 +48,7 @@
                         </li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
-                            <select @change="industry" ref="qyindustry" class="industry border" name="selectAge" id="selectAge">   
+                            <select @change="industry" ref="qyindustry" class="industry border" name="selectAge" id="selectAge" style="margin-left: -10px;padding-left: 5px;">   
                                 <option value="" disabled selected hidden>请选择所属行业</option>
                                 <option value="贸易零售">贸易零售</option>
                                 <option value="制造加工">制造加工</option>
@@ -86,7 +86,7 @@
                         <li><span class="qy-biaoti">手机号</span><span>{{content.adminMobile}}</span></li>
                         <li>
                             <span class="qy-biaoti">邮<span style="width:2em;display: inline-block;"></span>箱</span>
-                            <input @blur="email" @focus="heidemail" ref="email" type="text" value="" :class= "{showborder:isemail}">
+                            <input @blur="email" @focus="heidemail" ref="email" type="text" value="" :class= "{showborder:isemail}" style="margin-left: -10px;padding-left: 5px;">
                             <div v-show="isheidemail" class="qy-Tips"><span style="color:red" v-html="Email"></span></div>
                         </li>
                     </ul>

frontend/saas-portal-web/src/components/conenter/enterprise.vue

@@ -38,7 +38,7 @@
                 <li><router-link to="/home"><a @click="setTurnHome"><span style="color: white">首页</span></a></router-link></li>
                 <li><a href="#" @click="feature"><span>特色</span></a></li>
                 <li><a href="#" @click="service"><span>功能</span></a></li>
-                <!-- <li><a href="#" @click="download"><span>下载</span></a></li> -->
+                <li><a href="#" @click="download"><span>下载</span></a></li>
                 <!-- <router-link to="/invitation"><a ><span style="color: white">邀请</span></a></router-link> -->
                 <li>
                     <el-menu  
@@ -519,7 +519,6 @@ import { setTimeout } from 'timers';
     border-bottom: 0 !important;
 }
 .el-menu-item:hover {
-    /* color: green !important; */
     background: #1E88F5 !important;
 }
 .modifyname {
@@ -579,9 +578,6 @@ import { setTimeout } from 'timers';
     color: #243A52;
 }
 .gs-news > ul > li:nth-child(1) {
-    font-family: PingFangSC-Regular;
-    font-size: 14px;
-    color: #243A52;
     font-weight: 600;
     padding: 0px 0px 0px 25px;
 }

frontend/saas-portal-web/src/components/conenter/home.vue

@@ -47,7 +47,7 @@
             <li><a href="#" @click="setTurnHome"><span>首页</span></a></li>
             <li class="xs"><a @click="feature2"><span>特色</span></a></li>
             <li class="xs"><a @click="service2"><span>功能</span></a></li>
-            <!-- <li class="xs"><a @click="download"><span>下载</span></a></li> -->
+            <li class="xs"><a @click="download"><span>下载</span></a></li>
             <li>
               <el-menu  
               class="el-menu-demo" 
@@ -165,7 +165,8 @@
               <p class="ts-text">简易SCM+内部协同+外部连接</p>
             </div>
             <div class="gn-hei">
-              <div class="col-md-3 col-sm-6 col-xs-12">
+              <!-- <div class="col-md-3 col-sm-6 col-xs-12"> -->
+              <div class="col-md-3 col-sm-3 col-xs-3">
                 <div class="service-item">
                   <p class="gn-text gn-color">任务管理</p>
                   <p>任务分配，高效工作</p>
@@ -175,7 +176,7 @@
                   </div>
                 </div>
               </div>
-              <div class="col-md-3 col-sm-6 col-xs-12">
+              <div class="col-md-3 col-sm-3 col-xs-3">
                 <div class="service-item">
                   <p class="gn-text">资源管理</p>
                   <p>一键查询，海量供应商产品信息</p>
@@ -185,7 +186,7 @@
                   </div>
                 </div>
               </div>
-              <div class="col-md-3 col-sm-6 col-xs-12">
+              <div class="col-md-3 col-sm-3 col-xs-3">
                 <div class="service-item">
                   <p class="gn-text">销售管理</p>
                   <p>快速制单</p>
@@ -196,7 +197,7 @@
                   </div>
                 </div>
               </div>
-              <div class="col-md-3 col-sm-6 col-xs-12">
+              <div class="col-md-3 col-sm-3 col-xs-3">
                 <div class="service-item">
                   <p class="gn-text">采购管理</p>
                   <p>寻源.定价.采购</p>
@@ -206,7 +207,7 @@
                   </div>
                 </div>
               </div>
-              <div class="col-md-3 col-sm-6 col-xs-12">
+              <div class="col-md-3 col-sm-3 col-xs-3">
                 <div class="service-item">
                   <div class="gn-img gn-huise">
                     <img src="/static/img/gongneng/cang ku 5@3x.png" alt="">
@@ -217,7 +218,7 @@
                   <p>呆滞分析</p>
                 </div>
               </div>
-              <div class="col-md-3 col-sm-6 col-xs-12">
+              <div class="col-md-3 col-sm-3 col-xs-3">
                 <div class="service-item">
                   <div class="gn-img">
                     <img src="/static/img/gongneng/jia gong 6@3x.png" alt="">
@@ -227,7 +228,7 @@
                   <p>加工单自动出入库作业</p>
                 </div>
               </div>
-              <div class="col-md-3 col-sm-6 col-xs-12">
+              <div class="col-md-3 col-sm-3 col-xs-3">
                 <div class="service-item">
                   <div class="gn-img gn-huise">
                     <img src="/static/img/gongneng/QIAN BAO 7@3x.png" alt="">
@@ -237,7 +238,7 @@
                   <p>实时查看供应商和客户账款情况</p>
                 </div>
               </div>
-              <div class="col-md-3 col-sm-6 col-xs-12">
+              <div class="col-md-3 col-sm-3 col-xs-3">
                 <div class="service-item">
                   <div class="gn-img">
                     <img src="/static/img/gongneng/FEN XI 8@3x.png" alt="">
@@ -254,44 +255,29 @@
       </section>
       <!-- end Service section -->
       <!-- 下载 -->
-      <!-- <section>
+      <section>
         <div class="container ts-worp">
           <div class="section-title text-center" style="margin-bottom: 50px">
             <p class="ts-title">下载</p>
             <p class="ts-text">下载U企云服客户端</p>
           </div>
           <div class="download-conenter">
-            <div class="left download-box">
-              <div class="download-box-shang">
-                <img style="width:140px" src="/static/img/weiruan@2x.png" alt="">
+            <div class="download-box over">
+              <div class="left download-box-shang">
+                <img style="width:200px" src="/static/img/weiruan.png" alt="">
               </div>
-              <div class="download-box-xia">
-                <p class="download-title">U企云服PC版</p>
-                <p>适用于Windows86</p>
-                <p class="download-Edition">
-                  <span>-最新版：16.30.0</span> <br/>
-                  <span>-发布时间：2018-10-20</span>
-                </p>
-                <button class="download-btn" @click="downloadOne">立即下载</button>
-              </div>
-            </div>
-            <div class="right download-box">
-              <div class="download-box-shang">
-                <img style="width:140px" src="/static/img/weiruan@2x.png" alt="">
-              </div>
-              <div class="download-box-xia">
-                <p class="download-title">U企云服PC版</p>
-                <p>适用于Windows64</p>
-                <p class="download-Edition">
-                  <span>-最新版：16.30.0</span> <br/>
-                  <span>-发布时间：2018-10-20</span>
-                </p>
-                <button class="download-btn">立即下载</button>
+              <div class="right download-box-xia">
+                <div>
+                  <p class="download-title">U企云服PC版</p>
+                  <p>适用于Windows</p>
+                  <button class="download-btn" @click="downloadOne">立即下载</button>
+                </div>
               </div>
             </div>
           </div>
+          <div><img style="width:100%" src="/static/img/Waves.png" alt=""></div>
         </div>
-      </section> -->
+      </section>
     </main>
     <problem v-else></problem>
   </div>
@@ -300,7 +286,7 @@
 <script>
   import {subscribe, disconnect} from '@/api/socket'
   import Session from '@/utils/session'
-  import { setTimeout } from 'timers'
+  import { setTimeout, setInterval, clearInterval } from 'timers'
   import problem from '../conenter/problem.vue'
 
   export default {
@@ -523,15 +509,13 @@
       },
       // 下载1
       downloadOne(){
-        console.log('我是下载按钮')
-        let url = '/static/img/banner--X.jpg';
-        // let url = 'http://h.hiphotos.baidu.com/image/h%3D300/sign=f2db86688ccb39dbdec06156e01709a7/2f738bd4b31c87018e9450642a7f9e2f0708ff16.jpg';
+        let url = 'https://saas-assets.usoftchina.com/UsoftchinaSaasClient_setup.exe';
         let alink = document.createElement("a");
         alink.style.display = 'none';
         // let blob = new Blob([url]);
         // alink.href = URL.createObjectURL(blob);
         alink.href = url;//下载地址
-        alink.download = "pic"; //文件名(自定义)
+        // alink.download = "pic"; //文件名(自定义)
         document.body.appendChild(alink);
         alink.click();
         // URL.revokeObjectURL(alink.href);
@@ -553,7 +537,7 @@
       openexperience(mobile){
         let me = this;
         let phone = this.$refs.typhone.value || mobile;
-        let reg = new RegExp('^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$')
+        let reg = new RegExp('^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$');
         if (phone == '') {
           this.$refs.Caution.innerHTML = '号码不能为空'
           setTimeout(()=>{
@@ -599,23 +583,20 @@
       },
       //特色
       feature2(){
-        setTimeout(()=>{
-          document.documentElement.scrollTop = 730;
-        },5);
+        document.documentElement.scrollTop = 730;
         this.setTurnHome();
       },
       //功能
       service2(){
-        setTimeout(()=>{
-          document.documentElement.scrollTop = 3670;
-        },5);
+        document.documentElement.scrollTop = 3670;
         this.setTurnHome();
       },
       // 下载
       download(){
-        setTimeout(()=>{
-          document.documentElement.scrollTop = 4400;
-        },5);
+        document.documentElement.scrollTop = 4400;
+        // $('html,body').animate({
+        //       scrollTop: 4400
+        // },2000);
         this.setTurnHome();
       },
       gohome(e){
@@ -667,7 +648,6 @@
     border-bottom: 0 !important;
 }
 .el-menu-item:hover {
-    /* color: green !important; */
     background: #1E88F5 !important;
 }
 /* 体验 */
@@ -737,40 +717,36 @@
 }
 /* 下载 */
 .download-conenter {
-  width: 55%;
-  height: 420px;
+  width: 400px;
+  height: 233px;
   position: relative;
   left: 50%;
   transform: translateX(-50%);
-  margin-bottom: 100px;
 }
 .download-box {
-  width: 49%;
   height: 100%;
-  border: 1px solid #5DA9F8;
+}
+.download-box > div {
+  width: 50%;
+  height: 100%;
 }
 .download-box-shang {
-  height: 50%;
-  background: #1E88F5;
-  text-align: center;
-  line-height: 210px;
+  text-align: right;
 }
 .download-title {
   font-size: 18px;
   color: #0D253E;
   font-weight: 550;
 }
-.download-box-xia {
+.download-box-xia > div {
   text-align: center;
-  padding: 20px;
-  line-height: 30px;
-  color: rgb(103, 107, 112);
+  margin-left: -30px;
+  line-height: 35px;
+  color:  #9EA8B2;
   font-size: 14px;
-}
-.download-Edition {
-  text-align: left;
-  margin-left: 28%;
-  line-height: 20px;
+  position: relative;
+  top: 50%;
+  transform: translateY(-50%);
 }
 .download-btn {
   font-family: PingFangSC-Regular;
@@ -780,7 +756,7 @@
   background: #1E88F5;
   box-shadow: 0 0 99px 0 #E4F2FF;
   border-radius: 4px;
-  padding: 2px 30px;
+  padding: 0px 30px;
   border: 0;
   margin-top: 5%
 }

frontend/saas-portal-web/src/components/conenter/invitation.vue

@@ -252,7 +252,7 @@ import { log } from 'util';
             },
             getUrlParam(name){   
                 var reg=new RegExp("(^|&)"+name+"=([^&]*)(&|$)");   
-                var index = window.location.href.indexOf('?')
+                var index = window.location.href.indexOf('?');
                 var r=window.location.href.substr(index+1).match(reg);   
                 if  (r!=null)   return decodeURI(r[2]); 
                 return   null;   

frontend/saas-portal-web/static/css/main.css

@@ -9,6 +9,7 @@ body {
     line-height: 24px;
     font-size: 16px;
     color: #818181;
+    min-width: 1300px;
 }
 
 figure, p, address {