Commit 48895623 authored by 华润's avatar 华润

跨省单位前置机本地环境,测试环境,正式环境,动态参数配置,方便切换

parent 2b7d9191
......@@ -74,6 +74,10 @@
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
......
......@@ -2,7 +2,9 @@ package net.cdkj.gjj.adapter.controller;
import com.alibaba.fastjson.JSONObject;
import net.cdkj.gjj.adapter.domain.PropertyUtil;
import net.cdkj.gjj.adapter.domain.UnitAccountOpeningInformation;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
......@@ -12,10 +14,7 @@ import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.zip.GZIPInputStream;
import static net.cdkj.gjj.adapter.domain.GzipUtil.unzipString;
import static net.cdkj.gjj.adapter.domain.GzipUtil.zipString;
......@@ -36,6 +35,7 @@ public class ProvidentFundServicesController {
@ResponseBody
@PostMapping("ProvidentFundServices")
public static String ProvidentFundServices(HttpServletRequest request) {
Properties prop = PropertyUtil.getConfig("application.properties");
//-----------------------------------------------------
StringBuffer json = new StringBuffer();
String line = null;
......@@ -59,7 +59,7 @@ public class ProvidentFundServicesController {
OutputStream out = null;
try {
// 创建url 资源
URL url = new URL("http://59.208.149.225:18080/sjzt/api/dx/e39a08e0a52b413897f9d23359540b27/GJJ?access_token="+token);//正式环境第三方地址
URL url = new URL(PropertyUtil.getPropValue( prop ,"provifunserviurl")+token);//正式环境第三方地址
// URL url = new URL("http://59.208.149.225:18080/sjzt/api/dx/e39a08e0a52b413897f9d23359540b27/GJJ?access_token="+token);//测试环境第三方地址
// URL url = new URL("http://127.0.0.1:8080/FrontEndProcessor/FrontEndProcessor/ProvidentFundServices2?access_token=" + token);//本地模拟第三方地址
// 创建http 连接
......@@ -236,6 +236,7 @@ public class ProvidentFundServicesController {
@ResponseBody
@PostMapping("BusinessProcessing")
public static String BusinessProcessing(HttpServletRequest request) {
Properties prop = PropertyUtil.getConfig("application.properties");
System.out.println("继续调前置机的进度第二个接口");
//-----------------------------------------------------
StringBuffer json = new StringBuffer();
......@@ -260,7 +261,7 @@ public class ProvidentFundServicesController {
OutputStream out = null;
try {
// 创建url 资源
URL url = new URL("http://59.208.149.225:18080/sjzt/api/retGjjProgData?access_token="+token);//正式环境第三方地址
URL url = new URL(PropertyUtil.getPropValue( prop ,"bussiniprourl")+token);//正式环境第三方地址
// URL url = new URL("http://59.208.149.225:18080/sjzt/api/testretGjjProgData?access_token="+token);//测试环境第三方地址
// URL url = new URL("http://127.0.0.1:8080/FrontEndProcessor/FrontEndProcessor/BusinessProcessing2?access_token=" + token);//本地模拟第三方地址
// 创建http 连接
......
......@@ -2,11 +2,13 @@ package net.cdkj.gjj.adapter.controller;
import com.alibaba.fastjson.JSONObject;
import net.cdkj.gjj.adapter.domain.PropertyUtil;
import org.springframework.web.bind.annotation.*;
import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.io.IOException;
import java.util.Properties;
import java.util.zip.GZIPInputStream;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
......@@ -22,6 +24,16 @@ import static net.cdkj.gjj.adapter.domain.GzipUtil.*;
@RequestMapping(value = "FrontEndProcessor")
public class TokenAcquisitionController {
/**
* 测试静态方法读取配置文件属性值方法
*/
@ResponseBody
@PostMapping("test")
public static void test(){
Properties prop = PropertyUtil.getConfig("application.properties");
System.out.println( PropertyUtil.getPropValue( prop ,"tokenurl"));
}
/**
* 鉴权认证接口(token和过期时间获取)
*
......@@ -31,6 +43,7 @@ public class TokenAcquisitionController {
@ResponseBody
@PostMapping("token")
public static String TokenAcquisition() {
Properties prop = PropertyUtil.getConfig("application.properties");
JSONObject jsonObject = new JSONObject();
jsonObject.put("app_id", "eb453ca78b354f2c9163a703530f5186");
jsonObject.put("app_secret", "9a31b84878654a72a999e38ef55aa186");
......@@ -43,7 +56,7 @@ public class TokenAcquisitionController {
OutputStream out = null;
try {
// 创建url 资源
URL url = new URL("http://59.208.149.225:18080/sjzt/api/oauth2/token");//正式环境第三方地址
URL url = new URL(PropertyUtil.getPropValue( prop ,"tokenurl"));//正式环境第三方地址
// URL url = new URL("https://scjg.hubei.gov.cn/sjzt/api/oauth2/token");//测试环境第三方地址
// URL url = new URL("http://127.0.0.1:8080/FrontEndProcessor/FrontEndProcessor/token2");//本地环境模拟第三方地址
// 创建http 连接
......
package net.cdkj.gjj.adapter.domain;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Properties;
public class PropertyUtil {
/**
* 读取 classpath 下 指定的properties配置文件,加载到Properties并返回Properties
* @param name 配置文件名,如:mongo.properties
* @return
*/
public static Properties getConfig(String name){
Properties props=null;
try{
props = new Properties();
InputStream in = PropertyUtil.class.getClassLoader().getResourceAsStream(name);
BufferedReader bf = new BufferedReader(new InputStreamReader(in));
props.load(bf);
in.close();
}catch(Exception ex){
ex.printStackTrace();
}
return props;
}
public static String getPropValue(Properties prop,String key){
if(key == null || "".equals(key.trim())){
return null;
}
String value = prop.getProperty(key);
if(value == null){
return null;
}
value = value.trim();
//判断是否是环境变量配置属性,例如 server.env=${serverEnv:local}
if(value.startsWith("${") && value.endsWith("}") && value.contains(":")){
int indexOfColon = value.indexOf(":");
String envName = value.substring(2,indexOfColon);
//获取系统环境变量 envName 的内容,如果没有找到,则返回defaultValue
String envValue = System.getenv(envName);
if(envValue == null){
//配置的默认值
return value.substring(indexOfColon+1,value.length()-1);
}
return envValue;
}
return value;
}
}
......@@ -4,3 +4,31 @@ spring.application.name=adapter
server.port=8080
#server.servlet.context-path=/FrontEndProcessor
#鉴权认证第三方接口(正式环境地址)
tokenurl:http://59.208.149.225:18080/sjzt/api/oauth2/token
#公积金系统服务第三方接口(正式环境地址)
provifunserviurl:http://59.208.149.225:18080/sjzt/api/dx/e39a08e0a52b413897f9d23359540b27/GJJ?access_token=
#进度推送第三方接口(正式环境地址)
bussiniprourl:http://59.208.149.225:18080/sjzt/api/retGjjProgData?access_token=
#鉴权认证第三方接口(测试环境地址)
#tokenurl:https://scjg.hubei.gov.cn/sjzt/api/oauth2/token
#公积金系统服务第三方接口(测试环境地址)
#provifunserviurl:http://59.208.149.225:18080/sjzt/api/dx/e39a08e0a52b413897f9d23359540b27/GJJ?access_token=
#进度推送第三方接口(测试环境地址)
#bussiniprourl:http://59.208.149.225:18080/sjzt/api/testretGjjProgData?access_token=
#鉴权认证第三方接口(本地环境地址)
#tokenurl:http://127.0.0.1:8080/FrontEndProcessor/FrontEndProcessor/token2
#公积金系统服务第三方接口(本地环境地址)
#provifunserviurl:http://127.0.0.1:8080/FrontEndProcessor/FrontEndProcessor/ProvidentFundServices2?access_token=
#进度推送第三方接口(本地环境地址)
#bussiniprourl:http://127.0.0.1:8080/FrontEndProcessor/FrontEndProcessor/BusinessProcessing2?access_token=
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment