From 4536a68f86f50e09032066e00e9e3cacf366cbd4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Jun 2021 11:02:33 +0800
Subject: [PATCH] modify
---
zq-xcx/project.config.json | 444 +++++++++++++++++++++++++++---------------------------
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 13 +
2 files changed, 231 insertions(+), 226 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
index 2b580f6..8e31540 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
@@ -39,10 +39,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author wzy
@@ -226,7 +223,15 @@
+ @ApiOperation(value = "获取api接口地址", notes = "获取api接口地址")
+ @GetMapping(value = "/findApiUrl")
+ public AjaxResult findApiUrl() {
+ Map<String, String> map = new HashMap<>();
+ map.put("prd", "http://myapp.jyymatrix.cc/");
+ map.put("test", "http://test.hive.jyymatrix.cc/");
+ return AjaxResult.buildSuccessInstance(map);
+ }
diff --git a/zq-xcx/project.config.json b/zq-xcx/project.config.json
index 77acbda..a6ed60e 100644
--- a/zq-xcx/project.config.json
+++ b/zq-xcx/project.config.json
@@ -1,224 +1,224 @@
{
- "description": "项目配置文件。",
- "packOptions": {
- "ignore": []
- },
- "setting": {
- "urlCheck": false,
- "es6": true,
- "enhance": true,
- "postcss": true,
- "preloadBackgroundData": false,
- "minified": true,
- "newFeature": true,
- "coverView": true,
- "nodeModules": false,
- "autoAudits": false,
- "showShadowRootInWxmlPanel": true,
- "scopeDataCheck": false,
- "uglifyFileName": false,
- "checkInvalidKey": true,
- "checkSiteMap": true,
- "uploadWithSourceMap": true,
- "compileHotReLoad": false,
- "useMultiFrameRuntime": true,
- "useApiHook": true,
- "useApiHostProcess": false,
- "babelSetting": {
- "ignore": [],
- "disablePlugins": [],
- "outputPath": ""
- },
- "enableEngineNative": false,
- "bundle": false,
- "useIsolateContext": true,
- "useCompilerModule": true,
- "userConfirmedUseCompilerModuleSwitch": false,
- "userConfirmedBundleSwitch": false,
- "packNpmManually": false,
- "packNpmRelationList": [],
- "minifyWXSS": true
- },
- "compileType": "miniprogram",
- "libVersion": "1.9.98",
- "appid": "wx3836ab3c1490ff29",
- "projectname": "%E8%82%BD%E7%A0%94",
- "isGameTourist": false,
- "simulatorType": "wechat",
- "simulatorPluginLibVersion": {},
- "condition": {
- "plugin": {
- "list": []
- },
- "game": {
- "list": []
- },
- "gamePlugin": {
- "list": []
- },
- "miniprogram": {
- "list": [
- {
- "id": -1,
- "name": "pages/yuyue/yyInfo",
- "pathName": "pages/yuyue/yyInfo",
- "query": "model=1&id=10",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/customerCenter/customerCenter",
- "pathName": "pages/customerCenter/customerCenter",
- "query": "",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/yuyue/order",
- "pathName": "pages/yuyue/order",
- "query": "status=0",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/service/service",
- "pathName": "pages/service/service",
- "query": "status=0",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/logistics/logistics",
- "pathName": "pages/logistics/logistics",
- "query": "id=911",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/yuyue/choseShop",
- "pathName": "pages/yuyue/choseShop",
- "query": "",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/service/service2",
- "pathName": "pages/service/service2",
- "query": "",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/shopCar/shopCar",
- "pathName": "pages/shopCar/shopCar",
- "query": "",
- "scene": null
- },
- {
- "id": 8,
- "name": "pages/groupbuy/groupList",
- "pathName": "pages/groupbuy/groupList",
- "query": "",
- "scene": null
- },
- {
- "id": 9,
- "name": "groupDetails",
- "pathName": "pages/groupbuy/groupDetails",
- "query": "",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/miaosha/msList",
- "pathName": "pages/miaosha/msList",
- "query": "",
- "scene": null
- },
- {
- "id": 11,
- "name": "pages/groupbuy/groupDetails",
- "pathName": "pages/groupbuy/groupDetails",
- "query": "id=1&shopId=16&gjId=12",
- "scene": null
- },
- {
- "id": 12,
- "name": "pages/groupbuy/groupDetails",
- "pathName": "pages/groupbuy/groupDetails",
- "query": "id=1&shopId=16&gjId=1",
- "scene": null
- },
- {
- "id": 13,
- "name": "pages/groupbuy/groupDetails",
- "pathName": "pages/groupbuy/groupDetails",
- "query": "id=1&shopId=16&gjId=1",
- "scene": null
- },
- {
- "id": 14,
- "name": "pages/groupbuy/groupDetails",
- "pathName": "pages/groupbuy/groupDetails",
- "query": "id=2&shopId=33&gjId=9",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/payOrder/paySuccess",
- "pathName": "pages/payOrder/paySuccess",
- "query": "showModel=1",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/miaosha/msList",
- "pathName": "pages/miaosha/msList",
- "query": "id=2&shopId=33&gjId=9",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/customerCenter/customerCenter",
- "pathName": "pages/shalong/shalongList",
- "query": "id=2&shopId=33&gjId=9",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/index/index",
- "pathName": "pages/shalong/shalongList",
- "query": "",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/groupbuy/groupDetails",
- "pathName": "pages/groupbuy/groupDetails",
- "query": "id=1&shopId=16&gjId=15",
- "scene": null
- },
- {
- "id": 20,
- "name": "pages/ads/showAdPage",
- "pathName": "pages/ads/showAdPage",
- "query": "pageCode=index",
- "scene": null
- },
- {
- "id": -1,
- "name": "pages/shalong/shalongDetail",
- "pathName": "pages/shalong/shalongDetail",
- "query": "id=6",
- "scene": null
- },
- {
- "name": "pages/yuyue/showYyInfo",
- "pathName": "pages/yuyue/showYyInfo",
- "query": "id=3004",
- "scene": null
- }
- ]
- }
- }
+ "description": "项目配置文件。",
+ "packOptions": {
+ "ignore": []
+ },
+ "setting": {
+ "urlCheck": false,
+ "es6": true,
+ "enhance": true,
+ "postcss": true,
+ "preloadBackgroundData": false,
+ "minified": true,
+ "newFeature": true,
+ "coverView": true,
+ "nodeModules": false,
+ "autoAudits": false,
+ "showShadowRootInWxmlPanel": true,
+ "scopeDataCheck": false,
+ "uglifyFileName": false,
+ "checkInvalidKey": true,
+ "checkSiteMap": true,
+ "uploadWithSourceMap": true,
+ "compileHotReLoad": false,
+ "useMultiFrameRuntime": true,
+ "useApiHook": true,
+ "useApiHostProcess": false,
+ "babelSetting": {
+ "ignore": [],
+ "disablePlugins": [],
+ "outputPath": ""
+ },
+ "enableEngineNative": false,
+ "bundle": false,
+ "useIsolateContext": true,
+ "useCompilerModule": true,
+ "userConfirmedUseCompilerModuleSwitch": false,
+ "userConfirmedBundleSwitch": false,
+ "packNpmManually": false,
+ "packNpmRelationList": [],
+ "minifyWXSS": true
+ },
+ "compileType": "miniprogram",
+ "libVersion": "1.9.98",
+ "appid": "wx3836ab3c1490ff29",
+ "projectname": "%E8%82%BD%E7%A0%94",
+ "isGameTourist": false,
+ "simulatorType": "wechat",
+ "simulatorPluginLibVersion": {},
+ "condition": {
+ "plugin": {
+ "list": []
+ },
+ "game": {
+ "list": []
+ },
+ "gamePlugin": {
+ "list": []
+ },
+ "miniprogram": {
+ "list": [
+ {
+ "id": -1,
+ "name": "pages/yuyue/yyInfo",
+ "pathName": "pages/yuyue/yyInfo",
+ "query": "model=1&id=10",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/customerCenter/customerCenter",
+ "pathName": "pages/customerCenter/customerCenter",
+ "query": "",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/yuyue/order",
+ "pathName": "pages/yuyue/order",
+ "query": "status=0",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/service/service",
+ "pathName": "pages/service/service",
+ "query": "status=0",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/logistics/logistics",
+ "pathName": "pages/logistics/logistics",
+ "query": "id=911",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/yuyue/choseShop",
+ "pathName": "pages/yuyue/choseShop",
+ "query": "",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/service/service2",
+ "pathName": "pages/service/service2",
+ "query": "",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/shopCar/shopCar",
+ "pathName": "pages/shopCar/shopCar",
+ "query": "",
+ "scene": null
+ },
+ {
+ "id": 8,
+ "name": "pages/groupbuy/groupList",
+ "pathName": "pages/groupbuy/groupList",
+ "query": "",
+ "scene": null
+ },
+ {
+ "id": 9,
+ "name": "groupDetails",
+ "pathName": "pages/groupbuy/groupDetails",
+ "query": "",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/miaosha/msList",
+ "pathName": "pages/miaosha/msList",
+ "query": "",
+ "scene": null
+ },
+ {
+ "id": 11,
+ "name": "pages/groupbuy/groupDetails",
+ "pathName": "pages/groupbuy/groupDetails",
+ "query": "id=1&shopId=16&gjId=12",
+ "scene": null
+ },
+ {
+ "id": 12,
+ "name": "pages/groupbuy/groupDetails",
+ "pathName": "pages/groupbuy/groupDetails",
+ "query": "id=1&shopId=16&gjId=1",
+ "scene": null
+ },
+ {
+ "id": 13,
+ "name": "pages/groupbuy/groupDetails",
+ "pathName": "pages/groupbuy/groupDetails",
+ "query": "id=1&shopId=16&gjId=1",
+ "scene": null
+ },
+ {
+ "id": 14,
+ "name": "pages/groupbuy/groupDetails",
+ "pathName": "pages/groupbuy/groupDetails",
+ "query": "id=2&shopId=33&gjId=9",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/payOrder/paySuccess",
+ "pathName": "pages/payOrder/paySuccess",
+ "query": "showModel=1",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/miaosha/msList",
+ "pathName": "pages/miaosha/msList",
+ "query": "id=2&shopId=33&gjId=9",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/customerCenter/customerCenter",
+ "pathName": "pages/shalong/shalongList",
+ "query": "id=2&shopId=33&gjId=9",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/index/index",
+ "pathName": "pages/shalong/shalongList",
+ "query": "",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/groupbuy/groupDetails",
+ "pathName": "pages/groupbuy/groupDetails",
+ "query": "id=1&shopId=16&gjId=15",
+ "scene": null
+ },
+ {
+ "id": 20,
+ "name": "pages/ads/showAdPage",
+ "pathName": "pages/ads/showAdPage",
+ "query": "pageCode=index",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "pages/shalong/shalongDetail",
+ "pathName": "pages/shalong/shalongDetail",
+ "query": "id=6",
+ "scene": null
+ },
+ {
+ "name": "pages/yuyue/showYyInfo",
+ "pathName": "pages/yuyue/showYyInfo",
+ "query": "id=3004",
+ "scene": null
+ }
+ ]
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1