把.env.development和.env.production的配置服务路径单独拿出，做成静态资源

jero-web/src/components/jero/JTreeSelect.vue

@@ -46,7 +46,7 @@
     props: {
       isAsync:{ // 是否采用异步方式初始化树
         type:Boolean,
-        required:true,
+        required:false,
         default:true
       },
       value:{

jero-web/src/components/jero/JUpload.vue

@@ -384,7 +384,6 @@
           this.moveDisplay = 'none';
         });
       }
-    
       let picList = document.getElementById(this.containerId)?document.getElementById(this.containerId).getElementsByClassName('ant-upload-list-picture-card'):[];
       if(picList && picList.length>0){
         picList[0].addEventListener('mouseover',(ev)=>{

jero-web/src/components/layouts/UserLayout.vue

@@ -10,6 +10,10 @@
           <span id="p-company">HEZHONGWEILAI</span>
         </div>
       </div>
+      <div>
+        <span class="top-bg"><img src="~/@assets/mobileBg.png" alt=""></span>
+        <span class="btm-bg"><img src="~/@assets/mobileHome.png" alt=""></span>
+      </div>
       <div v-if="mobile" class="mobile">
         <div class="logo">
           <img src="~@/assets/logo.png" alt="">
@@ -145,6 +149,26 @@
     }
     .container-mobile{
       /*移动端的logo样式*/
+      .top-bg{
+        width: 100%;
+        position: absolute;
+        top: -3.5rem;
+        img{
+          width: 100%;
+        }
+      }
+      .btm-bg{
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        max-width: 75%;
+        overflow: hidden;
+        img{
+          margin-left: -5rem;
+          max-width: 100%;
+          margin-bottom: -3rem;
+        }
+      }
       background: #f0f2f5;
       width: 100%;
       height: 100%;
@@ -153,27 +177,30 @@
         top: 6rem;
         width: 100%;
         display: flex;
+        flex-direction: column;
         justify-content: center;
-        align-items: flex-end;
+        align-items: center;
         .logo{
           max-width: 4rem;
           img{
             max-width: 100%;
+            margin-bottom: 0.5rem;
           }
         }
         .company{
-          margin-left: 0.8rem;
           display: flex;
           flex-direction: column;
           justify-content: flex-end;
           span:first-child{
+            color: #000;
             font-size: 1.6rem;
             font-weight: bold;
-            letter-spacing: 0.1rem;
+            letter-spacing: 0.3rem;
           }
           span:last-child{
+            color: #000;
             font-size: 0.8rem;
-            line-height: 0.8rem;
+            line-height: 1.2rem;
             font-weight: bold;
           }
         }

jero-web/src/components/onlineForm/onlineForm.js

@@ -13147,7 +13147,7 @@
         }
 
         function d(e) {
-          return "object" === typeof e && "string" === typeof e.name && "string" === typeof e.theme && ("object" ===
+          return "object" ===  typeof e && "string" === typeof e.name && "string" === typeof e.theme && ("object" ===
             typeof e.icon || "function" === typeof e.icon)
         }
 

jero-web/src/components/tools/HeaderNotice.vue

@@ -199,7 +199,7 @@
       initWebSocket: function () {
         // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https
         var userId = store.getters.userInfo.id;
-        var url = window._CONFIG['domianURL'].replace("https://","wss://").replace("http://","ws://")+"/websocket/"+userId;
+        var url = window._CONFIG['domianWebSocketURL'].replace("https://","wss://").replace("http://","ws://")+"/websocket/"+userId;
         //console.log(url);
         this.websock = new WebSocket(url);
         this.websock.onopen = this.websocketOnopen;

jero-web/src/config/index.js

@@ -1,10 +0,0 @@
-/** init domain config */
-import Vue from 'vue'
-//设置全局API_BASE_URL
-Vue.prototype.API_BASE_URL = process.env.VUE_APP_API_BASE_URL
-window._CONFIG['domianURL'] = Vue.prototype.API_BASE_URL
-//单点登录地址
-window._CONFIG['casPrefixUrl'] = process.env.VUE_APP_CAS_BASE_URL
-window._CONFIG['onlinePreviewDomainURL'] =  process.env.VUE_APP_ONLINE_BASE_URL
-window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/sys/common/static'
-window._CONFIG['pdfDomainURL'] = Vue.prototype.API_BASE_URL+ '/sys/common/pdf/pdfPreviewIframe'

jero-web/src/views/modules/oss/OSSFileList.vue

@@ -37,21 +37,7 @@
           @change="handleChange">
         <a-button>
           <a-icon type="upload"/>
-          OSS文件上传
-        </a-button>
-      </a-upload>
-
-      <a-upload
-        name="file"
-        :multiple="false"
-        :action="minioUploadAction"
-        :headers="tokenHeader"
-        :showUploadList="false"
-        :beforeUpload="beforeUpload"
-        @change="handleChange">
-        <a-button>
-          <a-icon type="upload"/>
-          MINIO文件上传
+          文件上传
         </a-button>
       </a-upload>
     </div>
@@ -91,7 +77,9 @@
 
 <script>
   import {JeroListMixin} from '@/mixins/JeroListMixin'
-
+  import Vue from 'vue'
+  import { ACCESS_TOKEN } from "@/store/mutation-types"
+  const Base64 = require('js-base64').Base64
   export default {
     name: "OSSFileList",
     mixins: [JeroListMixin],
@@ -128,20 +116,16 @@
           }
         ],
         url: {
-          upload: "/sys/oss/file/upload",
+          upload: "/sys/common/upload",
           list: "/sys/oss/file/list",
           delete: "/sys/oss/file/delete",
-          minioUpload: "/sys/upload/uploadMinio"
         }
       }
     },
     computed: {
       uploadAction() {
         return window._CONFIG['domianURL'] + this.url.upload;
-      },
-      minioUploadAction() {
-        return window._CONFIG['domianURL'] + this.url.minioUpload;
-      },
+      }
     },
     methods: {
       beforeUpload(file) {
@@ -160,6 +144,7 @@
         return true
       },
       handleChange(info) {
+        console.log("ok")
         if (info.file.status === 'done') {
           if (info.file.response.success) {
             this.loadData()
@@ -183,8 +168,9 @@
       },
       handlePreview(record) {
         if (record && record.url) {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(record.url)
-          window.open(url, '_blank')
+          var fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${record.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.fileName}`
+          let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}`
+          window.open(url)
         }
       }
     }

jero-web/src/views/user/Login.vue

@@ -44,6 +44,7 @@
                 size="large"
                 type="text"
                 @change="inputCodeChange"
+                autocomplete="off"
                 placeholder="请输入验证码">
                 <a-icon slot="prefix" type="safety" :style="{ color: '#B3B7C2',fontSize:'20px'}"/>
               </a-input>
@@ -93,7 +94,6 @@
     </a-form>
     <a-form v-if="mobile" :form="form" class="user-layout-login user-layout-login-mobile" ref="formLogin" id="formLogin">
       <div class="user-box user-box-mobile">
-        <!--<span class="title">用户登录</span>-->
         <a-row>
           <a-col :span="24">
             <a-form-item>
@@ -241,7 +241,7 @@
             loginParams.remember_me = values.rememberMe
             loginParams.captcha = that.inputCodeContent
             loginParams.checkKey = that.currdatetime
-            console.log("登录参数",loginParams)
+            // console.log("登录参数",loginParams)
             that.Login(loginParams).then((res) => {
               //登录成功
               this.loginSuccess()