From 1857a1f11ffadf7ef7e660be145ce52ad9246829 Mon Sep 17 00:00:00 2001
From: ky <592468495@qq.com>
Date: Tue, 21 Jul 2020 16:33:38 +0800
Subject: [PATCH] p

---
 src/main/java/com/yhjd/conf/UrlConfig.java                | 8 ++++----
 src/main/java/com/yhjd/handler/MsgHandler.java            | 2 +-
 .../java/com/yhjd/service/impl/MissonServiceImpl.java     | 5 ++++-
 src/main/resources/application-dev.yml                    | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/yhjd/conf/UrlConfig.java b/src/main/java/com/yhjd/conf/UrlConfig.java
index 56b986b..8a58f3d 100644
--- a/src/main/java/com/yhjd/conf/UrlConfig.java
+++ b/src/main/java/com/yhjd/conf/UrlConfig.java
@@ -6,13 +6,13 @@ import org.springframework.stereotype.Component;
 @Component
 @ConfigurationProperties(prefix = "config")
 public class UrlConfig {
-    private static String baseUrl;
+    private String baseUrl;
 
-    public static String getBaseUrl() {
+    public String getBaseUrl() {
         return baseUrl;
     }
 
-    public static void setBaseUrl(String baseUrl) {
-        UrlConfig.baseUrl = baseUrl;
+    public void setBaseUrl(String baseUrl) {
+        this.baseUrl = baseUrl;
     }
 }
diff --git a/src/main/java/com/yhjd/handler/MsgHandler.java b/src/main/java/com/yhjd/handler/MsgHandler.java
index e213afe..e82e30e 100644
--- a/src/main/java/com/yhjd/handler/MsgHandler.java
+++ b/src/main/java/com/yhjd/handler/MsgHandler.java
@@ -68,7 +68,7 @@ public class MsgHandler extends AbstractHandler {
         item.setTitle(name);
         item.setDescription(result.getDescription());
         item.setPicUrl(result.getPreviewUrl());
-        item.setUrl(result.getH5Url());
+        item.setUrl("backend.emaylearningsh.com/oss/download?fileName="+result.getFileUrl());
         articles.add(item);
 //        return new TextBuilder().build(content, wxMessage, weixinService);
         return new NewsBuilder().articles(articles).fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()).build();
diff --git a/src/main/java/com/yhjd/service/impl/MissonServiceImpl.java b/src/main/java/com/yhjd/service/impl/MissonServiceImpl.java
index 4dc22b3..5e027f3 100644
--- a/src/main/java/com/yhjd/service/impl/MissonServiceImpl.java
+++ b/src/main/java/com/yhjd/service/impl/MissonServiceImpl.java
@@ -31,12 +31,15 @@ public class MissonServiceImpl extends ServiceImpl<MissonMapper, Misson> impleme
     @Autowired
     MissonMapper missonMapper;
 
+    @Autowired
+    UrlConfig urlConfig;
+
     public void addMisson(Misson misson){
         String id = UUID.randomUUID().toString();
         misson.setId(id);
         misson.setCreateDate(new Date());
         misson.setModifyDate(new Date());
-        misson.setH5Url(UrlConfig.getBaseUrl()+"/h5/task/brief?id"+id);
+        misson.setH5Url(urlConfig.getBaseUrl()+"/h5/task/brief?id="+id);
         missonMapper.insert(misson);
     }
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 1734e53..41b6b03 100755
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -20,8 +20,8 @@ spring:
         allow: true
   servlet:
     multipart:
-      max-request-size: 10MB
-      max-file-size: 10MB
+      max-request-size: 20MB
+      max-file-size: 20MB
   mvc:
     view:
       prefix: /WEB-INF/jsp/
@@ -58,4 +58,4 @@ oss:
   endpoint: oss-cn-shanghai.aliyuncs.com
 
 config:
-  baseUrl: localhost:8080
\ No newline at end of file
+  baseUrl: http://back.emaylearningsh.com/
\ No newline at end of file