1、增加网关负载lb指向

2、文件服务增加21世纪文档生成接口

1、增加网关负载lb指向
2、文件服务增加21世纪文档生成接口
陶汉栋
1 parent 97289310
Showing 16 changed files with 577 additions and 23 deletions Show diff stats
cloud/autho/src/main/java/com/sincere/autho/mapper/UserMapper.java
cloud/autho/src/main/java/com/sincere/autho/service/impl/LoginServiceImpl.java
cloud/autho/src/main/resources/application.yaml
cloud/autho/src/main/resources/mapper/UserMapper.xml
cloud/fIle-center/pom.xml
cloud/fIle-center/src/main/java/com/sincere/file/control/FileControl.java
cloud/fIle-center/src/main/java/com/sincere/file/model/question/OptionsModel.java
cloud/fIle-center/src/main/java/com/sincere/file/model/question/QuestionDataModel.java
cloud/fIle-center/src/main/java/com/sincere/file/model/question/QuestionModel.java
cloud/fIle-center/src/main/java/com/sincere/file/model/question/Questions.java
cloud/fIle-center/src/main/java/com/sincere/file/service/FileService.java
cloud/fIle-center/src/main/java/com/sincere/file/service/impl/AliyunOssServiceImpl.java
cloud/fIle-center/src/main/java/com/sincere/file/utils/HtmlUtil.java
cloud/fIle-center/src/main/java/com/sincere/file/utils/PoiUtils.java
cloud/getaway/src/main/java/com/sincere/getaway/GetawayApplication.java
cloud/getaway/src/main/resources/application.yml
@@ -7,4 +7,6 @@ public interface UserMapper {
     String loginTeacher(LoginReqDto loginReqDto) ;
  
     String loginStudent(LoginReqDto loginReqDto) ;
+
+    String loginStudentOthName(LoginReqDto loginReqDto);
 }
