用户授权

zoniot-rmcp/zoniot-rmcp-web/pom.xml

@@ -38,6 +38,10 @@
             <groupId>com.zcxk</groupId>
             <artifactId>zoniot-rmcp-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.zcxk</groupId>
+            <artifactId>zoniot-core-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.zcxk</groupId>
             <artifactId>zoniot-core-mysql</artifactId>
@@ -46,6 +50,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-oauth2</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/config/SwaggerConfig.java

@@ -0,0 +1,71 @@
+package com.zcxk.rmcp.web.config;
+
+import org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.ApiKey;
+import springfox.documentation.service.AuthorizationScope;
+import springfox.documentation.service.SecurityReference;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.List;
+
+import static com.google.common.collect.Lists.newArrayList;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+    @Bean
+    public Docket api() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .ignoredParameterTypes(BasicErrorController.class)
+                .groupName("web")
+                .select()
+                .apis(RequestHandlerSelectors.any())
+                .paths(PathSelectors.any())
+                .build()
+                .apiInfo(apiInfo())
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts());
+    }
+
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("计量集抄Api")
+                .description("计量集抄")
+                .version("1.0")
+                .termsOfServiceUrl("Terms of service")
+                .build();
+    }
+
+    private List<ApiKey> securitySchemes() {
+        return newArrayList(
+                new ApiKey("Authorization", "Authorization", "header"));
+    }
+
+    private List<SecurityContext> securityContexts() {
+        return newArrayList(
+                SecurityContext.builder()
+                        .securityReferences(defaultAuth())
+                        .forPaths(PathSelectors.regex("^(?!auth).*$"))
+                        .build()
+        );
+    }
+
+    List<SecurityReference> defaultAuth() {
+        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+        authorizationScopes[0] = authorizationScope;
+        return newArrayList(
+                new SecurityReference("Authorization", authorizationScopes));
+    }
+
+}

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/DeviceController.java

@@ -0,0 +1,34 @@
+package com.zcxk.rmcp.web.controller;
+
+import com.zcxk.core.common.pojo.AjaxMessage;
+import com.zcxk.core.common.pojo.LoginUser;
+import com.zcxk.core.common.util.UserUtil;
+import com.zcxk.rmcp.core.entity.Device;
+import com.zcxk.rmcp.web.service.DeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * @author linqingwei
+ * @date 2021-07-19 14:31
+ *
+ */
+@RestController
+@RequestMapping("/device")
+public class DeviceController {
+
+    @Autowired
+    DeviceService deviceService;
+
+    @PostMapping("/test")
+    public AjaxMessage<Void> test(){
+        LoginUser user = UserUtil.getCurrentUser();
+        System.out.println(user);
+        Device device = deviceService.findById(1L);
+        System.out.println(device);
+        return AjaxMessage.success();
+    }
+}

zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-dev.properties

@@ -1,7 +1,7 @@
 server.port=8325
-spring.application.name=zoniot-rmcp
+spring.application.name=zoniot-rmcp-web
 logging.level.root=info
-logging.path=./logs/zoniot-rmcp
+logging.path=./logs/zoniot-rmcp-web
 
 # mysql
 spring.datasource.url=jdbc:mysql://114.135.61.188:33306/rmcp_v2?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
@@ -62,7 +62,7 @@ spring.redis.lettuce.shutdown-timeout=100
 security.oauth2.client.client-id=smart-city-v2
 security.oauth2.client.client-secret=smart-city-v2-123
 security.oauth2.resource.id=smartcity-deivice-service
-security.oauth2.resource.user-info-uri=http://localhost:8321/user/principal
+security.oauth2.resource.user-info-uri=http://10.0.0.135:8321/user/principal
 security.oauth2.resource.prefer-token-info=false
 
 
@@ -99,6 +99,7 @@ spring.rabbitmq.connection-timeout=15000
 spring.rabbitmq.publisher-confirm-type=correlated
 spring.rabbitmq.publisher-returns=true
 spring.rabbitmq.template.mandatory=true
+
 dispath.queue=dispath
 receive.exchange.name=messageExchange
 dispath.routing.key=dipathKey
@@ -106,12 +107,9 @@ dispath.routing.key=dipathKey
 ribbon.OkToRetryOnAllOperations=false
 ribbon.ReadTimeout=5000:
 ribbon.ConnectTimeout=3000
-# ���� feign �ͻ��˳�ʱʱ�䣨OpenFeign Ĭ��֧�� ribbon��
-# ֵ���ǽ����������õ�ʱ�䣬ʹ��������״̬����������������������õ�ʱ��
 
-# ָ���ǽ������Ӻ�ӷ�������ȡ��������Դ���õ�ʱ��
-ribbon.ConnectionTimeout=5000
-add_iot_user_url=http://localhost:8090/api/integration/user/savePlatformUser
+
+-
 
 
 

zoniot-rmcp/zoniot-rmcp-web/src/main/resources/logback-spring.xml

@@ -2,6 +2,7 @@
 <configuration>
     <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
     <property name="LOG_HOME" value="logs"/>
+    <springProperty scope="context" name="APPLICATION_NAME" source="spring.application.name" defaultValue="default" />
     <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
     <jmxConfigurator/>
 
@@ -13,7 +14,7 @@
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!-- rollover daily -->
-            <fileNamePattern>${LOG_HOME}/zoniot-rmcp-web-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_HOME}/${APPLICATION_NAME}-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
             <maxFileSize>20MB</maxFileSize>
             <maxHistory>60</maxHistory>