he2802 преди 2 години
родител
ревизия
8dff3c6674

+ 11 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -16,6 +16,7 @@ import com.zhongzheng.common.utils.file.FileUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.config.ServerConfig;
 import com.zhongzheng.framework.web.service.WxLoginService;
+import com.zhongzheng.modules.base.bo.ConfigQueryBo;
 import com.zhongzheng.modules.course.vo.CourseMenuVo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.bo.GoodsStudyUrlBo;
@@ -39,6 +40,7 @@ import com.zhongzheng.modules.system.bo.SysTenantAdminBo;
 import com.zhongzheng.modules.system.domain.SysTenant;
 import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.system.service.ISysUserService;
+import com.zhongzheng.modules.system.service.ISysWebService;
 import com.zhongzheng.modules.system.vo.SysTenantVo;
 import com.zhongzheng.modules.top.bo.TopSysTenantRegisterAddBo;
 import com.zhongzheng.modules.top.service.ITopSysTenantRegisterService;
@@ -101,6 +103,8 @@ public class CommonController
     private IUserService iUserService;
     @Autowired
     private  ITopSysTenantRegisterService iTopSysTenantRegisterService;
+    @Autowired
+    private  ISysWebService webService;
     /**
      * 通用下载请求
      *
@@ -357,4 +361,11 @@ public class CommonController
         }
         return AjaxResult.success("成功",iTopSysTenantRegisterService.insertByAddBo(bo) ? 1 : 0);
     }
+
+    @ApiOperation("服务restart")
+    @GetMapping("common/free/webRestart")
+    public AjaxResult<Void> webRestart(ConfigQueryBo bo) {
+        webService.restartWebService(bo.getUrl());
+        return AjaxResult.success();
+    }
 }

+ 3 - 0
zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -29,6 +29,7 @@ import com.zhongzheng.modules.order.domain.Printer;
 import com.zhongzheng.modules.system.bo.SysTenantQueryBo;
 import com.zhongzheng.modules.system.service.ISysConfigService;
 import com.zhongzheng.modules.system.service.ISysTenantService;
+import com.zhongzheng.modules.system.service.ISysWebService;
 import com.zhongzheng.modules.wx.bo.WxInfoBo;
 import com.zhongzheng.modules.wx.bo.WxInfoQuery;
 import com.zhongzheng.modules.wx.bo.WxServerBody;
@@ -63,6 +64,7 @@ public class CommonController extends BaseController {
     private final ISysConfigService configService;
 
 
+
     @Autowired
     private RedisCache redisCache;
 
@@ -266,4 +268,5 @@ public class CommonController extends BaseController {
         return AjaxResult.success(map);
     }
 
+
 }

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

@@ -127,7 +127,7 @@ public class ExamSimulateServiceImpl extends ServiceImpl<ExamSimulateMapper, Exa
         qk3Bo.setExamId(exam.getExamId());
         qk3Bo.setKnowledIds(simulateConfig.getCaseQuestion().getKnowledIds());
         qk3Bo.setKnum(simulateConfig.getCaseQuestion().getKnum());
-        qk3Bo.setRandomNum(simulateConfig.getType());
+        qk3Bo.setRandomNum(2); //案例强制随机
         qk3Bo.setType(4);
         qk3Bo.setOrderGoodsId(bo.getOrderGoodsId());
         qk3Bo.setFromType(bo.getFrom());
@@ -157,7 +157,7 @@ public class ExamSimulateServiceImpl extends ServiceImpl<ExamSimulateMapper, Exa
         q3Bo.setExamId(exam.getExamId());
         q3Bo.setKnowledQuestionIds(qk3);
         q3Bo.setQnum(simulateConfig.getCaseQuestion().getQnum()-qk3.size());
-        q3Bo.setRandomNum(simulateConfig.getType());
+        q3Bo.setRandomNum(2);//案例强制随机
         q3Bo.setType(4);
         q3Bo.setOrderGoodsId(bo.getOrderGoodsId());
         q3Bo.setFromType(bo.getFrom());

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ConfigQueryBo.java

@@ -22,5 +22,7 @@ public class ConfigQueryBo extends BaseEntity {
 
 	@ApiModelProperty("版本号")
 	private String version;
+	@ApiModelProperty("url")
+	private String url;
 
 }

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

@@ -0,0 +1,16 @@
+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 java.util.List;
+
+/**
+ * 用户 业务层
+ *
+ * @author zhongzheng
+ */
+public interface ISysWebService {
+    Boolean restartWebService(String url);
+}

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

@@ -0,0 +1,58 @@
+package com.zhongzheng.modules.system.service.impl;
+
+import cn.hutool.core.lang.Validator;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhongzheng.common.annotation.DataScope;
+import com.zhongzheng.common.constant.UserConstants;
+import com.zhongzheng.common.core.domain.entity.SysRole;
+import com.zhongzheng.common.core.domain.entity.SysUser;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.SecurityUtils;
+import com.zhongzheng.common.utils.ServletUtils;
+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.domain.SysPost;
+import com.zhongzheng.modules.system.domain.SysUserPost;
+import com.zhongzheng.modules.system.domain.SysUserRole;
+import com.zhongzheng.modules.system.mapper.*;
+import com.zhongzheng.modules.system.service.ISysConfigService;
+import com.zhongzheng.modules.system.service.ISysUserService;
+import com.zhongzheng.modules.system.service.ISysWebService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 用户 业务层处理
+ *
+ * @author zhongzheng
+ */
+@Slf4j
+@Service
+public class SysWebServiceImpl implements ISysWebService {
+
+
+    @Override
+    public Boolean restartWebService(String url) {
+        String respone = "";
+        try {
+    //        String url = "http://127.0.0.1:2929/v1.39/containers/nginx-test/restart";
+            respone = HttpUtils.postFormBody(url, null);
+            System.out.println(respone);
+        } catch (IOException e) {
+            throw new CustomException("重启请求错误"+e.getMessage());
+        }
+        return true;
+    }
+}