Merge branch 'master' of http://39.105.126.192:3000/DR3_server/sky_ioc_server

 Conflicts:

	src/main/java/com/sky/ioc/service/system/impl/UserServiceImpl.java

src/main/java/com/sky/ioc/config/CorsConfig.java

@@ -0,0 +1,32 @@
+package com.sky.ioc.config;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+@Configuration
+public class CorsConfig {
+
+    @Bean
+    public CorsFilter corsFilter() {
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        // 设置允许跨域请求的域名
+        corsConfiguration.addAllowedOriginPattern("*");
+        // 设置允许跨域请求头
+        corsConfiguration.addAllowedHeader("*");
+        // 设置允许的方法
+        corsConfiguration.addAllowedMethod("*");
+        // 是否允许证书
+        corsConfiguration.setAllowCredentials(true);
+        // 跨域允许时间
+        corsConfiguration.setMaxAge(3600L);
+
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", corsConfiguration);
+        return new CorsFilter(source);
+    }
+
+}

src/main/java/com/sky/ioc/config/SwaggerConfig.java

@@ -1,6 +1,7 @@
 package com.sky.ioc.config;
 
 import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -8,11 +9,15 @@ import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.oas.annotations.EnableOpenApi;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
+import springfox.documentation.service.*;
 import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Swagger的接口配置
  */
@@ -35,7 +40,9 @@ public class SwaggerConfig {
                 .apiInfo(apiInfo())
                 .select()
                 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-                .paths(PathSelectors.any()).build();
+                .paths(PathSelectors.any()).build().securityContexts(Arrays.asList(securityContext()))
+                // ApiKey的name需与SecurityReference的reference保持一致
+                .securitySchemes(Arrays.asList(new ApiKey("token", "token", SecuritySchemeIn.HEADER.name())));
     }
 
     /**
@@ -51,6 +58,23 @@ public class SwaggerConfig {
                 // 作者信息
                 .contact(new Contact(SkyConfig.getName(), null, null))
                 // 版本
-                .version("版本号:" + SkyConfig.getVersion()).build();
+                .version("版本号:" + SkyConfig.getVersion())
+                .build();
+    }
+
+    private SecurityContext securityContext() {
+        return SecurityContext.builder()
+                .securityReferences(defaultAuth())
+                //.forPaths(PathSelectors.regex("/*.*"))
+                .build();
     }
+    private List<SecurityReference> defaultAuth() {
+        AuthorizationScope authorizationScope
+                = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+        authorizationScopes[0] = authorizationScope;
+        return Collections.singletonList(
+                new SecurityReference("token", authorizationScopes));
+    }
+
 }

src/main/java/com/sky/ioc/service/system/impl/UserServiceImpl.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sky.ioc.config.RestTemplateConfig;
 import com.sky.ioc.constant.Constant;
-import com.sky.ioc.entity.domain.meeting.MeetingRecord;
 import com.sky.ioc.entity.domain.system.Menus;
 import com.sky.ioc.entity.domain.system.Users;
 import com.sky.ioc.entity.result.system.LoginUserVo;
@@ -13,7 +12,10 @@ import com.sky.ioc.mapper.job.TokenMapper;
 import com.sky.ioc.mapper.system.MenuMapper;
 import com.sky.ioc.mapper.system.UserMapper;
 import com.sky.ioc.service.system.UserService;
-import com.sky.ioc.tool.*;
+import com.sky.ioc.tool.JwtUtil;
+import com.sky.ioc.tool.Pbkdf2Sha256Digest;
+import com.sky.ioc.tool.RedisUtil;
+import com.sky.ioc.tool.ReturnMsg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +31,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.concurrent.ThreadLocalRandom;
 
 @Service
 @Slf4j
@@ -189,46 +190,4 @@ public class UserServiceImpl implements UserService {
         }
        return null;
     }
-
-    @Override
-    public ReturnMsg getUserList() {
-        // 1.请求URL
-        RestTemplate restTemplate = restTemplateConfig.build();
-        String postUrl = "http://"+dataIp+"/api/hr/HR/staff/list?pageNum=1&pageSize=10000";
-        String url = restTemplateConfig.addBaseUrl(postUrl);
-        ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
-        // 获取响应对象里的 body 对象
-        Map<String, Object> body = responseEntity.getBody();
-        // 获取状态码
-        Integer code = (Integer)body.get("code");
-        // 获取响应信息
-        String message = (String)body.get("msg");
-        ThreadLocalRandom random = ThreadLocalRandom.current();
-        if(code==200){
-            ArrayList list = (ArrayList) body.get("rows");
-            if(list!=null&&list.size()>0){
-                for (int i=0;i<list.size();i++){
-                    LinkedHashMap json = (LinkedHashMap) list.get(i);
-                    String staffNo = json.get("staffNo").toString();
-                    Users users = userMapper.selectOne(new LambdaQueryWrapper<Users>().eq(Users::getUserName,staffNo));
-                    if(users==null){
-                        users = new Users();
-                        users.setUserName(staffNo);
-                        users.setName(json.get("staffName").toString());
-                        users.setPhone(json.get("phone").toString());
-                        users.setCompany(json.get("departName").toString());
-                        users.setEmail(json.get("email").toString());
-                        String password = Pbkdf2Sha256Digest.encode("123456");
-                        users.setPassword(password);
-                        userMapper.insert(users);
-                    }
-                }
-            }
-            return ReturnMsg.ok();
-            //  System.out.println("data   "+data.getString(""));
-        }else{
-            log.info("登录接口失败："+message);
-            return ReturnMsg.fail(message);
-        }
-    }
 }