1.修改字典放白 2.修改给山大提供的推荐岗位接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -22,7 +22,6 @@ import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.system.service.ISysMenuService;
 
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * 登录验证
@@ -212,8 +211,7 @@ public class SysLoginController
      * @return
      */
     @GetMapping("/getWwTjmHlwToken")
-    public AjaxResult getWwTjmHlwToken(HttpServletRequest request){
+    public AjaxResult getWwTjmHlwToken(@RequestParam("token") String token){
-        String token = request.getHeader("Access-Token");
         if (StringUtils.isNotBlank(token)) {
             WwTokenResult wwTokenResult=new WwTokenResult();
             wwTokenResult.setAccessToken(token);
@@ -222,7 +220,7 @@ public class SysLoginController
                     .put("token", localToken)
                     .put("accessUrl", "");
         } else {
-            return AjaxResult.error("token获取失败!");
+            return AjaxResult.error("token为空!");
         }
     }
 

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/BussinessDictDataController.java

@@ -3,6 +3,7 @@ package com.ruoyi.cms.controller.cms;
 import com.ruoyi.cms.domain.BussinessDictData;
 import com.ruoyi.cms.service.IBussinessDictDataService;
 import com.ruoyi.cms.service.IBussinessDictTypeService;
+import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -29,6 +30,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/cms/dict/data")
+@Anonymous
 public class BussinessDictDataController extends BaseController
 {
     @Autowired

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java

@@ -314,4 +314,21 @@ public class CmsJobController extends BaseController
         }
         return toAjax(iAppReviewJobService.insertAppReviewJob(appReviewJob));
     }
+
+
+    @ApiOperation("获取推荐岗位-给数据底座的")
+    @GetMapping("/recommendTosjdz")
+    public AjaxResult recommendTosjdz(ESJobSearch esJobSearch)
+    {
+        if (RoleUtils.isCompanyAdmin()) {
+            esJobSearch.setCode(RoleUtils.getCurrentUseridCard());
+            esJobSearch.setUserType(StringUtil.IS_COMPANY_USER);
+        }
+        esJobSearch.setPageSize(20);
+        List<ESJobDocument> jobList = jobService.sysRecommend(esJobSearch);
+        jobList.stream().forEach(it->{
+            it.setAppJobUrl(StringUtil.BASE_WW_GW+it.getJobId());
+        });
+        return success(jobList);
+    }
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsNoticeController.java

@@ -187,7 +187,7 @@ public class CmsNoticeController extends BaseController
     @GetMapping("/noticTotal")
     public AjaxResult getNoticTotal(Notice notice){
         if(!SecurityUtils.isLogin()){
-            error(HttpStatus.ERROR,"未登录!");
+            return AjaxResult.error("未登录!,返回为空");
         }
         if(notice.getUserId()==null){
             String idCard= RoleUtils.getCurrentUseridCard();

ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/StringUtil.java

@@ -30,6 +30,11 @@ public class StringUtil {
      */
     public static final String USER_KEY="hlw_";
 
+    /**
+     * 岗位互联网
+     */
+    public static final String BASE_WW_GW="http://http://222.80.110.161:11111/kashi/job-portal/detail/";
+
     public static Boolean isEmptyOrNull(String s){
         if(Objects.isNull(s)){return true;}
         return s.isEmpty();

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -112,13 +112,15 @@ public class SecurityConfig
                 permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 requests.antMatchers("/login", "/register", "/captchaImage","/app/login","/websocket/**","/speech-recognition","/speech-synthesis",
-                                "/cms/company/listPage","/cms/appUser/noTmlist","/getTjmhToken","/getWwTjmhToken","/getWwTjmHlwToken").permitAll()
+                                "/cms/company/listPage","/cms/appUser/noTmlist","/getTjmhToken","/getWwTjmhToken","/getWwTjmHlwToken","/cms/notice/noticTotal").permitAll()
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                     // 移动端公用查询，可匿名访问
                     .antMatchers("/app/common/**").permitAll()
                     .antMatchers("/app/**").permitAll()
                     .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+                    //放行前端界面
+                    .antMatchers("/kashi/job-portal/detail/**").permitAll()
                     // 除上面外的所有请求全部需要鉴权认证
                     .anyRequest().authenticated();
             })