1.修改项目结构

2.登陆
3.等等

.idea/compiler.xml

@@ -10,12 +10,13 @@
         <module name="cneeds-server-datashow" />
         <module name="cneeds-common-utils" />
         <module name="cneeds-common-data" />
-        <module name="cneeds-server-logupload" />
         <module name="cneeds-server-eureka" />
+        <module name="cneeds-common-pojo" />
         <module name="cneeds-server-device_activate" />
+        <module name="cneeds-server-authorization" />
         <module name="cneeds-server-user" />
+        <module name="cneeds-server-logupload" />
         <module name="cneeds-server-device" />
-        <module name="cneeds-server-authorization" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
@@ -27,6 +28,7 @@
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
       <module name="cneeds-common-data" options="-parameters" />
+      <module name="cneeds-common-pojo" options="-parameters" />
       <module name="cneeds-common-utils" options="-parameters" />
       <module name="cneeds-server-advice-control" options="-parameters" />
       <module name="cneeds-server-authorization" options="-parameters" />

.idea/encodings.xml

@@ -4,6 +4,7 @@
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cneeds-common-data" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cneeds-common-data/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/cneeds-common-pojo/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cneeds-common-utils" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cneeds-common-utils/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cneeds-server-authorization/src/main/java" charset="UTF-8" />

.idea/misc.xml

@@ -14,6 +14,7 @@
     <option name="ignoredFiles">
       <set>
         <option value="$PROJECT_DIR$/cneeds-server-advice-control/pom.xml" />
+        <option value="$PROJECT_DIR$/cneeds-server-pojo/pom.xml" />
       </set>
     </option>
   </component>

cneeds-common-data/pom.xml

@@ -47,11 +47,11 @@
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>-->
 
-        <dependency>
+        <!--<dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
             <version>${druid.version}</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>

cneeds-common-pojo/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cneeds-server</artifactId>
+        <groupId>com.mx.cneeds</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+
+    <packaging>jar</packaging>
+
+
+    <artifactId>cneeds-common-pojo</artifactId>
+
+    <!--<dependencies>
+        <dependency>
+            <groupId>com.mx.cneeds</groupId>
+            <artifactId>cneeds-common-utils</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>-->
+
+</project>
\ No newline at end of file

cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/JwtToken.java

+package com.mx.cneeds.common.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName JwtToken
+ * @Author zzrdark
+ * @Date 2020-03-04 17:35
+ * @Description TODO
+ **/
+@Data
+public class JwtToken implements Serializable {
+
+    @JsonProperty("access_token")
+    private String accessToken;
+    @JsonProperty("token_type")
+    private String tokenType;
+    @JsonProperty("expires_in")
+    private String expiresIn;
+
+    private String scope;
+
+    private String jti;
+}

cneeds-common-data/src/main/java/com/mx/cneeds/server/vo/UserVo.java → cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/UserVo.java

-package com.mx.cneeds.server.vo;
+package com.mx.cneeds.common.vo;
 
 import lombok.Data;
 

cneeds-common-utils/pom.xml

@@ -16,7 +16,6 @@
         <mybatisplus.version>3.1.2</mybatisplus.version>
         <commons.lang.version>2.6</commons.lang.version>
         <commons.io.version>2.5</commons.io.version>
-        <swagger.version>2.7.0</swagger.version>
     </properties>
 
     <dependencies>
@@ -24,6 +23,7 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>${mybatisplus.version}</version>
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>com.baomidou</groupId>
@@ -42,15 +42,6 @@
             <artifactId>commons-io</artifactId>
             <version>${commons.io.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.version}</version>
-        </dependency>
+
     </dependencies>
 </project>
\ No newline at end of file

cneeds-server-authorization/Dockerfile

