Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/components/uploadFileChangeDown/file.vue

jero-web/src/components/uploadFile/file.vue

@@ -30,6 +30,7 @@
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import { getAction, postAction, downFile, downloadFile } from '@/api/manage'
   import { Base64 } from 'js-base64'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'file',
@@ -69,6 +70,7 @@
       // console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl);
     },
     methods: {
+      ...mapGetters(['userInfo']),
       perentHandleFunc(data) {
         this.myfileList = data
         if (data && data.length > 0) {
@@ -190,7 +192,7 @@
         let index2 = fileName.length
         let fileSuffix = fileName.substring(index1, index2)
         if (fileSuffix === '.pdf') {
-          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id))
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
         } else if (fileSuffix === '.docx') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')