Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev1

server/svr-admin-server/pom.xml

@@ -64,4 +64,31 @@
            <artifactId>servo-core</artifactId>
        </dependency>
    </dependencies>
    <build>
        <finalName>svr-admin-server</finalName>
        <plugins>
            <plugin>
                <artifactId>maven-war-plugin</artifactId>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
                <configuration>
                    <mainClass>com.yihu.admin.AdminServer</mainClass>
                </configuration>
            </plugin>
        </plugins>
    </build>
</project>

server/svr-configuration/pom.xml

@@ -14,7 +14,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-configuration</artifactId>
    <version>1.0.0</version>
    <packaging>war</packaging>
    <packaging>jar</packaging>
    <dependencies>
        <dependency>

server/svr-discovery/pom.xml

@@ -13,7 +13,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-discovery</artifactId>
    <version>1.0.0</version>
    <packaging>war</packaging>
    <packaging>jar</packaging>
    <dependencies>
        <dependency>
@@ -30,10 +30,10 @@
            <artifactId>spring-boot-starter-logging</artifactId>
        </dependency>
        <!--给 eurika界面添加账号密码验证-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-security</artifactId>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>org.springframework.boot</groupId>-->
            <!--<artifactId>spring-boot-starter-security</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-webmvc</artifactId>

server/svr-discovery/src/main/resources/application.yml

@@ -22,12 +22,12 @@ eureka:
#eurika界面的账号密码
security:
  basic:
    enabled: true
  user:
    name: jw
    password: jkzl
#security:
#  basic:
#    enabled: true
#  user:
#    name: jw
#    password: jkzl
---

svr/svr-base/pom.xml

@@ -20,6 +20,10 @@
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-entity</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.data</groupId>
                    <artifactId>spring-data-elasticsearch</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>com.yihu.base</groupId>
                    <artifactId>common-data-es</artifactId>
@@ -171,6 +175,11 @@
            <!--<groupId>org.springframework.boot</groupId>-->
            <!--<artifactId>spring-boot-starter-data-redis</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-rest-model</artifactId>
            <version>1.0.0</version>
        </dependency>
    </dependencies>
    <build>
        <finalName>svr-base</finalName>

svr/svr-base/src/main/java/com/yihu/jw/business/login/service/LoginService.java

