Merge branch 'wangming' into '105'

banner

See merge request !5

src/main/java/com/server/utils/FileStore.java

 package com.server.utils;
 
+import com.qiniu.common.QiniuException;
+import com.qiniu.common.Zone;
+import com.qiniu.storage.Configuration;
+import com.qiniu.storage.UploadManager;
+import com.qiniu.util.Auth;
 import com.server.utils.key.QiniuKey;
 import com.server.utils.key.UploadUrlKey;
 import org.slf4j.Logger;
@@ -11,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.imageio.ImageIO;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * 本地文件存储
@@ -24,8 +30,22 @@ public class FileStore {
     @Autowired
     QiniuKey qiniuKey;
 
-    public String storeImage(String path, MultipartFile file) {
-        return store(path, file);
+    public String storeImage(String path, MultipartFile file) throws IOException {
+        String accessKey = qiniuKey.getAccessKey();
+        String secretKey = qiniuKey.getSecretKey();
+        String bucket = qiniuKey.getBucket();
+        String fileName = file.getOriginalFilename();
+        Auth auth = Auth.create(accessKey, secretKey);
+        String upToken = auth.uploadToken(bucket);
+        String imageUrl = "";
+        InputStream input = file.getInputStream();
+        imageUrl = uploadUrlKey.getBasePath()+String.valueOf(System.currentTimeMillis())+"."+fileName.substring(fileName.lastIndexOf(".") + 1);
+        //构造一个带指定Zone对象的配置类
+        Configuration cfg = new Configuration(Zone.zone1());
+        //...其他参数参考类注释
+        UploadManager uploadManager = new UploadManager(cfg);
+        uploadManager.put(input,imageUrl,upToken,null, null);
+        return imageUrl;
     }
 
     public String getRealPath(String path) {

src/main/resources/mybatis/mapping/queryModel.xml

@@ -124,4 +124,40 @@
         ORDER BY t.id DESC
     </select>
 
+    <select id="queryCourseZb" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        SELECT
+        c.id,
+        c.course_name AS courseName,
+        c.is_up as isUp,
+        date_format(c.start_dt,'%Y-%m-%d %H:%i:%S') startDt,
+        date_format(c.end_dt,'%Y-%m-%d %H:%i:%S') endDt,
+        if(date_format(NOW(),'%Y-%m-%d %H:%i:%S') &lt; date_format(c.start_dt,'%Y-%m-%d %H:%i:%S'),0,if(date_format(NOW(),'%Y-%m-%d %H:%i:%S')&gt; date_format(c.end_dt,'%Y-%m-%d %H:%i:%S'),2,1)) status
+        FROM
+        t_kzy_course c
+        WHERE c.course_type=1
+        AND  c.is_delete = 0
+        <if test="courseName != null">
+            AND c.course_name LIKE #{courseName}
+        </if>
+        ORDER BY c.create_dt DESC
+    </select>
+
+    <select id="queryCourseLb" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        SELECT
+        c.id,
+        c.course_name AS courseName,
+        date_format(c.create_dt,'%Y-%m-%d %H:%i:%S') createDt,
+        if(c.live_url is not null,1,2) liveStatus,
+        c.is_up AS isUp
+        FROM
+        t_kzy_course c
+        WHERE c.course_type=2
+        AND  c.is_delete = 0
+        <if test="courseName != null">
+            AND c.course_name LIKE #{courseName}
+        </if>
+        ORDER BY c.create_dt DESC
+    </select>
+
+
 </mapper>
\ No newline at end of file

src/main/resources/servers/105/application.properties

@@ -48,7 +48,7 @@ rest.api.charset=utf-8
 #加密secret_key
 rest.api.secretkey=FoK28EsYrxuiM3ohnAurFGm2uGAHyijL
 #上传图片
-upload.image.dir=/data/tempImages
+upload.image.dir=/alidata/server/kzy_oss/tempImages
 upload.image.base.path=tempImages/
 #七牛云
 qiniu.accessKey=tOdsZIdcGZB4A6B4X6XnhRj9PALEPIY4QRT7RduW