Browse Source

更改配置

zyj
sj 3 years ago
parent
commit
8d66f53be5
  1. 1
      node_modules/.package_versions.json
  2. 6
      package-lock.json
  3. 8
      yudao-server/src/main/resources/application-local.yaml
  4. 1
      zsw-bxg/src/main/java/co/yixiang/modules/mp/config/BxgConstans.java
  5. 2
      zsw-bxg/src/main/java/co/yixiang/tools/rest/UploadController.java
  6. 2
      zsw-bxg/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java

1
node_modules/.package_versions.json generated vendored

@ -0,0 +1 @@
{}

6
package-lock.json generated

@ -0,0 +1,6 @@
{
"name": "zsw-farm",
"lockfileVersion": 2,
"requires": true,
"packages": {}
}

8
yudao-server/src/main/resources/application-local.yaml

@ -243,7 +243,7 @@ dubbo:
bxg: bxg:
shop: shop:
API_URL: http://192.168.10.129:48080/bxgApp API_URL: http://192.168.10.113:48080/bxgApp
SITE_URL: http://192.168.10.129:48080/bxgApp SITE_URL: http://192.168.10.113:48080/bxgApp
UNI_SITE_URL: http://192.168.10.129:48080/bxgApp UNI_SITE_URL: http://192.168.10.113:48080/bxgApp
ADMIN_API_URL: http://192.168.10.129:48080/bxg ADMIN_API_URL: http://192.168.10.113:48080/bxg

1
zsw-bxg/src/main/java/co/yixiang/modules/mp/config/BxgConstans.java

@ -22,6 +22,7 @@ public class BxgConstans {
@Value("${bxg.shop.ADMIN_API_URL}") @Value("${bxg.shop.ADMIN_API_URL}")
public void setAdminApiUrl(String adminApiUrl) { public void setAdminApiUrl(String adminApiUrl) {
// System.out.println(adminApiUrl);
ADMIN_API_URL = adminApiUrl; ADMIN_API_URL = adminApiUrl;
} }
} }

2
zsw-bxg/src/main/java/co/yixiang/tools/rest/UploadController.java

@ -80,6 +80,7 @@ public class UploadController {
QiniuContent qiniuContent = qiNiuService.upload(file, qiNiuService.find()); QiniuContent qiniuContent = qiNiuService.upload(file, qiNiuService.find());
if ("".equals(url.toString())) { if ("".equals(url.toString())) {
url = url.append(qiniuContent.getUrl()); url = url.append(qiniuContent.getUrl());
System.out.println("".equals(url.toString()));
}else{ }else{
url = url.append(","+qiniuContent.getUrl()); url = url.append(","+qiniuContent.getUrl());
} }
@ -89,6 +90,7 @@ public class UploadController {
Map<String, Object> map = new HashMap<>(2); Map<String, Object> map = new HashMap<>(2);
map.put("errno", 0); map.put("errno", 0);
map.put("link", url); map.put("link", url);
System.out.println();
return new ResponseEntity(map, HttpStatus.CREATED); return new ResponseEntity(map, HttpStatus.CREATED);
} }

2
zsw-bxg/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java

@ -94,6 +94,7 @@ public class QiNiuServiceImpl implements QiNiuService {
// @CacheEvict(allEntries = true) // @CacheEvict(allEntries = true)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public QiniuContent upload(MultipartFile file, QiniuConfig qiniuConfig) { public QiniuContent upload(MultipartFile file, QiniuConfig qiniuConfig) {
System.out.println("走到了这里");
if(qiniuConfig.getId() == null){ if(qiniuConfig.getId() == null){
throw new BadRequestException("请先添加相应配置,再操作"); throw new BadRequestException("请先添加相应配置,再操作");
} }
@ -109,7 +110,6 @@ public class QiNiuServiceImpl implements QiNiuService {
} }
Response response = uploadManager.put(file.getBytes(), key, upToken); Response response = uploadManager.put(file.getBytes(), key, upToken);
//解析上传成功的结果 //解析上传成功的结果
DefaultPutRet putRet = JSON.parseObject(response.bodyString(), DefaultPutRet.class); DefaultPutRet putRet = JSON.parseObject(response.bodyString(), DefaultPutRet.class);
QiniuContent content = qiniuContentService.getOne(new LambdaQueryWrapper<QiniuContent>().eq(QiniuContent::getName,FileUtil.getFileNameNoEx(putRet.key))); QiniuContent content = qiniuContentService.getOne(new LambdaQueryWrapper<QiniuContent>().eq(QiniuContent::getName,FileUtil.getFileNameNoEx(putRet.key)));

Loading…
Cancel
Save