征信项目代码调整

pom.xml

@@ -11,39 +11,34 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.4.1.RELEASE</version>
-
+        <version>1.5.6.RELEASE</version>
     </parent>
 
     <dependencies>
 
         <dependency>
-            <groupId>com.uas.platform</groupId>
-            <artifactId>platform-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.6.5</version>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.47</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>3.7</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sf.flexjson</groupId>
+            <artifactId>flexjson</artifactId>
+            <version>3.3</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -57,152 +52,45 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
        <!-- <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>-->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <version>1.0.24</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-            <version>1.4.1.RELEASE</version>
-        </dependency>
-               <dependency>
-                   <groupId>com.alibaba</groupId>
-                   <artifactId>fastjson</artifactId>
-                   <version>1.2.15</version>
-               </dependency>
-               <dependency>
-                   <groupId>com.uas.account</groupId>
-                   <artifactId>account-common</artifactId>
-                   <version>0.0.1-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                   <groupId>com.alibaba</groupId>
-                   <artifactId>dubbo</artifactId>
-                   <version>2.8.4</version>
-                   <exclusions>
-                       <exclusion>
-                           <artifactId>log4j</artifactId>
-                           <groupId>log4j</groupId>
-                       </exclusion>
-                   </exclusions>
-               </dependency>
-               <dependency>
-                   <groupId>com.caucho</groupId>
-                   <artifactId>hessian</artifactId>
-                   <version>4.0.38</version>
-               </dependency>
-               <dependency>
-                   <groupId>com.uas.dfs</groupId>
-                   <artifactId>dfs-api</artifactId>
-                   <version>0.0.2</version>
-               </dependency>
-               <dependency>
-                   <groupId>org.apache.poi</groupId>
-                   <artifactId>poi</artifactId>
-                   <version>3.9</version>
-               </dependency>
+
     </dependencies>
 
     <build>
         <plugins>
-            <!-- 在maven生命周期validate阶段生成timestamp -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>1.3</version>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>create-timestamp</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
-                    <items>
-                        <item>timestamp</item>
-                    </items>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/minify</outputDirectory>
-                            <overwrite>false</overwrite>
-                            <resources>
-                                <resource>
-                                    <directory>${basedir}/src/main/webapp</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webResources>
-                        <resource>
-                            <directory>${project.build.directory}/statics</directory>
-                        </resource>
-                        <resource>
-                            <directory>${project.build.directory}/minify</directory>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
-
         </plugins>
     </build>
-    <distributionManagement>
-        <!-- 发布release仓库 -->
-        <repository>
-            <id>platform-release</id>
-            <name>platform-release</name>
-            <url>http://113.105.74.141:8081/artifactory/libs-release-local</url>
-        </repository>
-        <!-- 发布快照版本 -->
-        <snapshotRepository>
-            <id>platform-snapshots</id>
-            <name>platform-snapshots</name>
-            <url>http://113.105.74.141:8081/artifactory/libs-snapshot-local</url>
-        </snapshotRepository>
-    </distributionManagement>
+    <!--<distributionManagement>-->
+        <!--&lt;!&ndash; 发布release仓库 &ndash;&gt;-->
+        <!--<repository>-->
+            <!--<id>platform-release</id>-->
+            <!--<name>platform-release</name>-->
+            <!--<url>http://113.105.74.141:8081/artifactory/libs-release-local</url>-->
+        <!--</repository>-->
+        <!--&lt;!&ndash; 发布快照版本 &ndash;&gt;-->
+        <!--<snapshotRepository>-->
+            <!--<id>platform-snapshots</id>-->
+            <!--<name>platform-snapshots</name>-->
+            <!--<url>http://113.105.74.141:8081/artifactory/libs-snapshot-local</url>-->
+        <!--</snapshotRepository>-->
+    <!--</distributionManagement>-->
 
 </project>

src/main/java/com/uas/credit/Application.java

@@ -1,18 +1,40 @@
 package com.uas.credit;
 
+import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Profile;
+import org.springframework.core.io.Resource;
 
 /**
  * 项目启动
  * created by shicr on 2018/6/5
  **/
-@SpringBootApplication(scanBasePackages = "com.uas.credit")
+@SpringBootApplication
 public class Application {
 
+
     public static void main(String[] args) throws Exception {
         SpringApplication.run(Application.class, args);
     }
+
+    @Bean
+    @Profile("prod")
+    public PropertyPlaceholderConfigurer prod(ApplicationContext applicationContext) {
+        PropertyPlaceholderConfigurer configurer = new PropertyPlaceholderConfigurer();
+        Resource resource = applicationContext.getResource("classpath:prod.properties");
+        configurer.setLocation(resource);
+        return configurer;
+    }
+
+    @Bean
+    @Profile("dev")
+    public PropertyPlaceholderConfigurer dev(ApplicationContext applicationContext) {
+        PropertyPlaceholderConfigurer configurer = new PropertyPlaceholderConfigurer();
+        Resource resource = applicationContext.getResource("classpath:dev.properties");
+        configurer.setLocation(resource);
+        return configurer;
+    }
 }

src/main/java/com/uas/credit/DruidDBConfiguration.java

