Merge branch 'wx-service' of http://git.dashitech.com/seimin/zuel-itsm-3.0.2 into wx-service

src/views/Login.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="fle bgColor" v-if="!isSSo">
+  <div class="fle bgColor" v-if="!isSSo && false">
     <load-ing v-show="requesterLgoinType == 'wechat'"></load-ing>
     <h2
       v-if="requesterLgoinType == 'web'"

upload/development.js

@@ -4,7 +4,7 @@ const config = {
   ip: "192.168.3.110", // ssh地址
   username: "root", // ssh 用户名
   port: 22,      //端口
-  password: "DStech@123", // ssh 密码
+  password: "123456", // ssh 密码
   path: '/home/itsm/project/web/serviceApp', // 上传地址,删除地址
   buildPath: '../dist' // 本地打包后文件地址
 }