fix score

run-dev.sh

@@ -65,7 +65,7 @@ docker run \
 -v /etc/localtime:/etc/localtime \
 -v /usr/share/fonts:/usr/share/fonts \
 -v /data/logs/dev_admin:/logs \
--v /usr/local/nginx/conf/vhost:/nginx/conf/vhost \
+-v /usr/local/nginx/conf/vhost:/usr/local/nginx/conf/vhost \
 -v /mydata/app/${app_admin_name}/logs:/var/logs \
 -d ${group_admin_name}/${app_admin_name}:${app_admin_version}
 echo '----start container admin----'

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/ExamSimulateServiceImpl.java

@@ -142,7 +142,6 @@ public class ExamSimulateServiceImpl extends ServiceImpl<ExamSimulateMapper, Exa
         q1Bo.setOrderGoodsId(bo.getOrderGoodsId());
         q1Bo.setFromType(bo.getFrom());
         List<Long> q1 = baseMapper.getQuestionList(q1Bo);
-
         ExamSimulateQueryBo q2Bo = new ExamSimulateQueryBo();  //多选
         q2Bo.setExamId(exam.getExamId());
         q2Bo.setKnowledQuestionIds(qk2);
@@ -152,7 +151,6 @@ public class ExamSimulateServiceImpl extends ServiceImpl<ExamSimulateMapper, Exa
         q2Bo.setOrderGoodsId(bo.getOrderGoodsId());
         q2Bo.setFromType(bo.getFrom());
         List<Long> q2 = baseMapper.getQuestionList(q2Bo);
-
         ExamSimulateQueryBo q3Bo = new ExamSimulateQueryBo();  //案例选
         q3Bo.setExamId(exam.getExamId());
         q3Bo.setKnowledQuestionIds(qk3);
@@ -162,11 +160,9 @@ public class ExamSimulateServiceImpl extends ServiceImpl<ExamSimulateMapper, Exa
         q3Bo.setOrderGoodsId(bo.getOrderGoodsId());
         q3Bo.setFromType(bo.getFrom());
         List<Long> q3 = baseMapper.getQuestionList(q3Bo);
-
         qk1.addAll(q1);
         qk2.addAll(q2);
         qk3.addAll(q3);
-
         List<Long> allQ = new ArrayList<>();
         if(simulateConfig.getSingleChoice().getRandomNum()==1){ //题型顺序
             for(int i=1;i<4;i++){
@@ -203,7 +199,7 @@ public class ExamSimulateServiceImpl extends ServiceImpl<ExamSimulateMapper, Exa
                         allQ.addAll(qk3);
                     }
                 }
-                if(allQ.size()>=3){
+                if(map.size()>=3){
                     break;
                 }
             }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/SysNginxConfigAddBo.java

@@ -0,0 +1,22 @@
+package com.zhongzheng.modules.system.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+
+
+@Data
+@ApiModel("nginx配置文件")
+public class SysNginxConfigAddBo {
+
+
+    @ApiModelProperty("1PC 2h5 3直播")
+    private Integer plat;
+
+    /** 域名 */
+    @ApiModelProperty("域名")
+    private String host;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysWebService.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.system.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.common.core.domain.entity.SysUser;
 import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
+import com.zhongzheng.modules.system.bo.SysNginxConfigAddBo;
 
 import java.util.List;
 
@@ -13,4 +14,5 @@ import java.util.List;
  */
 public interface ISysWebService {
     Boolean restartWebService();
+    Boolean configNginxFile(SysNginxConfigAddBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysWebServiceImpl.java

@@ -16,6 +16,7 @@ import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.common.utils.ip.IpUtils;
 import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
 import com.zhongzheng.modules.order.bo.OrderShareMoneyAddBo;
+import com.zhongzheng.modules.system.bo.SysNginxConfigAddBo;
 import com.zhongzheng.modules.system.domain.SysPost;
 import com.zhongzheng.modules.system.domain.SysUserPost;
 import com.zhongzheng.modules.system.domain.SysUserRole;
@@ -28,6 +29,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.util.*;
 
@@ -54,4 +58,80 @@ public class SysWebServiceImpl implements ISysWebService {
         }
         return true;
     }
+
+    @Override
+    public Boolean configNginxFile(SysNginxConfigAddBo bo) {
+        String filePath = "/usr/local/nginx/conf/vhost" + "1.txt";
+        FileWriter fw = null;
+        try
+        {
+            File file = new File(filePath);
+            if (!file.exists())
+            {
+                file.createNewFile();
+            }
+            fw = new FileWriter(filePath);
+            BufferedWriter bw=new BufferedWriter(fw);
+            bw.write("hello\n");
+            bw.write("world\n");
+            bw.close();
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        finally
+        {
+            try
+            {
+                fw.close();
+            }
+            catch (Exception e)
+            {
+                e.printStackTrace();
+            }
+
+        }
+        return null;
+    }
+
+    private String makeConfigTxt(Integer plat,String host){
+        String filePath = null;
+        if(plat==1){
+            filePath = "/www/public/pc";
+        }
+        else if(plat==2){
+            filePath = "/www/public/h5";
+        }
+        else if(plat==3){
+            filePath = "/www/public/live";
+        }
+        String configParam = " server {\n" +
+                "    listen       80; # 同时支持HTTP\n" +
+                "    listen       443 ssl; # 添加HTTPS支持\n" +
+                "    server_name   %s;\n" +
+                "    root %s;\n" +
+                "    if ($scheme = http ) {\n" +
+                "\treturn 301 https://$host$request_uri;\n" +
+                "    }\n" +
+                "\n" +
+                "    #SSL配置\n" +
+                "    ssl_certificate      /mydata/nginx/ssl/gdzzkj.net.pem; # 配置证书\n" +
+                "    ssl_certificate_key  /mydata/nginx/ssl/gdzzkj.net.key; # 配置证书私钥\n" +
+                "    ssl_protocols        TLSv1 TLSv1.1 TLSv1.2; # 配置SSL协议版本 # 配置SSL加密算法\n" +
+                "    ssl_ciphers          ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;\n" +
+                "    ssl_prefer_server_ciphers  on; # 优先采取服务器算法\n" +
+                "    ssl_session_cache    shared:SSL:10m; # 配置共享会话缓存大小\n" +
+                "    ssl_session_timeout  10m; # 配置会话超时时间\n" +
+                "\n" +
+                "\n" +
+                "    index index.html index.htm;\n" +
+                "\n" +
+                "     location / {\n" +
+                "                try_files $uri $uri/ /index.html?$args;\n" +
+                "        }\n" +
+                "}\n";
+        String param = String.format(configParam, host, filePath);
+        return param;
+    }
 }