@@ -1,113 +0,0 @@
-package com.uas.credit;
-
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.support.http.StatViewServlet;
-import com.alibaba.druid.support.http.WebStatFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-import javax.sql.DataSource;
-import java.sql.SQLException;
-
-/**
- * 数据库配置
- * created by shicr on 2018/6/5
- **/
-@Configuration
-public class DruidDBConfiguration {
-
-    private Logger logger = LoggerFactory.getLogger(DruidDBConfiguration.class);
-
-    @Value("${datasource.url}")
-    private String url;
-
-    @Value("${datasource.username}")
-    private String username;
-
-    @Value("${datasource.password}")
-    private String password;
-
-    @Value("${datasource.driverClassName}")
-    private String driverClassName;
-
-    @Value("${datasource.initialSize}")
-    private int initialSize;
-
-    @Value("${datasource.minIdle}")
-    private int minIdle;
-
-    @Value("${datasource.maxActive}")
-    private int maxActive;
-
-    @Value("${datasource.maxWait}")
-    private int maxWait;
-
-    @Value("${datasource.timeBetweenEvictionRunsMillis}")
-    private int timeBetweenEvictionRunsMillis;
-
-    @Value("${datasource.minEvictableIdleTimeMillis}")
-    private int minEvictableIdleTimeMillis;
-
-    @Value("${datasource.validationQuery}")
-    private String validationQuery;
-
-    @Value("${datasource.testWhileIdle}")
-    private boolean testWhileIdle;
-
-    @Value("${datasource.testOnBorrow}")
-    private boolean testOnBorrow;
-
-    @Value("${datasource.testOnReturn}")
-    private boolean testOnReturn;
-
-    @Value("${datasource.timeBetweenLogStatsMillis}")
-    private int timeBetweenLogStatsMillis;
-
-    @Value("${datasource.poolPreparedStatements}")
-    private boolean poolPreparedStatements;
-
-    @Value("${datasource.maxPoolPreparedStatementPerConnectionSize}")
-    private int maxPoolPreparedStatementPerConnectionSize;
-
-    @Value("${datasource.filters}")
-    private String filters;
-
-    @Value("${datasource.connectionProperties}")
-    private String connectionProperties;
-
-    @Bean
-    @Primary
-    public DataSource dataSource() {
-        DruidDataSource dataSource = new DruidDataSource();
-
-        dataSource.setUrl(url);
-        dataSource.setUsername(username);
-        dataSource.setPassword(password);
-        dataSource.setDriverClassName(driverClassName);
-
-        // configuration
-        dataSource.setInitialSize(initialSize);
-        dataSource.setMinIdle(minIdle);
-        dataSource.setMaxActive(maxActive);
-        dataSource.setMaxWait(maxWait);
-        dataSource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
-        dataSource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
-        dataSource.setValidationQuery(validationQuery);
-        dataSource.setTestWhileIdle(testWhileIdle);
-        dataSource.setTestOnBorrow(testOnBorrow);
-        dataSource.setTestOnReturn(testOnReturn);
-        dataSource.setTimeBetweenLogStatsMillis(timeBetweenLogStatsMillis);
-        dataSource.setPoolPreparedStatements(poolPreparedStatements);
-        dataSource.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize);
-        dataSource.setConnectionProperties(connectionProperties);
-        return dataSource;
-    }
-
-}

src/main/java/com/uas/credit/SSOConfiguration.java

@@ -1,22 +0,0 @@
-package com.uas.credit;
-
-import com.uas.credit.filter.AccessSignatureInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-/**
- * ssoconfig 配置
- * created by shicr on 2018/6/5
- **/
-@Configuration
-public class SSOConfiguration extends WebMvcConfigurerAdapter {
-
-    @Autowired
-    private AccessSignatureInterceptor accessSignatureInterceptor;
-
-   /* public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(accessSignatureInterceptor).addPathPatterns("/**");
-    }*/
-}

src/main/java/com/uas/credit/config/ApplicationContextRegister.java

@@ -0,0 +1,30 @@
+package com.uas.credit.config;
+
+import com.uas.credit.util.ContextUtils;
+import org.apache.log4j.Logger;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * 注册Spring上下文对象
+ * @author liuam
+ * @since 2018/6/25 0025 下午 15:09
+ */
+@Component
+public class ApplicationContextRegister implements ApplicationContextAware {
+
+    private static Logger logger = Logger.getLogger(ApplicationContextRegister.class);
+
+    /**
+     * 将上下文对象保存到ContextUtils中
+     * @param applicationContext
+     * @throws BeansException
+     */
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        ContextUtils.setApplicationContext(applicationContext);
+        logger.debug("ApplicationContext registed");
+    }
+}

src/main/java/com/uas/credit/config/PyConfig.java