+FROM hub.c.163.com/library/java:8-alpine
+
+MAINTAINER XXX XXX@imooc.com
+
+ADD target/*.jar app.jar
+# ADD *.jar app.jar
+
+EXPOSE 8761
+
+ENTRYPOINT ["java", "-jar", "/app.jar"]
\ No newline at end of file

cneeds-server-authorization/build.sh

+#!/usr/bin/env bash
+
+mvn clean package -Dmaven.test.skip=true -U
+
+#docker build -t hub.c.163.com/springcloud/eureka .
+
+#docker push hub.c.163.com/springcloud/eureka
+
+
+docker build -t zzrdark/eureka .
+docker push zzrdark/eureka
+
+# docker build -t 192.168.2.244:5000/eureka .
+
+# docker push 192.168.2.244:5000/eureka
\ No newline at end of file

cneeds-server-authorization/pom.xml

@@ -8,11 +8,18 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>cneeds-server-authorization</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
+
+        <!-- eureka-client -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
+
+
         <!-- for Spring Security -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/AuthorizaitonApplication.java

@@ -2,6 +2,7 @@ package com.mx.cneeds.server.anthorization;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
 /**
  * @ClassName AuthorizaitonApplication
@@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @Description TODO
  **/
 @SpringBootApplication
+@EnableEurekaClient
 public class AuthorizaitonApplication {
 
     public static void main(String[] args) {

cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/config/SecurityConfig.java

+package com.mx.cneeds.server.anthorization.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@Configuration
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+
+    @Bean
+    @Override
+    public AuthenticationManager authenticationManagerBean() throws Exception {
+        AuthenticationManager manager = super.authenticationManagerBean();
+        return manager;
+    }
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        /*http
+                .formLogin().and()
+                .authorizeRequests()
+                .anyRequest()
+                .permitAll()
+                .and()
+                .csrf().disable();*/
+        http.formLogin().disable();
+    }
+}
\ No newline at end of file

cneeds-server-authorization/src/main/resources/application.properties

-server.port=8081
-server.servlet.context-path=/server
+server.port=8861
+server.servlet.context-path=/
 
 spring.application.name= cneeds-server-authorization
+
+
+eureka.client.service-url.defaultZone= http://192.168.2.244:8761/eureka/
+eureka.instance.prefer-ip-address=true
\ No newline at end of file

cneeds-server-datashow/Dockerfile

+FROM hub.c.163.com/library/java:8-alpine
+
+MAINTAINER XXX XXX@imooc.com
+
+ADD target/*.jar app.jar
+# ADD *.jar app.jar
+
+EXPOSE 8761
+
+ENTRYPOINT ["java", "-jar", "/app.jar"]
\ No newline at end of file

cneeds-server-datashow/build.sh

+#!/usr/bin/env bash
+
+mvn clean package -Dmaven.test.skip=true -U
+
+#docker build -t hub.c.163.com/springcloud/eureka .
+
+#docker push hub.c.163.com/springcloud/eureka
+
+
+docker build -t zzrdark/eureka .
+docker push zzrdark/eureka
+
+# docker build -t 192.168.2.244:5000/eureka .
+
+# docker push 192.168.2.244:5000/eureka
\ No newline at end of file

cneeds-server-datashow/pom.xml

@@ -12,18 +12,20 @@
     <artifactId>cneeds-server-datashow</artifactId>
     <packaging>jar</packaging>
     <dependencies>
+
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.mx.cneeds</groupId>
-            <artifactId>cneeds-common-data</artifactId>
+            <artifactId>cneeds-common-utils</artifactId>
             <version>1.0-SNAPSHOT</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.mx.cneeds</groupId>
-            <artifactId>cneeds-common-utils</artifactId>
+            <artifactId>cneeds-common-pojo</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 

cneeds-server-datashow/src/main/java/com/mx/cneeds/common/converter/RequestParamterConverter.java

+package com.mx.cneeds.common.converter;
+
+import javax.xml.bind.DatatypeConverter;
+
+/**
+ * @ClassName RequestParamterConverter
+ * @Author zzrdark
+ * @Date 2020-03-04 17:54
+ * @Description TODO
+ **/
+public class RequestParamterConverter {
+
+    public static String authorizationConverter(String username, String password){
+        StringBuilder sb = new StringBuilder();
+        sb.append(username+":");
+        sb.append(password);
+
+        String encoding = DatatypeConverter.printBase64Binary(sb.toString().getBytes());
+
+        sb = new StringBuilder();
+        sb.append("Basic ");
+        sb.append(encoding);
+        return sb.toString();
+    }
+
+    public static void main(String[] args) {
+        System.out.println(authorizationConverter("clientapp", "112233"));
+    }
+}

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/DatashowApplication.java

@@ -3,6 +3,7 @@ package com.mx.cneeds.server.datashow;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
@@ -14,8 +15,10 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @SpringBootApplication
 @EnableEurekaClient
 @EnableSwagger2
