修改服务注册地址

auth/src/main/java/com/bonus/auth/controller/TokenController.java

@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest;
  * 
  * @author zys
  */
-@CrossOrigin
+//@CrossOrigin
 @RestController
 public class TokenController
 {

gateway/src/main/java/com/bonus/gateway/config/CorsConfig.java

@@ -7,18 +7,22 @@ import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
 import org.springframework.web.util.pattern.PathPatternParser;
 
 /**
- * description:
+ * 跨域处理请求配置
- * java项目fhadmin.cn
+ * @author 黑子
  */
 @Configuration
 public class CorsConfig {
     @Bean
     public CorsWebFilter corsFilter() {
         CorsConfiguration config = new CorsConfiguration();
-        config.addAllowedMethod("*");  // 是什么请求方法，比如GET POST PUT DELATE ...
+        // 是什么请求方法，比如GET POST PUT DELATE ...
-        config.addAllowedOrigin("*");  // 来自哪个域名的请求，*号表示所有
+        config.addAllowedMethod("*");
-        config.addAllowedOriginPattern("*");  // 来自哪个域名的请求，*号表示所有
+        // 来自哪个域名的请求，*号表示所有
-        config.addAllowedHeader("*");  // 是什么请求头部
+        config.addAllowedOrigin("*");
+        // 来自哪个域名的请求，*号表示所有
+        config.addAllowedOriginPattern("*");
+        // 是什么请求头部
+        config.addAllowedHeader("*");
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(new PathPatternParser());
         source.registerCorsConfiguration("/**", config);
         return new CorsWebFilter(source);

modules/file/src/main/java/com/bonus/file/upload/controller/UploadController.java

@@ -32,7 +32,7 @@ import java.util.*;
  * 文件上传
  * @author zys
  */
-@CrossOrigin
+//@CrossOrigin
 @RestController
 @RequestMapping("/file")
 public class UploadController {
@@ -46,7 +46,7 @@ public class UploadController {
 	 * 文件上传请求
 	 */
 	@PostMapping("/upload")
-	@CrossOrigin
+	//@CrossOrigin
 	public R<SysFile> upload(HttpServletRequest request) {
 		try {
 			// 上传并返回访问地址
@@ -224,7 +224,7 @@ public class UploadController {
 	 * @return
 	 */
 	@PostMapping("uploadmake")
-	@CrossOrigin
+	//@CrossOrigin
 	@Log(title = "文件上传请求", businessType = BusinessType.IMPORT)
 	public R<SysFile> uploadmake(HttpServletRequest request) {
 		try {

modules/mw/src/main/java/com/bonus/mw/home/controller/PerAttendanceController.java

@@ -19,7 +19,7 @@ import java.util.Map;
  * 人员考勤统计
  */
 @RestController
-@CrossOrigin
+//@CrossOrigin
 @RequestMapping("/perAttendance")
 public class PerAttendanceController {
     @Resource(name = "perAttendanceService")

modules/mw/src/main/java/com/bonus/mw/home/controller/PlanRiskPlanController.java

@@ -16,7 +16,7 @@ import java.util.Map;
  * 作业计划
  */
 @RestController
-@CrossOrigin
+//@CrossOrigin
 @RequestMapping("/planRiskPlan")
 public class PlanRiskPlanController {
     @Resource(name = "planRiskPlanService")

modules/mw/src/main/java/com/bonus/mw/home/controller/ProBranchAnalyseController.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * 工程分布分析
  */
 @RestController
-@CrossOrigin
+//@CrossOrigin
 @RequestMapping("/proBranch")
 public class ProBranchAnalyseController {
     @Resource(name = "proBranchAnalyseService")

modules/mw/src/main/java/com/bonus/mw/home/controller/SubTypeController.java

@@ -17,7 +17,7 @@ import java.util.*;
  * 人员评价统计
  */
 @RestController
-@CrossOrigin
+//@CrossOrigin
 @RequestMapping("/subType")
 public class SubTypeController {
     @Resource(name = "subTypeService")

modules/mw/src/main/java/com/bonus/mw/home/controller/ToolController.java

@@ -18,7 +18,7 @@ import java.util.List;
  * 工具类
  */
 @RestController
-@CrossOrigin
+//@CrossOrigin
 @RequestMapping("/tool")
 public class ToolController {
     @Resource(name = "toolService")

modules/mw/src/main/java/com/bonus/mw/home/controller/UserController.java

@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.Map;
 
 @RestController
-@CrossOrigin
+//@CrossOrigin
 @RequestMapping("/user")
 public class UserController {
     @Resource(name = "userService")

modules/mw/src/main/java/com/bonus/mw/home/controller/WorkPeopleController.java

@@ -18,7 +18,7 @@ import java.util.List;
  * 施工人员统计
  */
 @RestController
-@CrossOrigin
+//@CrossOrigin
 @RequestMapping("/workPeople")
 public class WorkPeopleController {
     @Resource(name = "workPeopleService")

modules/mw/src/main/java/com/bonus/mw/home/controller/proInAnalyseController.java

@@ -18,7 +18,7 @@ import java.util.Map;
  * 工程投入分析
  */
 @RestController
-@CrossOrigin
+//@CrossOrigin
 @RequestMapping("/proIn")
 public class proInAnalyseController {
     @Resource(name = "proInAnalyseService")

modules/system/src/main/java/com/bonus/system/basic/controller/DictController.java

@@ -10,7 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
-@CrossOrigin
+//@CrossOrigin
 @RestController
 @RequestMapping("/dicts")
 @Slf4j

modules/system/src/main/java/com/bonus/system/basic/controller/SelectController.java

@@ -31,7 +31,7 @@ public class SelectController {
     private SelectService service;
 
     @GetMapping("getCompany")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询公司", businessType = BusinessType.SELECT)
     public R getCompany(SelectBean o){
         if(StringUtils.isEmpty(o.getCompanyId())){
@@ -42,7 +42,7 @@ public class SelectController {
     }
 
     @GetMapping("getPro")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询工程-companyId", businessType = BusinessType.SELECT)
     public R getPro(SelectBean o){
         if(StringUtils.isEmpty(o.getCompanyId())) {
@@ -53,7 +53,7 @@ public class SelectController {
     }
 
     @GetMapping("getNoticeType")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "获取公告类型", businessType = BusinessType.SELECT)
     public R getNoticeType(SelectBean o){
 
@@ -61,7 +61,7 @@ public class SelectController {
     }
 
     @GetMapping("getProByOrgId")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询工程-orgId", businessType = BusinessType.SELECT)
     public R getProByOrgId(SelectBean o){
         SelfPermissionSettingUtils.getSelfPermissionByOrgId(o);
@@ -69,14 +69,14 @@ public class SelectController {
     }
 
     @GetMapping("getProByTeamId")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询工程-teamId", businessType = BusinessType.SELECT)
     public R getProByTeamId(SelectBean o){
         return service.getProByTeamId(o);
     }
 
     @GetMapping("getTeamByProId")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询班组-proId", businessType = BusinessType.SELECT)
     public R getTeamByProId(SelectBean o){
         SelfPermissionSettingUtils.getSelfPermissionByOrgId(o);
@@ -84,14 +84,14 @@ public class SelectController {
     }
 
     @GetMapping("getTeamBySubId")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询班组-subId", businessType = BusinessType.SELECT)
     public R getTeamBySubId(SelectBean o){
         return service.getTeamBySubId(o);
     }
 
     @GetMapping("getProBuildByOrgId")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询在建工程-orgId", businessType = BusinessType.SELECT)
     public R getProBuildByOrgId(SelectBean o){
         SelfPermissionSettingUtils.getSelfPermissionByOrgId(o);
@@ -99,7 +99,7 @@ public class SelectController {
     }
 
     @GetMapping("getRole")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询角色", businessType = BusinessType.SELECT)
     public R getRole(SelectBean o){
         if(StringUtils.isEmpty(o.getCompanyId())) {
@@ -110,14 +110,14 @@ public class SelectController {
     }
 
     @GetMapping("getRoleByLevel")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询角色根据等级", businessType = BusinessType.SELECT)
     public R getRoleByLevel(SelectBean o){
         return service.getRoleByLevel(o);
     }
 
     @GetMapping("getSub")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询分包商", businessType = BusinessType.SELECT)
     public R getSub(SelectBean o){
         return service.getSub(o);
@@ -125,7 +125,7 @@ public class SelectController {
 
 
     @GetMapping("getCerSub")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询证件模块分包商", businessType = BusinessType.SELECT)
     public R getCerSub(SelectBean o){
         String roleLevel = SecurityUtils.getLoginUser().getSysUser().getRoleLevel();
@@ -137,28 +137,28 @@ public class SelectController {
     }
 
     @GetMapping("getProBySubId")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询分包商下的工程", businessType = BusinessType.SELECT)
     public R getProBySubId(SelectBean o){
         return service.getProBySubId(o);
     }
 
     @GetMapping("getAttendanceMachineByProId")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询工程下的考勤机", businessType = BusinessType.SELECT)
     public R getAttendanceMachineByProId(SelectBean o){
         return service.getAttendanceMachineByProId(o);
     }
 
     @GetMapping("getSubByProId")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询分包商根据工程id", businessType = BusinessType.SELECT)
     public R getSubByProId(SelectBean o){
         return service.getSubByProId(o);
     }
 
     @GetMapping("getCompanyAndSubCompany")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询公司和子公司", businessType = BusinessType.SELECT)
     public R getCompanyAndSubCompany(SelectBean o){
         SelfPermissionSettingUtils.getSelfPermissionByOrgId(o);
@@ -166,7 +166,7 @@ public class SelectController {
     }
 
     @GetMapping("getSubCompany")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询分公司", businessType = BusinessType.SELECT)
     public R getSubCompany(SelectBean o){
         String subComId = SecurityUtils.getLoginUser().getSysUser().getSubComId();
@@ -175,21 +175,21 @@ public class SelectController {
     }
 
     @GetMapping("getSubCompanyNoAuth")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询分公司-无权限限制", businessType = BusinessType.SELECT)
     public R getSubCompanyNoAuth(SelectBean o){
         return service.getSubCompanyNoAuth(o);
     }
 
     @GetMapping("getPrincipal")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询现场负责人", businessType = BusinessType.SELECT)
     public R getPrincipal(SelectBean o){
         return service.getPrincipal(o);
     }
 
     @GetMapping("getProListByOrg")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "用户所在组织及其组织下级所绑定的所有工程", businessType = BusinessType.SELECT)
     public R getProListByOrg(SelectBean o){
         o.setOrgId(SecurityUtils.getLoginUser().getSysUser().getOrgId());
@@ -197,14 +197,14 @@ public class SelectController {
     }
 
     @GetMapping("getRiskLevelLists")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "获取风险等级", businessType = BusinessType.SELECT)
     public R getRiskLevelLists(){
         return service.getRiskLevelLists();
     }
 
     @GetMapping("getOrg")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "获取组织", businessType = BusinessType.SELECT)
     public R getOrg(SelectBean o){
         SelfPermissionSettingUtils.getSelfPermissionByOrgId(o);
@@ -212,7 +212,7 @@ public class SelectController {
     }
 
     @GetMapping("getPlanAuditor")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "获取分公司计划审核人", businessType = BusinessType.SELECT)
     public R getPlanAuditor(SelectBean o){
          String  ownOrgId = SecurityUtils.getLoginUser().getSysUser().getOrgId();
@@ -228,56 +228,56 @@ public class SelectController {
      * type = produceCompanyAuditor 生产审核人
       */
     @GetMapping("getCompanyPlanAuditor")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "获取总公司计划审核人", businessType = BusinessType.SELECT)
     public R getCompanyPlanAuditor(SelectBean o){
         return service.getCompanyPlanAuditor(o);
     }
 
     @GetMapping("getControlLevelLists")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "获取管控级别", businessType = BusinessType.SELECT)
     public R getControlLevelLists(){
         return service.getControlLevelLists();
     }
 
     @GetMapping("getControlMethodLists")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "获取管控方式", businessType = BusinessType.SELECT)
     public R getControlMethodLists(){
         return service.getControlMethodLists();
     }
 
     @GetMapping("getJobTypeLists")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "获取作业类型", businessType = BusinessType.SELECT)
     public R getJobTypeLists(){
         return service.getJobTypeLists();
     }
 
     @GetMapping("getCertificate")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "获取证件", businessType = BusinessType.SELECT)
     public R getCertificate(){
         return service.getCertificate();
     }
 
     @GetMapping("getCertificateSub")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "获取证件", businessType = BusinessType.SELECT)
     public R getCertificateSub(){
         return service.getCertificateSub();
     }
 
     @GetMapping("getSubContract")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "查询分包商合同", businessType = BusinessType.SELECT)
     public R getSubContract(SelectBean o){
         return service.getSubContract(o);
     }
 
     @GetMapping("getProBySubContract")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "根据分包商合同查工程", businessType = BusinessType.SELECT)
     public R getProBySubContract(SelectBean o){
         return service.getProBySubContract(o);
@@ -285,14 +285,14 @@ public class SelectController {
 
 
     @GetMapping("getQuestionBank")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "获取题库", businessType = BusinessType.SELECT)
     public R getQuestionBank(SelectBean o){
         return service.getQuestionBank(o);
     }
 
     @GetMapping("getTDict")
-    @CrossOrigin
+    //@CrossOrigin
     @Log(title = "获取字典", businessType = BusinessType.SELECT)
     public R getTDict(SelectBean o){
         return service.getTDict(o);

modules/system/src/main/java/com/bonus/system/exam/controller/ExamController.java

@@ -18,7 +18,7 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping("/exam")
 @Slf4j
-@CrossOrigin
+//@CrossOrigin
 public class ExamController {
 
     @Resource(name = "examPagerService")

modules/system/src/main/java/com/bonus/system/exam/controller/MergeTrainingExamController.java

@@ -18,7 +18,7 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping("/mergeTrainExam")
 @Slf4j
-@CrossOrigin
+//@CrossOrigin
 public class MergeTrainingExamController {
 
     @Resource(name = "mergeTrainingExamService")

modules/system/src/main/java/com/bonus/system/exam/controller/TrainController.java

@@ -17,7 +17,7 @@ import javax.annotation.Resource;
 @RestController
 @RequestMapping("/train")
 @Slf4j
-@CrossOrigin
+//@CrossOrigin
 public class TrainController {
 
     @Resource(name = "trainService")

modules/system/src/main/java/com/bonus/system/logs/controller/SysOperlogController.java

@@ -41,7 +41,7 @@ public class SysOperlogController extends BaseController
     }
 
 
-    @CrossOrigin
+    //@CrossOrigin
     @PostMapping("/getAllList")
     @Log(title = "系统管理-操作日志", businessType = BusinessType.SELECT)
     @RequiresPermissions("sys:operlog:query")