~admin:上传图片地址URL更正;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/LocalAdminController.java

-package com.liquidnet.client.admin.web.controller.zhengzai.adam;
+package com.liquidnet.client.admin.web.controller.zhengzai;
 
-import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
-import com.liquidnet.client.admin.common.core.domain.AjaxResult;
-import com.liquidnet.client.admin.common.core.page.TableDataInfo;
-import com.liquidnet.client.admin.common.enums.BusinessType;
-import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
-import com.liquidnet.client.admin.zhengzai.adam.service.IAdamUserAdminService;
-import com.liquidnet.service.adam.entity.AdamUser;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 用户Controller
  * 
@@ -26,132 +16,131 @@ import java.util.List;
 @RequestMapping("local")
 public class LocalAdminController extends BaseController
 {
-    private String prefix = "zhengzai/stone";
-    private String prefix2 = "zhengzai/store";
-
-    @Autowired
-    private IAdamUserAdminService adamUserService;
+    private final String stonePrefix = "zhengzai/stone";
+    private final String storePrefix = "zhengzai/store";
 
+    @Value("${liquidnet.client.admin.platformUrl}")
+    private String platformUrl;
 
     @GetMapping("/integralList")
     public String integralList()
     {
-        return prefix + "/integralList";
+        return stonePrefix + "/integralList";
     }
     @GetMapping("/integralStore")
     public String integralStore()
     {
-        return prefix + "/integralStore";
+        return stonePrefix + "/integralStore";
     }
     @GetMapping("/LuckyDraw")
     public String LuckyDraw()
     {
-        return prefix + "/LuckyDraw";
+        return stonePrefix + "/LuckyDraw";
     }
     @GetMapping("/integralOrder")
     public String integralOrder()
     {
-        return prefix + "/integralOrder";
+        return stonePrefix + "/integralOrder";
     }
     @GetMapping("/integralDetail")
     public String integralDetail()
     {
-        return prefix + "/integralDetail";
+        return stonePrefix + "/integralDetail";
     }
     @GetMapping("/shopList")
     public String shopList()
     {
-        return prefix2 + "/shopManage/shopList";
+        return storePrefix + "/shopManage/shopList";
     }
     @GetMapping("/shopDetail")
     public String shopDetail()
     {
-        return prefix2 + "/shopManage/shopDetail";
+        return storePrefix + "/shopManage/shopDetail";
     }
     @GetMapping("/storeClassify")
     public String storeClassify()
     {
-        return prefix2 + "/storeClassify/index";
+        return storePrefix + "/storeClassify/index";
     }
     @GetMapping("/MusicTagStore")
     public String MusicTagStore()
     {
-        return prefix2 + "/MusicTagStore/index";
+        return storePrefix + "/MusicTagStore/index";
     }
     @GetMapping("/tagStore")
     public String tagStore()
     {
-        return prefix2 + "/tagStore/index";
+        return storePrefix + "/tagStore/index";
     }
     @GetMapping("/activityList")
     public String activityList()
     {
-        return prefix2 + "/placingOrder/activityList";
+        return storePrefix + "/placingOrder/activityList";
     }
     @GetMapping("/addNewActivity")
     public String addNewActivity()
     {
-        return prefix2 + "/placingOrder/addNewActivity";
+        return storePrefix + "/placingOrder/addNewActivity";
     }
     @GetMapping("/activityStoreList")
     public String activityStoreList()
     {
-        return prefix2 + "/placingOrder/activityStoreList";
+        return storePrefix + "/placingOrder/activityStoreList";
     }
     @GetMapping("/storeDetail")
     public String storeDetail()
     {
-        return prefix2 + "/placingOrder/storeDetail";
+        return storePrefix + "/placingOrder/storeDetail";
     }
     @GetMapping("/setGoodsRole")
     public String setGoodsRole()
     {
-        return prefix2 + "/placingOrder/setGoodsRole";
+        return storePrefix + "/placingOrder/setGoodsRole";
     }
     @GetMapping("/selectGoddsTab")
     public String selectGoddsTab()
     {
-        return prefix2 + "/placingOrder/selectGoddsTab";
+        return storePrefix + "/placingOrder/selectGoddsTab";
     }
     @GetMapping("/homeSet")
-    public String homeSet()
-    {
-        return prefix2 + "/homeSet/index";
+    public String homeSet(ModelMap mmap) {
+        mmap.put("platformUrl", platformUrl);
+        return storePrefix + "/homeSet/index";
     }
     @GetMapping("/searchStore")
     public String searchStore()
     {
-        return prefix2 + "/homeSet/searchStore";
+        return storePrefix + "/homeSet/searchStore";
     }
     @GetMapping("/topBanner")
-    public String topBanner()
-    {
-        return prefix2 + "/homeSet/topBanner";
+    public String topBanner(ModelMap mmap) {
+        mmap.put("platformUrl", platformUrl);
+        return storePrefix + "/homeSet/topBanner";
     }
     @GetMapping("/kingArea")
-    public String kingArea()
-    {
-        return prefix2 + "/homeSet/kingArea";
+    public String kingArea(ModelMap mmap) {
+        mmap.put("platformUrl", platformUrl);
+        return storePrefix + "/homeSet/kingArea";
     }
     @GetMapping("/RubikArea")
     public String RubikArea()
     {
-        return prefix2 + "/homeSet/RubikArea";
+        return storePrefix + "/homeSet/RubikArea";
     }
     @GetMapping("/carefullyGoods")
     public String carefullyGoods()
     {
-        return prefix2 + "/homeSet/carefullyGoods";
+        return storePrefix + "/homeSet/carefullyGoods";
     }
     @GetMapping("/goodsIntersection")
     public String goodsIntersection()
     {
-        return prefix2 + "/goodsIntersection/index";
+        return storePrefix + "/goodsIntersection/index";
     }
     @GetMapping("/newRecommended")
     public String newRecommended()
     {
-        return prefix2 + "/homeSet/newRecommended";
+        return storePrefix + "/homeSet/newRecommended";
     }
 
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfCategoryAdminController.java

@@ -20,22 +20,26 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
-import java.util.Arrays;
 
 @Api(tags = "商品分类")
 @Controller
 @RequestMapping("goblin/category")
 public class GoblinSelfCategoryAdminController extends BaseController {
     private final String prefix = "zhengzai/goblin/category";
+    @Value("${liquidnet.client.admin.platformUrl}")
+    private String platformUrl;
     @Autowired
     IGoblinSelfGoodsCategoryService goblinSelfGoodsCategoryService;
 
     @GetMapping()
-    public String category() {
+    public String category(ModelMap mmap) {
+        mmap.put("platformUrl", platformUrl);
         return prefix.concat("/category");
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfExtagAdminController.java

@@ -20,7 +20,9 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -33,11 +35,14 @@ import java.util.List;
 public class GoblinSelfExtagAdminController extends BaseController {
     private final String prefix = "zhengzai/goblin/extag";
     private final String tagBelong = "1";
+    @Value("${liquidnet.client.admin.platformUrl}")
+    private String platformUrl;
     @Autowired
     IGoblinSelfTagService goblinSelfTagService;
 
     @GetMapping()
-    public String extag() {
+    public String extag(ModelMap mmap) {
+        mmap.put("platformUrl", platformUrl);
         return prefix.concat("/extag");
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfTagAdminController.java

@@ -18,7 +18,9 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,11 +33,14 @@ import java.util.stream.Collectors;
 public class GoblinSelfTagAdminController extends BaseController {
     private final String prefix = "zhengzai/goblin/tag";
     private final String tagBelong = "0";
+    @Value("${liquidnet.client.admin.platformUrl}")
+    private String platformUrl;
     @Autowired
     IGoblinSelfTagService goblinSelfTagService;
 
     @GetMapping("")
-    public String tag() {
+    public String tag(ModelMap mmap) {
+        mmap.put("platformUrl", platformUrl);
         return prefix.concat("/tag");
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/extag/extag.html

@@ -253,7 +253,8 @@
     $(function () {
         $("#fileinput").fileinput({
             'theme': 'explorer-fas',
-            'uploadUrl': 'https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload',
+            // 'uploadUrl': 'https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload',
+            'uploadUrl': platformUrl + '/platform/basicServices/alOss/upload',
             "uploadExtraData": {
                 "pathName" : "banner",
                 "buckType" : 1

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/tag/tag.html

@@ -205,10 +205,12 @@
     var rmvFlg = [[${@permission.hasPermi('goblin:extag:rmv')}]];
     let tagId = '';
     var prefix = ctx + "goblin/tag";
+    var platformUrl = [[${platformUrl}]];
     $(function () {
         $("#fileinput").fileinput({
             'theme': 'explorer-fas',
-            'uploadUrl': 'https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload',
+            // 'uploadUrl': 'https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload',
+            'uploadUrl': platformUrl + '/platform/basicServices/alOss/upload',
             "uploadExtraData": {
                 "pathName" : "banner",
                 "buckType" : 1

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/kingArea.html

@@ -441,7 +441,8 @@
         function common (num) {
             $("#fileinput"+num+"").fileinput({
                 'theme': 'explorer-fas',
-                'uploadUrl':  "https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload",
+                // 'uploadUrl':  "https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload",
+                'uploadUrl':  platformUrl + "/platform/basicServices/alOss/upload",
                 "uploadExtraData": {
                     "pathName" : "banner",
                     "buckType" : 1

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/topBanner.html

@@ -538,7 +538,8 @@
             });
             $("#fileinput"+num+"").fileinput({
                 'theme': 'explorer-fas',
-                'uploadUrl':  "https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload",
+                // 'uploadUrl':  "https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload",
+                'uploadUrl':  platformUrl + "/platform/basicServices/alOss/upload",
                 "uploadExtraData": {
                     "pathName" : "banner",
                     "buckType" : 1

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/qrCode/addQrCode.html

@@ -65,7 +65,7 @@
         var formData = new FormData();
         formData.append("file", e.target.files[0]);
         $.ajax({
-            url: "http://devplatform.zhengzai.tv" + "/platform/basicServices/alOss/upload",//路径是你控制器中上传图片的方法，下面controller里面我会写到
+            url: platformUrl + "/platform/basicServices/alOss/upload",//路径是你控制器中上传图片的方法，下面controller里面我会写到
             data: formData,
             cache: false,
             contentType: false,