记得上下班打卡 | git大法好,push需谨慎

Commit 3306269b authored by 张国柄's avatar 张国柄

更正上传图片URL;

parent eedff160
...@@ -13,8 +13,8 @@ import io.swagger.annotations.Api; ...@@ -13,8 +13,8 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -25,6 +25,9 @@ import org.springframework.web.bind.annotation.*; ...@@ -25,6 +25,9 @@ import org.springframework.web.bind.annotation.*;
public class StoneItemController extends BaseController { public class StoneItemController extends BaseController {
private String prefix = "zhengzai/stone"; private String prefix = "zhengzai/stone";
@Value("${liquidnet.client.admin.platformUrl}")
private String platformUrl;
@Autowired @Autowired
private IItemService iItemService; private IItemService iItemService;
...@@ -37,6 +40,7 @@ public class StoneItemController extends BaseController { ...@@ -37,6 +40,7 @@ public class StoneItemController extends BaseController {
@GetMapping("integralStoreEdit") @GetMapping("integralStoreEdit")
@ApiOperation(value = "积分商品:详情View") @ApiOperation(value = "积分商品:详情View")
public String integralStoreEdit (ModelMap mmap) { public String integralStoreEdit (ModelMap mmap) {
mmap.put("platformUrl", platformUrl);
return prefix + "/integralStoreEdit"; return prefix + "/integralStoreEdit";
} }
......
...@@ -17,7 +17,9 @@ import io.swagger.annotations.ApiImplicitParams; ...@@ -17,7 +17,9 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -42,6 +44,9 @@ import javax.validation.constraints.NotNull; ...@@ -42,6 +44,9 @@ import javax.validation.constraints.NotNull;
public class SweetIntegralActivityController extends BaseController { public class SweetIntegralActivityController extends BaseController {
private String prefix = "zhengzai/sweet/integralActivity"; private String prefix = "zhengzai/sweet/integralActivity";
@Value("${liquidnet.client.admin.platformUrl}")
private String platformUrl;
@Autowired @Autowired
private ISweetIntegralActivityService iSweetIntegralActivityService; private ISweetIntegralActivityService iSweetIntegralActivityService;
...@@ -124,7 +129,8 @@ public class SweetIntegralActivityController extends BaseController { ...@@ -124,7 +129,8 @@ public class SweetIntegralActivityController extends BaseController {
@GetMapping("formView") @GetMapping("formView")
@ApiOperation(value = "积分活动添加编辑view") @ApiOperation(value = "积分活动添加编辑view")
public String formView() { public String formView(ModelMap mmap) {
mmap.put("platformUrl", platformUrl);
return prefix + "/form"; return prefix + "/form";
} }
......
...@@ -495,14 +495,10 @@ ...@@ -495,14 +495,10 @@
<script th:inline="javascript"> <script th:inline="javascript">
var member = [[${member}]]; var member = [[${member}]];
console.log(member);
var platformUrl = [[${platformUrl}]]; var platformUrl = [[${platformUrl}]];
var memberRightsList = [[${memberRightsList}]]; var memberRightsList = [[${memberRightsList}]];
console.log(memberRightsList);
var couponMemberDtoListMap = [[${couponMemberDtoListMap}]]; var couponMemberDtoListMap = [[${couponMemberDtoListMap}]];
console.log(couponMemberDtoListMap);
var memberPrice = [[${memberPrice}]]; var memberPrice = [[${memberPrice}]];
console.log(member);
var typeRadio = ''; var typeRadio = '';
......
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
<th:block th:include="include :: summernote-js" /> <th:block th:include="include :: summernote-js" />
</body> </body>
<script th:inline="javascript"> <script th:inline="javascript">
var phpMallUrl = [[${phpMallUrl}]]; // https://devmall.zhengzai.tv/admin/goodListForQuick?title= var platformUrl = [[${platformUrl}]];
var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", ""); var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", "");
var prefix = ctx + "candy/coupon/mgt"; var prefix = ctx + "candy/coupon/mgt";
let typeOne = '0'; // 类别 let typeOne = '0'; // 类别
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
var formData = new FormData(); var formData = new FormData();
formData.append("file", file); formData.append("file", file);
$.ajax({ $.ajax({
url: "https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload",//路径是你控制器中上传图片的方法,下面controller里面我会写到 url: platformUrl + "/platform/basicServices/alOss/upload",//路径是你控制器中上传图片的方法,下面controller里面我会写到
data: formData, data: formData,
cache: false, cache: false,
contentType: false, contentType: false,
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
} }
$("#fileinput").fileinput({ $("#fileinput").fileinput({
'theme': 'explorer-fas', 'theme': 'explorer-fas',
'uploadUrl': "https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload", 'uploadUrl': platformUrl + "/platform/basicServices/alOss/upload",
"uploadExtraData": { "uploadExtraData": {
"pathName" : "banner", "pathName" : "banner",
"buckType" : 1 "buckType" : 1
......
...@@ -200,6 +200,7 @@ ...@@ -200,6 +200,7 @@
<script th:src="@{/js/jquery.tmpl.js}"></script> <script th:src="@{/js/jquery.tmpl.js}"></script>
<th:block th:include="include :: bootstrap-fileinput-js" /> <th:block th:include="include :: bootstrap-fileinput-js" />
<script type="text/javascript"> <script type="text/javascript">
var platformUrl = [[${platformUrl}]];
var prefix = ctx + "sweet/sweetIntegralActivity"; var prefix = ctx + "sweet/sweetIntegralActivity";
let showIndex = null; let showIndex = null;
// 初始化数据, 可以由后台传过来 // 初始化数据, 可以由后台传过来
...@@ -486,7 +487,7 @@ ...@@ -486,7 +487,7 @@
var formData = new FormData(); var formData = new FormData();
formData.append("file", e.target.files[0]); formData.append("file", e.target.files[0]);
$.ajax({ $.ajax({
url: "https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload",//路径是你控制器中上传图片的方法,下面controller里面我会写到 url: platformUrl + "/platform/basicServices/alOss/upload",//路径是你控制器中上传图片的方法,下面controller里面我会写到
data: formData, data: formData,
cache: false, cache: false,
contentType: false, contentType: false,
...@@ -507,7 +508,7 @@ ...@@ -507,7 +508,7 @@
var formData = new FormData(); var formData = new FormData();
formData.append("file", e.target.files[0]); formData.append("file", e.target.files[0]);
$.ajax({ $.ajax({
url: "https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload",//路径是你控制器中上传图片的方法,下面controller里面我会写到 url: platformUrl + "/platform/basicServices/alOss/upload",//路径是你控制器中上传图片的方法,下面controller里面我会写到
data: formData, data: formData,
cache: false, cache: false,
contentType: false, contentType: false,
...@@ -523,7 +524,7 @@ ...@@ -523,7 +524,7 @@
}) })
$("#fileinput").fileinput({ $("#fileinput").fileinput({
'theme': 'explorer-fas', 'theme': 'explorer-fas',
'uploadUrl': "https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload", 'uploadUrl': platformUrl + "/platform/basicServices/alOss/upload",
"uploadExtraData": { "uploadExtraData": {
"pathName" : "banner", "pathName" : "banner",
"buckType" : 1 "buckType" : 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment