修改使用可配置的访问url

src/main/java/com/mooctest/controller/AuditController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.mooctest.service.AuditTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,17 +14,20 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 public class AuditController {
-
+    @Value("${report.host}")
+    String reportHost ;
     @Autowired
     AuditTaskService auditTaskService;
 
     @GetMapping("/addTask")
     public String gettest (Model model){
+        model.addAttribute("reportHost",reportHost);
         return "addTask";
     }
 
     @GetMapping("/reloadTask")
     public String reloadTask ( Model model ){
+        model.addAttribute("reportHost",reportHost);
         return "addTask";
     }
 
@@ -33,6 +37,7 @@ public class AuditController {
     public String auditTask ( Model model){
         JSONArray jsonArray = auditTaskService.getTaskData(); // 所有的数据。
         model.addAttribute("tasks",jsonArray);
+        model.addAttribute("reportHost",reportHost);
         return "audit_task_list";
     }
 
@@ -40,6 +45,7 @@ public class AuditController {
     public String changeTask ( Model model ,@RequestParam("id") String id ){
         JSONObject data = auditTaskService.getSingleTask(id);
         model.addAttribute("data",data);
+        model.addAttribute("reportHost",reportHost);
         return "changeAuditTask";
     }
 

src/main/java/com/mooctest/controller/PaperController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mooctest.service.AuditTaskService;
 import com.mooctest.service.PaperService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 public class PaperController {
 
+    @Value("${report.host}")
+    String reportHost ;
     @Autowired
     PaperService paperService;
 
@@ -22,6 +25,7 @@ public class PaperController {
 
     @GetMapping("/addPaper")
     public String addPaper (Model model){
+        model.addAttribute("reportHost",reportHost);
         return "add_paper";
     }
 
@@ -50,6 +54,7 @@ public class PaperController {
         JSONArray arrary = data.getJSONArray(ITEM_GROUP_NAME);
         model.addAttribute("data",data);
         model.addAttribute("ruleLength",arrary.size());
+        model.addAttribute("reportHost",reportHost);
         return "changePaper";
     }
 
@@ -57,6 +62,7 @@ public class PaperController {
     public String paperDetail ( Model model , @RequestParam("id") String id){
         JSONObject data = paperService.getSinglePaper(id);
         model.addAttribute("data",data);
+        model.addAttribute("reportHost",reportHost);
         return "paperDetail";
     }
 

src/main/resources/static/js/addTask.js

@@ -740,7 +740,7 @@ generateJson = function( type ){
     // return ;
     // 发送请求
     $.ajax({
-        url: 'http://47.99.140.117:9090/Bug/api/extra/uploadJob',
+        url: 'http://'+reportHost+'/Bug/api/extra/uploadJob',
         data:{
             'jobJson':JSON.stringify(data)
         },
@@ -769,7 +769,7 @@ generateJson = function( type ){
                     var workid = getOneWorker();
                     console.log("worke")
                     console.log(workid)
-                    window.open('http://47.99.140.117:9090/report/job/'+jobId+'/'+workid+'/0/1');
+                    window.open('http://'+reportHost+'/report/job/'+jobId+'/'+workid+'/0/1');
                 }else{
                     $.notify({
                         // options

src/main/resources/static/js/add_paper.js

@@ -741,7 +741,7 @@ generateJson = function( type ){
     // return ;
     // 发送请求
     $.ajax({
-        url: 'http://47.99.140.117:9090/Bug/api/paper/uploadPaper',
+        url: 'http://'+reportHost+'/Bug/api/paper/uploadPaper',
         data:{
             'paperJson':JSON.stringify(data)
         },
@@ -770,7 +770,7 @@ generateJson = function( type ){
                     var workid = getOneWorker();
                     console.log("worke")
                     console.log(workid)
-                    window.open('http://47.99.140.117:9090/report/job/'+jobId+'/'+workid+'/0/1');
+                    window.open('http://'+reportHost+'/report/job/'+jobId+'/'+workid+'/0/1');
                 }else{
                     $.notify({
                         // options

src/main/resources/static/js/changePaper.js

@@ -743,7 +743,7 @@ generateJson = function( paperId, type ){
     // return ;
     // 发送请求
     $.ajax({
-        url: 'http://47.99.140.117:9090/Bug/api/paper/updatePaper',
+        url: 'http://'+reportHost+'/Bug/api/paper/updatePaper',
         data:{
             'paperId':paperId,
             'paperJson':JSON.stringify(data)
@@ -773,8 +773,7 @@ generateJson = function( paperId, type ){
                     // var workid = getOneWorker();
                     // console.log("worke")
                     // console.log(workid)
-                    window.open('http://47.99.140.117:9090/report/review/paper/'+paperId)
-                    // window.open('http://47.99.140.117:9090/report/job/'+jobId+'/'+workid+'/0/1');
+                    window.open('http://'+reportHost+'/report/review/paper/'+paperId)
                 }else{
                     $.notify({
                         // options

src/main/resources/templates/addTask.html

@@ -373,10 +373,13 @@
 <!-- add Task js for this file only -->
 <script src="/static/js/addTask.js"></script>
 <script src="/static/AdminLTE/bower_components/bootstrap-notify/dist/bootstrap-notify.min.js"></script>
-<script type="text/javascript">
+<script  type="text/javascript" xmlns:th="http://www.thymeleaf.org" th:inline="javascript">
+
     var ruleId ;
     var ratioIndex;
-
+    /*<![CDATA[*/
+    var reportHost = [[${reportHost}]]
+    /*]]>*/
     $(document).ready(function(){
         $('[data-toggle="tooltip"]').tooltip();
 

src/main/resources/templates/add_paper.html

@@ -350,10 +350,12 @@
 <!-- add Task js for this file only -->
 <script src="/static/js/add_paper.js"></script>
 <script src="/static/AdminLTE/bower_components/bootstrap-notify/dist/bootstrap-notify.min.js"></script>
-<script type="text/javascript">
+<script  type="text/javascript" xmlns:th="http://www.thymeleaf.org" th:inline="javascript">
     var ruleId ;
     var ratioIndex;
-
+    /*<![CDATA[*/
+    var reportHost = [[${reportHost}]]
+    /*]]>*/
     $(document).ready(function(){
         $('[data-toggle="tooltip"]').tooltip();
 

src/main/resources/templates/audit_task_list.html

@@ -139,7 +139,11 @@
 <script src="/static/AdminLTE/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
 <script src="/static/AdminLTE/bower_components/select2/dist/js/select2.min.js"></script>
 
-<script type="text/javascript">
+
+<script type="text/javascript" xmlns:th="http://www.thymeleaf.org" th:inline="javascript">
+    /*<![CDATA[*/
+    var reportHost = [[${reportHost}]]
+    /*]]>*/
     $(document).ready(function(){
         $('[data-toggle="tooltip"]').tooltip();
 
@@ -150,7 +154,7 @@
     });
 
     showYulan = function ( id ) {
-        window.open('http://47.99.140.117:9090/report/job/'+id+'/'+1+'/0/1');
+        window.open('http://'+reportHost+'/report/job/'+id+'/'+1+'/0/1');
         // 默认使用0号worker做展示页面。
     }
 </script>

src/main/resources/templates/changeAuditTask.html

@@ -428,10 +428,13 @@
 <!-- add Task js for this file only -->
 <script src="/static/js/addTask.js"></script>
 <script src="/static/AdminLTE/bower_components/bootstrap-notify/dist/bootstrap-notify.min.js"></script>
-<script type="text/javascript">
+<script  type="text/javascript" xmlns:th="http://www.thymeleaf.org" th:inline="javascript">
+
     var ruleId ;
     var ratioIndex;
-
+    /*<![CDATA[*/
+    var reportHost = [[${reportHost}]]
+    /*]]>*/
     $(document).ready(function(){
         $('[data-toggle="tooltip"]').tooltip();
 

src/main/resources/templates/changePaper.html

@@ -551,6 +551,7 @@
     var urlParams = new URLSearchParams(window.location.search);
     var paperId = urlParams.get('id');
     var id = [[${data.get('paperId')}]];
+    var reportHost = [[${reportHost}]]
     ruleId = [[${ruleLength}]]
 
 

src/main/resources/templates/paperDetail.html

@@ -550,6 +550,7 @@
     var urlParams = new URLSearchParams(window.location.search);
     var paperId = urlParams.get('id');
     var id = [[${data.get('paperId')}]];
+    var reportHost = [[${reportHost}]]
     // ruleId = [[${ruleLength}]]
 
 
@@ -592,7 +593,7 @@
     });
 
     showYulan = function (  ) {
-        window.open('http://47.99.140.117:9090/report/review/paper/'+ id);
+        window.open('http://'+reportHost+'/report/review/paper/'+ id);
     }
 
     changePaper = function ( ) {

src/main/resources/templates/paper_list.html

@@ -147,7 +147,11 @@
 <script src="/static/AdminLTE/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
 <script src="/static/AdminLTE/bower_components/select2/dist/js/select2.min.js"></script>
 
-<script type="text/javascript">
+<script type="text/javascript" xmlns:th="http://www.thymeleaf.org" th:inline="javascript">
+    /*<![CDATA[*/
+    var reportHost = [[${reportHost}]]
+    /*]]>*/
+
     $(document).ready(function(){
         $('[data-toggle="tooltip"]').tooltip();
 
@@ -158,8 +162,7 @@
     });
 
     showYulan = function ( id ) {
-        // window.open('http://47.99.140.117:9090/report/job/'+id+'/'+1+'/0/1');
-        window.open('http://47.99.140.117:9090/report/review/paper/'+ id);
+        window.open('http://'+reportHost+'/report/review/paper/'+ id);
         // 默认使用0号worker做展示页面。
     }
 
@@ -180,7 +183,7 @@
                 //     var workid = getOneWorker();
                 //     console.log("worke")
                 //     console.log(workid)
-                //     window.open('http://47.99.140.117:9090/report/job/'+jobId+'/'+workid+'/0/1');
+                //     window.open('http://reporthost/report/job/'+jobId+'/'+workid+'/0/1');
                 // }else{
                 //     $.notify({
                 //         // options