@@ -8,7 +8,6 @@ import com.yihu.jw.business.user.service.EmployService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.base.BaseEnvelop;
import com.yihu.jw.restmodel.common.base.BaseEnvelopStatus;
import com.yihu.jw.rm.base.BaseLoginRequestMapping;
import com.yihu.jw.util.common.ConvertToSpellUtils;
import com.yihu.jw.util.security.MD5;
@@ -55,7 +54,7 @@ public class LoginService  extends BaseJpaService<BaseEmployDO,EmployDao> {
    public Envelop register(String mobilePhone,String password,String saasId,String name,String idcard,String ssc) throws Exception {
        //判断账号是否重复
        BaseEmployDO baseEmployDO = employDao.findByPhoneAndSaasId(mobilePhone,saasId);
        BaseEmployDO baseEmployDO = employService.findByPhoneAndSaasId(mobilePhone,saasId);
        if(baseEmployDO!=null){
            return Envelop.getError("该手机号已注册！");
        }

svr/svr-base/src/main/resources/application.yml

@@ -2,21 +2,22 @@
spring:
  application:
    name: svr-base  #注册到发现服务的id 如果id一样 eurika会自动做负载
#  jmx:
#    default-domain: svr-base
  jmx:
    default-domain: svr-base
    enabled: true
  data:
    elasticsearch:
      cluster-name: jkzl #es集群的名字
      cluster-nodes: 172.19.103.68:9300  #多个逗号分割
      cluster-nodes-jest: http://172.19.103.68:9200  #多个逗号分割
      repositories:
        enabled: false
      properties:
        client:
          transport:
            sniff: false #开启嗅探集群  用nginx代理一层过后会出现ip解析失败问题
#  data:
#    elasticsearch:
#      cluster-name: jkzl #es集群的名字
#      cluster-nodes: 172.19.103.68:9300  #多个逗号分割
#      cluster-nodes-jest: http://172.19.103.68:9200  #多个逗号分割
#      repositories:
#        enabled: true
#      properties:
#        client:
#          transport:
#            sniff: false #开启嗅探集群  用nginx代理一层过后会出现ip解析失败问题

web-gateway/src/main/java/com/yihu/jw/config/SwaggerConfig.java

@@ -3,13 +3,19 @@ package com.yihu.jw.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ParameterBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.schema.ModelRef;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Parameter;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.ArrayList;
import java.util.List;
@Configuration
@EnableSwagger2
@ComponentScan("com.yihu.jw.controller.**")
@@ -19,10 +25,12 @@ public class SwaggerConfig {
    public static final String login_API = "login";
    public static final String iot_API = "iot";
    final String userAgentJson = "{\"id\":int,\"uid\":string,\"openid\":string,\"token\":string,\"lastUid\":string,\"platform\":int}";
    @Bean
    public Docket baseAPI() {
        List<Parameter> pars = addToken();
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(base_API)
                .useDefaultResponseMessages(false)
@@ -30,7 +38,7 @@ public class SwaggerConfig {
                .select()
                .apis(RequestHandlerSelectors.basePackage("com.yihu.jw.controller.base"))
                .paths(PathSelectors.any())
                .build();
                .build().globalOperationParameters(pars);
    }
    private ApiInfo baseApiInfo() {
@@ -46,10 +54,20 @@ public class SwaggerConfig {
        return apiInfo;
    }
    private List<Parameter> addToken() {
        ParameterBuilder tokenPar = new ParameterBuilder();
        ParameterBuilder userAgentPar = new ParameterBuilder();
        List<Parameter> pars = new ArrayList<Parameter>();
        userAgentPar.name("Authorization").description("\"Authorization\":\"bearer 5fe6b2c3-f69c-4ddc-a36a-367cdf9479a3\"").modelRef(new ModelRef("string")).parameterType("header").required(false).defaultValue("").build();
        tokenPar.name("accesstoken").description("accesstoken").modelRef(new ModelRef("string")).parameterType("header").required(false).defaultValue("").build();
        pars.add(tokenPar.build());
        pars.add(userAgentPar.build());
        return pars;
    }
    @Bean
    public Docket wlyyAPI() {
        List<Parameter> pars = addToken();
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(wlyy_API)
                .useDefaultResponseMessages(false)
@@ -57,7 +75,7 @@ public class SwaggerConfig {
                .select()
                .apis(RequestHandlerSelectors.basePackage("com.yihu.jw.controller.wlyy"))
                .paths(PathSelectors.any())
                .build();
                .build().globalOperationParameters(pars);
    }
    private ApiInfo wlyyApiInfo() {
@@ -76,7 +94,7 @@ public class SwaggerConfig {
    @Bean
    public Docket loginAPI() {
        List<Parameter> pars = addToken();
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(login_API)
                .useDefaultResponseMessages(false)
@@ -84,7 +102,7 @@ public class SwaggerConfig {
                .select()
                .apis(RequestHandlerSelectors.basePackage("com.yihu.jw.controller.login"))
                .paths(PathSelectors.any())
                .build();
                .build().globalOperationParameters(pars);
    }
    private ApiInfo loginApiInfo() {
@@ -102,7 +120,7 @@ public class SwaggerConfig {
    @Bean
    public Docket iotAPI() {
        List<Parameter> pars = addToken();
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(iot_API)
                .useDefaultResponseMessages(false)
@@ -110,7 +128,7 @@ public class SwaggerConfig {
                .select()
                .apis(RequestHandlerSelectors.basePackage("com.yihu.jw.controller.iot"))
                .paths(PathSelectors.any())
                .build();
                .build().globalOperationParameters(pars);
    }
    private ApiInfo iotApiInfo() {

web-gateway/src/main/java/com/yihu/jw/controller/base/security/TokenController.java

@@ -39,7 +39,7 @@ import java.util.Map;
 * Created by 刘文彬 on 2018/5/4.
 */
@RestController
@RequestMapping("/aa")
@RequestMapping("/token")
@Api(value = "权限token模块", description = "权限token模块")
public class TokenController {

web-gateway/src/main/resources/application.yml

@@ -11,20 +11,20 @@ spring:
      enabled: true
      max-file-size: 500MB
      max-request-size: 500MB
  data:
    elasticsearch: #ElasticsearchProperties
      cluster-name: jkzl #默认即为elasticsearch  集群名
      cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
      local: false #是否本地连接
      properties: # Additional properties used to configure the client.
        enable: true
    # JEST (Elasticsearch HTTP client) (JestProperties)
  elasticsearch:
    jest:
      uris: http://172.19.103.45:9200,http://172.19.103.68:9200
#      uris: http://172.19.103.68:9200
      connection-timeout: 60000 # Connection timeout in milliseconds.
      multi-threaded: true
#  data:
#    elasticsearch: #ElasticsearchProperties
#      cluster-name: jkzl #默认即为elasticsearch  集群名
#      cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
#      local: false #是否本地连接
#      properties: # Additional properties used to configure the client.
#        enable: true
#    # JEST (Elasticsearch HTTP client) (JestProperties)
#  elasticsearch:
#    jest:
#      uris: http://172.19.103.45:9200,http://172.19.103.68:9200
##      uris: http://172.19.103.68:9200
#      connection-timeout: 60000 # Connection timeout in milliseconds.
#      multi-threaded: true
  redis:
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.