图片改为相对地址

VisualInspection/js/config.js

@@ -1,9 +1,10 @@
 // var base_ui_url = "http://10.112.0.236:8088/";
 // var base_server_url = "http://10.112.0.236:8089/";
-var base_image_server_url = getCurrentaddr();
 
 var base_ui_url = getCurrentaddr();
 var base_server_url = getserveraddr();
+var base_image_server_url = getImageaddr();
+
 
 function getCurrentaddr(){
     return "http://"+window.location.host+"/"
@@ -11,7 +12,18 @@ function getCurrentaddr(){
 function getserveraddr(){
     if(base_ui_url.indexOf("topm.win")!=-1){
         return "http://server_yanhai.git.topm.win:8080/";
-    }else{
+    }else if(base_ui_url.indexOf("localhost")!=-1){
+        return "http://localhost:8089/"
+    }
+    else{
         return "http://10.112.0.199:8089/"
     }
+}
+function getImageaddr(){
+    if(base_ui_url.indexOf("topm.win")!=-1){
+        return "http://file_yanhai.git.topm.win:8080/";
+    }
+    else{
+        return "http://10.112.0.199/"
+    }
 }

VisualInspection/js/lib/imageupload/js/imgUp.js

@@ -55,8 +55,8 @@ $(function() {
 
                 //上传
                 uploadFile(fileList[i], "file", function(data) {
-                    $img.attr("src", data.path);
-                    $img.attr("path", data.path);
+                    $img.attr("src", base_image_server_url+data.path);
+                    $img.attr("path", base_image_server_url+data.path);
                 }, function(error) {
                     console.log(error)
                 });

VisualInspection/js/mytask/check.js

@@ -227,7 +227,7 @@ function showChangeUser() {
             var name = data[i].truename;
             if (data[i].workno) name = name+" "+data[i].workno;
             var pic = "../../images/body-bg.png";
-            if (data[i].pic) pic = data[i].pic;
+            if (data[i].pic) pic = base_image_server_url+data[i].pic;
             str = '<div style="width:100px;float:left;margin:5px;">'
                 + '<a class="card" href="javascript:void(0)" onclick="changePerson(\'' + data[i].id + '\')">'
                 + '<img src="' + pic + '" alt="" style="height:100px">'

VisualInspection/js/util/util.js

@@ -310,12 +310,13 @@ function genAppeaFiles(file_src){
     var files = $.checkTask.appeal.file_src.split(",");
     var optionStr="";
     for(var i in files) {
-        if(files[i].endWith("png") || files[i].endWith("jpg")||files[i].endWith("ico")){
-            optionStr+= '<a href="'+files[i]+'" target="_blank"><img src="'+files[i]+'" style="height:55px;margin:5px;"></a>';
-        }else if(files[i].endWith("doc")|| files[i].endWith("docx")){
-            optionStr+= '<a href="'+files[i]+'" target="_blank"><i class="icon icon-file-word icon-4x" style="vertical-align: middle"></a>';
-        }else if(files[i].endWith("txt")){
-            optionStr+= '<a href="'+files[i]+'" target="_blank"><i class="icon icon-file-code icon-3x"></a>';
+        var fileSrc = base_image_server_url+files[i];
+        if(fileSrc.endWith("png") || fileSrc.endWith("jpg")||fileSrc.endWith("ico")){
+            optionStr+= '<a href="'+fileSrc+'" target="_blank"><img src="'+fileSrc+'" style="height:55px;margin:5px;"></a>';
+        }else if(fileSrc.endWith("doc")|| fileSrc.endWith("docx")){
+            optionStr+= '<a href="'+fileSrc+'" target="_blank"><i class="icon icon-file-word icon-4x" style="vertical-align: middle"></a>';
+        }else if(fileSrc.endWith("txt")){
+            optionStr+= '<a href="'+fileSrc+'" target="_blank"><i class="icon icon-file-code icon-3x"></a>';
         }
     }
     return optionStr;

VisualInspection/view/appeal_management/appealDetail.html

@@ -33,7 +33,7 @@
         url: base_image_server_url +'fileServer/file/upload',  // 文件上传提交地址
         onFileUploaded: function(file, responseObject){
             var datas = eval('('+responseObject.response+')');
-            file_src += datas.result_data.path+",";
+            file_src += base_image_server_url + datas.result_data.path+",";
         },
         onFilesRemoved:function(files) {
             // alert(files);

VisualInspection/view/mytask/changePerson.html

@@ -9,14 +9,5 @@
                     </div>
                 </a>
              </div>
-            <div style="width:200px;">
-                <a class="card" href="###">
-                    <img src="../../image/img4.jpg" alt="">
-                    <div class="card-heading"><strong>022 飞机垃圾费</strong></div>
-                    <div class="card-actions">
-                        <button type="button" class="btn btn-danger"><i class="icon-heart"></i> 更换</button>
-                    </div>
-                </a>
-            </div>
         </div>
 </div>

VisualInspection_server/src/main/resources/application.properties

@@ -2,8 +2,8 @@ server.port=8089
 spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
-#master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://192.168.8.236:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -11,8 +11,8 @@ master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
-#cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url=jdbc:mysql://git.topm.win:6381/yanhai?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://git.topm.win:6381/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -53,11 +53,11 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
 spring.redis.database=0  
 # Redis\u670d\u52a1\u5668\u5730\u5740
-#spring.redis.host=10.112.0.199
-spring.redis.host=git.topm.win
+spring.redis.host=10.112.0.199
+#spring.redis.host=git.topm.win
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
-spring.redis.port=6380
-#spring.redis.port=6380  
+#spring.redis.port=6380
+spring.redis.port=6379 
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09
 spring.redis.password=xintong
 # \u8fde\u63a5\u6c60\u6700\u5927\u8fde\u63a5\u6570\uff08\u4f7f\u7528\u8d1f\u503c\u8868\u793a\u6ca1\u6709\u9650\u5236\uff09