mlx

simulation-gateway/pom.xml

@@ -37,5 +37,23 @@
         </dependency>
         <!-- nacos - 结束 -->
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                    <addResources>true</addResources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

simulation-gateway/src/main/resources/bootstrap.yml

@@ -1,15 +1,9 @@
-server:
-  port: 6001
-
 spring:
   application:
     name: simulation-gateway
-  #* -------------------------------- profile 环境 --------------------------------
   profiles:
     active: dev
-  #* -------------------------------- cloud 微服务 --------------------------------
   cloud:
-    #* -------------------------------- 注册中心 --------------------------------
     nacos:
       discovery:
         server-addr: 10.15.12.70:8848

simulation-oauth-client/pom.xml

@@ -89,5 +89,23 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                    <addResources>true</addResources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

simulation-oauth-client/src/main/java/com/css/simulation/oauth/client/configuration/oauth/OauthParameter.java

@@ -24,5 +24,6 @@ public class OauthParameter {
     private String simulationClientId;
     private String simulationClientSecret;
     private String simulationTokenUri;
+    private String simulationHome;
 
 }

simulation-oauth-client/src/main/java/com/css/simulation/oauth/client/controller/SignController.java

@@ -1,14 +1,12 @@
 package com.css.simulation.oauth.client.controller;
 
-import api.common.pojo.common.ResponseBodyVO;
-import api.common.pojo.common.SimulationTokenVO;
 import api.common.pojo.po.UserPO;
 import api.common.util.EncryptUtil;
 import api.common.util.HttpUtil;
-import api.common.util.JsonUtil;
 import com.css.simulation.oauth.client.configuration.oauth.OauthParameter;
 import com.css.simulation.oauth.client.mapper.UserMapper;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.boot.configurationprocessor.json.JSONObject;
@@ -18,9 +16,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
 
 @Controller
 @RequestMapping("/sign")