@@ -5,6 +5,7 @@ import com.sincere.autho.mapper.UserMapper;
 import com.sincere.autho.service.LoginService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
  
 @Service
 public class LoginServiceImpl implements LoginService {
@@ -17,6 +18,9 @@ public class LoginServiceImpl implements LoginService {
         String userId = "" ;
         if(loginReqDto.getUserType() == 2){
             userId = userMapper.loginStudent(loginReqDto);
+            if (StringUtils.isEmpty(userId)){//用othername登录
+                userId = userMapper.loginStudentOthName(loginReqDto);
+            }
         }else {
             userId = userMapper.loginTeacher(loginReqDto);
         }
@@ -19,7 +19,7 @@ ribbon:
   ConnectTimeout: 5000
 eureka:
   instance:
-    hostname: localhost
+    hostname: 121.40.30.78
     lease-expiration-duration-in-seconds: 60
     lease-renewal-interval-in-seconds: 10
   client:
@@ -11,4 +11,8 @@
         select user_id from SZ_User where name = #{account} and pass = #{password}
     </select>
  
+    <select id="loginStudentOthName" parameterType="com.sincere.autho.dto.req.LoginReqDto"  resultType="java.lang.String">
+        select user_id from SZ_User where othername = #{account} and pass = #{password}
+    </select>
+
 </mapper>
@@ -43,6 +43,18 @@
             <version>2.8.3</version>
         </dependency>
  
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+
     </dependencies>
     <!-- 形成带第三方jar包的可执行jar包，jar包目录结构如下 application.properties lib META-INF mybatis
             org -->
 package com.sincere.file.control;
  
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.serializer.ValueFilter;
 import com.sincere.file.model.FileInfo;
+import com.sincere.file.model.question.QuestionDataModel;
 import com.sincere.file.service.FileService;
 import com.sincere.file.utils.FileUtil;
+import com.sincere.file.utils.PoiUtils;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.xwpf.usermodel.Document;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.configurationprocessor.json.JSONException;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
  
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
  
 @RestController
 @Api(tags = "文件管理")
 @RequestMapping(value = "file/*")
 public class FileControl {
  
+    Logger logger = LoggerFactory.getLogger(FileControl.class);
+
     @Autowired
     FileService fileService;
  
@@ -31,27 +54,45 @@ public class FileControl {
  
     }
  
-    @PostMapping("fileUpload1")
-    @ApiOperation("上传文件")
-    public String fileUpload1(@RequestParam("file") MultipartFile file) throws Exception {
-
-//        String ossPath = request.getHeader("ossPath");//oss的二级目录
-//
-//        FileInfo fileInfo = fileService.upload(file, ossPath);
+    @DeleteMapping("deleteFile/{fileName}")
+    @ApiOperation("删除文件")
+    public boolean deleteFile(@PathVariable String fileName, HttpServletRequest request) {
+        String ossPath = request.getHeader("ossPath");//oss的二级目录
+        fileService.delete(fileName, ossPath);
  
-        return "111";
+        System.out.println("fileName:" + fileName + "----ossPath:" + ossPath);
  
+        return true;
     }
  
  
-    @DeleteMapping("deleteFile/{fileName}")
-    @ApiOperation("删除文件")
-    public boolean deleteFile(@PathVariable String fileName,HttpServletRequest request){
-        String ossPath = request.getHeader("ossPath");//oss的二级目录
-        fileService.delete(fileName,ossPath);
+    @RequestMapping(value = "getWord", method = RequestMethod.GET)
+    @ApiOperation("获取21世纪题目")
+    @ApiImplicitParams(
+            {@ApiImplicitParam(name = "url",value = "链接")}
+
+    )
+    public String getWord(@RequestParam("url") String url) {
+
+        RestTemplate restTemplate = new RestTemplate();
+
+        String content = restTemplate.getForObject(url, String.class, new HashMap<>());
+
+//        logger.error("json:{}", content);
+
+        JSONObject jsonObject = JSON.parseObject(content);
+        JSONObject data = jsonObject.getJSONObject("data");
+        JSONArray questions = data.getJSONArray("questions");
+        String wordPath = PoiUtils.createWord(questions);
+
+//        QuestionDataModel questionDataModel = JSON.parseObject(content, QuestionDataModel.class);
+
+//        logger.error("questionDataModel:{}", questionDataModel);
+
+        return fileService.uploadLocalFile(new File(wordPath), "test");
  
-        System.out.println("fileName:"+fileName+"----ossPath:"+ossPath);
  
-        return true;
     }
+
+
 }
@@ -0,0 +1,56 @@
+package com.sincere.file.model.question;
+
+import java.io.Serializable;
+
+public class OptionsModel implements Serializable {
+
+    private String A;
+
+    private String B;
+
+    private String C;
+
+    private String D;
+
+    public String getA() {
+        return A;
+    }
+
+    public void setA(String a) {
+        A = a;
+    }
+
+    public String getB() {
+        return B;
+    }
+
+    public void setB(String b) {
+        B = b;
+    }
+
+    public String getC() {
+        return C;
+    }
+
+    public void setC(String c) {
+        C = c;
+    }
+
+    public String getD() {
+        return D;
+    }
+
+    public void setD(String d) {
+        D = d;
+    }
+
+    @Override
+    public String toString() {
+        return "OptionsModel{" +
+                "A='" + A + '\'' +
+                ", B='" + B + '\'' +
+                ", C='" + C + '\'' +
+                ", D='" + D + '\'' +
+                '}';
+    }
+}
@@ -0,0 +1,50 @@
+package com.sincere.file.model.question;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class QuestionDataModel implements Serializable {
+
+    private int code;
+
+    private String msg;
+
+    private Questions data;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String isMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public Questions getData() {
+        return data;
+    }
+
+    public void setData(Questions data) {
+        this.data = data;
+    }
+
+    @Override
+    public String toString() {
+        return "QuestionDataModel{" +
+                "code=" + code +
+                ", msg=" + msg +
+                ", data=" + data +
+                '}';
+    }
+}
@@ -0,0 +1,47 @@
+package com.sincere.file.model.question;
+
+import java.io.Serializable;
+
+public class QuestionModel implements Serializable {
+
+
+    private String channel_type_name;
+
+    private String question_text;
+
+    private OptionsModel options;
+
+
+    public String getChannel_type_name() {
+        return channel_type_name;
+    }
+
+    public void setChannel_type_name(String channel_type_name) {
+        this.channel_type_name = channel_type_name;
+    }
+
+    public String getQuestion_text() {
+        return question_text;
+    }
+
+    public void setQuestion_text(String question_text) {
+        this.question_text = question_text;
+    }
+
+    public OptionsModel getOptionsModel() {
+        return options;
+    }
+
+    public void setOptionsModel(OptionsModel optionsModel) {
+        this.options = optionsModel;
+    }
+
+    @Override
+    public String toString() {
+        return "QuestionModel{" +
+                "channel_type_name='" + channel_type_name + '\'' +
+                ", question_text='" + question_text + '\'' +
+                ", options=" + options +
+                '}';
+    }
+}
@@ -0,0 +1,25 @@
+package com.sincere.file.model.question;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Questions implements Serializable {
+
+
+    private List<QuestionModel> questions;
+
+    public List<QuestionModel> getQuestions() {
+        return questions;
+    }
+
+    public void setQuestions(List<QuestionModel> questions) {
+        this.questions = questions;
+    }
+
+    @Override
+    public String toString() {
+        return "Questions{" +
+                "questions=" + questions +
+                '}';
+    }
+}
@@ -3,6 +3,7 @@ package com.sincere.file.service;
 import com.sincere.file.model.FileInfo;
 import org.springframework.web.multipart.MultipartFile;
  
+import java.io.File;
 import java.util.Map;
  
 /**
@@ -14,6 +15,8 @@ public interface FileService {
  
 	FileInfo upload(MultipartFile file,String filePath) throws Exception;
  
+	String uploadLocalFile(File file,String filePath);
+
 	void delete(String fileName,String filePath);
  
 	FileInfo getById(String id);
 package com.sincere.file.service.impl;
  
 import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.model.PutObjectResult;
 import com.sincere.file.model.FileInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
  
+import java.io.File;
+
 /**
  * @author 作者 owen E-mail: 624191343@qq.com
  * @version 创建时间：2017年11月12日 上午22:57:51
@@ -48,4 +51,10 @@ public class AliyunOssServiceImpl extends AbstractFileService {
 		return true;
 	}
  
+	@Override
+	public String uploadLocalFile(File file, String filePath) {
+		PutObjectResult putObjectResult = ossClient.putObject(bucketName,filePath+"/"+file.getName(),file);
+		System.out.println("uploadLocalFile;"+putObjectResult.toString());
+		return domain+"/"+filePath+"/"+file.getName();
+	}
 }
@@ -0,0 +1,56 @@
+package com.sincere.file.utils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class HtmlUtil {
+    private static final String regEx_script = "]*?>[//s//S]*?"; // 定义script的正则表达式
+
+    private static final String regEx_style = "]*?>[//s//S]*?"; // 定义style的正则表达式
+
+    private static final String regEx_html = "<[^>]+>"; // 定义HTML标签的正则表达式
+
+    private static final String regEx_space = "//s*|/t|/r|/n";//定义空格回车换行符
+
+
+
+    /**
+
+     * @param htmlStr
+
+     * @return
+
+     *  删除Html标签
+
+     */
+
+    public static String delHTMLTag(String htmlStr) {
+
+        Pattern p_script = Pattern.compile(regEx_script, Pattern.CASE_INSENSITIVE);
+
+        Matcher m_script = p_script.matcher(htmlStr);
+
+        htmlStr = m_script.replaceAll(""); // 过滤script标签
+
+        Pattern p_style = Pattern.compile(regEx_style, Pattern.CASE_INSENSITIVE);
+
+        Matcher m_style = p_style.matcher(htmlStr);
+
+        htmlStr = m_style.replaceAll(""); // 过滤style标签
+
+        Pattern p_html = Pattern.compile(regEx_html, Pattern.CASE_INSENSITIVE);
+
+        Matcher m_html = p_html.matcher(htmlStr);
+
+        htmlStr = m_html.replaceAll(""); // 过滤html标签
+
+        Pattern p_space = Pattern.compile(regEx_space, Pattern.CASE_INSENSITIVE);
+
+        Matcher m_space = p_space.matcher(htmlStr);
+
+        htmlStr = m_space.replaceAll(""); // 过滤空格回车标签
+
+        return htmlStr.trim(); // 返回文本字符串
+
+    }
+}
@@ -0,0 +1,243 @@
+package com.sincere.file.utils;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.poi.ooxml.POIXMLTypeLoader;
+import org.apache.poi.ooxml.util.DocumentHelper;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xwpf.usermodel.*;
+import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xml.sax.InputSource;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class PoiUtils {
+
+    static Logger logger = LoggerFactory.getLogger(PoiUtils.class);
+
+    public static String createWord(JSONArray questions) {
+
+        XWPFDocument doc = new XWPFDocument();//创建word文档
+
+        for (int i = 0; i < questions.size(); i++) {
+            JSONObject question = questions.getJSONObject(i);
+            String question_text = question.getString("question_text");
+            String channel_type_name = question.getString("channel_type_name");
+            JSONObject options = question.getJSONObject("options");
+            XWPFParagraph p = doc.createParagraph();//新建一个段落
+
+            p.setAlignment(ParagraphAlignment.LEFT);//设置对其方式
+
+            if (channel_type_name.contains("img")){
+                getImg(channel_type_name,doc,p);
+            }else {
+                writeP(HtmlUtil.delHTMLTag(channel_type_name) + "\r\n",p);
+            }
+
+            question_text=question_text.replaceAll("&nbsp;"," ");
+
+            if (question_text.contains("img")){
+                writeP(question_text.replaceAll("<img[^>]*/>", " "), p);
+                getImg(question_text,doc,p);
+            }else {
+                writeP(HtmlUtil.delHTMLTag(question_text) + "\r\n", p);
+            }
+
+            if (null != options) {
+                String A = options.getString("A");
+                if (A.contains("src")) {
+                    writeP("A."+A.replaceAll("<img[^>]*/>", " "), p);
+                    getImg(A, doc,p);
+                } else {
+                    writeP( "A." + A+"\r\n", p);
+                }
+
+                String B = options.getString("B");
+                if (B.contains("src")) {
+                    writeP("B."+B.replaceAll("<img[^>]*/>", " "), p);
+                    getImg(B, doc,p);
+                } else {
+                    writeP("B." + B+"\r\n", p);
+                }
+
+                String C = options.getString("C");
+                if (C.contains("src")) {
+                    writeP("C."+C.replaceAll("<img[^>]*/>", " "), p);
+                    getImg(C, doc,p);
+                } else {
+                    writeP("C." + C+"\r\n", p);
+                }
+
+                String D = options.getString("D");
+                if (D.contains("src")) {
+                    writeP("D."+D.replaceAll("<img[^>]*/>", " "), p);
+                    getImg(D, doc,p);
+                } else {
+                    writeP("D." + D+"\r\n", p);
+                }
+            }
+        }
+
+        try {
+            File file = new File("D://POI");
+            if (!file.exists()) file.mkdirs();
+            File file1 = new File(file.getAbsolutePath() + File.separator + System.currentTimeMillis()+".doc");
+            if (!file1.exists()) file1.createNewFile();
+            FileOutputStream out = new FileOutputStream(file1);
+            doc.write(out);
+            out.close();
+          return   file1.getAbsolutePath();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+return "";
+    }
+
+
+    private static void writeP( String content, XWPFParagraph p) {
+
+        XWPFRun r = p.createRun();//创建段落文本
+
+        r.setFontSize(14);
+        r.setText(content);
+        r.setColor("000000");//设置颜色
+
+    }
+
+
+    private static void getImg(String imgHtml, XWPFDocument doc,XWPFParagraph paragraph) {
+//        imgHtml = HtmlUtil.delHTMLTag(imgHtml);
+//        imgHtml = imgHtml.substring(imgHtml.indexOf("src="), imgHtml.indexOf("style"));
+//        imgHtml = imgHtml.replace("\"", "");
+//        imgHtml = imgHtml.replace("src=", "");
+//        logger.error("imgHtml:{}", imgHtml);
+        Set<String> imgSer = getImgStr(imgHtml);
+        Iterator<String> iterator = imgSer.iterator();
+        while (iterator.hasNext()){
+            String imgUrl = iterator.next();
+            String imgName = System.currentTimeMillis() + ".png";
+            String filePath = "D://POI//Img";
+            download(imgUrl, imgName, filePath);
+            writeImg2Word(filePath + File.separator + imgName, doc,paragraph);
+        }
+
+    }
+
+    private static String writeImg2Word(String s, XWPFDocument doc,XWPFParagraph paragraph) {
+
+        try {
+
+            XWPFRun run = paragraph.createRun();
+            // 获取图片
+            InputStream is = new FileInputStream(s);
+            byte[] bs = IOUtils.toByteArray(is);
+            BufferedImage image = ImageIO.read(new ByteArrayInputStream(bs));
+
+            // 获取组装图片宽高，单位pt
+            StringBuffer dataSize = new StringBuffer();
+            dataSize.append("width:").append(image.getWidth()).append("pt;");
+            dataSize.append("height:").append(image.getHeight()).append("pt;");
+
+            // 添加图片到Word中
+            String rid = doc.addPictureData(bs, Document.PICTURE_TYPE_PNG);
+
+            StringBuffer xml = new StringBuffer();
+            xml.append("<w:pict xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\"");
+            xml.append(" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:o=\"urn:schemas-microsoft-com:office:office\"");
+            xml.append(" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">");
+            xml.append("	<v:shape id=\"图片1").append("\" o:spid=\"\" type=\"\" alt=\"\" style=\"").append(dataSize).append("\">\r\n");
+            xml.append("		<v:imagedata r:id=\"").append(rid).append("\" o:title=\"\" />\r\n");
+            xml.append("	</v:shape>");
+            xml.append("</w:pict>\r\n");
+
+            InputSource source = new InputSource(new StringReader(xml.toString()));
+
+            org.w3c.dom.Document pictDoc = DocumentHelper.readDocument(source);
+            // 将信息写入run中
+            run.setEmbossed(true);
+            XmlObject xmlObject = XmlObject.Factory.parse(pictDoc.getDocumentElement(), POIXMLTypeLoader.DEFAULT_XML_OPTIONS);
+            run.getCTR().set(xmlObject);
+            run.setText("\r\n");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public static void download(String urlString, String filename, String savePath) {
+        try {
+
+            // 构造URL
+            URL url = new URL(urlString);
+            // 打开连接
+            URLConnection con = url.openConnection();
+            //设置请求超时为5s
+            con.setConnectTimeout(5 * 1000);
+            // 输入流
+            InputStream is = con.getInputStream();
+
+            // 1K的数据缓冲
+            byte[] bs = new byte[1024];
+            // 读取到的数据长度
+            int len;
+            // 输出的文件流
+            File sf = new File(savePath);
+            if (!sf.exists()) {
+                sf.mkdirs();
+            }
+            // 获取图片的扩展名
+            String extensionName = filename.substring(filename.lastIndexOf(".") + 1);
+            // 新的图片文件名 = 编号 +"."图片扩展名
+            OutputStream os = new FileOutputStream(sf.getPath() + "\\" + filename);
+            // 开始读取
+            while ((len = is.read(bs)) != -1) {
+                os.write(bs, 0, len);
+            }
+            // 完毕，关闭所有链接
+            os.close();
+            is.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    /**
+     * 得到网页中图片的地址
+     */
+    private static Set<String> getImgStr(String htmlStr) {
+        Set<String> pics = new HashSet<String>();
+        String img = "";
+        Pattern p_image;
+        Matcher m_image;
+        String regEx_img = "<img.*src\\s*=\\s*(.*?)[^>]*?>";
+        p_image = Pattern.compile(regEx_img, Pattern.CASE_INSENSITIVE);
+        m_image = p_image.matcher(htmlStr);
+        while (m_image.find()) {
+            // 得到<img />数据
+            img = m_image.group();
+            // 匹配<img>中的src数据
+            Matcher m = Pattern.compile("src\\s*=\\s*\"?(.*?)(\"|>|\\s+)").matcher(img);
+            while (m.find()) {
+                pics.add(m.group(1));
+            }
+        }
+        return pics;
+    }
+
+}
@@ -2,6 +2,7 @@ package com.sincere.getaway;
  
 import org.springframework.boot.SpringApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
  
 /**
  * 统一网关配置
@@ -28,28 +28,29 @@ spring:
           filters:
             - StripPrefix=1
         - id: SmartCampusWebApi
-          uri: http://120.26.116.253:9022
-#          uri: lb://SmartCampusWebApi
+#          uri: http://120.26.116.253:9022
+          uri: lb://SmartCampusWebApi
           predicates:
             - Path=/SmartCampusWebApi/**
           filters:
             - StripPrefix=1
         - id: file-center
-#          uri: lb://file-center
-          uri: http://121.40.30.78:5000
+          uri: lb://file-center
+#          uri: http://121.40.30.78:5000
           predicates:
             - Path=/file-center/**
           filters:
             - StripPrefix=1
         - id: authserver
-          uri: http://121.40.30.78:9005
-#          uri: lb://authserver
+#          uri: http://121.40.30.78:9005
+          uri: lb://authserver
           predicates:
             - Path=/authserver/**
           filters:
             - StripPrefix=1
         - id: NewSmartCampus
-          uri: http://114.55.30.100:1111
+#          uri: http://114.55.30.100:1111
+          uri: lb://NewSmartCampus
           predicates:
             - Path=/NewSmartCampus/**
           filters:
...	...	@@ -7,4 +7,6 @@ public interface UserMapper {
7	7	String loginTeacher(LoginReqDto loginReqDto) ;
8	8
9	9	String loginStudent(LoginReqDto loginReqDto) ;
	10	+
	11	+ String loginStudentOthName(LoginReqDto loginReqDto);
10	12	}
...	...
...	...	@@ -5,6 +5,7 @@ import com.sincere.autho.mapper.UserMapper;
5	5	import com.sincere.autho.service.LoginService;
6	6	import org.springframework.beans.factory.annotation.Autowired;
7	7	import org.springframework.stereotype.Service;
	8	+import org.springframework.util.StringUtils;
8	9
9	10	@Service
10	11	public class LoginServiceImpl implements LoginService {
...	...	@@ -17,6 +18,9 @@ public class LoginServiceImpl implements LoginService {
17	18	String userId = "" ;
18	19	if(loginReqDto.getUserType() == 2){
19	20	userId = userMapper.loginStudent(loginReqDto);
	21	+ if (StringUtils.isEmpty(userId)){//用othername登录
	22	+ userId = userMapper.loginStudentOthName(loginReqDto);
	23	+ }
20	24	}else {
21	25	userId = userMapper.loginTeacher(loginReqDto);
22	26	}
...	...
...	...	@@ -19,7 +19,7 @@ ribbon:
19	19	ConnectTimeout: 5000
20	20	eureka:
21	21	instance:
22		- hostname: localhost
	22	+ hostname: 121.40.30.78
23	23	lease-expiration-duration-in-seconds: 60
24	24	lease-renewal-interval-in-seconds: 10
25	25	client:
...	...
...	...	@@ -11,4 +11,8 @@
11	11	select user_id from SZ_User where name = #{account} and pass = #{password}
12	12	</select>
13	13
	14	+ <select id="loginStudentOthName" parameterType="com.sincere.autho.dto.req.LoginReqDto" resultType="java.lang.String">
	15	+ select user_id from SZ_User where othername = #{account} and pass = #{password}
	16	+ </select>
	17	+
14	18	</mapper>
...	...
...	...	@@ -43,6 +43,18 @@
43	43	<version>2.8.3</version>
44	44	</dependency>
45	45
	46	+ <dependency>
	47	+ <groupId>org.apache.poi</groupId>
	48	+ <artifactId>poi</artifactId>
	49	+ <version>4.1.2</version>
	50	+ </dependency>
	51	+
	52	+ <dependency>
	53	+ <groupId>org.apache.poi</groupId>
	54	+ <artifactId>poi-ooxml</artifactId>
	55	+ <version>4.1.2</version>
	56	+ </dependency>
	57	+
46	58	</dependencies>
47	59	<!-- 形成带第三方jar包的可执行jar包，jar包目录结构如下 application.properties lib META-INF mybatis
48	60	org -->
...	...
1	1	package com.sincere.file.control;
2	2
	3	+import com.alibaba.fastjson.JSON;
	4	+import com.alibaba.fastjson.JSONArray;
	5	+import com.alibaba.fastjson.JSONObject;
	6	+import com.alibaba.fastjson.serializer.SerializerFeature;
	7	+import com.alibaba.fastjson.serializer.ValueFilter;
3	8	import com.sincere.file.model.FileInfo;
	9	+import com.sincere.file.model.question.QuestionDataModel;
4	10	import com.sincere.file.service.FileService;
5	11	import com.sincere.file.utils.FileUtil;
	12	+import com.sincere.file.utils.PoiUtils;
6	13	import io.swagger.annotations.Api;
	14	+import io.swagger.annotations.ApiImplicitParam;
	15	+import io.swagger.annotations.ApiImplicitParams;
7	16	import io.swagger.annotations.ApiOperation;
	17	+import org.apache.poi.xwpf.usermodel.Document;
	18	+import org.slf4j.Logger;
	19	+import org.slf4j.LoggerFactory;
8	20	import org.springframework.beans.factory.annotation.Autowired;
	21	+import org.springframework.boot.configurationprocessor.json.JSONException;
	22	+import org.springframework.util.StringUtils;
9	23	import org.springframework.web.bind.annotation.*;
	24	+import org.springframework.web.client.RestTemplate;
10	25	import org.springframework.web.multipart.MultipartFile;
11	26
12	27	import javax.servlet.http.HttpServletRequest;
	28	+import java.io.File;
	29	+import java.text.SimpleDateFormat;
	30	+import java.util.ArrayList;
	31	+import java.util.Date;
	32	+import java.util.HashMap;
	33	+import java.util.List;
13	34
14	35	@RestController
15	36	@Api(tags = "文件管理")
16	37	@RequestMapping(value = "file/*")
17	38	public class FileControl {
18	39
	40	+ Logger logger = LoggerFactory.getLogger(FileControl.class);
	41	+
19	42	@Autowired
20	43	FileService fileService;
21	44
...	...	@@ -31,27 +54,45 @@ public class FileControl {
31	54
32	55	}
33	56
34		- @PostMapping("fileUpload1")
35		- @ApiOperation("上传文件")
36		- public String fileUpload1(@RequestParam("file") MultipartFile file) throws Exception {
37		-
38		-// String ossPath = request.getHeader("ossPath");//oss的二级目录
39		-//
40		-// FileInfo fileInfo = fileService.upload(file, ossPath);
	57	+ @DeleteMapping("deleteFile/{fileName}")
	58	+ @ApiOperation("删除文件")
	59	+ public boolean deleteFile(@PathVariable String fileName, HttpServletRequest request) {
	60	+ String ossPath = request.getHeader("ossPath");//oss的二级目录
	61	+ fileService.delete(fileName, ossPath);
41	62
42		- return "111";
	63	+ System.out.println("fileName:" + fileName + "----ossPath:" + ossPath);
43	64
	65	+ return true;
44	66	}
45	67
46	68
47		- @DeleteMapping("deleteFile/{fileName}")
48		- @ApiOperation("删除文件")
49		- public boolean deleteFile(@PathVariable String fileName,HttpServletRequest request){
50		- String ossPath = request.getHeader("ossPath");//oss的二级目录
51		- fileService.delete(fileName,ossPath);
	69	+ @RequestMapping(value = "getWord", method = RequestMethod.GET)
	70	+ @ApiOperation("获取21世纪题目")
	71	+ @ApiImplicitParams(
	72	+ {@ApiImplicitParam(name = "url",value = "链接")}
	73	+
	74	+ )
	75	+ public String getWord(@RequestParam("url") String url) {
	76	+
	77	+ RestTemplate restTemplate = new RestTemplate();
	78	+
	79	+ String content = restTemplate.getForObject(url, String.class, new HashMap<>());
	80	+
	81	+// logger.error("json:{}", content);
	82	+
	83	+ JSONObject jsonObject = JSON.parseObject(content);
	84	+ JSONObject data = jsonObject.getJSONObject("data");
	85	+ JSONArray questions = data.getJSONArray("questions");
	86	+ String wordPath = PoiUtils.createWord(questions);
	87	+
	88	+// QuestionDataModel questionDataModel = JSON.parseObject(content, QuestionDataModel.class);
	89	+
	90	+// logger.error("questionDataModel:{}", questionDataModel);
	91	+
	92	+ return fileService.uploadLocalFile(new File(wordPath), "test");
52	93
53		- System.out.println("fileName:"+fileName+"----ossPath:"+ossPath);
54	94
55		- return true;
56	95	}
	96	+
	97	+
57	98	}
...	...
...	...	@@ -0,0 +1,56 @@
	1	+package com.sincere.file.model.question;
	2	+
	3	+import java.io.Serializable;
	4	+
	5	+public class OptionsModel implements Serializable {
	6	+
	7	+ private String A;
	8	+
	9	+ private String B;
	10	+
	11	+ private String C;
	12	+
	13	+ private String D;
	14	+
	15	+ public String getA() {
	16	+ return A;
	17	+ }
	18	+
	19	+ public void setA(String a) {
	20	+ A = a;
	21	+ }
	22	+
	23	+ public String getB() {
	24	+ return B;
	25	+ }
	26	+
	27	+ public void setB(String b) {
	28	+ B = b;
	29	+ }
	30	+
	31	+ public String getC() {
	32	+ return C;
	33	+ }
	34	+
	35	+ public void setC(String c) {
	36	+ C = c;
	37	+ }
	38	+
	39	+ public String getD() {
	40	+ return D;
	41	+ }
	42	+
	43	+ public void setD(String d) {
	44	+ D = d;
	45	+ }
	46	+
	47	+ @Override
	48	+ public String toString() {
	49	+ return "OptionsModel{" +
	50	+ "A='" + A + '\'' +
	51	+ ", B='" + B + '\'' +
	52	+ ", C='" + C + '\'' +
	53	+ ", D='" + D + '\'' +
	54	+ '}';
	55	+ }
	56	+}
...	...
...	...	@@ -0,0 +1,50 @@
	1	+package com.sincere.file.model.question;
	2	+
	3	+import java.io.Serializable;
	4	+import java.util.List;
	5	+
	6	+public class QuestionDataModel implements Serializable {
	7	+
	8	+ private int code;
	9	+
	10	+ private String msg;
	11	+
	12	+ private Questions data;
	13	+
	14	+ public int getCode() {
	15	+ return code;
	16	+ }
	17	+
	18	+ public void setCode(int code) {
	19	+ this.code = code;
	20	+ }
	21	+
	22	+ public String isMsg() {
	23	+ return msg;
	24	+ }
	25	+
	26	+ public void setMsg(String msg) {
	27	+ this.msg = msg;
	28	+ }
	29	+
	30	+ public String getMsg() {
	31	+ return msg;
	32	+ }
	33	+
	34	+ public Questions getData() {
	35	+ return data;
	36	+ }
	37	+
	38	+ public void setData(Questions data) {
	39	+ this.data = data;
	40	+ }
	41	+
	42	+ @Override
	43	+ public String toString() {
	44	+ return "QuestionDataModel{" +
	45	+ "code=" + code +
	46	+ ", msg=" + msg +
	47	+ ", data=" + data +
	48	+ '}';
	49	+ }
	50	+}
...	...
...	...	@@ -0,0 +1,47 @@
	1	+package com.sincere.file.model.question;
	2	+
	3	+import java.io.Serializable;
	4	+
	5	+public class QuestionModel implements Serializable {
	6	+
	7	+
	8	+ private String channel_type_name;
	9	+
	10	+ private String question_text;
	11	+
	12	+ private OptionsModel options;
	13	+
	14	+
	15	+ public String getChannel_type_name() {
	16	+ return channel_type_name;
	17	+ }
	18	+
	19	+ public void setChannel_type_name(String channel_type_name) {
	20	+ this.channel_type_name = channel_type_name;
	21	+ }
	22	+
	23	+ public String getQuestion_text() {
	24	+ return question_text;
	25	+ }
	26	+
	27	+ public void setQuestion_text(String question_text) {
	28	+ this.question_text = question_text;
	29	+ }
	30	+
	31	+ public OptionsModel getOptionsModel() {
	32	+ return options;
	33	+ }
	34	+
	35	+ public void setOptionsModel(OptionsModel optionsModel) {
	36	+ this.options = optionsModel;
	37	+ }
	38	+
	39	+ @Override
	40	+ public String toString() {
	41	+ return "QuestionModel{" +
	42	+ "channel_type_name='" + channel_type_name + '\'' +
	43	+ ", question_text='" + question_text + '\'' +
	44	+ ", options=" + options +
	45	+ '}';
	46	+ }
	47	+}
...	...
...	...	@@ -0,0 +1,25 @@
	1	+package com.sincere.file.model.question;
	2	+
	3	+import java.io.Serializable;
	4	+import java.util.List;
	5	+
	6	+public class Questions implements Serializable {
	7	+
	8	+
	9	+ private List<QuestionModel> questions;
	10	+
	11	+ public List<QuestionModel> getQuestions() {
	12	+ return questions;
	13	+ }
	14	+
	15	+ public void setQuestions(List<QuestionModel> questions) {
	16	+ this.questions = questions;
	17	+ }
	18	+
	19	+ @Override
	20	+ public String toString() {
	21	+ return "Questions{" +
	22	+ "questions=" + questions +
	23	+ '}';
	24	+ }
	25	+}
...	...