Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

CODE/smart-community/app-api/pom.xml

@@ -22,6 +22,10 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<spring-cloud.version>Finchley.SR1</spring-cloud.version>
+		<spring-session-jdbc.version>2.0.5.RELEASE</spring-session-jdbc.version>
+		<logback.version>1.1.6</logback.version>
+		<logback.access.version>1.1.2</logback.access.version>
+		<commons.logging.version>1.2</commons.logging.version>
 	</properties>
 
 	<dependencies>
@@ -85,6 +89,49 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-jdbc</artifactId>
+			<version>${spring-session-jdbc.version}</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.2</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- logback -->
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>${logback.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-access</artifactId>
+			<version>${logback.access.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>${commons.logging.version}</version>
+		</dependency>
+
+
 	</dependencies>
 
 	<dependencyManagement>

CODE/smart-community/app-api/src/main/java/com/community/huiju/config/HttpSessionConfig.java

@@ -0,0 +1,21 @@
+package com.community.huiju.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
+import org.springframework.session.web.http.HeaderHttpSessionIdResolver;
+import org.springframework.session.web.http.HttpSessionIdResolver;
+
+/**
+ * @author weiximei
+ */
+@Configuration
+@EnableJdbcHttpSession
+public class HttpSessionConfig {
+
+    @Bean
+    public HttpSessionIdResolver httpSessionIdResolver() {
+        return HeaderHttpSessionIdResolver.xAuthToken();
+    }
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/config/entity/UserElement.java

@@ -0,0 +1,34 @@
+package com.community.huiju.config.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * session 基础类
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserElement implements Serializable {
+
+    /** 用户唯一标识符 **/
+    private Integer id;
+
+    /** 用户名 **/
+    private String userName;
+
+    /** 登陆名 **/
+    private String loginName;
+
+    /** 邮箱 **/
+    private String email;
+
+    /** 用户状态 **/
+    private String status;
+
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TestController.java

@@ -1,10 +1,12 @@
 package com.community.huiju.controller;
 
+import com.community.huiju.config.entity.UserElement;
 import com.community.huiju.model.ScUser;
 import com.community.huiju.service.ScUserServiceI;
 import com.community.huiju.microController.MicroTestController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -13,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -23,6 +28,7 @@ import java.util.List;
 @RefreshScope
 @RequestMapping("/client2")
 @Api("eureka-client2的测试controller的API")
+@Slf4j
 public class TestController {
     
     @Autowired
@@ -47,4 +53,22 @@ public class TestController {
     public List<ScUser> getMicroUser(){
         return microTestController.getUser();
     }
+
+    /**
+     * 测试session
+     * @param request
+     * @param session
+     * @return
+     */
+    @RequestMapping(value = "/getUserElement",method = RequestMethod.GET)
+    public UserElement getUserElement(HttpServletRequest request, HttpSession session){
+        log.info("sessionId: {}", session.getId());
+        UserElement userElement = new UserElement();
+        userElement.setId(1);
+        userElement.setEmail("907147608@qq.com");
+        userElement.setUserName("weiximei");
+        userElement.setLoginName("weiximei");
+        userElement.setStatus("1");
+        return userElement;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/ScUser.java

@@ -1,10 +1,12 @@
 package com.community.huiju.model;
 
+import java.io.Serializable;
+
 /**
  * @author FXF
  * @date 2018-09-19
  */
-public class ScUser {
+public class ScUser implements Serializable {
 	private Integer id;
 	
 	private String userName;

CODE/smart-community/app-api/src/main/resources/bootstrap.yml

@@ -11,7 +11,11 @@ spring:
       discovery:
         enabled: true
         serviceId: config-server
+  session:
+    store-type: jdbc
 eureka:
   client:
     service-url:
       defaultZone: http://localhost:8080/eureka/
+logging:
+  config: classpath:logback.xml

CODE/smart-community/app-api/src/main/resources/logback.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <property name="LOG_HOME" value="/logs/smartCommunity/app-api" />
+
+    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger{16} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="normalLog"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${LOG_HOME}/web.normal.%d{yyyy-MM-dd}.log
+            </FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <maxFileSize>10MB</maxFileSize>
+        </triggeringPolicy>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger{16} - %msg%n
+            </pattern>
+        </layout>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>DENY</onMatch>
+            <onMismatch>ACCEPT</onMismatch>
+        </filter>
+    </appender>
+    <appender name="errorLog"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${LOG_HOME}/web.error.%d{yyyy-MM-dd}.log
+            </FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <maxFileSize>10MB</maxFileSize>
+        </triggeringPolicy>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{16} - %msg%n
+            </pattern>
+        </layout>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+
+    <logger name="com.community" level="debug" >
+        <appender-ref ref="normalLog" />
+        <appender-ref ref="errorLog" />
+    </logger>
+
+    <root level="info">
+        <appender-ref ref="Console" />
+    </root>
+</configuration>

CODE/smart-community/app-api/src/main/resources/mapper/ScUserMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="ScUserMapper">
+<mapper namespace="com.community.huiju.dao.ScUserMapper">
 
     <parameterMap id="paramMap" type="ScUser"></parameterMap>
 

CODE/smart-community/zuul/pom.xml

@@ -22,6 +22,10 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<spring-cloud.version>Finchley.SR1</spring-cloud.version>
+		<spring-session-jdbc.version>2.0.5.RELEASE</spring-session-jdbc.version>
+		<logback.version>1.1.6</logback.version>
+		<logback.access.version>1.1.2</logback.access.version>
+		<commons.logging.version>1.2</commons.logging.version>
 	</properties>
 
 	<dependencies>
@@ -69,23 +73,49 @@
 
 		</dependency>
 
-		<!--<dependency>-->
-			<!--<groupId>org.springframework.session</groupId>-->
-			<!--<artifactId>spring-session</artifactId>-->
-			<!--<version>1.3.3.RELEASE</version>-->
-		<!--</dependency>-->
-
-		<dependency>
-			<groupId>org.springframework.session</groupId>
-			<artifactId>spring-session-jdbc</artifactId>
-			<version>2.0.5.RELEASE</version>
-		</dependency>
-
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.12</version>
         </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session-jdbc</artifactId>
+            <version>${spring-session-jdbc.version}</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.2</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- logback -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-access</artifactId>
+            <version>${logback.access.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons.logging.version}</version>
+        </dependency>
+
 	</dependencies>
 
 	<dependencyManagement>

CODE/smart-community/zuul/src/main/java/com/community/huiju/config/entity/UserElement.java

@@ -0,0 +1,33 @@
+package com.community.huiju.config.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * session 基础类
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserElement implements Serializable {
+
+    /** 用户唯一标识符 **/
+    private Integer id;
+
+    /** 用户名 **/
+    private String userName;
+
+    /** 登陆名 **/
+    private String loginName;
+
+    /** 邮箱 **/
+    private String email;
+
+    /** 用户状态 **/
+    private String status;
+
+
+}

CODE/smart-community/zuul/src/main/resources/bootstrap.yml

@@ -13,22 +13,15 @@ spring:
         enabled: true
         serviceId: config-server
   session:
-    #    jdbc:
-    #      schema: classpath:org/springframework/session/jdbc/schema-mysql.sql
-    #      table-name: tb_session
-    #      initialize-schema: embedded
     store-type: jdbc
-  datasource:
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/smart_community?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
-    username: root
-    password: DQ@0lW##kBb2+-jPZC1s$Ma0h5$9W((q
-    driver-class-name: com.mysql.jdbc.Driver
+#  datasource:
+#    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/smart_community?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+#    username: root
+#    password: DQ@0lW##kBb2+-jPZC1s$Ma0h5$9W((q
+#    driver-class-name: com.mysql.jdbc.Driver
 eureka:
   client:
     service-url:
       defaultZone: http://localhost:8080/eureka/
-zuul:
-  routes:
-    user-server:
-      path: /user-server/**
-      service-id: user-server
+logging:
+  config: classpath:logback.xml

CODE/smart-community/zuul/src/main/resources/logback.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <property name="LOG_HOME" value="/logs/smartCommunity/zuul" />
+
+    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger{16} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="normalLog"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${LOG_HOME}/web.normal.%d{yyyy-MM-dd}.log
+            </FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <maxFileSize>10MB</maxFileSize>
+        </triggeringPolicy>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger{16} - %msg%n
+            </pattern>
+        </layout>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>DENY</onMatch>
+            <onMismatch>ACCEPT</onMismatch>
+        </filter>
+    </appender>
+    <appender name="errorLog"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${LOG_HOME}/web.error.%d{yyyy-MM-dd}.log
+            </FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <maxFileSize>10MB</maxFileSize>
+        </triggeringPolicy>
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{16} - %msg%n
+            </pattern>
+        </layout>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+
+    <logger name="com.community" level="debug" >
+        <appender-ref ref="normalLog" />
+        <appender-ref ref="errorLog" />
+    </logger>
+
+    <root level="info">
+        <appender-ref ref="Console" />
+    </root>
+</configuration>