+@EnableFeignClients
 public class DatashowApplication {
     public static void main(String[] args) {
+
         SpringApplication.run(DatashowApplication.class);
     }
 }

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/AuthorizationClient.java

+package com.mx.cneeds.server.datashow.client;
+
+import com.mx.cneeds.common.dto.JwtToken;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @ClassName authorizationClient
+ * @Author zzrdark
+ * @Date 2020-03-04 17:33
+ * @Description TODO
+ **/
+
+@FeignClient(name = "CNEEDS-SERVER-AUTHORIZATION")
+public interface AuthorizationClient {
+
+
+    @PostMapping("/oauth/token")
+    JwtToken getToken(@RequestParam("grant_type") String grant_type,
+                      @RequestParam("username") String username,
+                      @RequestParam("password") String password,
+                      @RequestParam("scope") String scope);
+
+}

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignConfig.java

+package com.mx.cneeds.server.datashow.config;
+
+import com.mx.cneeds.common.converter.RequestParamterConverter;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @ClassName FeignConfig
+ * @Author zzrdark
+ * @Date 2020-03-04 17:26
+ * @Description TODO
+ **/
+@Configuration
+@Slf4j
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        //只支持 servlet
+        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+
+        if(requestAttributes == null){
+            return;
+        }
+        HttpServletRequest request = requestAttributes.getRequest();
+
+        if (request.getRequestURL().toString().contains("/user/login")){
+            String authString = RequestParamterConverter.authorizationConverter("clientapp","112233");
+            requestTemplate.header("Authorization",authString);
+            System.out.println(authString);
+        }
+    }
+}

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java

+package com.mx.cneeds.server.datashow.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
+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.TokenStore;
+import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
+import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
+
+// 资源服务配置
+@Configuration
+@EnableResourceServer
+public class OAuth2ResourceServer extends ResourceServerConfigurerAdapter {
+
+    @Override
+    public void configure(HttpSecurity http) throws Exception {
+        http.authorizeRequests()
+                .antMatchers("/user/login")
+                .permitAll()
+                // 开启认证
+                .anyRequest()
+                .authenticated()
+                .and();
+
+
+    }
+
+    @Override
+    public void configure(ResourceServerSecurityConfigurer resources) throws Exception {
+        resources.stateless(true);
+        resources.tokenStore(jwtTokenStore());
+    }
+
+    @Bean
+    public TokenStore jwtTokenStore() {
+        return new JwtTokenStore(jwtAccessTokenConverter());
+    }
+
+    @Bean
+    public JwtAccessTokenConverter jwtAccessTokenConverter(){
+        JwtAccessTokenConverter converter = new JwtAccessTokenConverter();
+        // 对JWT进行前面的key
+        converter.setSigningKey("imooc");
+        return converter;
+    }
+}
\ No newline at end of file

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/UserController.java

+package com.mx.cneeds.server.datashow.web.user;
+
+import com.mx.cneeds.server.datashow.client.AuthorizationClient;
+import com.mx.cneeds.common.dto.JwtToken;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.logging.Logger;
+
+/**
+ * @ClassName UserController
+ * @Author zzrdark
+ * @Date 2020-03-04 18:09
+ * @Description TODO
+ **/
+@RestController
+@Slf4j
+@RequestMapping("/user")
+public class UserController {
+
+    @Autowired
+    private AuthorizationClient authenticatorClient;
+
+    @GetMapping("/login")
+    public JwtToken login(String username, String password){
+
+        JwtToken token = authenticatorClient.getToken("password", username, password, "all");
+        log.info(token.toString());
+        return token;
+    }
+}

cneeds-server-datashow/src/main/resources/application-dev.yml

-spring:
-  datasource:
-    hikari:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      jdbc-url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8
-      username: root
-      password: cneeds!QAZ1qaz
-
+eureka:
+  client:
+    service-url:
+      defaultZone: http://192.168.2.244:8761/eureka/
+  instance:
+    prefer-ip-address: true

cneeds-server-datashow/src/main/resources/application.yml

 spring:
   profiles:
     active: dev
+  application:
+    name: cneeds-server-datashow
+
+server:
+  port: 9000
+  servlet:
+    context-path: /
\ No newline at end of file

cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceInfoService.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java

-package com.mx.cneeds.server.service.device;
+package com.mx.cneeds.server.device.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;

cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogService.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogService.java

-package com.mx.cneeds.server.service.device;
+package com.mx.cneeds.server.device.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;

cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogmediaService.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogmediaService.java

-package com.mx.cneeds.server.service.device;
+package com.mx.cneeds.server.device.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;

cneeds-common-data/src/main/java/com/mx/cneeds/server/service/device/DeviceLogsettingService.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceLogsettingService.java

-package com.mx.cneeds.server.service.device;
+package com.mx.cneeds.server.device.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;

cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java

@@ -3,7 +3,7 @@ package com.mx.cneeds.server.device.service.impl;
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.dao.DeviceInfoDao;
-import com.mx.cneeds.server.service.device.DeviceInfoService;
+import com.mx.cneeds.server.device.service.DeviceInfoService;
 import com.mx.cneeds.server.entity.DeviceInfoEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;

cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogServiceImpl.java

@@ -3,7 +3,7 @@ package com.mx.cneeds.server.device.service.impl;
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.dao.DeviceLogDao;
-import com.mx.cneeds.server.service.device.DeviceLogService;
+import com.mx.cneeds.server.device.service.DeviceLogService;
 import com.mx.cneeds.server.entity.DeviceLogEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;

cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogmediaServiceImpl.java

@@ -3,7 +3,7 @@ package com.mx.cneeds.server.device.service.impl;
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.dao.DeviceLogmediaDao;
-import com.mx.cneeds.server.service.device.DeviceLogmediaService;
+import com.mx.cneeds.server.device.service.DeviceLogmediaService;
 import com.mx.cneeds.server.entity.DeviceLogmediaEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;

cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceLogsettingServiceImpl.java

@@ -3,7 +3,7 @@ package com.mx.cneeds.server.device.service.impl;
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.dao.DeviceLogsettingDao;
-import com.mx.cneeds.server.service.device.DeviceLogsettingService;
+import com.mx.cneeds.server.device.service.DeviceLogsettingService;
 import com.mx.cneeds.server.entity.DeviceLogsettingEntity;
 import org.springframework.stereotype.Service;
 import java.util.Map;

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceInfoController.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java

-package com.mx.cneeds.server.datashow.web.device;
+package com.mx.cneeds.server.device.web;
 
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.validator.ValidatorUtils;
-import com.mx.cneeds.server.service.device.DeviceInfoService;
 import com.mx.cneeds.server.entity.DeviceInfoEntity;
+import com.mx.cneeds.server.device.service.DeviceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogController.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogController.java

-package com.mx.cneeds.server.datashow.web.device;
+package com.mx.cneeds.server.device.web;
 
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.validator.ValidatorUtils;
-import com.mx.cneeds.server.service.device.DeviceLogService;
 import com.mx.cneeds.server.entity.DeviceLogEntity;
+import com.mx.cneeds.server.device.service.DeviceLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogmediaController.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogmediaController.java

-package com.mx.cneeds.server.datashow.web.device;
+package com.mx.cneeds.server.device.web;
 
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.validator.ValidatorUtils;
-import com.mx.cneeds.server.service.device.DeviceLogmediaService;
 import com.mx.cneeds.server.entity.DeviceLogmediaEntity;
+import com.mx.cneeds.server.device.service.DeviceLogmediaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceLogsettingController.java → cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceLogsettingController.java

-package com.mx.cneeds.server.datashow.web.device;
+package com.mx.cneeds.server.device.web;
 
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.validator.ValidatorUtils;
-import com.mx.cneeds.server.service.device.DeviceLogsettingService;
 import com.mx.cneeds.server.entity.DeviceLogsettingEntity;
+import com.mx.cneeds.server.device.service.DeviceLogsettingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

cneeds-server-user/pom.xml

@@ -24,14 +24,14 @@
         </dependency>
         <dependency>
             <groupId>com.mx.cneeds</groupId>
-            <artifactId>cneeds-common-data</artifactId>
+            <artifactId>cneeds-common-pojo</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.version}</version>
+            <groupId>com.mx.cneeds</groupId>
+            <artifactId>cneeds-common-data</artifactId>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysDeptService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysDeptService.java

-package com.mx.cneeds.server.service.user;
+package com.mx.cneeds.server.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;

cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysFuncService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysFuncService.java

