diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java index ee00c07..a48a715 100644 --- a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java +++ b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java @@ -41,6 +41,11 @@ public class InvoiceAddController extends BaseController { + + + + + return AjaxResult.success("保存成功"); } diff --git a/jianshui-admin/src/main/resources/application-dev.yml b/jianshui-admin/src/main/resources/application-dev.yml index ae34211..779b404 100644 --- a/jianshui-admin/src/main/resources/application-dev.yml +++ b/jianshui-admin/src/main/resources/application-dev.yml @@ -84,6 +84,8 @@ spring: # #连接池最大阻塞等待时间(使用负值表示没有限制) max-wait: -1ms ele_auth_url: https://sandbox.ele-cloud.com/api/ +ele_check_url: https://openapi.zncspt.com/api/ +elephant_entcode_check: 91370102MA3UD2FG21 logstash: host: 43.138.58.64:14560 indexname: jianshui-dev \ No newline at end of file diff --git a/jianshui-admin/src/main/resources/application-prod.yml b/jianshui-admin/src/main/resources/application-prod.yml index 55cb5e8..525d6f4 100644 --- a/jianshui-admin/src/main/resources/application-prod.yml +++ b/jianshui-admin/src/main/resources/application-prod.yml @@ -81,6 +81,8 @@ spring: # #连接池最大阻塞等待时间(使用负值表示没有限制) max-wait: -1ms ele_auth_url: https://openapi.ele-cloud.com/api/dxhy-open-income/v1/ +ele_check_url: https://openapi.zncspt.com/api/ +elephant_entcode_check: 91370102MA3UD2FG21 logstash: host: 43.138.58.64:14560 indexname: jianshui-prod \ No newline at end of file diff --git a/jianshui-income/src/main/java/com/jianshui/income/utils/elephant/ElephantUtils.java b/jianshui-income/src/main/java/com/jianshui/income/utils/elephant/ElephantUtils.java index 754b525..41e47f7 100644 --- a/jianshui-income/src/main/java/com/jianshui/income/utils/elephant/ElephantUtils.java +++ b/jianshui-income/src/main/java/com/jianshui/income/utils/elephant/ElephantUtils.java @@ -19,6 +19,7 @@ import com.jianshui.system.service.ICompanyservicePropService; import com.jianshui.system.service.ISysConfigService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomUtils; +import org.springframework.core.env.Environment; import sun.misc.BASE64Encoder; import org.apache.commons.httpclient.HttpClient; @@ -54,6 +55,14 @@ import org.apache.commons.codec.binary.Base64; public class ElephantUtils { + private static String ELE_CHECK_URL; + private static String ELE_CHECK_ENTCODE; + + static { + Environment environment = SpringUtils.getBean(Environment.class); + ELE_CHECK_URL = environment.getProperty("ele_check_url"); + ELE_CHECK_ENTCODE = environment.getProperty("elephant_entcode_check"); + } /** * 大象请求 云端版 * @@ -67,11 +76,11 @@ public class ElephantUtils { boolean isDevMode = CommonUtils.isDevMode(); - String host = ElephantConstants.PROD_HOST; + /*String host = ElephantConstants.PROD_HOST; if (isDevMode || devMode) { host = ElephantConstants.DEV_HOST; - } - String url = host + uri; + }*/ + String url = ELE_CHECK_URL + uri; String token = getToken(devMode); if (StringUtils.isEmpty(token)) { @@ -81,8 +90,9 @@ public class ElephantUtils { // 先处理下请求体 JSONObject requestBody = new JSONObject(); - String entCode = configService.selectConfigByKey("elephant_entcode"); - requestBody.put("entCode", entCode); + /*String entCode = configService.selectConfigByKey("elephant_entcode"); + requestBody.put("entCode", entCode);*/ + requestBody.put("entCode", ELE_CHECK_ENTCODE); requestBody.put("zipCode", 0); // 不压缩 requestBody.put("encryptCode", 0); // 不加密 @@ -157,10 +167,12 @@ public class ElephantUtils { } boolean isDevMode = CommonUtils.isDevMode(); - String url = ElephantConstants.PROD_TOKEN_HOST; + /*String url = ElephantConstants.PROD_TOKEN_HOST; if (isDevMode || devMode) { url = ElephantConstants.DEV_TOKEN_HOST; - } + }*/ + + String url = ELE_CHECK_URL + "authen/token"; JSONObject jsonObject = new JSONObject(); jsonObject.put("appKey", appkey); @@ -199,11 +211,11 @@ public class ElephantUtils { String sercretKey = secretIdProp.getValue(); boolean isDevMode = CommonUtils.isDevMode(); - String host = ElephantConstants.PROD_HOST; + /*String host = ElephantConstants.PROD_HOST; if (isDevMode) { host = ElephantConstants.DEV_HOST; - } - String url = host + uri; + }*/ + String url = ELE_CHECK_URL + uri; String token = getToken(devMode); if (token == "") { @@ -233,7 +245,7 @@ public class ElephantUtils { query = StrUtil.removePrefix(query, "&"); query = query.replace("_", "."); query = "POST" + - host.replace("http://", "").replace("https://", "") + + ELE_CHECK_URL.replace("http://", "").replace("https://", "") + uri + methodName + query;