1.服务发现的Ip

2.配置文件

cneeds-common-data/pom.xml

@@ -9,6 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <version>1.0-SNAPSHOT</version>
     <artifactId>cneeds-common-data</artifactId>
     <packaging>jar</packaging>
     <properties>

cneeds-common-pojo/pom.xml

@@ -11,7 +11,7 @@
 
 
     <packaging>jar</packaging>
-
+    <version>1.0-SNAPSHOT</version>
 
     <artifactId>cneeds-common-pojo</artifactId>
 

cneeds-common-utils/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <artifactId>cneeds-common-utils</artifactId>
 

cneeds-server-authorization/Dockerfile

-FROM hub.c.163.com/library/java:8-alpine
-
+#FROM hub.c.163.com/library/java:8-alpine
+FROM openjdk:8
 MAINTAINER XXX XXX@imooc.com
 
 ADD target/*.jar app.jar

cneeds-server-authorization/cneeds-server-authorization.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
\ No newline at end of file

cneeds-server-authorization/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cneeds-server-authorization</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-SNAPSHOT</version>
     <dependencies>
 
         <!-- eureka-client -->

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

+eureka:
+  client:
+    service-url:
+      defaultZone: http://192.168.2.244:8761/eureka/
+  instance:
+    prefer-ip-address: true
+    ip-address: 192.168.2.244
\ No newline at end of file

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

-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-authorization/src/main/resources/application.yml

+spring:
+  profiles:
+    active: dev
+  application:
+    name: cneeds-server-authorization
+server:
+  port: 8861
+  servlet:
+    context-path: /
+
+
+

cneeds-server-datashow/Dockerfile

-FROM hub.c.163.com/library/java:8-alpine
+#FROM hub.c.163.com/library/java:8-alpine
+FROM openjdk:8
 
 MAINTAINER XXX XXX@imooc.com
 

cneeds-server-datashow/pom.xml

@@ -11,6 +11,7 @@
 
     <artifactId>cneeds-server-datashow</artifactId>
     <packaging>jar</packaging>
+    <version>1.0-SNAPSHOT</version>
     <dependencies>
 
 

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

@@ -34,7 +34,6 @@ public class FeignInterceptor implements RequestInterceptor {
         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

@@ -20,6 +20,7 @@ public class OAuth2ResourceServer extends ResourceServerConfigurerAdapter {
         http.authorizeRequests()
                 .antMatchers("/user/login",
                         "/device/getChannel_nums",
+//                        "/user/info",
                         "/statics/**")
                 .permitAll()
                 // 开启认证

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

@@ -30,7 +30,7 @@ public class WebConfig implements WebMvcConfigurer {
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
                 .allowedOrigins("*")
-                .allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS")
+                .allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS","AUTHORIZATION")
                 .allowCredentials(true)
                 .maxAge(3600)
                 .allowedHeaders("*");

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

@@ -42,15 +42,14 @@ public class UserController {
     }
 
     @RequestMapping("/info")
-    public UserInfoVo getInfo(){
-
+    public R getInfo(){
         UserInfoVo userInfoVo = new UserInfoVo();
         log.info("getInfo");
         userInfoVo.setName("admin");
         userInfoVo.setIntroduction("manager");
         userInfoVo.setRoles("admin");
         userInfoVo.setAvatar("avatar");
-        return userInfoVo;
+        return new R().put("data",userInfoVo);
     }
 
 }

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

@@ -4,3 +4,5 @@ eureka:
       defaultZone: http://192.168.2.244:8761/eureka/
   instance:
     prefer-ip-address: true
+    # ip-address: 192.168.2.244
+

cneeds-server-eureka/Dockerfile

-FROM hub.c.163.com/library/java:8-alpine
-
+#FROM hub.c.163.com/library/java:8-alpine
+FROM openjdk:8
 MAINTAINER XXX XXX@imooc.com
 
 ADD target/*.jar app.jar

cneeds-server-eureka/pom.xml

@@ -11,7 +11,7 @@
 
     <artifactId>cneeds-server-eureka</artifactId>
     <packaging>jar</packaging>
-
+    <version>1.0-SNAPSHOT</version>
 
 
     <dependencies>

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

+eureka:
+  client:
+    service-url:
+      #defaultZone: http://eureka2:8762/eureka/
+      defaultZone: http://localhost:8761/eureka/
+      ## 单机的时候开启
+      register-with-eureka: false
+    fetch-registry: 'false'

+  #  server:
+  #    enable-self-preservation: false
+  instance:
+    prefer-ip-address: true
+    ip-address: 192.168.2.244
\ No newline at end of file

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

@@ -12,6 +12,8 @@ eureka:
     prefer-ip-address: true
 
 spring:
+  profiles:
+    active: dev
   application:
     name: cneeds-server-eureka
 server:

cneeds-server-user/Dockerfile

-FROM hub.c.163.com/library/java:8-alpine
-
+#FROM hub.c.163.com/library/java:8-alpine
+#FROM hub.c.163.com/library/java:8-jre
+FROM openjdk:8
 MAINTAINER XXX XXX@imooc.com
 
 ADD target/*.jar app.jar

cneeds-server-user/src/main/resources/applicaiton-dev.yml

+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    password: cneeds!QAZ1qaz
+    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
+    ip-address: 192.168.2.244
\ No newline at end of file

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

 spring:
+  profiles:
+    active: dev
   application:
     name: cneeds-server-user
-  datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-    password: cneeds!QAZ1qaz
-    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: 9001
   servlet: