代码优化

common-lib/pom.xml

@@ -35,6 +35,11 @@
        <!--wlyy后台管理-->
        <module>../patient-co-manage/wlyy-manage</module> <!--i健康后台管理系统-->
        <!--定制化的项目-->
        <module>../patient-co-customization/patient-co-modern-medicine</module>  <!--中医项目-->
    </modules>
</project>

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/MMApplication.java

@@ -0,0 +1,18 @@
package com.yihu.mm;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ApplicationContext;
/**
 * Created by chenweida on 2017/8/7.
 */
@SpringBootApplication
public class MMApplication {
    public static ApplicationContext ctx = null;
    public static void main(String[] args) {
        ctx = SpringApplication.run(MMApplication.class, args);
    }
}

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/config/security/WebSecurityConfig.java

@@ -0,0 +1,44 @@
package com.yihu.mm.config.security;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
/**
 * Created by Administrator on 2016.10.17.
 */
@Configuration
@EnableWebSecurity
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
    @Value("${security.basic.username}")
    String username;
    @Value("${security.basic.password}")
    String password;
    protected void configure(HttpSecurity http) throws Exception {
        http.authorizeRequests()
                .antMatchers("/swagger-ui.html").authenticated()
                .antMatchers("/swagger-ui.html").authenticated()
                .antMatchers("/configuration/security").authenticated()
                .anyRequest().permitAll()
                .and()
                .csrf().disable()
                .formLogin().defaultSuccessUrl("/swagger-ui.html").failureUrl("/login") //登录成功之后的跳转
                .permitAll()
                .and()
                .logout().logoutSuccessUrl("/login")
                .permitAll();
    }
    @Autowired
    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
        auth.inMemoryAuthentication()
                .withUser(username).password(password).roles("USER");
    }
}

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/config/swagger/SwaggerConfig.java

@@ -0,0 +1,48 @@
package com.yihu.mm.config.swagger;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.context.request.async.DeferredResult;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import static com.google.common.base.Predicates.or;
import static springfox.documentation.builders.PathSelectors.regex;
@EnableSwagger2
@Configuration
public class SwaggerConfig {
    private static final String PUBLIC_API = "Default";
    @Bean
    public Docket publicAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(PUBLIC_API)
                .genericModelSubstitutes(DeferredResult.class)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(true)
                .pathMapping("/")
                .select()
                .paths(PathSelectors.regex("/.*"))
                .build()
                .apiInfo(publicApiInfo());
    }
    private ApiInfo publicApiInfo() {
        ApiInfo apiInfo = new ApiInfo("三师平台API",
                "向PC端，微信、App等应用提供功能与数据接口。",
                "1.0",
                "No terms of service",
                "admin@jkzl.com",
                "The Apache License, Version 2.0",
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return apiInfo;
    }
}

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/config/war/ServletInitializer.java

@@ -0,0 +1,15 @@
package com.yihu.mm.config.war;//package com.yihu.wlyy.config.war;
import com.yihu.mm.MMApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.web.SpringBootServletInitializer;
/**
 * Created by Administrator on 2016.10.14.
 */
public class ServletInitializer extends SpringBootServletInitializer {
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
        return application.sources(MMApplication.class);
    }
}

patient-co-customization/patient-co-modern-medicine/src/main/resources/application.yml

@@ -0,0 +1,30 @@
server:
  port: 8080
security:
  basic:
    username: jkzl
    password: jkzlehr
---
##测试的配置
spring:
  profiles: test
---
##正式的配置
spring:
  profiles: prod
---
##开发的配置
spring:
  profiles: dev
---
##开发连测试用这个版本的配置
spring:
  profiles: dev_test

patient-co/patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/etl/mycache/CachePool.java

@@ -58,7 +58,7 @@ public class CachePool {
        if (model == null) {
            model = new CacheModel();
            String sql = " select id,code,idcard,hospital,admin_team_code,expenses_status,patient,server_type from wlyy_sign_family a " +
                    " where " +
            " where " +
                    " status in(1,2) " +
                    " and a.type =2  " +
                    " and expenses_status=1 " +

readme.MD

@@ -28,4 +28,7 @@ patient-co-service   i健康和外部项目对接的项目
    wlyy_sign 和基卫对接签约的项目
    
    wlyy_service 和基卫对接其他业务
    
 
patient-co-customization  定制化的项目
    patient-co-modern-medicine  集美区中医