-package com.mx.cneeds.server.service.user;
+package com.mx.cneeds.server.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;

cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleDeptService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleDeptService.java

-package com.mx.cneeds.server.service.user;
+package com.mx.cneeds.server.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;

cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleFuncService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleFuncService.java

-package com.mx.cneeds.server.service.user;
+package com.mx.cneeds.server.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;

cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysRoleService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleService.java

-package com.mx.cneeds.server.service.user;
+package com.mx.cneeds.server.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;

cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysUserRoleService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserRoleService.java

-package com.mx.cneeds.server.service.user;
+package com.mx.cneeds.server.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;

cneeds-common-data/src/main/java/com/mx/cneeds/server/service/user/SysUserService.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserService.java

-package com.mx.cneeds.server.service.user;
+package com.mx.cneeds.server.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mx.cneeds.common.pager.PageUtils;

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysDeptServiceImpl.java

@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.dao.SysDeptDao;
 import com.mx.cneeds.server.entity.SysDeptEntity;
-import com.mx.cneeds.server.service.user.SysDeptService;
+import com.mx.cneeds.server.user.service.SysDeptService;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysFuncServiceImpl.java

@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.dao.SysFuncDao;
 import com.mx.cneeds.server.entity.SysFuncEntity;
-import com.mx.cneeds.server.service.user.SysFuncService;
+import com.mx.cneeds.server.user.service.SysFuncService;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleDeptServiceImpl.java

@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.dao.SysRoleDeptDao;
 import com.mx.cneeds.server.entity.SysRoleDeptEntity;
-import com.mx.cneeds.server.service.user.SysRoleDeptService;
+import com.mx.cneeds.server.user.service.SysRoleDeptService;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleFuncServiceImpl.java

@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.dao.SysRoleFuncDao;
 import com.mx.cneeds.server.entity.SysRoleFuncEntity;
-import com.mx.cneeds.server.service.user.SysRoleFuncService;
+import com.mx.cneeds.server.user.service.SysRoleFuncService;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysRoleServiceImpl.java

@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.dao.SysRoleDao;
 import com.mx.cneeds.server.entity.SysRoleEntity;
-import com.mx.cneeds.server.service.user.SysRoleService;
+import com.mx.cneeds.server.user.service.SysRoleService;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserRoleServiceImpl.java

@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.dao.SysUserRoleDao;
 import com.mx.cneeds.server.entity.SysUserRoleEntity;
-import com.mx.cneeds.server.service.user.SysUserRoleService;
+import com.mx.cneeds.server.user.service.SysUserRoleService;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserServiceImpl.java

@@ -4,7 +4,7 @@ import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.pager.Query;
 import com.mx.cneeds.server.dao.SysUserDao;
 import com.mx.cneeds.server.entity.SysUserEntity;
-import com.mx.cneeds.server.service.user.SysUserService;
+import com.mx.cneeds.server.user.service.SysUserService;
 import org.springframework.stereotype.Service;
 import java.util.Map;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysDeptController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysDeptController.java

-package com.mx.cneeds.server.datashow.web.user;
+package com.mx.cneeds.server.user.web;
 
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.validator.ValidatorUtils;
 import com.mx.cneeds.server.entity.SysDeptEntity;
-import com.mx.cneeds.server.service.user.SysDeptService;
+import com.mx.cneeds.server.user.service.SysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysFuncController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysFuncController.java

-package com.mx.cneeds.server.datashow.web.user;
+package com.mx.cneeds.server.user.web;
 
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.validator.ValidatorUtils;
 import com.mx.cneeds.server.entity.SysFuncEntity;
-import com.mx.cneeds.server.service.user.SysFuncService;
+import com.mx.cneeds.server.user.service.SysFuncService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleController.java

-package com.mx.cneeds.server.datashow.web.user;
+package com.mx.cneeds.server.user.web;
 
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.validator.ValidatorUtils;
 import com.mx.cneeds.server.entity.SysRoleEntity;
-import com.mx.cneeds.server.service.user.SysRoleService;
+import com.mx.cneeds.server.user.service.SysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleDeptController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleDeptController.java

-package com.mx.cneeds.server.datashow.web.user;
+package com.mx.cneeds.server.user.web;
 
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.validator.ValidatorUtils;
 import com.mx.cneeds.server.entity.SysRoleDeptEntity;