@@ -0,0 +1,142 @@
+package com.uas.credit.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 鹏元配置信息
+ */
+@Component
+@ConfigurationProperties(prefix = "pyconfig")
+public class PyConfig {
+    /**
+     * 鹏元征信 api 域名
+     */
+    private String host;
+
+    /**
+     * 返回报文压缩的URL
+     */
+    private String pathZip;
+
+    /**
+     *  返回报文不压缩的URL
+     */
+    private String pathUnZip;
+
+    /**
+     * 认证信息，用户id
+     */
+    private String userId;
+
+    /**
+     * 认证信息，密码
+     */
+    private String password;
+
+    /**
+     * 是否测试模式
+     */
+    private boolean test;
+
+    /**
+     * 请求内容样本文件
+     */
+    private String queryFile;
+
+    private String keyStoreFile;
+
+    private String keyStorePassword;
+
+    private String trustStoreFile;
+
+    private String trustStorePassword;
+
+    public String getHost() {
+        return host;
+    }
+
+    public void setHost(String host) {
+        this.host = host;
+    }
+
+    public String getPathZip() {
+        return pathZip;
+    }
+
+    public void setPathZip(String pathZip) {
+        this.pathZip = pathZip;
+    }
+
+    public String getPathUnZip() {
+        return pathUnZip;
+    }
+
+    public void setPathUnZip(String pathUnZip) {
+        this.pathUnZip = pathUnZip;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public boolean isTest() {
+        return test;
+    }
+
+    public void setTest(boolean test) {
+        this.test = test;
+    }
+
+    public String getQueryFile() {
+        return queryFile;
+    }
+
+    public void setQueryFile(String queryFile) {
+        this.queryFile = queryFile;
+    }
+
+    public String getKeyStoreFile() {
+        return keyStoreFile;
+    }
+
+    public void setKeyStoreFile(String keyStoreFile) {
+        this.keyStoreFile = keyStoreFile;
+    }
+
+    public String getKeyStorePassword() {
+        return keyStorePassword;
+    }
+
+    public void setKeyStorePassword(String keyStorePassword) {
+        this.keyStorePassword = keyStorePassword;
+    }
+
+    public String getTrustStoreFile() {
+        return trustStoreFile;
+    }
+
+    public void setTrustStoreFile(String trustStoreFile) {
+        this.trustStoreFile = trustStoreFile;
+    }
+
+    public String getTrustStorePassword() {
+        return trustStorePassword;
+    }
+
+    public void setTrustStorePassword(String trustStorePassword) {
+        this.trustStorePassword = trustStorePassword;
+    }
+}

src/main/java/com/uas/credit/controller/CompanyController.java

@@ -1,6 +1,5 @@
 package com.uas.credit.controller;
 
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -8,7 +7,6 @@ import org.springframework.web.bind.annotation.RestController;
  * created by shicr on 2018/6/7
  **/
 @RestController
-@ResponseBody
 public class CompanyController {
 
 

src/main/java/com/uas/credit/controller/ErpQueryController.java

@@ -1,16 +1,14 @@
 package com.uas.credit.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.credit.model.EnterpriseQuery;
 import com.uas.credit.model.PersonQuery;
 import com.uas.credit.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * UAS查询入口
@@ -41,22 +39,22 @@ public class ErpQueryController {
     /**
      * ERP对企业进行查询
      */
-    @RequestMapping(value = "/queryEn",method = RequestMethod.POST)
+    @RequestMapping(value = "/queryEn", method = RequestMethod.POST)
     public ModelMap queryEn(@RequestBody EnterpriseQuery erpQuery) {
         ModelMap modelMap = new ModelMap();
         if (erpQuery != null) {
-                //查询企业债务信息
-                String Endept = enterpriseDeptService.queryAndSave(erpQuery);
-                //查询企业经营异常信息
-                String Enexception = enexceptionService.queryAndSave(erpQuery);
-                //查询企业信用信息
-                String Encredit = creditInfoService.queryAndSave(erpQuery);
-                //查询企业风险信息
-                String Enrisk = enRiskInfoService.queryAndSave(erpQuery);
-                modelMap.put("Endept", Endept);
-                modelMap.put("Enexception", Enexception);
-                modelMap.put("Enrisk", Enrisk);
-                modelMap.put("Encredit", Encredit);
+            // 查询企业债务信息
+            String endept = enterpriseDeptService.queryAndSave(erpQuery);
+            // 查询企业经营异常信息
+            String enexception = enexceptionService.queryAndSave(erpQuery);
+            // 查询企业信用信息
+            String encredit = creditInfoService.queryAndSave(erpQuery);
+            // 查询企业风险信息
+            String enrisk = enRiskInfoService.queryAndSave(erpQuery);
+            modelMap.put("endept", endept);
+            modelMap.put("enexception", enexception);
+            modelMap.put("enrisk", enrisk);
+            modelMap.put("encredit", encredit);
         }
         return modelMap;
     }
@@ -64,16 +62,16 @@ public class ErpQueryController {
     /**
      * erp对个人进行查询
      */
-    @RequestMapping(value = "/queryPe",method = RequestMethod.POST)
+    @RequestMapping(value = "/queryPe", method = RequestMethod.POST)
     public ModelMap queryPerson(@RequestBody PersonQuery erpQuery) {
         ModelMap modelMap = new ModelMap();
-        if(erpQuery != null){
-            //查询个人身份信息
-            String Pnidentity = personalService.queryAndSave(erpQuery);
-            //查询个人股东信息
-            String Pnshareholder = personCorporationService.queryAndSave(erpQuery);
-            modelMap.put("Pnidentity",Pnidentity);
-            modelMap.put("Pnshareholder",Pnshareholder);
+        if (erpQuery != null) {
+            // 查询个人身份信息
+            String pnidentity = personalService.queryAndSave(erpQuery);
+            // 查询个人股东信息
+            String pnshareholder = personCorporationService.queryAndSave(erpQuery);
+            modelMap.put("pnidentity", pnidentity);
+            modelMap.put("pnshareholder", pnshareholder);
         }
         return modelMap;
     }

src/main/java/com/uas/credit/controller/PyApiDemo.java

@@ -1,9 +1,11 @@
 package com.uas.credit.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.uas.credit.config.PyConfig;
 import com.uas.credit.model.Item;
 import com.uas.credit.model.QueryCondition;
 import com.uas.credit.model.QueryConditions;
+import com.uas.credit.util.ContextUtils;
 import com.uas.credit.util.HttpUtils;
 import com.uas.credit.util.PyUtils;
 import org.apache.http.HttpResponse;
@@ -20,14 +22,19 @@ import java.util.Map;
  */
 public class PyApiDemo {
 
+    private static PyConfig pyConfig;
+    {
+        pyConfig = ContextUtils.getBean(PyConfig.class);
+    }
+
     public void requestUnzipApi() throws Exception {
-        String result = requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP);
+        String result = requestApi(pyConfig.getHost(), pyConfig.getPathUnZip());
         System.out.println(result);
     }
 
     //    @Test
     public void requestZipApi() throws Exception {
-        String result = requestApi(PyConfig.HOST, PyConfig.PATH_ZIP);
+        String result = requestApi(pyConfig.getHost(), pyConfig.getPathZip());
         System.out.println(result);
 
         // 对压缩文本做进一步处理
@@ -54,8 +61,8 @@ public class PyApiDemo {
         Map<String, String> bodys = new HashMap<String, String>();
 		//默认请求条件是JSON格式.如果请求条件是xml，需要指定格式。
 		//bodys.put("format","xml")
-        bodys.put("userID", PyConfig.USERID);
-        bodys.put("password", PyConfig.PASSWORD);
+        bodys.put("userID", pyConfig.getUserId());
+        bodys.put("password", pyConfig.getPassword());
         bodys.put("queryCondition", getQueryCondition());
         HttpResponse response = HttpUtils.doPost(host, path, "POST", headers, querys, bodys);
         String result = EntityUtils.toString(response.getEntity());
@@ -65,9 +72,9 @@ public class PyApiDemo {
 
     private static String getQueryCondition() throws Exception {
 
-        if (PyConfig.IS_TEST) {
+        if (pyConfig.isTest()) {
             // 读取文件方式（测试使用,仅供参考）
-            return PyUtils.toString(new FileInputStream(PyConfig.QUERY_FILE), "UTF-8");
+            return PyUtils.toString(new FileInputStream(pyConfig.getQueryFile()), "UTF-8");
         } else {
             // 使用JavaBean/Map方式（正式使用,仅供参考）
             QueryConditions queryConditions = new QueryConditions();

src/main/java/com/uas/credit/controller/PyConfig.java

@@ -1,32 +0,0 @@
-package com.uas.credit.controller;
-
-/**
- * 鹏元配置信息
- */
-public class PyConfig {
-
-    // API域名
-    public final static String HOST = "http://test.pycredit.com:6001"; // 测试环境
-//    public final static String HOST = "https://www.pycredit.com:6443"; // 生产环境
-
-    // 返回报文压缩的URL
-    public final static String PATH_ZIP = "/rest/query/report/zip";
-
-    // 返回报文不压缩的URL
-    public final static String PATH_UNZIP = "/rest/query/report/unzip";
-
-    // 认证信息
-    public final static String USERID = "ytznwsqueryn2";
-    public final static String PASSWORD = "{MD5}Ctp7/RnkBEzsBh+aNa3cNA==";
-
-    // 是否测试模式
-    public final static boolean IS_TEST = false;
-
-    // 请求内容样本文件，实际中可使用具体对象组装
-    public final static String QUERY_FILE = "/sample.json";
-
-    public final static String KEYSTORE_FILE = "d:/certs/client.jks";
-    public final static String KEYSTORE_PASSWORD = "123456";
-    public final static String TRUSTSTORE_FILE = "d:/certs/client.jks";
-    public final static String TRUSTSTORE_PASSWORD = "123456";
-}

src/main/java/com/uas/credit/filter/AbstractSSOInterceptor.java

@@ -1,92 +0,0 @@
-package com.uas.credit.filter;
-
-import com.uas.sso.SSOConfig;
-import com.uas.sso.SSOHelper;
-import com.uas.sso.SSOToken;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.logging.Logger;
-
-/**
- * spring mvc 接口，SSO 过滤器验证登录状态
- *
- * @author yingp
- *
- */
-public abstract class AbstractSSOInterceptor extends HandlerInterceptorAdapter {
-
-    private static final Logger logger = Logger.getLogger(com.uas.sso.web.spring.AbstractSSOInterceptor.class.getName());
-
-    /**
-     * 未登录情况下的处理
-     *
-     * @param request
-     * @param response
-     * @return true继续，false跳转登录
-     */
-    protected abstract boolean onAuthenticateFailed(HttpServletRequest request, HttpServletResponse response);
-
-    /**
-     * 已登录情况下的处理
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    protected abstract void onAuthenticateSuccess(HttpServletRequest request, HttpServletResponse response);
-
-    /**
-     * 跳转登录
-     *
-     * @param request
-     * @param response
-     * @throws IOException
-     */
-    protected void sendRedirect(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        boolean cross = SSOHelper.isCrossDomain(request);
-        if (cross) {
-            request.getSession().setAttribute(SSOConfig.SSOReferer, request.getRequestURL());
-            response.sendRedirect(SSOHelper.getSSOService().getConfig().getCrossProxyUri());
-        } else {
-            SSOHelper.clearRedirectLogin(request, response);
-        }
-    }
-
-    private final boolean authenticate(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        SSOToken token = SSOHelper.getToken(request);
-        if (token == null) {
-            // 返回false表示需要跳转登录
-            if (!onAuthenticateFailed(request, response)) {
-                if (isRedirectAble(request)) {
-                    /**
-                     * 重新登录
-                     */
-                    logger.fine("logout. request url:" + request.getRequestURL());
-                    sendRedirect(request, response);
-                }
-                return false;
-            } else {
-                return true;
-            }
-        }
-        request.setAttribute(SSOConfig.SSO_TOKEN_ATTR, token);
-        onAuthenticateSuccess(request, response);
-        return true;
-    }
-
-    @Override
-    public final boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        if (super.preHandle(request, response, handler)) {
-            return authenticate(request, response);
-        }
-        return false;
-    }
-
-    protected boolean isRedirectAble(HttpServletRequest request) {
-        return null == request.getHeader("x-requested-with")
-                && (null == request.getHeader("Accept") || !request.getHeader("Accept").contains("application/json"));
-    }
-}

src/main/java/com/uas/credit/filter/AccessSignatureInterceptor.java

@@ -1,56 +0,0 @@
-package com.uas.credit.filter;
-
-import com.uas.credit.model.Company;
-import com.uas.credit.service.EnterpriseService;
-import com.uas.credit.util.SystemSession;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * 对需要签名认证的请求进行拦截认证
- * created by shicr on 2018/6/5
- **/
-@SuppressWarnings("deprecation")
-@Component
-public class AccessSignatureInterceptor extends HandlerInterceptorAdapter {
-
-
-    private final static String enuu = "enuu";
-    private final static String useruu = "useruu";
-
-    private static final Logger logger = Logger.getLogger(AccessSignatureInterceptor.class);
-
-    @Autowired
-    private EnterpriseService enterpriseService;
-
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        String enuu = request.getParameter("enuu");
-        if (enuu != null) {
-            Company company = enterpriseService.findByEnuu(Long.parseLong(enuu));
-            if (company != null) {
-
-                // 将企业信息、企业管理员信息写入SystemSession
-                SystemSession.setEnterprise(company);
-
-                return true;
-            }
-
-        }
-        response.setStatus(HttpStatus.FORBIDDEN.value());
-        return false;
-    }
-
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-        super.afterCompletion(request, response, handler, ex);
-        SystemSession.clear();
-    }
-}

src/main/java/com/uas/credit/model/Company.java

@@ -1,5 +1,6 @@
 package com.uas.credit.model;
 
+
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;

src/main/java/com/uas/credit/model/corpcreditinfo/NationalFrOtherCorpShareholderInfo.java

@@ -1,6 +1,6 @@
 package com.uas.credit.model.corpcreditinfo;
 
-import com.sun.tools.javac.jvm.Items;
+
 
 import javax.persistence.*;
 import java.util.List;

src/main/java/com/uas/credit/model/corpcreditinfo/RegisterContactInfos.java

@@ -1,6 +1,5 @@
 package com.uas.credit.model.corpcreditinfo;
 
-import com.sun.tools.javac.jvm.Items;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/uas/credit/service/impl/EnCreditInfoServiceImpl.java

@@ -1,13 +1,12 @@
 package com.uas.credit.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.credit.controller.PyConfig;
+import com.uas.credit.config.PyConfig;
 import com.uas.credit.dao.EnCreditDao;
 import com.uas.credit.model.EnterpriseQuery;
 import com.uas.credit.model.Item;
 import com.uas.credit.model.QueryCondition;
 import com.uas.credit.model.QueryConditions;
-import com.uas.credit.model.corpcreditinfo.EncreditReport;
 import com.uas.credit.model.corpcreditinfo.EncreditinfoRoot;
 import com.uas.credit.service.EnCreditInfoService;
 import com.uas.credit.service.ErpQueryService;
@@ -41,6 +40,9 @@ public class EnCreditInfoServiceImpl implements EnCreditInfoService {
     @Autowired
     private ErpQueryService erpQueryService;
 
+    @Autowired
+    private PyConfig pyConfig;
+
     /**
      * 查找企业信息
      *
@@ -85,7 +87,7 @@ public class EnCreditInfoServiceImpl implements EnCreditInfoService {
         String encredit = getQueryCondition(query);
 
         //发起鹏元征信的请求
-        String encreditResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, encredit);
+        String encreditResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), encredit);
         //保存返回的结果
         EncreditinfoRoot encreditinfoRoot = JSON.parseObject(encreditResult, EncreditinfoRoot.class);
         EncreditinfoRoot encreditReport1 = creditDao.save(encreditinfoRoot);

src/main/java/com/uas/credit/service/impl/EnRiskInfoServiceImpl.java

@@ -1,7 +1,7 @@
 package com.uas.credit.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.credit.controller.PyConfig;
+import com.uas.credit.config.PyConfig;
 import com.uas.credit.dao.EnRiskInfoDao;
 import com.uas.credit.model.EnterpriseQuery;
 import com.uas.credit.model.Item;
@@ -39,6 +39,9 @@ public class EnRiskInfoServiceImpl implements EnRiskInfoService {
     @Autowired
     private ErpQueryService erpQueryService;
 
+    @Autowired
+    private PyConfig pyConfig;
+
     /**
      * 查找企业信息
      *
@@ -82,7 +85,7 @@ public class EnRiskInfoServiceImpl implements EnRiskInfoService {
         //拼装查询的json
         String enrisk = getQueryCondition(query);
         //发起鹏元征信的请求
-        String enriskResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, enrisk);
+        String enriskResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), enrisk);
         //保存返回的结果
         EnRiskInfoRoot enRiskInfoRoot = JSON.parseObject(enriskResult, EnRiskInfoRoot.class);
         EnRiskInfoRoot enRiskInfoRoot1 = enRiskInfoDao.save(enRiskInfoRoot);

src/main/java/com/uas/credit/service/impl/EnexceptionServiceImpl.java

@@ -1,7 +1,7 @@
 package com.uas.credit.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.credit.controller.PyConfig;
+import com.uas.credit.config.PyConfig;
 import com.uas.credit.dao.EnexceptionDao;
 import com.uas.credit.model.EnterpriseQuery;
 import com.uas.credit.model.Item;
@@ -38,6 +38,9 @@ public class EnexceptionServiceImpl implements EnexceptionService {
     @Autowired
     private ErpQueryService erpQueryService;
 
+    @Autowired
+    private PyConfig pyConfig;
+
     /**
      * 查找企业信息
      *
@@ -83,7 +86,7 @@ public class EnexceptionServiceImpl implements EnexceptionService {
         String enexception = getQueryCondition(query);
 
         //发起鹏元征信的请求
-        String enexceptionResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, enexception);
+        String enexceptionResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), enexception);
         //保存返回的结果
         AbnormalRoot abnormalRoot = JSON.parseObject(enexceptionResult, AbnormalRoot.class);
         AbnormalRoot abnormalReport1 = enexceptionDao.save(abnormalRoot);

src/main/java/com/uas/credit/service/impl/EnterpriseDeptServiceImpl.java

@@ -1,7 +1,7 @@
 package com.uas.credit.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.credit.controller.PyConfig;
+import com.uas.credit.config.PyConfig;
 import com.uas.credit.dao.EnDebtInfoDao;
 import com.uas.credit.model.EnterpriseQuery;
 import com.uas.credit.model.Item;
@@ -29,6 +29,9 @@ public class EnterpriseDeptServiceImpl implements EnterpriseDeptService {
     @Autowired
     private ErpQueryService erpQueryService;
 
+    @Autowired
+    private PyConfig pyConfig;
+
     //查询类型
     private static String ENTERPRISE_DEPT = "25123";
 
@@ -80,7 +83,7 @@ public class EnterpriseDeptServiceImpl implements EnterpriseDeptService {
     public String queryAndSave(EnterpriseQuery query) {
         String endept = getQueryCondition(query);
 
-        String endeptResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, endept);
+        String endeptResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), endept);
         EndeptinfoRoot endeptinfoRoot = JSON.parseObject(endeptResult, EndeptinfoRoot.class);
         EndeptinfoRoot endeptinfoRoot1 = enterpriseDeptDao.save(endeptinfoRoot);
         return endeptResult;

src/main/java/com/uas/credit/service/impl/EnterpriseServiceImpl.java

@@ -1,7 +1,7 @@
 package com.uas.credit.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.credit.controller.PyConfig;
+import com.uas.credit.config.PyConfig;
 import com.uas.credit.dao.EnterpriseDao;
 import com.uas.credit.model.*;
 import com.uas.credit.service.EnRiskInfoService;
@@ -32,6 +32,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     @Autowired
     private EnRiskInfoService corpRiskInfoService;
 
+    @Autowired
+    private PyConfig pyConfig;
+
     /**
      * 拼装企业查询json格式
      *
@@ -85,8 +88,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         Map<String, String> bodys = new HashMap<String, String>();
         //默认请求条件是JSON格式.如果请求条件是xml，需要指定格式。
         //bodys.put("format","xml")
-        bodys.put("userID", PyConfig.USERID);
-        bodys.put("password", PyConfig.PASSWORD);
+        bodys.put("userID", pyConfig.getUserId());
+        bodys.put("password", pyConfig.getPassword());
         bodys.put("queryCondition", getQueryCondition(subreportIDs,queryReasonID));
         HttpResponse response = null;
         try {

src/main/java/com/uas/credit/service/impl/ErpQueryServiceImpl.java

@@ -1,6 +1,6 @@
 package com.uas.credit.service.impl;
 
-import com.uas.credit.controller.PyConfig;
+import com.uas.credit.config.PyConfig;
 import com.uas.credit.service.EnterpriseDeptService;
 import com.uas.credit.service.EnterpriseService;
 import com.uas.credit.service.ErpQueryService;
@@ -32,6 +32,9 @@ public class ErpQueryServiceImpl implements ErpQueryService {
     @Autowired
     private EnterpriseDeptService enterpriseDeptService;
 
+    @Autowired
+    private PyConfig pyConfig;
+
 
     public String requestApi(String host, String path,String query) {
 
@@ -47,8 +50,8 @@ public class ErpQueryServiceImpl implements ErpQueryService {
         Map<String, String> bodys = new HashMap<String, String>();
         //默认请求条件是JSON格式.如果请求条件是xml，需要指定格式。
         //bodys.put("format","xml")
-        bodys.put("userID", PyConfig.USERID);
-        bodys.put("password", PyConfig.PASSWORD);
+        bodys.put("userID", pyConfig.getUserId());
+        bodys.put("password", pyConfig.getPassword());
         bodys.put("queryCondition", query);
         HttpResponse response = null;
         try {

src/main/java/com/uas/credit/service/impl/PersonCorporationServiceImpl.java

@@ -1,7 +1,7 @@
 package com.uas.credit.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.credit.controller.PyConfig;
+import com.uas.credit.config.PyConfig;
 import com.uas.credit.dao.PersonCorporationDao;
 import com.uas.credit.model.Item;
 import com.uas.credit.model.PersonQuery;
@@ -41,6 +41,9 @@ public class PersonCorporationServiceImpl implements PersonCorporationService {
     @Autowired
     private ErpQueryService erpQueryService;
 
+    @Autowired
+    private PyConfig pyConfig;
+
     /**
      * 拼装企业查询json格式
      *
@@ -84,7 +87,7 @@ public class PersonCorporationServiceImpl implements PersonCorporationService {
         //拼装查询的json
         String corporation = getQueryCondition(query);
         //发起鹏元征信的请求
-        String corporationResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, corporation);
+        String corporationResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), corporation);
         //保存返回的结果
         PersonCorporationRoot personCorporationRoot = JSON.parseObject(corporationResult, PersonCorporationRoot.class);
         PersonCorporationRoot personCorporationReport1 = personCorporationDao.save(personCorporationRoot);

src/main/java/com/uas/credit/service/impl/PersonalServiceImpl.java

@@ -1,15 +1,12 @@
 package com.uas.credit.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.credit.controller.PyConfig;
-import com.uas.credit.dao.EnCreditDao;
+import com.uas.credit.config.PyConfig;
 import com.uas.credit.dao.PersonDao;
 import com.uas.credit.model.Item;
 import com.uas.credit.model.PersonQuery;
 import com.uas.credit.model.QueryCondition;
 import com.uas.credit.model.QueryConditions;
-import com.uas.credit.model.corpcreditinfo.EncreditReport;
-import com.uas.credit.model.personal.PoliceCheckReport;
 import com.uas.credit.model.personal.PoliceCheckRoot;
 import com.uas.credit.service.ErpQueryService;
 import com.uas.credit.service.PersonalService;
@@ -43,6 +40,9 @@ public class PersonalServiceImpl implements PersonalService {
     @Autowired
     private ErpQueryService erpQueryService;
 
+    @Autowired
+    private PyConfig pyConfig;
+
 
     @Override
     public String getQueryCondition(PersonQuery query) {
@@ -80,7 +80,7 @@ public class PersonalServiceImpl implements PersonalService {
         //拼装查询的json
         String person = getQueryCondition(query);
         //发起鹏元征信的请求
-        String prsonResult = erpQueryService.requestApi(PyConfig.HOST, PyConfig.PATH_UNZIP, person);
+        String prsonResult = erpQueryService.requestApi(pyConfig.getHost(), pyConfig.getPathUnZip(), person);
         //保存返回的结果
         PoliceCheckRoot policeCheckRoot = JSON.parseObject(prsonResult, PoliceCheckRoot.class);
         PoliceCheckRoot policeCheckRoot1 = personDao.save(policeCheckRoot);

src/main/java/com/uas/credit/util/ContextUtils.java

@@ -0,0 +1,71 @@
+package com.uas.credit.util;
+
+import org.apache.log4j.Logger;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * spring容器上下文对象
+ * @author liuam
+ * @since 2018/6/25 0025 下午 15:12
+ */
+public class ContextUtils {
+
+    private static ApplicationContext applicationContext;
+
+    private static Logger logger = Logger.getLogger(ContextUtils.class);
+
+    public static void setApplicationContext(ApplicationContext applicationContext) {
+        logger.debug("setApplicationContext, notifyAll");
+        ContextUtils.applicationContext = applicationContext;
+    }
+
+    /**
+     * 获取上下文对象，需容器启动才可调用
+     * @return
+     */
+    public static ApplicationContext getApplicationContext() {
+        while (applicationContext == null) {
+            try {
+                logger.debug("getApplicationContext, wait...");
+                ContextUtils.class.wait(60000);
+                if (applicationContext == null) {
+                    logger.debug("Have been waiting for ApplicationContext to be set for 1 minute", new Exception());
+                }
+            } catch (InterruptedException ex) {
+                logger.debug("getApplicationContext, wait interrupted");
+            }
+        }
+        return applicationContext;
+    }
+
+    /**
+     * 获取bean
+     *
+     * @param name
+     * @return
+     */
+    public static Object getBean(String name) {
+        return getApplicationContext().getBean(name);
+    }
+
+    /**
+     * 获取bean
+     *
+     * @param cls
+     * @return
+     */
+    public static <T> T getBean(Class<T> cls) {
+        return getApplicationContext().getBean(cls);
+    }
+
+    /**
+     * 触发事件
+     *
+     * @param event
+     */
+    public static void publishEvent(ApplicationEvent event) {
+        getApplicationContext().publishEvent(event);
+    }
+
+}

src/main/java/com/uas/credit/util/PyConfig.java

@@ -1,31 +0,0 @@
-package com.uas.credit.util;
-
-/**
- * created by shicr on 2018/6/7
- **/
-public class PyConfig {
-    // API域名
-    public final static String HOST = "http://test.pycredit.com:6001"; // 测试环境
-//    public final static String HOST = "https://www.pycredit.com:6443"; // 生产环境
-
-    // 返回报文压缩的URL
-    public final static String PATH_ZIP = "/rest/query/report/zip";
-
-    // 返回报文不压缩的URL
-    public final static String PATH_UNZIP = "/rest/query/report/unzip";
-
-    // 认证信息
-    public final static String USERID = "";
-    public final static String PASSWORD = "";
-
-    // 是否测试模式
-    public final static boolean IS_TEST = false;
-
-    // 请求内容样本文件，实际中可使用具体对象组装
-    public final static String QUERY_FILE = "/sample.json";
-
-    public final static String KEYSTORE_FILE = "d:/certs/client.jks";
-    public final static String KEYSTORE_PASSWORD = "123456";
-    public final static String TRUSTSTORE_FILE = "d:/certs/client.jks";
-    public final static String TRUSTSTORE_PASSWORD = "123456";
-}

src/main/java/com/uas/credit/util/PySSLContextUtil.java

@@ -1,6 +1,8 @@
 package com.uas.credit.util;
 
 
+import com.uas.credit.config.PyConfig;
+
 import javax.net.ssl.*;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -13,6 +15,12 @@ import java.security.cert.CertificateException;
  */
 public class PySSLContextUtil {
 
+    private static PyConfig pyConfig;
+
+    {
+        pyConfig = ContextUtils.getBean(PyConfig.class);
+    }
+
     /**
      * 使用该SSLContext，证书如下
      * keystore  ： javax.net.ssl.keyStore 指定的证书
@@ -33,9 +41,9 @@ public class PySSLContextUtil {
      */
     public static SSLContext createCustomerSSLContext() throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException, IOException, CertificateException, UnrecoverableKeyException {
         SSLContext context = SSLContext.getInstance("TLS");
-        KeyStore keyStore = getKeyStore("JKS", new FileInputStream(PyConfig.KEYSTORE_FILE), PyConfig.KEYSTORE_PASSWORD);
-        KeyManager[] kms = createKeyManager(keyStore, PyConfig.KEYSTORE_PASSWORD);
-        KeyStore trustStore = getKeyStore("JKS", new FileInputStream(PyConfig.TRUSTSTORE_FILE), PyConfig.TRUSTSTORE_PASSWORD);
+        KeyStore keyStore = getKeyStore("JKS", new FileInputStream(pyConfig.getKeyStoreFile()), pyConfig.getKeyStorePassword());
+        KeyManager[] kms = createKeyManager(keyStore, pyConfig.getKeyStorePassword());
+        KeyStore trustStore = getKeyStore("JKS", new FileInputStream(pyConfig.getTrustStoreFile()), pyConfig.getTrustStorePassword());
         TrustManager[] tms = createTrustManager(trustStore);
 		//需要添加信任证书（需要公钥）
         //context.init(kms, tms, null);

src/main/java/com/uas/credit/util/SystemSession.java

@@ -1,41 +0,0 @@
-package com.uas.credit.util;
-
-import com.uas.credit.model.Company;
-import com.uas.account.entity.UserView;
-
-/**
- * 每次请求服务器时，请求的企业信息保存，然后进行相关操作
- * created by shicr on 2018/6/6
- **/
-public class SystemSession {
-
-    private static ThreadLocal<Company> local = new ThreadLocal<Company>();
-
-    public static void setEnterprise(Company enterprise) {
-        local.set(enterprise);
-    }
-
-    public static Company getEnterprise() {
-        return local.get();
-    }
-
-    public static void clear(){
-        local.set(null);
-    }
-
-    private static ThreadLocal<UserView> user = new ThreadLocal<UserView>();
-
-    public static void setUser(UserView session){
-        user.set(session);
-    }
-
-    public static UserView getUser() {
-        return user.get();
-    }
-
-    public static void clearUser(){
-        user.set(null);
-    }
-
-
-}

src/main/resources/config/application-dev.properties

@@ -1,26 +0,0 @@
-datasource.url=jdbc:mysql://10.10.100.18:3306/credit?characterEncoding=utf-8
-datasource.username=root
-datasource.password=select
-datasource.driverClassName=com.mysql.jdbc.Driver
-datasource.initialSize=1
-datasource.minIdle=1
-datasource.maxActive=20
-datasource.maxWait=60000
-datasource.timeBetweenEvictionRunsMillis=60000
-datasource.minEvictableIdleTimeMillis=300000
-datasource.validationQuery=SELECT 1 FROM DUAL
-datasource.testWhileIdle=true
-datasource.testOnBorrow=true
-datasource.testOnReturn=false
-datasource.poolPreparedStatements=true
-datasource.timeBetweenLogStatsMillis=60000
-datasource.maxPoolPreparedStatementPerConnectionSize=20
-datasource.filters=stat,slf4j
-datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
-
-spring.jpa.hibernate.show-sql= true  
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect  
-spring.jackson.serialization.indent_output=false  
-
-pengyuan=http://test.pycredit.com:6001/rest/query/report/unzip       

src/main/resources/config/application-dev.yml

@@ -0,0 +1,8 @@
+
+
+spring:
+  datasource:
+    url: jdbc:mysql://192.168.253.6:3306/credit?characterEncoding=utf-8&useSSL=false
+    driver-class-name: com.mysql.jdbc.Driver
+    username: root
+    password: select111***

src/main/resources/config/application-prod.properties

@@ -1,24 +0,0 @@
-datasource.url=jdbc:mysql://10.10.100.18:3306/credit?characterEncoding=utf-8
-datasource.username=root
-datasource.password=select
-datasource.driverClassName=com.mysql.jdbc.Driver
-datasource.initialSize=1
-datasource.minIdle=1
-datasource.maxActive=20
-datasource.maxWait=60000
-datasource.timeBetweenEvictionRunsMillis=60000
-datasource.minEvictableIdleTimeMillis=300000
-datasource.validationQuery=SELECT 1 FROM DUAL
-datasource.testWhileIdle=true
-datasource.testOnBorrow=true
-datasource.testOnReturn=false
-datasource.poolPreparedStatements=true
-datasource.timeBetweenLogStatsMillis=60000
-datasource.maxPoolPreparedStatementPerConnectionSize=20
-datasource.filters=stat,slf4j
-datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
-
-spring.jpa.hibernate.show-sql= true  
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect  
-spring.jackson.serialization.indent_output=false  

src/main/resources/config/application-prod.yml

@@ -0,0 +1,6 @@
+spring:
+  datasource:
+    url: jdbc:mysql://10.10.100.18:3306/credit?characterEncoding=utf-8&useSSL=false
+    driver-class-name: com.mysql.jdbc.Driver
+    username: root
+    password: select

src/main/resources/dev.properties

@@ -0,0 +1,24 @@
+#鹏元征信 api 域名
+pyconfig.host=http://test.pycredit.com:6001
+
+#返回报文压缩的URL
+pyconfig.pathZip=/rest/query/report/zip
+
+#返回报文不压缩的URL
+pyconfig.pathUnZip=/rest/query/report/unzip
+
+#认证信息，用户id
+pyconfig.userId=ytznwsqueryn2
+
+#认证信息，密码
+pyconfig.password={MD5}Ctp7/RnkBEzsBh+aNa3cNA==
+
+#是否测试模式
+pyconfig.test=true
+
+#请求内容样本文件
+pyconfig.queryFile=/sample.json
+pyconfig.keyStoreFile=d:/certs/client.jks
+pyconfig.keyStorePassword=123456
+pyconfig.trustStoreFile=d:/certs/client.jks
+pyconfig.trustStorePassword=123456

src/main/resources/dev/account.properties

@@ -1 +0,0 @@
-

src/main/resources/prod.properties

@@ -0,0 +1,24 @@
+#鹏元征信 api 域名
+pyconfig.host=https://www.pycredit.com:6443
+
+#返回报文压缩的URL
+pyconfig.pathZip=/rest/query/report/zip
+
+#返回报文不压缩的URL
+pyconfig.pathUnZip=/rest/query/report/unzip
+
+#认证信息，用户id
+pyconfig.userId=ytznwsqueryn2
+
+#认证信息，密码
+pyconfig.password={MD5}Ctp7/RnkBEzsBh+aNa3cNA==
+
+#是否测试模式
+pyconfig.test=false
+
+#请求内容样本文件
+pyconfig.queryFile=/sample.json
+pyconfig.keyStoreFile=d:/certs/client.jks
+pyconfig.keyStorePassword=123456
+pyconfig.trustStoreFile=d:/certs/client.jks
+pyconfig.trustStorePassword=123456