+@Slf4j
 public class SignController {
 
     @Resource
@@ -49,25 +50,24 @@ public class SignController {
      */
     @RequestMapping("/entry")
     public String entry(@RequestParam("ticket") String ticket) {
-        System.out.println(oauthParameter);
+        log.info(oauthParameter.toString());
         String zoogooyAuthorizeUrl = oauthParameter.getZoogooyAuthorizeUri() +
                 "?appid=" + oauthParameter.getZoogooyAppid() +
                 "&redirect_uri=" + oauthParameter.getZoogooyRedirectUri() +
                 "&ticket=" + ticket +
                 "&response_type=code" +
                 "&scope=snsapi_userinfo";
-        return "redirect:" +zoogooyAuthorizeUrl;
+        return "redirect:" + zoogooyAuthorizeUrl;
     }
 
     /**
-     * 登录接口首页，将 code 返回给前端
+     * 重定向到登录页，并将 token 放在 cookie 中传给前端
      *
      * @return token 信息
      */
     @RequestMapping("/home")
     @SneakyThrows
-    @ResponseBody
-    public ResponseBodyVO<SimulationTokenVO> home(@RequestParam("code") String code, @RequestParam("ticket") String ticket) {
+    public String home(@RequestParam("code") String code, @RequestParam("ticket") String ticket, HttpServletResponse response) {
         //1 根据统一凭条 code 获取统一平台 access_token
         /*
         响应体
@@ -79,15 +79,14 @@ public class SignController {
           "appid":"{APPID}"
         }
          */
-        JSONObject zoogooyToken = HttpUtil.post(closeableHttpClient, requestConfig,
-                oauthParameter.getZoogooyTokenUri() + "?appid=" + oauthParameter.getZoogooyAppid() +
-                        "&secret=" + oauthParameter.getZoogooyAppSecret() +
-                        "&code=" + code +
-                        "&grant_type=authorization_code",
-                null, null);
+        String zoogooyTokenUrl = oauthParameter.getZoogooyTokenUri() + "?appid=" + oauthParameter.getZoogooyAppid() +
+                "&secret=" + oauthParameter.getZoogooyAppSecret() +
+                "&code=" + code +
+                "&grant_type=authorization_code";
+        JSONObject zoogooyToken = HttpUtil.post(closeableHttpClient, requestConfig, zoogooyTokenUrl, null, null);
         String accessToken = zoogooyToken.optString("access_token");
         String openid = zoogooyToken.optString("openid");
-        System.out.println("------- 统一平台令牌信息为：" + zoogooyToken);
+        log.info("------- 统一平台令牌信息为：" + zoogooyToken);
 
         //2 根据统一平台 access_token、openid、ticket 获取统一平台用户信息
         /*
@@ -107,7 +106,7 @@ public class SignController {
 
         String unionid = userInfo.optString("unionid");
         String nickname = userInfo.optString("nickname");
-        System.out.println("------- 统一平台用户信息为：" + userInfo);
+        log.info("------- 统一平台用户信息为：" + userInfo);
 
         //3 使用 union_id 查询数据库，是否已在仿真平台存在该用户
         String username;
@@ -140,11 +139,11 @@ public class SignController {
                 "&client_secret=" + oauthParameter.getSimulationClientSecret() +
                 "&username=" + username +
                 "&password=" + password;
-        SimulationTokenVO simulationToken = JsonUtil.jsonObjectToBean(HttpUtil.post(closeableHttpClient, requestConfig, simulationTokenUrl, null, null), SimulationTokenVO.class);
-        System.out.println("------- 仿真平台令牌信息为："+simulationToken);
-
+        String simulationToken = HttpUtil.post(closeableHttpClient, requestConfig, simulationTokenUrl, null, null).toString();
+        System.out.println("------- 仿真平台令牌信息为：" + simulationToken);
 
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, "请求成功！", simulationToken);
+        response.addCookie(new Cookie("token", simulationToken));
+        return "redirect:" + oauthParameter.getSimulationHome();
     }
 
 }

simulation-oauth-client/src/main/resources/bootstrap.yaml

@@ -1,15 +1,8 @@
-server:
-  port: 7001
-  servlet:
-    context-path: /simulation/oauth/client
-
 spring:
   application:
     name: simulation-oauth-client
-  #* -------------------------------- 环境配置 --------------------------------
   profiles:
     active: dev
-  #* -------------------------------- 微服务配置 --------------------------------
   cloud:
     nacos:
       discovery:

simulation-oauth-client/src/main/resources/logback-spring.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true">
+    <!-- 项目名称 -->
+    <property name="PROJECT_NAME" value="changjingyun"/>
+
+    <!--定义不同环境的日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <springProfile name="dev">
+        <property name="LOG_HOME" value="D:\\idea-log\\simulation-cloud\\simulation-oauth-client"/>
+    </springProfile>
+
+    <!--输出到控制台-->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>debug</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+    </appender>
+
+    <!--输出到debug-->
+    <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/debug.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>15</MaxHistory>
+            <!--日志文件最大的大小-->
+            <MaxFileSize>10MB</MaxFileSize>
+        </rollingPolicy>
+        <append>true</append>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印DEBUG日志 -->
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--输出到info-->
+    <appender name="info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/info.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>15</MaxHistory>
+            <!--日志文件最大的大小-->
+            <MaxFileSize>10MB</MaxFileSize>
+        </rollingPolicy>
+        <append>true</append>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印INFO日志 -->
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--输出到error-->
+    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/error.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>15</MaxHistory>
+            <!--日志文件最大的大小-->
+            <MaxFileSize>10MB</MaxFileSize>
+        </rollingPolicy>
+        <append>true</append>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印ERROR日志 -->
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--输出到warn-->
+    <appender name="warn" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/warn.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>15</MaxHistory>
+            <!--日志文件最大的大小-->
+            <MaxFileSize>10MB</MaxFileSize>
+        </rollingPolicy>
+        <append>true</append>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印WARN日志 -->
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--分别设置对应的日志输出节点 -->
+    <root level="info">
+        <appender-ref ref="console"/>
+        <appender-ref ref="debug"/>
+        <appender-ref ref="info"/>
+        <appender-ref ref="error"/>
+        <appender-ref ref="warn"/>
+    </root>
+</configuration>

simulation-resource-common/pom.xml

@@ -46,7 +46,16 @@
         </dependency>
         <!-- minio - 结束 -->
 
-
+        <!-- 权限认证 - 开始 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-oauth2</artifactId>
+        </dependency>
+        <!-- 权限认证 - 结束 -->
         <!-- nacos - 开始 -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -70,6 +79,11 @@
             <artifactId>api-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!-- 基础 -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -95,8 +109,24 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
-
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                    <addResources>true</addResources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

simulation-resource-common/src/main/java/com/css/simulation/resource/common/configuration/oauth/MyTokenServices.java

@@ -0,0 +1,55 @@
+package com.css.simulation.resource.common.configuration.oauth;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.oauth2.provider.token.RemoteTokenServices;
+import org.springframework.security.oauth2.provider.token.ResourceServerTokenServices;
+
+import javax.annotation.Resource;
+
+@Configuration
+public class MyTokenServices {
+
+    @Resource
+    private OauthParameter oauthParameter;
+
+
+    /**
+     * access_token 验证策略
+     * DefaultTokenServices()
+     * RemoteTokenServices()：远程验证，通过 /oauth/check_token
+     * SpringSocialTokenServices()
+     * UserInfoTokenServices()
+     */
+    @Bean
+    public ResourceServerTokenServices tokenServices() {
+        RemoteTokenServices services = new RemoteTokenServices();
+        services.setCheckTokenEndpointUrl(oauthParameter.getCheckTokenEndpointUrl());  // 需要在授权服务器公开 /oauth/check_token
+        services.setClientId(oauthParameter.getClientId());
+        services.setClientSecret(oauthParameter.getClientSecret());
+        return services;
+    }
+
+//* -------------------------------- 使用 jwt 令牌，无需访问远程授权服务器，也可以两者结合 --------------------------------
+//    /**
+//     * 令牌存储
+//     * <p>
+//     * （推荐）new JwtTokenStore()：基于 Jwt
+//     * （推荐）new RedisTokenStore()：基于 redis
+//     * new InMemoryTokenStore()：基于内存
+//     * new JwkTokenStore()：基于 Jwk
+//     * new JdbcTokenStore()：基于 Jdbc
+//     */
+//    @Bean
+//    public TokenStore tokenStore() {
+////        return new InMemoryTokenStore();
+//        return new JwtTokenStore(accessTokenConverter());
+//    }
+//
+//    @Bean
+//    public JwtAccessTokenConverter accessTokenConverter() {
+//        JwtAccessTokenConverter jwtAccessTokenConverter = new JwtAccessTokenConverter();
+//        jwtAccessTokenConverter.setSigningKey("project");
+//        return jwtAccessTokenConverter;
+//    }
+}

simulation-resource-common/src/main/java/com/css/simulation/resource/common/configuration/oauth/OAuth2ResourceServerConfiguration.java

@@ -0,0 +1,42 @@
+package com.css.simulation.resource.common.configuration.oauth;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
+import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
+import org.springframework.security.oauth2.provider.token.ResourceServerTokenServices;
+
+import javax.annotation.Resource;
+
+@Configuration
+public class OAuth2ResourceServerConfiguration extends ResourceServerConfigurerAdapter {
+
+
+    @Resource
+    private OauthParameter oauthParameter;
+
+    @Resource
+    private ResourceServerTokenServices resourceServerTokenServices;
+
+    @Override
+    public void configure(ResourceServerSecurityConfigurer resources) {
+        resources.resourceId(oauthParameter.getResourceId())      // 资源 id
+                .tokenServices(resourceServerTokenServices)    // 使用远程服务验证令牌的服务
+//                .tokenStore(tokenStore)    // 使用 jwt 令牌
+                .stateless(true);   // 无状态模式，即无需用户登录，无 session
+    }
+
+    /**
+     * 配置拦截请求，通过 scope
+     */
+    @Override
+    public void configure(HttpSecurity http) throws Exception {
+        http.csrf().disable()   // 禁用 csrf
+                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)// 无状态验证
+                .and()
+                .authorizeRequests().anyRequest()
+                .access("#oauth2.hasScope('scope-a')") // 拦截所有请求判断 scope
+        ;
+    }
+}

simulation-resource-common/src/main/java/com/css/simulation/resource/common/configuration/oauth/OauthParameter.java

@@ -0,0 +1,16 @@
+package com.css.simulation.resource.common.configuration.oauth;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix="oauth")
+public class OauthParameter {
+
+    private String resourceId;
+    private String checkTokenEndpointUrl;
+    private String clientId;
+    private String clientSecret;
+}

simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/MinioController.java

@@ -23,7 +23,7 @@ public class MinioController {
     @Resource
     private MinioClient minioClient;
 
-    @RequestMapping("/upload1")
+    @RequestMapping("/upload")
     public void upload(
             MultipartFile multipartFile,
             @RequestBody @Validated MinioParameter minioParameter

simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/RedisController.java

@@ -1,7 +1,10 @@
 package com.css.simulation.resource.common.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
+import com.css.simulation.resource.common.pojo.parameter.RedisParameter;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

simulation-resource-common/src/main/java/com/css/simulation/resource/common/pojo/parameter/KafkaParameter.java

@@ -0,0 +1,17 @@
+package com.css.simulation.resource.common.pojo.parameter;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class KafkaParameter {
+    @NotBlank(message ="主题不能为空！")
+    private String topic;
+    @NotBlank(message ="消息数据不能为空！")
+    private String data;
+}

simulation-resource-common/src/main/java/com/css/simulation/resource/common/pojo/parameter/RedisParameter.java

@@ -0,0 +1,18 @@
+package com.css.simulation.resource.common.pojo.parameter;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RedisParameter {
+    @NotBlank(message ="key 不能为空！")
+    private String key;
+    @NotBlank(message ="value 不能为空！")
+    private String value;
+}

simulation-resource-common/src/main/resources/bootstrap.yml

@@ -1,15 +1,8 @@
-server:
-  port: 8001
-  servlet:
-    context-path: /simulation/resource/scheduler
-
 spring:
   application:
     name: simulation-resource-scheduler
-  #* -------------------------------- 环境配置 --------------------------------
   profiles:
     active: dev
-  #* -------------------------------- 微服务配置 --------------------------------
   cloud:
     nacos:
       discovery:
@@ -19,19 +12,3 @@ spring:
         server-addr: 10.15.12.70:8848
         namespace: 3698bfc2-a612-487a-b2a2-aaad16cd9d9d
         file-extension: yaml
-  #* -------------------------------- Kafka --------------------------------
-  kafka:
-    bootstrap-servers: 10.15.12.70:9092    # 指定连接的 kafka 集群。
-    listener:
-      missing-topics-fatal: false   # 消费端监听的topic不存在时，项目启动会报错(关掉)
-    #      type: batch # 设置批量消费
-    producer: # 生产者配置
-      retries: 3                          # 重试次数。
-      acks: 1                             # 指定 ack 应答级别。0，1，-1
-      batch-size: 16384                   # 批次大小
-      buffer-memory: 33554432             # 缓冲区大小
-      key-serializer: org.apache.kafka.common.serialization.StringSerializer
-      value-serializer: org.apache.kafka.common.serialization.StringSerializer
-      properties:
-        linger:
-          ms: 0 # linger.ms为0表示每接收到一条消息就提交给kafka,这时候batch-size其实就没用了

simulation-resource-scheduler/pom.xml

@@ -100,5 +100,23 @@
         </dependency>
 
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                    <addResources>true</addResources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>