-import com.mx.cneeds.server.service.user.SysRoleDeptService;
+import com.mx.cneeds.server.user.service.SysRoleDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysRoleFuncController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysRoleFuncController.java

-package com.mx.cneeds.server.datashow.web.user;
+package com.mx.cneeds.server.user.web;
 
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.validator.ValidatorUtils;
 import com.mx.cneeds.server.entity.SysRoleFuncEntity;
-import com.mx.cneeds.server.service.user.SysRoleFuncService;
+import com.mx.cneeds.server.user.service.SysRoleFuncService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysUserController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java

-package com.mx.cneeds.server.datashow.web.user;
+package com.mx.cneeds.server.user.web;
 
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.validator.ValidatorUtils;
+import com.mx.cneeds.common.vo.UserVo;
 import com.mx.cneeds.server.entity.SysUserEntity;
-import com.mx.cneeds.server.service.user.SysUserService;
-import com.mx.cneeds.server.vo.UserVo;
+import com.mx.cneeds.server.user.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/SysUserRoleController.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserRoleController.java

-package com.mx.cneeds.server.datashow.web.user;
+package com.mx.cneeds.server.user.web;
 
 import com.mx.cneeds.common.pager.PageUtils;
 import com.mx.cneeds.common.result.R;
 import com.mx.cneeds.common.validator.ValidatorUtils;
 import com.mx.cneeds.server.entity.SysUserRoleEntity;
-import com.mx.cneeds.server.service.user.SysUserRoleService;
+import com.mx.cneeds.server.user.service.SysUserRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

cneeds-server-user/src/main/resources/application.yml

@@ -2,43 +2,57 @@ spring:
   application:
     name: cneeds-server-user
   datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-      username: root
     password: cneeds!QAZ1qaz
-      initial-size: 10
-      max-active: 100
-      min-idle: 10
-      max-wait: 60000
-      pool-prepared-statements: true
-      max-pool-prepared-statement-per-connection-size: 20
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      #Oracle需要打开注释
-      #validation-query: SELECT 1 FROM DUAL
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        #login-username: admin
-        #login-password: admin
-      filter:
-        stat:
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: false
-        wall:
-          config:
-            multi-statement-allow: true
+    username: root
+#    hikari:
+#      driver-class-name: com.mysql.jdbc.Driver
+#      url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+#      username: root
+#      password: cneeds!QAZ1qaz
+#  datasource:
+#    type: com.alibaba.druid.pool.DruidDataSource
+#    druid:
+#      driver-class-name: com.mysql.jdbc.Driver
+#      url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+#      username: root
+#      password: cneeds!QAZ1qaz
+#      initial-size: 10
+#      max-active: 100
+#      min-idle: 10
+#      max-wait: 60000
+#      pool-prepared-statements: true
+#      max-pool-prepared-statement-per-connection-size: 20
+#      time-between-eviction-runs-millis: 60000
+#      min-evictable-idle-time-millis: 300000
+#      #Oracle需要打开注释
+#      #validation-query: SELECT 1 FROM DUAL
+#      test-while-idle: true
+#      test-on-borrow: false
+#      test-on-return: false
+#      stat-view-servlet:
+#        enabled: true
+#        url-pattern: /druid/*
+#        #login-username: admin
+#        #login-password: admin
+#      filter:
+#        stat:
+#          log-slow-sql: true
+#          slow-sql-millis: 1000
+#          merge-sql: false
+#        wall:
+#          config:
+#            multi-statement-allow: true
 
 
 eureka:
   client:
     service-url:
       defaultZone: http://192.168.2.244:8761/eureka/
+  instance:
+    prefer-ip-address: true
 server:
-  port: 9999
+  port: 9001
+  servlet:
+    context-path: /

pom.xml

@@ -22,6 +22,7 @@
         <module>cneeds-common-data</module>
         <module>cneeds-common-utils</module>
         <module>cneeds-server-authorization</module>
+        <module>cneeds-common-pojo</module>
     </modules>
 
     <properties>
@@ -29,6 +30,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <spring-cloud.version>Finchley.SR2</spring-cloud.version>
+        <swagger.version>2.7.0</swagger.version>
     </properties>
 
     <dependencyManagement>
@@ -58,6 +60,22 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${swagger.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.version}</version>
+        </dependency>
     </dependencies>