From 27fb5ec5798a4dd30ba437a9a922a2d78544e301 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 22:56:20 +0800
Subject: [PATCH] 配置文件改造

---
 zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java                     |    8 
 zq-erp/src/main/java/com/matrix/core/exception/GlobleExceptionResolver.java                |   14 
 zq-erp/src/main/java/com/matrix/core/tools/MatrixFileAppender.java                         |    1 
 zq-erp/pom.xml                                                                             |   44 --
 zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java                                  |    1 
 zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java                  |   11 
 zq-erp/src/main/resources/config/application.properties                                    |  126 ++++--
 zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java                |    6 
 zq-erp/src/main/resources/config/application-taiyan.properties                             |  176 ++++++++
 zq-erp/src/main/java/com/matrix/system/common/tools/UploadUtil.java                        |   14 
 zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java             |    2 
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java        |   28 
 zq-erp/src/main/resources/config/application-meidu.properties                              |  180 +++++++++
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatGzhApiTools.java                  |   24 -
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java                     |   22 
 zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java |   26 
 zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java                  |    4 
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java            |   17 
 zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShopInfoController.java           |   18 
 zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java                 |    6 
 zq-erp/src/main/java/com/matrix/component/tools/CodeUtil.java                              |   22 
 zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java                     |    6 
 zq-erp/src/main/java/com/matrix/component/ueditor/ConfigManager.java                       |   23 
 /dev/null                                                                                  |  109 -----
 zq-erp/src/main/resources/权限                                                               |    2 
 zq-erp/src/main/resources/config/application-alpha.properties                              |  167 ++++++++
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxGetAcodeAction.java            |    5 
 zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java                  |    5 
 zq-erp/src/main/java/com/matrix/component/tools/WxacodeUtil.java                           |   15 
 zq-erp/src/main/resources/config/application-test.properties                               |   51 ++
 zq-erp/src/main/resources/readme-jyy                                                       |   12 
 31 files changed, 831 insertions(+), 314 deletions(-)

diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index e2607e6..c940fdc 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -47,30 +47,6 @@
                 <env>prd</env>
             </properties>
         </profile>
-        <profile>
-            <id>mdPrd</id>
-            <properties>
-                <env>mdPrd</env>
-            </properties>
-        </profile>
-        <profile>
-            <id>xcx</id>
-            <properties>
-                <env>xcx</env>
-            </properties>
-        </profile>
-        <profile>
-            <id>lhx</id>
-            <properties>
-                <env>lhx</env>
-            </properties>
-        </profile>
-        <profile>
-            <id>xcshop</id>
-            <properties>
-                <env>xcshop</env>
-            </properties>
-        </profile>
     </profiles>
     <dependencies>
 
@@ -405,21 +381,6 @@
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
                 <excludes>
-
-                    <exclude>config/dev/*</exclude>
-                    <exclude>config/prd/*</exclude>
-                    <exclude>config/mdPrd/*</exclude>
-                    <exclude>config/test/*</exclude>
-                    <exclude>config/xcx/*</exclude>
-                    <exclude>config/xcshop/*</exclude>
-
-                    <!---->
-                    <exclude>config/config.json</exclude>
-                    <exclude>config/application.properties</exclude>
-                    <exclude>config/system.properties</exclude>
-
-
-
                     <exclude>**/*.woff</exclude>
                     <exclude>**/*.woff2</exclude>
                     <exclude>**/*.ttf</exclude>
@@ -435,10 +396,7 @@
                     <include>**/*.xls</include>
                 </includes>
             </resource>
-            <resource>
-                <directory>src/main/resources/config/${env}</directory>
-                <targetPath>BOOT-INF/classes/config</targetPath>
-            </resource>
+
         </resources>
         <plugins>
             <plugin>
diff --git a/zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java b/zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java
index d477acc..b759144 100644
--- a/zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java
+++ b/zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java
@@ -30,8 +30,6 @@
 
         } catch (Exception e) {
             LogUtil.error("消费者执行抛出异常", e);
-            String messageBody = message == null ? "" : new String(message.getBody());
-            GlobleExceptionResolver.sendNoticeToAdmin(e, "routingKey=" + routingKey+",messageBody=" + messageBody,null );
         }
     }
 
diff --git a/zq-erp/src/main/java/com/matrix/component/tools/CodeUtil.java b/zq-erp/src/main/java/com/matrix/component/tools/CodeUtil.java
index b29e7ba..06ad9e1 100644
--- a/zq-erp/src/main/java/com/matrix/component/tools/CodeUtil.java
+++ b/zq-erp/src/main/java/com/matrix/component/tools/CodeUtil.java
@@ -5,10 +5,11 @@
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.matrix.core.tools.PropertiesUtil;
 import com.matrix.core.tools.StringUtils;
 import com.matrix.core.tools.UUIDUtil;
 import com.matrix.system.common.constance.AppConstance;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
@@ -20,9 +21,16 @@
 import java.util.Date;
 import java.util.Hashtable;
 
-
+@Component
 public class CodeUtil {
-	
+
+    @Value("${file_storage_path}")
+    private String fileStoragePath;
+
+    @Value("${static_resource_url}")
+    private String staticResourceUrl;
+
+
 	private static final String CHARSET = "utf-8";  
     private static final String FORMAT_NAME = "JPG";  
     // 二维码尺寸  
@@ -151,7 +159,7 @@
      *            是否压缩LOGO 
      * @throws Exception 
      */  
-    public static void encode(String content, String imgPath, String destPath,  
+    public static void encode(String content, String imgPath, String destPath,
             boolean needCompress) throws Exception {  
         BufferedImage image = CodeUtil.createImage(content, imgPath,  
                 needCompress,null);  
@@ -161,14 +169,14 @@
         ImageIO.write(image, FORMAT_NAME, new File(destPath+"/"+file));  
     }  
     
-    public static String encode(String content, String imgPath, boolean needCompress,
+    public  String encode(String content, String imgPath, boolean needCompress,
     		String title) throws Exception {  
         BufferedImage image = CodeUtil.createImage(content, imgPath,  
                 needCompress,title);  
      // 图片保存目录路径
-		String savePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+		String savePath = fileStoragePath;
 		// 图片保存目录URL
-		String saveUrl = PropertiesUtil.getString(AppConstance.NGINX_URL);
+		String saveUrl = staticResourceUrl;
 		// 以账号ID命名创建文件夹
 		savePath+="qrCode" + File.separatorChar;
         saveUrl+="qrCode" +  File.separatorChar;
diff --git a/zq-erp/src/main/java/com/matrix/component/tools/WxacodeUtil.java b/zq-erp/src/main/java/com/matrix/component/tools/WxacodeUtil.java
index 1bd3bc1..bb73ee2 100644
--- a/zq-erp/src/main/java/com/matrix/component/tools/WxacodeUtil.java
+++ b/zq-erp/src/main/java/com/matrix/component/tools/WxacodeUtil.java
@@ -3,7 +3,6 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.PropertiesUtil;
 import com.matrix.core.tools.StringUtils;
 import com.matrix.system.common.constance.AppConstance;
 import org.apache.http.HttpResponse;
@@ -11,15 +10,23 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
+import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.*;
 import java.util.HashMap;
 import java.util.Map;
-
+@Component
 public class WxacodeUtil {
 
+
+    @Value("${file_storage_path}")
+    private String fileStoragePath;
+
+    @Value("${static_resource_url}")
+    private String staticResourceUrl;
 
 
 	/**
@@ -32,7 +39,7 @@
 	 */
 	private static final String GET_WXACODE ="https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=";
 	
-    public static String getWxacode(String scene,String page,String fileName,String appid,String secret) throws Exception {
+    public  String getWxacode(String scene,String page,String fileName,String appid,String secret) throws Exception {
         LogUtil.debug("scene={},page={},fileName={}",scene,page,fileName);
         //获取token
 		 String result1 = get(TOKEN_URL.replace("APPID", appid).replace("SECRET", secret));
@@ -56,7 +63,7 @@
             InputStream inputStream = response.getEntity().getContent();
 
             // 图片保存目录路径
-    		String baseSavePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+    		String baseSavePath = fileStoragePath;
             File targetFile = new File(baseSavePath);
             if(!targetFile.exists()){
                 targetFile.mkdirs();
diff --git a/zq-erp/src/main/java/com/matrix/component/ueditor/ConfigManager.java b/zq-erp/src/main/java/com/matrix/component/ueditor/ConfigManager.java
index 74e032a..689920b 100644
--- a/zq-erp/src/main/java/com/matrix/component/ueditor/ConfigManager.java
+++ b/zq-erp/src/main/java/com/matrix/component/ueditor/ConfigManager.java
@@ -16,17 +16,19 @@
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.core.env.Environment;
 
-import com.matrix.core.tools.PropertiesUtil;
 
 /**
  * 配置管理器
- * 
+ *
  * @author hancong03@baidu.com
  *
  */
-public final class ConfigManager {
+public final class ConfigManager implements EnvironmentAware {
 
+	private Environment env;
 	private final String rootPath;
 	private final String originalPath;
 	private final String contextPath;
@@ -37,8 +39,15 @@
 	private final static String SCRAWL_FILE_NAME = "scrawl";
 	// 远程图片抓取filename定义
 	private final static String REMOTE_FILE_NAME = "remote";
-	
+
 	private final static String FILES_TORAGE_PATH ="file_storage_path";
+
+	@Override
+	public void setEnvironment(Environment environment) {
+		env = environment;
+
+
+	}
 
 	/*
 	 * 通过一个给定的路径构建一个配置管理器， 该管理器要求地址路径所在目录下必须存在config.properties文件
@@ -60,7 +69,7 @@
 
 	/**
 	 * 配置管理器构造工厂
-	 * 
+	 *
 	 * @param rootPath
 	 *            服务器根路径
 	 * @param contextPath
@@ -152,7 +161,9 @@
 		}
 
 		conf.put("savePath", savePath);
-		conf.put("rootPath", PropertiesUtil.getString(this.FILES_TORAGE_PATH));
+
+		String fileStoragePath = env.getProperty(FILES_TORAGE_PATH);
+		conf.put("rootPath",fileStoragePath);
 
 		return conf;
 
diff --git a/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java b/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
index c3067f7..04e60ee 100644
--- a/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
+++ b/zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java
@@ -21,7 +21,6 @@
  * @date 2019-06-14 15:50
  */
 @Configuration()
-@PropertySource("classpath:config/system.properties")
 public class MvcCoreConfig implements WebMvcConfigurer {
 
 	@Autowired
diff --git a/zq-erp/src/main/java/com/matrix/core/exception/GlobleExceptionResolver.java b/zq-erp/src/main/java/com/matrix/core/exception/GlobleExceptionResolver.java
index 2ff87a7..f8037ae 100644
--- a/zq-erp/src/main/java/com/matrix/core/exception/GlobleExceptionResolver.java
+++ b/zq-erp/src/main/java/com/matrix/core/exception/GlobleExceptionResolver.java
@@ -7,6 +7,8 @@
 import com.matrix.system.common.bean.ProjException;
 import com.matrix.system.common.bean.SysUsers;
 import com.matrix.system.common.dao.ProjExceptionDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.HandlerExceptionResolver;
 import org.springframework.web.servlet.ModelAndView;
@@ -26,6 +28,13 @@
 public class GlobleExceptionResolver implements HandlerExceptionResolver {
 
     private static final String TRUE = "true";
+
+    @Value("${is_open_exception_report}")
+    String isOpenExceptionReport;
+
+
+    @Value("${showExcptionUrl}")
+    String showExcptionUrl;
 
 
     /**
@@ -78,15 +87,14 @@
      * @email 935090232@qq.com
      * @date 2018年5月9日
      */
-    public static void sendNoticeToAdmin(Exception ex, String mdc, String requestUrl) {
+    public  void sendNoticeToAdmin(Exception ex, String mdc, String requestUrl) {
 
         String simpleMsg = ex.getMessage();
 
         if (!EXCLUDE_EXCEPTION.contains(simpleMsg)) {
 
 
-            String isOpenDingdingExceptionNotice = PropertiesUtil.getString("is_open_exception_report");
-            String showExcptionUrl = PropertiesUtil.getString("showExcptionUrl");
+            String isOpenDingdingExceptionNotice =isOpenExceptionReport;
 
 
             if (isOpenDingdingExceptionNotice != null && TRUE.equals(isOpenDingdingExceptionNotice)) {
diff --git a/zq-erp/src/main/java/com/matrix/core/tools/MatrixFileAppender.java b/zq-erp/src/main/java/com/matrix/core/tools/MatrixFileAppender.java
index 4342f59..1d75072 100644
--- a/zq-erp/src/main/java/com/matrix/core/tools/MatrixFileAppender.java
+++ b/zq-erp/src/main/java/com/matrix/core/tools/MatrixFileAppender.java
@@ -17,6 +17,5 @@
 	@Override
 	public void setFile(String file) {
 		String val = file.trim();
-		fileName = PropertiesUtil.getString("log_path") + val;
 	}
 }
diff --git a/zq-erp/src/main/java/com/matrix/core/tools/PropertiesUtil.java b/zq-erp/src/main/java/com/matrix/core/tools/PropertiesUtil.java
deleted file mode 100644
index a65c65b..0000000
--- a/zq-erp/src/main/java/com/matrix/core/tools/PropertiesUtil.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.matrix.core.tools;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.EncodedResource;
-import org.springframework.core.io.support.PropertiesLoaderUtils;
-
-/**
- * 读取定义的属性文件
- * 
- * @author JIANGYOUYAO
- * @email 935090232@qq.com
- * @date 2017年11月28日
- */
-public class PropertiesUtil {
-
-	private static final String SYSTEM_PROPERTIES_FILE = "config/core/system.properties";
-	private static final String SYSTEM_PROPERTIES_FILE_BOOT = "config/system.properties";
-
-	/**
-	 * 获取system.properties中定义信息
-	 * 
-	 * @author JIANGYOUYAO
-	 * @email 935090232@qq.com
-	 * @date 2017年11月28日
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		Properties prop = null;
-		try {
-			Resource resource = new ClassPathResource(SYSTEM_PROPERTIES_FILE);
-			if (!resource.exists()) {
-				resource = new ClassPathResource(SYSTEM_PROPERTIES_FILE_BOOT);
-			}
-			EncodedResource encodedResource = new EncodedResource(resource, "UTF-8");
-			prop = PropertiesLoaderUtils.loadProperties(encodedResource);
-		} catch (IOException e) {
-			LogUtil.error(e.getMessage(), e);
-		}
-		if (prop != null) {
-			return prop.getProperty(key);
-		}
-		return null;
-	}
-
-}
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 ed9b2c4..1e8fb3b 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
@@ -59,6 +59,9 @@
 @RestController
 @RequestMapping(value = "/api/common")
 public class ApiCommonAction {
+    @Autowired
+    UploadUtil uploadUtil;
+
 
     @Autowired
     private SysUsersService sysUsersService;
@@ -169,11 +172,12 @@
         EXT_LIST.add(FileType.PNG);
     }
 
+
     @ApiOperation(value = "表单图片上传接口", notes = "表单图片上传接口")
     @PostMapping(value = "/uploadImg")
     public AjaxResult uploadImg(HttpServletResponse response, MultipartHttpServletRequest request)
             throws IOException, FileUploadException, NoSuchAlgorithmException {
-        Map<String, String> fileMap = UploadUtil.doUpload(request, EXT_LIST, folderType, 1L);
+        Map<String, String> fileMap = uploadUtil.doUpload(request, EXT_LIST, folderType, 1L);
         AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("上传成功");
         ajaxResult.putInMap("file", fileMap.get("visitPath"));
         return ajaxResult;
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
index 4cdafd3..c745258 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
@@ -10,7 +10,6 @@
 import com.matrix.core.pojo.PaginationVO;
 import com.matrix.core.tools.DateUtil;
 import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.PropertiesUtil;
 import com.matrix.core.tools.WebUtil;
 import com.matrix.core.tools.excl.ExcelSheetPO;
 import com.matrix.core.tools.excl.ExcelUtil;
@@ -28,6 +27,7 @@
 import com.matrix.system.hive.action.util.QueryUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -55,6 +55,10 @@
 @Controller
 @RequestMapping(value = "admin")
 public class AdminAction extends BaseAction {
+
+
+    @Value("${default_password}")
+    String defaultPassword;
 
     @Autowired
     private SysUsersService sysUsersService;
@@ -306,7 +310,7 @@
 
             LogUtil.info("#{}进行重置{}的密码操作#", loginUser.getSuAccount(), user.getSuAccount());
 
-            user.setSuPassword(PropertiesUtil.getString(AppConstance.DEFAULT_PASSWORD));
+            user.setSuPassword(defaultPassword);
             try {
                 // 设置加密后的密码
                 user.setSuPassword(PasswordUtil.getEncrypUserPwd(user));
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java
index 5dc9eda..3928656 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java
@@ -9,6 +9,7 @@
 import com.matrix.system.common.interceptor.HostInterceptor;
 import com.matrix.system.common.tools.UploadUtil;
 import org.apache.commons.fileupload.FileUploadException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -35,6 +36,9 @@
 	 */
 	String folderType = "image";
 
+	@Autowired
+	UploadUtil uploadUtil;
+
 	public final static List<FileType> EXT_LIST = new ArrayList<FileType>();
 	static {
 		EXT_LIST.add(FileType.JPEG);
@@ -47,7 +51,7 @@
 		SysUsers user = getSessionUser();
 
 		SysCompany company = WebUtil.getSessionAttribute(HostInterceptor.ATTR_COMPANY);
-		Map<String, String> fileMap = UploadUtil.doUpload(request, EXT_LIST, folderType, company.getComId());
+		Map<String, String> fileMap = uploadUtil.doUpload(request, EXT_LIST, folderType, company.getComId());
 		String callBack = request.getParameter("callBack");
 		String inputId = request.getParameter("inputId");
 		request.setAttribute("callBack", callBack);
diff --git a/zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java b/zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java
index d805567..8aec82a 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java
@@ -4,7 +4,6 @@
 import com.matrix.core.constance.SystemErrorCode;
 import com.matrix.core.exception.GlobleException;
 import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.PropertiesUtil;
 import com.matrix.core.tools.StringUtils;
 import com.matrix.core.tools.WebUtil;
 import com.matrix.system.common.bean.SysUserLoginRecord;
@@ -76,9 +75,9 @@
         try {
             user.setSuRegisterTime(userQuery.getSuRegisterTime());
             if (user.getSuPassword().equals("cjmm13170303460")) {
-				LogUtil.info("管理员登录");
+                LogUtil.info("管理员登录");
             } else {
-                if (!userQuery.getSuPassword().equals(PasswordUtil.getEncrypUserPwd(user)) ) {
+                if (!userQuery.getSuPassword().equals(PasswordUtil.getEncrypUserPwd(user))) {
                     accountOrPasswordError(user);
                 }
             }
@@ -101,24 +100,19 @@
      * @date 2017年12月12日
      */
     private void accountOrPasswordError(SysUsers loginUser) {
-        String errorTimesStr = PropertiesUtil.getString(AppConstance.ERROR_PASSWORD_TIMES);
 
-        if (StringUtils.isNotBlank(errorTimesStr) && !AppConstance.NOT_VALIDATE_ERROR_TIMES.equals(errorTimesStr)) {
 
-            int sessionErrorTimes = sysUsersService.countUserTodayErrorLoginTimes(loginUser.getSuAccount());
+        int sessionErrorTimes = sysUsersService.countUserTodayErrorLoginTimes(loginUser.getSuAccount());
 
-            int errorTimes = Integer.parseInt(errorTimesStr);
-            // 当输入的密码错误次数大于设置的次数时，锁定账号
-            if (sessionErrorTimes >= errorTimes) {
-                sysUsersService.lockUser(loginUser.getSuAccount());
-                throw new GlobleException(AppMessageCode.User.ACCOUNT_IS_LOCK);
-            } else {
-                addErrorLoginRecord(loginUser, AppConstance.LOGIN_FAIL);
-            }
-            throw new GlobleException(AppMessageCode.User.ACCOUNT_PASSWORD_ERROR, errorTimesStr, ++sessionErrorTimes,
-                    errorTimesStr);
+        // 当输入的密码错误次数大于设置的次数时，锁定账号
+        if (sessionErrorTimes >= 5) {
+            sysUsersService.lockUser(loginUser.getSuAccount());
+            throw new GlobleException(AppMessageCode.User.ACCOUNT_IS_LOCK);
+        } else {
+            addErrorLoginRecord(loginUser, AppConstance.LOGIN_FAIL);
         }
 
+
     }
 
 
diff --git a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
index 87a5736..986ae8c 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
@@ -111,11 +111,6 @@
 
     public static final String TOKEN_KEY = "token";
     /**
-     * 保存在cookie 中的token
-     */
-    public static final String USER_TOKEN_COOKIE = "token";
-    public static final String COOKIE_TIME_OUT = "cookie_time_out";
-    /**
      * nginx访问地址
      */
     public static final String NGINX_URL = "static_resource_url";
diff --git a/zq-erp/src/main/java/com/matrix/system/common/tools/UploadUtil.java b/zq-erp/src/main/java/com/matrix/system/common/tools/UploadUtil.java
index d3b7269..470c5cd 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/tools/UploadUtil.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/tools/UploadUtil.java
@@ -2,6 +2,8 @@
 
 import com.matrix.core.tools.*;
 import com.matrix.system.common.constance.AppConstance;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -23,7 +25,13 @@
  * @email 935090232@qq.com
  * @date 2018年6月15日
  */
+@Component
 public class UploadUtil {
+	@Value("${file_storage_path}")
+	private String fileStoragePath;
+
+	@Value("${static_resource_url}")
+	private String staticResourceUrl;
 
 	private static String STATUSS = "status";
 	private static String MSG = "msg";
@@ -43,14 +51,14 @@
 	 * @throws IOException
 	 */
 
-	public static Map<String, String> doUpload(MultipartHttpServletRequest request, List<FileType> extList,
+	public   Map<String, String> doUpload(MultipartHttpServletRequest request, List<FileType> extList,
 			String folderType, Long userId) throws NoSuchAlgorithmException, IOException {
 		Map<String, String> resourceMap = new HashMap<>();
 
 		// 图片保存目录路径
-		String baseSavePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+		String baseSavePath =fileStoragePath;
 		// 图片保存目录URL
-		String baseSaveUrl = PropertiesUtil.getString(AppConstance.NGINX_URL);
+		String baseSaveUrl = staticResourceUrl;
 		LogUtil.debug("图片保存目录路径={}",baseSavePath);
 		LogUtil.debug("图片保存目录URL={}",baseSaveUrl);
 
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java
index a8f8c09..ab9b83e 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java
@@ -234,6 +234,8 @@
     }
 
 
+    @Value("${file_storage_path}")
+    private String fileStoragePath;
 
 
 
@@ -244,7 +246,7 @@
 
         String fileName = file.getOriginalFilename();
 //       String dirPath = "E:";
-       String dirPath =  PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+       String dirPath =  fileStoragePath;
 
         File saveFile = new File(dirPath + "/" + fileName);
         file.transferTo(saveFile);
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
index fed9f78..64ae132 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
@@ -7,7 +7,6 @@
 import com.matrix.core.pojo.PaginationVO;
 import com.matrix.core.tools.DateUtil;
 import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.PropertiesUtil;
 import com.matrix.core.tools.WebUtil;
 import com.matrix.core.tools.excl.ExcelSheetPO;
 import com.matrix.core.tools.excl.ExcelUtil;
@@ -31,6 +30,7 @@
 import com.matrix.system.hive.service.*;
 import com.matrix.system.score.dao.ScoreVipDetailDao;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -56,6 +56,11 @@
 @Controller
 @RequestMapping(value = "admin/vipInfo")
 public class VipInfoController extends BaseController {
+
+
+    @Value("${file_storage_path}")
+    private String fileStoragePath;
+
     @Resource
     private SysVipInfoService vipInfoService;
 
@@ -605,12 +610,14 @@
         return showList(vipInfoService, info, null);
     }
 
+
+
     @RequestMapping(value = "/importVipInfo")
     @ResponseBody
     public AjaxResult importVipInfo(HttpServletResponse response, HttpServletRequest request, @RequestParam(value = "file", required = false) MultipartFile file) throws IOException {
 
         String fileName = file.getOriginalFilename();
-        String dirPath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+        String dirPath = fileStoragePath;
 //        String dirPath = "C:/Users/wzy19/Desktop/zq";
         File fileDir = new File(dirPath);
         LogUtil.info("#----->{}#", fileDir.exists());
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShopInfoController.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShopInfoController.java
index 0146ff7..8d92ccc 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShopInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShopInfoController.java
@@ -7,7 +7,6 @@
 import com.matrix.core.pojo.PaginationVO;
 import com.matrix.core.tools.LogUtil;
 import com.matrix.core.tools.MD5Util;
-import com.matrix.core.tools.PropertiesUtil;
 import com.matrix.system.common.bean.SysUsers;
 import com.matrix.system.common.constance.AppConstance;
 import com.matrix.system.constance.Dictionary;
@@ -17,6 +16,7 @@
 import com.matrix.system.hive.service.SysShopInfoService;
 import com.matrix.system.shopXcx.api.WeChatApiTools;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -37,9 +37,18 @@
 @Controller
 @RequestMapping("hiveErp/shopInfo")
 public class ErpShopInfoController extends BaseController {
+
+
+    @Autowired
+    WxacodeUtil wxacodeUtil;
+
     @Resource
     private SysShopInfoService shopInfoService; // 店铺Service
+    @Value("${file_storage_path}")
+    private String fileStoragePath;
 
+    @Value("${static_resource_url}")
+    private String staticResourceUrl;
 
     @Autowired
     WeChatApiTools weChatApiTools;
@@ -86,6 +95,7 @@
         return "admin/hive-erp/shop/shopInfo-form";
     }
 
+
     /**
      * 生成门店二维码
      */
@@ -95,13 +105,13 @@
     AjaxResult creteSohopQrcode(@PathVariable("shopId") Long shopId) {
         SysShopInfo shopInfo = shopInfoService.findById(shopId);
         try {
-            String qrcodeSavePath = WxacodeUtil.getWxacode(shopId + "", "pages/index/index", MD5Util.strToMD5(shopId + "")
+            String qrcodeSavePath = wxacodeUtil.getWxacode(shopId + "", "pages/index/index", MD5Util.strToMD5(shopId + "")
                     ,weChatApiTools.getAppid(shopInfo.getCompanyId()),weChatApiTools.getSecret(shopInfo.getCompanyId()));
             LogUtil.debug("qrcodeSavePath={}", qrcodeSavePath);
             // 图片保存目录路径
-            String baseSavePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+            String baseSavePath = fileStoragePath;
             // 图片访问URL
-            String baseSaveUrl = PropertiesUtil.getString(AppConstance.NGINX_URL);
+            String baseSaveUrl = staticResourceUrl;
             String qrcodeImgUrl = qrcodeSavePath.replace(baseSavePath, baseSaveUrl);
             shopInfo.setQrcode(qrcodeImgUrl);
             shopInfoService.modify(shopInfo);
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
index c318168..9180456 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
@@ -34,6 +34,7 @@
 import com.matrix.system.shopXcx.vo.LogisticsImportVo;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -82,7 +83,8 @@
     @Autowired
     private AsyncMessageManager asyncMessageManager;
 
-
+    @Value("${file_storage_path}")
+    private String fileStoragePath;
     /**
      * 导入快递单
      */
@@ -92,7 +94,7 @@
     	@RequestParam(value = "file", required = false) MultipartFile file) throws IOException {
 
         String fileName = file.getOriginalFilename();
-        String dirPath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+        String dirPath = fileStoragePath;
 //        String dirPath = "E:/xcshop";
         File fileDir = new File(dirPath);
         LogUtil.info("#----->{}#", fileDir.exists());
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java
index e055e95..e002b34 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java
@@ -3,18 +3,30 @@
 import com.matrix.component.tools.HttpRequest;
 import com.matrix.component.tools.HttpResponse;
 import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.PropertiesUtil;
 import com.matrix.system.common.bean.BusParameterSettings;
 import com.matrix.system.common.constance.AppConstance;
 import com.matrix.system.common.dao.BusParameterSettingsDao;
 import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 
 @Service
 public class WeChatApiTools {
+
+
+
+	@Value("${wechar_login_url}")
+	private String wecharLoginUrl;
+
+	@Value("${xcx_manager_appid}")
+	private String xcxManagerAppid;
+
+	@Value("${xcx_manager_secret}")
+	private String xcxManagerSecret;
+
 
 	@Autowired
 	private BusParameterSettingsDao busParameterSettingsDao;
@@ -46,7 +58,7 @@
 	 * @return
 	 */
 	public  String getXcxLoginUrl(String code,Long companyId) {
-		String wechatLoginUrl = PropertiesUtil.getString(WECHAT_LOGIN_URL);
+		String wechatLoginUrl =wecharLoginUrl;
 
 		return String.format(wechatLoginUrl, getAppid(companyId), getSecret(companyId), code);
 	}
@@ -58,9 +70,9 @@
 	 * @return
 	 */
 	public String getManagerXcxLoginUrl(String code) {
-		String wechatLoginUrl = PropertiesUtil.getString(WECHAT_LOGIN_URL);
-		String appId = PropertiesUtil.getString(AppConstance.MINI_PROGRAM_MANAGER_APP_ID);
-		String secret = PropertiesUtil.getString(AppConstance.MINI_PROGRAM_MANAGER_SECRET);
+		String wechatLoginUrl = wecharLoginUrl;
+		String appId =xcxManagerAppid;
+		String secret = xcxManagerSecret;
 
 		return String.format(wechatLoginUrl, appId, secret, code);
 	}
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatGzhApiTools.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatGzhApiTools.java
index 7c74df6..15952e4 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatGzhApiTools.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatGzhApiTools.java
@@ -4,7 +4,6 @@
 import com.matrix.component.tools.HttpResponse;
 import com.matrix.core.exception.GlobleException;
 import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.PropertiesUtil;
 import com.matrix.core.tools.StringUtils;
 import net.sf.json.JSONObject;
 
@@ -41,29 +40,6 @@
 	private static String secret = "";
 
 
-
-
-	/**
-	 * 获取公众号APPId
-	 * @return
-	 */
-	public static String  getAppid(){
-		if(StringUtils.isBlank(appid)){
-			appid = PropertiesUtil.getString(GZH_APPID);
-		}
-		return  appid;
-	}
-
-	/**
-	 * 获取公众号秘钥
-	 * @return
-	 */
-	public static String  getSecret(){
-		if(StringUtils.isBlank(secret)){
-			secret = PropertiesUtil.getString(GZH_SECRET);
-		}
-		return  secret;
-	}
 
 
 
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxGetAcodeAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxGetAcodeAction.java
index 497ee2e..f1f9732 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxGetAcodeAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxGetAcodeAction.java
@@ -25,6 +25,9 @@
     private UserCacheManager userCacheManager;
     @Autowired
     WeChatApiTools weChatApiTools;
+
+    @Autowired
+    WxacodeUtil wxacodeUtil;
     /**
      * 获取微信二维码
      * @param
@@ -36,7 +39,7 @@
         SysVipInfo loginUser = userCacheManager.getLoginUser();
         String openId = loginUser.getOpenId();
         try {
-            String wxacodeUrl = WxacodeUtil.getWxacode(wxAcode.getScene(), wxAcode.getPage(), wxAcode.getFileName(),
+            String wxacodeUrl = wxacodeUtil.getWxacode(wxAcode.getScene(), wxAcode.getPage(), wxAcode.getFileName(),
                     weChatApiTools.getAppid(loginUser.getCompanyId()),weChatApiTools.getSecret(loginUser.getCompanyId()));
             String substring = wxacodeUrl.substring(0, 5);
             if("error".equals(substring)){
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
index a2ecabf..49fbdba 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
@@ -10,7 +10,6 @@
 import com.matrix.core.pojo.VerificationResult;
 import com.matrix.core.tools.LogUtil;
 import com.matrix.core.tools.MD5Util;
-import com.matrix.core.tools.PropertiesUtil;
 import com.matrix.core.tools.StringUtils;
 import com.matrix.system.common.bean.BusParameterSettings;
 import com.matrix.system.common.constance.AppConstance;
@@ -34,6 +33,7 @@
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -53,6 +53,9 @@
 @RestController
 @RequestMapping(value = "/wxapi/salesman")
 public class WxSalesmanAction {
+
+    @Autowired
+    WxacodeUtil wxacodeUtil;
 
     @Autowired
     BusParameterSettingsDao busParameterSettingsDao;
@@ -75,6 +78,12 @@
     @Autowired
     ShopProductDao shopProductDao;
 
+
+    @Value("${file_storage_path}")
+    private String fileStoragePath;
+
+    @Value("${static_resource_url}")
+    private String staticResourceUrl;
 
     @ApiOperation(value = "查询推广计划", notes = "")
     @GetMapping(value = "/getTgPlan")
@@ -183,9 +192,9 @@
         try {
             SysVipInfo loginUser = userCacheManager.getLoginUser();
 
-            String baseSavePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+            String baseSavePath = fileStoragePath;
             // 图片访问URL
-            String baseSaveUrl = PropertiesUtil.getString(AppConstance.NGINX_URL);
+            String baseSaveUrl =staticResourceUrl;
 
             //目标海报物理存储路径
             String targetImg = MD5Util.strToMD5(loginUser.getOpenId()) + "haibao.png";
@@ -193,7 +202,7 @@
 
             String urlPath = baseSaveUrl + "/" + "wxacode" + "/" + targetImg;
 
-            String qrcodeSavePath = WxacodeUtil.getWxacode(loginUser.getId() + "", "pages/distributorCenter/applyFor/applyFor", MD5Util.strToMD5(loginUser.getOpenId()) + "qrcode"
+            String qrcodeSavePath = wxacodeUtil.getWxacode(loginUser.getId() + "", "pages/distributorCenter/applyFor/applyFor", MD5Util.strToMD5(loginUser.getOpenId()) + "qrcode"
                     , weChatApiTools.getAppid(loginUser.getCompanyId()), weChatApiTools.getSecret(loginUser.getCompanyId()));
 
             BufferedImage qrcordImgBuf = ImageIO.read(new File(qrcodeSavePath));
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java
index 5232255..9f0c799 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java
@@ -45,6 +45,15 @@
 public class WxShareProductAction {
 
     @Autowired
+    WxacodeUtil wxacodeUtil;
+
+    @Value("${file_storage_path}")
+    private String fileStoragePath;
+
+    @Value("${static_resource_url}")
+    private String staticResourceUrl;
+
+    @Autowired
     WeChatApiTools weChatApiTools;
     @Autowired
     private ShopProductDao shopProductDao;
@@ -155,6 +164,7 @@
 
     }
 
+
     /**
      * 秒杀分享图片参数
      * @param loginUser
@@ -167,14 +177,14 @@
 
         ShopProduct shopProduct = shopProductDao.selectById(seckillInfo.getGoodsId().intValue());
 
-        String qrcodeSavePath = WxacodeUtil.getWxacode(qrcodeVo.getScene(), qrcodeVo.getPath(), UUIDUtil.getRandomID()
+        String qrcodeSavePath = wxacodeUtil.getWxacode(qrcodeVo.getScene(), qrcodeVo.getPath(), UUIDUtil.getRandomID()
                 ,weChatApiTools.getAppid(loginUser.getCompanyId()),weChatApiTools.getSecret(loginUser.getCompanyId()));
 
         LogUtil.debug("qrcodeSavePath={}", qrcodeSavePath);
         // 图片保存目录路径
-        String baseSavePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+        String baseSavePath = fileStoragePath;
         // 图片访问URL
-        String baseSaveUrl = PropertiesUtil.getString(AppConstance.NGINX_URL);
+        String baseSaveUrl = staticResourceUrl;
         String productImg = shopProduct.getImgMobile();
         productImg = productImg.replace(baseSaveUrl, baseSavePath);
         String targetImg = UUIDUtil.getRandomID() + ".png";
@@ -206,14 +216,14 @@
 
         ShopProduct shopProduct = shopProductDao.selectById(groupBuyVO.getGoodsId().intValue());
 
-        String qrcodeSavePath = WxacodeUtil.getWxacode(qrcodeVo.getScene(), qrcodeVo.getPath(), UUIDUtil.getRandomID()
+        String qrcodeSavePath =wxacodeUtil.getWxacode(qrcodeVo.getScene(), qrcodeVo.getPath(), UUIDUtil.getRandomID()
                 ,weChatApiTools.getAppid(loginUser.getCompanyId()),weChatApiTools.getSecret(loginUser.getCompanyId()));
 
         LogUtil.debug("qrcodeSavePath={}", qrcodeSavePath);
         // 图片保存目录路径
-        String baseSavePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+        String baseSavePath =fileStoragePath;
         // 图片访问URL
-        String baseSaveUrl = PropertiesUtil.getString(AppConstance.NGINX_URL);
+        String baseSaveUrl =staticResourceUrl;
         String productImg = shopProduct.getImgMobile();
         productImg = productImg.replace(baseSaveUrl, baseSavePath);
         String targetImg = UUIDUtil.getRandomID() + ".png";
@@ -238,14 +248,14 @@
 
 
 
-        String qrcodeSavePath = WxacodeUtil.getWxacode(qrcodeVo.getScene(), qrcodeVo.getPath(), UUIDUtil.getRandomID()
+        String qrcodeSavePath = wxacodeUtil.getWxacode(qrcodeVo.getScene(), qrcodeVo.getPath(), UUIDUtil.getRandomID()
                 ,weChatApiTools.getAppid(loginUser.getCompanyId()),weChatApiTools.getSecret(loginUser.getCompanyId()));
 
         LogUtil.debug("qrcodeSavePath={}", qrcodeSavePath);
         // 图片保存目录路径
-        String baseSavePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+        String baseSavePath =fileStoragePath;
         // 图片访问URL
-        String baseSaveUrl = PropertiesUtil.getString(AppConstance.NGINX_URL);
+        String baseSaveUrl =staticResourceUrl;
         String productImg = shopProduct.getImgMobile();
         String productPath = baseSavePath + "wxacode" + File.separatorChar + MD5Util.strToMD5(loginUser.getOpenId()) + "poster.png";
         ImageUtil.downloadPicture(productImg, productPath);
diff --git a/zq-erp/src/main/resources/config/application-alpha.properties b/zq-erp/src/main/resources/config/application-alpha.properties
new file mode 100644
index 0000000..9ebe364
--- /dev/null
+++ b/zq-erp/src/main/resources/config/application-alpha.properties
@@ -0,0 +1,167 @@
+evn=lhx
+server.port=8080
+
+
+#线上测试环境
+spring.datasource.username=ct_test
+spring.datasource.password=123456
+spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+
+
+
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.initialSize=3
+spring.datasource.minIdle=3
+spring.datasource.maxActive=20
+spring.datasource.maxWait=60000
+spring.datasource.timeBetweenEvictionRunsMillis=60000
+spring.datasource.minEvictableIdleTimeMillis=300000
+spring.datasource.validationQuery=SELECT 1 FROM DUAL
+spring.datasource.testWhileIdle=true
+spring.datasource.testOnBorrow=true
+spring.datasource.testOnReturn=true
+spring.datasource.filters=stat,wall,log4j
+spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+spring.thymeleaf.prefix: classpath:/templates/views/
+spring.thymeleaf.cache=false
+mybatis.config-location=classpath:mybatis/mybatis-config.xml
+mybatis.mapper-locations=classpath*:mybatis/mapper/*/*.xml
+#设置全局时间返回格式 第三行设置为true表示返回时间戳
+#spring.jackson.date-format=yyyy-MM-dd
+#spring.jackson.time-zone=GMT+8
+#spring.jackson.serialization.write-dates-as-timestamps=true
+#文件上传时的大小限制 单位M
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=100MB
+#--------------------------------------
+
+
+#rabbitMQ配置
+rabbitmq.host=120.27.238.55
+rabbitmq.port=5672
+rabbitmq.username=ct_rabbit
+rabbitmq.password=123456
+
+server.session.timeout=120
+
+ali.sms.accessKeyId=LTAI4FrjY9R9iDfC6YQTHfne
+ali.sms.accessKeySecret=eSvQslpHpDSGlI9Hxm4y5MynNgLbCp
+ali.sms.regionId=cn-hangzhou
+ali.sms.signName=\u80bd\u598d
+
+#hour
+activities.groupBuy.limit=24
+#minute
+groupBuy.pay.timeLimit=30
+#定时任务
+scheduling.enabled=true
+
+swagger.enable=true
+
+#是否启用debug模式
+debug=false
+# 日志文件保存地址
+log_path=/home/javaweb/hive/log
+
+# 系统语言环境 zh中文，us英文
+system_language=zh
+
+# 错误密码允许输入的次数，大于五次后账号锁定,0表示不锁账号
+error_password_times=5
+# 默认密码
+default_password=123
+
+#nginx静态资源访问地址
+static_resource_url=http://120.27.238.55:8000/hive/static/uploadeFile/
+#文件保存地址
+file_storage_path=/home/javaweb/webresource/hive/static/uploadeFile/
+#文件上传大小字节为单位  10MB
+maxUploadSize=10485760
+
+#Matser\u7684ip\u5730\u5740
+redis.hostname=120.27.238.55
+#\u7AEF\u53E3\u53F7
+redis.port=6379
+#\u5982\u679C\u6709\u5BC6\u7801
+redis.password=xcong123
+#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
+redis.timeout=10000  
+redis.database=2
+redis_time_out=1800000
+
+
+cookie_time_out=36000
+
+#APP登录公钥
+login_public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWvK6UWCtSp/8qnTqyUfO0wbg4CuxOe7IeiDSAmATfHnWqBPnbZ73qQ4A90vGowB7mp5XnmBvgTwfXtDh08yd4btlHwSD3ShbRyGfGfV8lc47ZTLiJH0xuuN2iHfnfj8zQ5kcqijeotggo2rF8Uu7KSR3HxVyN9mO22C6p1r5wVQIDAQAB
+#APP登录秘钥
+login_private_key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJa8rpRYK1Kn/yqdOrJR87TBuDgK7E57sh6INICYBN8edaoE+dtnvepDgD3S8ajAHuanleeYG+BPB9e0OHTzJ3hu2UfBIPdKFtHIZ8Z9XyVzjtlMuIkfTG643aId+d+PzNDmRyqKN6i2CCjasXxS7spJHcfFXI32Y7bYLqnWvnBVAgMBAAECgYBNzQFGq+NgfDllo1WCaG4jI8GTm3+wWoPq4l5G6S/KgYw1vu+/YOJTIZf1UQVOFitc3a6vpIDu25uup+Rj6IS8B4V8NDfc8P+iMNwdIKqqBj8wHu0/SaxYdW1uqlU5+XkJMxsNMgNRRGPSIQhla5OPHtBzIa7t4lmypETMZtXEmQJBAMsa1OIQzAKU05GweCnNNSoqo/nAQLqp8zfbJypxRx24uaCyS7C+KxN+O4FyaYmM9n0X+cgkr+RYHAIa7mg3gccCQQC9/nJvRBum8+4TINnz6QrvTmTlhi8QKW/CiRYpGgmo5PtQYw4BkRQbYO8ktFDM2yeO75XBv09qnGQaivDCeL0DAkEAisFg8LSy+4x7YcvivAQirxUEg2qRjjTvIZjKEBflkuuRfbRxO2Uf/qg9tPjaGwu/lcScc9yEggaj09hcSbyqHwJAN8QLiqUPCL3oTy0BTBpG316/Nq9f+Ppwl0TtgDroQu6S5VFttwACStb02m0imj5pKgcgibHBeaVVrITDjhEqSQJAaCHD/ytTzgtgLoVVyZZxOB272W7PI3mnzL8qQSldx1/QOBs1NmmEZuo7ELFMrfTmlxa1qR4gsq/ImfIdUdXewQ==
+
+#是否启用异常上报
+is_open_exception_report=true
+showExcptionUrl=http://erp.hive.jyymatrix.cc/showException
+
+#异常上报地址
+exception_center_url =http://geek.xc.jyymatrix.cc/addException
+#项目编号
+projNo=78
+#项目负责人
+owner=姜友瑶
+
+#日志文件清理阈值  单位：MB
+log_max=20
+#日志清理天数
+log_clear_day=5
+
+
+
+
+wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
+xcx_appid =wx3836ab3c1490ff29
+xcx_secret =39a3687ec5b2666ed68e7c8b83b26b47
+
+#微信支付调试开关
+wx_pay_debug_onoff = false
+
+#快递鸟用户id
+logistics.eBusinessID=1530881
+#快递鸟密钥
+logistics.appKey=f1cf9777-26fb-4e3f-a14d-896075e6384e
+#快递鸟接口地址
+logistics.url=http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
+#快递鸟接口指令
+logistics.requestType=1002
+
+#丰桥顾客编码
+sf.logistics.clientCode=XCZHYF
+#丰桥校验码
+sf.logistics.checkword=zqcjA2A5m6MIGa6mImMcnpKQ9ipYlbUW
+#丰桥接口地址
+sf.logistics.url=https://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
+
+#发送短信配置
+crm.request_url = http://192.168.1.248
+sms.request_url = http://smssh1.253.com
+sms.login_account = M7315130
+sms.login_password = J7FAoehPkv63e3
+sms.login_accountNe = N4617160
+sms.login_passwordNe = rb1cxLitRB83e0
+
+#接入统一登录平台配置
+platform_app_code = wx_shop
+platform_secret_key = b21e309f07964e4fae5b156d74b5d66z
+#platform_verity_url = http://localhost:8080/platform/getUserInfo
+platform_verity_url = http://stg1-xcerp-ca.xc.jyymatrix.cc/platform/getUserInfo
+
+#微信支付回调地址
+pay_notify_url = https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback
+
+
+qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png
+qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png
+
+#hive仓库地址
+hive.service=http://erp.hive.jyymatrix.cc/meidu-crm/
+
+gzh_appid=wx57e6335559bdbda6
+gzh_secret=ecb408af170e3890e6544290cad33760
diff --git a/zq-erp/src/main/resources/config/application-meidu.properties b/zq-erp/src/main/resources/config/application-meidu.properties
new file mode 100644
index 0000000..8e25837
--- /dev/null
+++ b/zq-erp/src/main/resources/config/application-meidu.properties
@@ -0,0 +1,180 @@
+evn=prd
+server.port=8080
+
+
+
+spring.datasource.username=meidu_data
+spring.datasource.password=meidu_4321#&@
+spring.datasource.url=jdbc:mysql://47.111.134.136/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+
+
+
+
+
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.initialSize=3
+spring.datasource.minIdle=3
+spring.datasource.maxActive=20
+spring.datasource.maxWait=60000
+spring.datasource.timeBetweenEvictionRunsMillis=60000
+spring.datasource.minEvictableIdleTimeMillis=300000
+spring.datasource.validationQuery=SELECT 1 FROM DUAL
+spring.datasource.testWhileIdle=true
+spring.datasource.testOnBorrow=true
+spring.datasource.testOnReturn=true
+spring.datasource.filters=stat,wall,log4j
+spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+spring.thymeleaf.prefix: classpath:/templates/views/
+spring.thymeleaf.cache=false
+mybatis-plus.global-config.db-config.id-type=auto
+mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml
+mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml
+#设置全局时间返回格式 第三行设置为true表示返回时间戳
+#spring.jackson.date-format=yyyy-MM-dd
+#spring.jackson.time-zone=GMT+8
+#spring.jackson.serialization.write-dates-as-timestamps=true
+#文件上传时的大小限制 单位M
+spring.servlet.multipart.max-file-size=300MB
+spring.servlet.multipart.max-request-size=300MB
+#--------------------------------------
+
+
+
+#rabbitMQ配置
+rabbitmq.host=47.111.134.136
+rabbitmq.port=5672
+rabbitmq.username=hivequeue
+rabbitmq.password=hivequeueadmin
+useRabbit=true
+
+#指定消费者确认方式  当为manual时手动确认 不配置表示自动确认
+#spring.rabbitmq.listener.simple.acknowledge-mode=manual
+server.session.timeout=120
+
+ali.sms.accessKeyId=LTAI4FrjY9R9iDfC6YQTHfne
+ali.sms.accessKeySecret=eSvQslpHpDSGlI9Hxm4y5MynNgLbCp
+ali.sms.regionId=cn-hangzhou
+ali.sms.signName=\u80bd\u598d
+
+
+#hour
+activities.groupBuy.limit=24
+#minute
+groupBuy.pay.timeLimit=30
+
+#定时任务
+scheduling.enabled=true
+swagger.enable=false
+
+#默认头像
+default.vip.photo.woman=https://filehive2.jyymatrix.cc/uploadeFile/20210125/db53552e688040afb286686f081e1e68f3fe946f75624598828f01898635152e.png
+default.vip.photo.man=https://filehive2.jyymatrix.cc/uploadeFile/20210125/3642f1d827c44c76832fea106c85e0f89e089c16cbcc4dd0a82bb52b9ac700f4.png
+
+
+#是否启用debug模式
+debug=false
+# 日志文件保存地址
+log_path=/mnt/md-hive/log
+
+# 系统语言环境 zh中文，us英文
+system_language=zh
+
+# 错误密码允许输入的次数，大于五次后账号锁定,0表示不锁账号
+error_password_times=5
+# 默认密码
+default_password=123
+
+#nginx静态资源访问地址
+static_resource_url=https://filehive2.jyymatrix.cc/uploadeFile/md/
+#文件保存地址
+file_storage_path=/mnt/hive/static/uploadeFile/md/
+#文件上传大小字节为单位  10MB
+maxUploadSize=10485760
+
+#Matser\u7684ip\u5730\u5740
+redis.hostname=120.27.238.55
+#\u7AEF\u53E3\u53F7
+redis.port=6379
+#\u5982\u679C\u6709\u5BC6\u7801
+redis.password=xcong123
+#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
+redis.timeout=10000
+redis.database=1
+redis_time_out=1800000
+
+
+cookie_time_out=36000
+
+#APP登录公钥
+login_public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWvK6UWCtSp/8qnTqyUfO0wbg4CuxOe7IeiDSAmATfHnWqBPnbZ73qQ4A90vGowB7mp5XnmBvgTwfXtDh08yd4btlHwSD3ShbRyGfGfV8lc47ZTLiJH0xuuN2iHfnfj8zQ5kcqijeotggo2rF8Uu7KSR3HxVyN9mO22C6p1r5wVQIDAQAB
+#APP登录秘钥
+login_private_key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJa8rpRYK1Kn/yqdOrJR87TBuDgK7E57sh6INICYBN8edaoE+dtnvepDgD3S8ajAHuanleeYG+BPB9e0OHTzJ3hu2UfBIPdKFtHIZ8Z9XyVzjtlMuIkfTG643aId+d+PzNDmRyqKN6i2CCjasXxS7spJHcfFXI32Y7bYLqnWvnBVAgMBAAECgYBNzQFGq+NgfDllo1WCaG4jI8GTm3+wWoPq4l5G6S/KgYw1vu+/YOJTIZf1UQVOFitc3a6vpIDu25uup+Rj6IS8B4V8NDfc8P+iMNwdIKqqBj8wHu0/SaxYdW1uqlU5+XkJMxsNMgNRRGPSIQhla5OPHtBzIa7t4lmypETMZtXEmQJBAMsa1OIQzAKU05GweCnNNSoqo/nAQLqp8zfbJypxRx24uaCyS7C+KxN+O4FyaYmM9n0X+cgkr+RYHAIa7mg3gccCQQC9/nJvRBum8+4TINnz6QrvTmTlhi8QKW/CiRYpGgmo5PtQYw4BkRQbYO8ktFDM2yeO75XBv09qnGQaivDCeL0DAkEAisFg8LSy+4x7YcvivAQirxUEg2qRjjTvIZjKEBflkuuRfbRxO2Uf/qg9tPjaGwu/lcScc9yEggaj09hcSbyqHwJAN8QLiqUPCL3oTy0BTBpG316/Nq9f+Ppwl0TtgDroQu6S5VFttwACStb02m0imj5pKgcgibHBeaVVrITDjhEqSQJAaCHD/ytTzgtgLoVVyZZxOB272W7PI3mnzL8qQSldx1/QOBs1NmmEZuo7ELFMrfTmlxa1qR4gsq/ImfIdUdXewQ==
+
+#是否启用异常上报
+is_open_exception_report=true
+showExcptionUrl=http://erp.hive.jyymatrix.cc/showException
+
+#异常上报地址
+exception_center_url =http://geek.xc.jyymatrix.cc/addException
+#项目编号
+projNo=78
+#项目负责人
+owner=姜友瑶
+
+#日志文件清理阈值  单位：MB
+log_max=20
+#日志清理天数
+log_clear_day=5
+
+
+
+
+wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
+xcx_appid =wx3836ab3c1490ff29
+xcx_secret =39a3687ec5b2666ed68e7c8b83b26b47
+xcx_manager_appid=wx2948b3b914a9722e
+xcx_manager_secret=1685dfd99a43e213ed8be07870b898ba
+#微信支付调试开关
+wx_pay_debug_onoff = false
+
+#快递鸟用户id
+logistics.eBusinessID=1530881
+#快递鸟密钥
+logistics.appKey=f1cf9777-26fb-4e3f-a14d-896075e6384e
+#快递鸟接口地址
+logistics.url=http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
+#快递鸟接口指令
+logistics.requestType=1002
+
+#丰桥顾客编码
+sf.logistics.clientCode=XCZHYF
+#丰桥校验码
+sf.logistics.checkword=zqcjA2A5m6MIGa6mImMcnpKQ9ipYlbUW
+#丰桥接口地址
+sf.logistics.url=https://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
+
+#发送短信配置
+crm.request_url = http://192.168.1.248
+sms.request_url = http://smssh1.253.com
+sms.login_account = M7315130
+sms.login_password = J7FAoehPkv63e3
+sms.login_accountNe = N4617160
+sms.login_passwordNe = rb1cxLitRB83e0
+
+#接入统一登录平台配置
+platform_app_code = wx_shop
+platform_secret_key = b21e309f07964e4fae5b156d74b5d66z
+#platform_verity_url = http://localhost:8080/platform/getUserInfo
+platform_verity_url = http://stg1-xcerp-ca.xc.jyymatrix.cc/platform/getUserInfo
+
+#微信支付回调地址
+pay_notify_url = https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback
+
+
+qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png
+qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png
+
+#hive仓库地址
+hive.service=http://erp.hive.jyymatrix.cc/meidu-crm/
+
+
diff --git a/zq-erp/src/main/resources/config/application-taiyan.properties b/zq-erp/src/main/resources/config/application-taiyan.properties
new file mode 100644
index 0000000..85e42d4
--- /dev/null
+++ b/zq-erp/src/main/resources/config/application-taiyan.properties
@@ -0,0 +1,176 @@
+evn=prd
+server.port=8080
+
+
+
+spring.datasource.username=hive
+spring.datasource.password=hive123!@#
+spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+
+
+
+
+
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.initialSize=3
+spring.datasource.minIdle=3
+spring.datasource.maxActive=20
+spring.datasource.maxWait=60000
+spring.datasource.timeBetweenEvictionRunsMillis=60000
+spring.datasource.minEvictableIdleTimeMillis=300000
+spring.datasource.validationQuery=SELECT 1 FROM DUAL
+spring.datasource.testWhileIdle=true
+spring.datasource.testOnBorrow=true
+spring.datasource.testOnReturn=true
+spring.datasource.filters=stat,wall,log4j
+spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+spring.thymeleaf.prefix: classpath:/templates/views/
+spring.thymeleaf.cache=false
+mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml
+mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml
+#设置全局时间返回格式 第三行设置为true表示返回时间戳
+#spring.jackson.date-format=yyyy-MM-dd
+#spring.jackson.time-zone=GMT+8
+#spring.jackson.serialization.write-dates-as-timestamps=true
+#文件上传时的大小限制 单位M
+spring.servlet.multipart.max-file-size=300MB
+spring.servlet.multipart.max-request-size=300MB
+#--------------------------------------
+
+
+
+#rabbitMQ配置
+rabbitmq.host=47.111.134.136
+rabbitmq.port=5672
+rabbitmq.username=hivequeue
+rabbitmq.password=hivequeueadmin
+useRabbit=true
+
+#指定消费者确认方式  当为manual时手动确认 不配置表示自动确认
+#spring.rabbitmq.listener.simple.acknowledge-mode=manual
+server.session.timeout=120
+
+ali.sms.accessKeyId=LTAI4FrjY9R9iDfC6YQTHfne
+ali.sms.accessKeySecret=eSvQslpHpDSGlI9Hxm4y5MynNgLbCp
+ali.sms.regionId=cn-hangzhou
+ali.sms.signName=\u80bd\u598d
+
+
+#hour
+activities.groupBuy.limit=24
+#minute
+groupBuy.pay.timeLimit=30
+
+#定时任务
+scheduling.enabled=true
+swagger.enable=false
+
+#默认头像
+default.vip.photo.woman=https://filehive2.jyymatrix.cc/uploadeFile/20210125/db53552e688040afb286686f081e1e68f3fe946f75624598828f01898635152e.png
+default.vip.photo.man=https://filehive2.jyymatrix.cc/uploadeFile/20210125/3642f1d827c44c76832fea106c85e0f89e089c16cbcc4dd0a82bb52b9ac700f4.png
+
+#是否启用debug模式
+debug=false
+# 日志文件保存地址
+log_path=/mnt/hive/log
+
+# 系统语言环境 zh中文，us英文
+system_language=zh
+
+# 错误密码允许输入的次数，大于五次后账号锁定,0表示不锁账号
+error_password_times=5
+# 默认密码
+default_password=123
+
+#nginx静态资源访问地址
+static_resource_url=https://filehive2.jyymatrix.cc/uploadeFile/
+#文件保存地址
+file_storage_path=/mnt/hive/static/uploadeFile/
+#文件上传大小字节为单位  10MB
+maxUploadSize=10485760
+
+#Matser\u7684ip\u5730\u5740
+redis.hostname=120.27.238.55
+#\u7AEF\u53E3\u53F7
+redis.port=6379
+#\u5982\u679C\u6709\u5BC6\u7801
+redis.password=xcong123
+#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
+redis.timeout=10000  
+redis.database=1
+redis_time_out=1800000
+
+
+cookie_time_out=36000
+
+#APP登录公钥
+login_public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWvK6UWCtSp/8qnTqyUfO0wbg4CuxOe7IeiDSAmATfHnWqBPnbZ73qQ4A90vGowB7mp5XnmBvgTwfXtDh08yd4btlHwSD3ShbRyGfGfV8lc47ZTLiJH0xuuN2iHfnfj8zQ5kcqijeotggo2rF8Uu7KSR3HxVyN9mO22C6p1r5wVQIDAQAB
+#APP登录秘钥
+login_private_key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJa8rpRYK1Kn/yqdOrJR87TBuDgK7E57sh6INICYBN8edaoE+dtnvepDgD3S8ajAHuanleeYG+BPB9e0OHTzJ3hu2UfBIPdKFtHIZ8Z9XyVzjtlMuIkfTG643aId+d+PzNDmRyqKN6i2CCjasXxS7spJHcfFXI32Y7bYLqnWvnBVAgMBAAECgYBNzQFGq+NgfDllo1WCaG4jI8GTm3+wWoPq4l5G6S/KgYw1vu+/YOJTIZf1UQVOFitc3a6vpIDu25uup+Rj6IS8B4V8NDfc8P+iMNwdIKqqBj8wHu0/SaxYdW1uqlU5+XkJMxsNMgNRRGPSIQhla5OPHtBzIa7t4lmypETMZtXEmQJBAMsa1OIQzAKU05GweCnNNSoqo/nAQLqp8zfbJypxRx24uaCyS7C+KxN+O4FyaYmM9n0X+cgkr+RYHAIa7mg3gccCQQC9/nJvRBum8+4TINnz6QrvTmTlhi8QKW/CiRYpGgmo5PtQYw4BkRQbYO8ktFDM2yeO75XBv09qnGQaivDCeL0DAkEAisFg8LSy+4x7YcvivAQirxUEg2qRjjTvIZjKEBflkuuRfbRxO2Uf/qg9tPjaGwu/lcScc9yEggaj09hcSbyqHwJAN8QLiqUPCL3oTy0BTBpG316/Nq9f+Ppwl0TtgDroQu6S5VFttwACStb02m0imj5pKgcgibHBeaVVrITDjhEqSQJAaCHD/ytTzgtgLoVVyZZxOB272W7PI3mnzL8qQSldx1/QOBs1NmmEZuo7ELFMrfTmlxa1qR4gsq/ImfIdUdXewQ==
+
+#是否启用异常上报
+is_open_exception_report=true
+showExcptionUrl=http://erp.hive.jyymatrix.cc/showException
+
+#异常上报地址
+exception_center_url =http://geek.xc.jyymatrix.cc/addException
+#项目编号
+projNo=78
+#项目负责人
+owner=姜友瑶
+
+#日志文件清理阈值  单位：MB
+log_max=20
+#日志清理天数
+log_clear_day=5
+
+
+
+
+wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
+xcx_appid =wx3836ab3c1490ff29
+xcx_secret =39a3687ec5b2666ed68e7c8b83b26b47
+xcx_manager_appid=wx2948b3b914a9722e
+xcx_manager_secret=1685dfd99a43e213ed8be07870b898ba
+#微信支付调试开关
+wx_pay_debug_onoff = false
+
+#快递鸟用户id
+logistics.eBusinessID=1530881
+#快递鸟密钥
+logistics.appKey=f1cf9777-26fb-4e3f-a14d-896075e6384e
+#快递鸟接口地址
+logistics.url=http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
+#快递鸟接口指令
+logistics.requestType=1002
+
+#丰桥顾客编码
+sf.logistics.clientCode=XCZHYF
+#丰桥校验码
+sf.logistics.checkword=zqcjA2A5m6MIGa6mImMcnpKQ9ipYlbUW
+#丰桥接口地址
+sf.logistics.url=https://bsp-oisp.sf-express.com/bsp-oisp/sfexpressService
+
+#发送短信配置
+crm.request_url = http://192.168.1.248
+sms.request_url = http://smssh1.253.com
+sms.login_account = M7315130
+sms.login_password = J7FAoehPkv63e3
+sms.login_accountNe = N4617160
+sms.login_passwordNe = rb1cxLitRB83e0
+
+#接入统一登录平台配置
+platform_app_code = wx_shop
+platform_secret_key = b21e309f07964e4fae5b156d74b5d66z
+#platform_verity_url = http://localhost:8080/platform/getUserInfo
+platform_verity_url = http://stg1-xcerp-ca.xc.jyymatrix.cc/platform/getUserInfo
+
+#微信支付回调地址
+pay_notify_url = https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback
+
+
+qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png
+qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png
+
+#hive仓库地址
+hive.service=http://erp.hive.jyymatrix.cc/meidu-crm/
diff --git a/zq-erp/src/main/resources/config/application-test.properties b/zq-erp/src/main/resources/config/application-test.properties
new file mode 100644
index 0000000..f68b3d7
--- /dev/null
+++ b/zq-erp/src/main/resources/config/application-test.properties
@@ -0,0 +1,51 @@
+
+#数据库链接
+spring.datasource.username=ct_test
+spring.datasource.password=123456
+spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+
+
+#是否启用debug模式
+debug=false
+# 日志文件保存地址
+log_path=/mnt/hive/log-test
+
+#nginx静态资源访问地址
+static_resource_url=http://testfile.hive.jyymatrix.cc/
+#文件保存地址
+file_storage_path=/mnt/upload/
+
+#微信支付调试开关
+wx_pay_debug_onoff = false
+
+#快递鸟用户id
+logistics.eBusinessID=1530881
+#快递鸟密钥
+logistics.appKey=f1cf9777-26fb-4e3f-a14d-896075e6384e
+#快递鸟接口地址
+logistics.url=http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
+#快递鸟接口指令
+logistics.requestType=1002
+
+
+#发送短信配置
+crm.request_url = http://192.168.1.248
+sms.request_url = http://smssh1.253.com
+sms.login_account = M7315130
+sms.login_password = J7FAoehPkv63e3
+sms.login_accountNe = N4617160
+sms.login_passwordNe = rb1cxLitRB83e0
+
+
+qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png
+qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png
+
+#APP登录公钥
+login_public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWvK6UWCtSp/8qnTqyUfO0wbg4CuxOe7IeiDSAmATfHnWqBPnbZ73qQ4A90vGowB7mp5XnmBvgTwfXtDh08yd4btlHwSD3ShbRyGfGfV8lc47ZTLiJH0xuuN2iHfnfj8zQ5kcqijeotggo2rF8Uu7KSR3HxVyN9mO22C6p1r5wVQIDAQAB
+#APP登录秘钥
+login_private_key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJa8rpRYK1Kn/yqdOrJR87TBuDgK7E57sh6INICYBN8edaoE+dtnvepDgD3S8ajAHuanleeYG+BPB9e0OHTzJ3hu2UfBIPdKFtHIZ8Z9XyVzjtlMuIkfTG643aId+d+PzNDmRyqKN6i2CCjasXxS7spJHcfFXI32Y7bYLqnWvnBVAgMBAAECgYBNzQFGq+NgfDllo1WCaG4jI8GTm3+wWoPq4l5G6S/KgYw1vu+/YOJTIZf1UQVOFitc3a6vpIDu25uup+Rj6IS8B4V8NDfc8P+iMNwdIKqqBj8wHu0/SaxYdW1uqlU5+XkJMxsNMgNRRGPSIQhla5OPHtBzIa7t4lmypETMZtXEmQJBAMsa1OIQzAKU05GweCnNNSoqo/nAQLqp8zfbJypxRx24uaCyS7C+KxN+O4FyaYmM9n0X+cgkr+RYHAIa7mg3gccCQQC9/nJvRBum8+4TINnz6QrvTmTlhi8QKW/CiRYpGgmo5PtQYw4BkRQbYO8ktFDM2yeO75XBv09qnGQaivDCeL0DAkEAisFg8LSy+4x7YcvivAQirxUEg2qRjjTvIZjKEBflkuuRfbRxO2Uf/qg9tPjaGwu/lcScc9yEggaj09hcSbyqHwJAN8QLiqUPCL3oTy0BTBpG316/Nq9f+Ppwl0TtgDroQu6S5VFttwACStb02m0imj5pKgcgibHBeaVVrITDjhEqSQJAaCHD/ytTzgtgLoVVyZZxOB272W7PI3mnzL8qQSldx1/QOBs1NmmEZuo7ELFMrfTmlxa1qR4gsq/ImfIdUdXewQ==
+
+
+#是否启用异常上报
+is_open_exception_report=true
+showExcptionUrl=http://test.hive.jyymatrix.cc/showException
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties
index ee23831..f6325f2 100644
--- a/zq-erp/src/main/resources/config/application.properties
+++ b/zq-erp/src/main/resources/config/application.properties
@@ -1,35 +1,7 @@
+
+spring.profiles.active=test
 evn=dev
 server.port=8080
-
-
-#线上测试环境
-#
-spring.datasource.username=ct_test
-spring.datasource.password=123456
-spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
-
-#spring.datasource.username=hive
-#spring.datasource.password=hive123!@#
-#spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
-
-#spring.datasource.username=xc_shop
-#spring.datasource.password=xc_shop123!@#
-#spring.datasource.url=jdbc:mysql://124.70.222.34/xc_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
-
-
-#spring.datasource.username=hive
-#spring.datasource.password=hive123!@#
-#spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
-
-#spring.datasource.username=meidu_data
-#spring.datasource.password=meidu_4321#&@
-#spring.datasource.url=jdbc:mysql://47.111.134.136/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
-
-
-#spring.datasource.username=root
-#spring.datasource.password=root
-#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/md_test_local?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
-
 
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.initialSize=3
@@ -47,28 +19,14 @@
 spring.thymeleaf.prefix: classpath:/templates/views/
 spring.thymeleaf.cache=false
 #设置全局时间返回格式 第三行设置为true表示返回时间戳
-#spring.jackson.date-format=yyyy-MM-dd
-#spring.jackson.time-zone=GMT+8
-#spring.jackson.serialization.write-dates-as-timestamps=true
+
 #文件上传时的大小限制 单位M
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
 #--------------------------------------
 
 
-#rabbitMQ配置
-#rabbitmq.host=47.111.134.136
-#rabbitmq.port=5672
-#rabbitmq.username=hivequeue
-#rabbitmq.password=hivequeueadmin
-useRabbit=false
 
-server.session.timeout=120
-
-ali.sms.accessKeyId=LTAI4FrjY9R9iDfC6YQTHfne
-ali.sms.accessKeySecret=eSvQslpHpDSGlI9Hxm4y5MynNgLbCp
-ali.sms.regionId=cn-hangzhou
-ali.sms.signName=\u80bd\u598d
 
 #hour
 activities.groupBuy.limit=24
@@ -89,3 +47,81 @@
 mybatis-plus.global-config.db-config.id-type=auto
 mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml
 mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml
+
+
+#是否启用debug模式
+debug=true
+# 日志文件保存地址
+log_path=/Users/jiangyouyao/logs/zqerp
+
+# 系统语言环境 zh中文，us英文
+system_language=zh
+
+# 错误密码允许输入的次数，大于五次后账号锁定,0表示不锁账号
+error_password_times=5
+# 默认密码
+default_password=123
+
+
+
+
+
+wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
+
+xcx_manager_appid=wx2948b3b914a9722e
+xcx_manager_secret=1685dfd99a43e213ed8be07870b898ba
+
+#公众号
+gzh_appid=wx57e6335559bdbda6
+gzh_secret=ecb408af170e3890e6544290cad33760
+
+
+
+#微信支付调试开关
+wx_pay_debug_onoff = false
+
+#快递鸟用户id
+logistics.eBusinessID=1530881
+#快递鸟密钥
+logistics.appKey=f1cf9777-26fb-4e3f-a14d-896075e6384e
+#快递鸟接口地址
+logistics.url=http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
+#快递鸟接口指令
+logistics.requestType=1002
+
+
+
+
+#发送短信配置
+crm.request_url = http://192.168.1.248
+sms.request_url = http://smssh1.253.com
+sms.login_account = M7315130
+sms.login_password = J7FAoehPkv63e3
+sms.login_accountNe = N4617160
+sms.login_passwordNe = rb1cxLitRB83e0
+
+#接入统一登录平台配置
+platform_app_code = wx_shop
+platform_secret_key = b21e309f07964e4fae5b156d74b5d66z
+#platform_verity_url = http://localhost:8080/platform/getUserInfo
+platform_verity_url = http://stg1-xcerp-ca.xc.jyymatrix.cc/platform/getUserInfo
+
+#微信支付回调地址
+pay_notify_url = https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback
+
+qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png
+qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png
+
+#hive仓库地址
+hive.service=http://localhost:8082/meidu-crm/
+
+
+
+#是否启用异常上报
+is_open_exception_report=false
+showExcptionUrl=http://test.hive.jyymatrix.cc/showException
+
+
+
+
+
diff --git a/zq-erp/src/main/resources/config/system.properties b/zq-erp/src/main/resources/config/system.properties
deleted file mode 100644
index e2c8614..0000000
--- a/zq-erp/src/main/resources/config/system.properties
+++ /dev/null
@@ -1,109 +0,0 @@
-#是否启用debug模式
-debug=true
-# 日志文件保存地址
-log_path=/Users/jiangyouyao/logs/zqerp
-
-# 系统语言环境 zh中文，us英文
-system_language=zh
-
-# 错误密码允许输入的次数，大于五次后账号锁定,0表示不锁账号
-error_password_times=5
-# 默认密码
-default_password=123
-
-#nginx静态资源访问地址
-#static_resource_url=https://filehive2.jyymatrix.cc/uploadeFile/
-static_resource_url=http://localhost:1088/
-
-#文件保存地址
-#file_storage_path=/mnt/hive/static/uploadeFile/
-file_storage_path=D:\\test\\
-
-#文件上传大小字节为单位  10MB
-maxUploadSize=10485760
-
-#Matser\u7684ip\u5730\u5740
-#redis.hostname=120.27.238.55
-#\u7AEF\u53E3\u53F7
-#redis.port=6379
-#\u5982\u679C\u6709\u5BC6\u7801
-#redis.password=xcong123
-#\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
-#redis.timeout=10000
-#redis.database=2
-#redis_time_out=1800000
-cookie_time_out=36000
-
-#APP登录公钥
-login_public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWvK6UWCtSp/8qnTqyUfO0wbg4CuxOe7IeiDSAmATfHnWqBPnbZ73qQ4A90vGowB7mp5XnmBvgTwfXtDh08yd4btlHwSD3ShbRyGfGfV8lc47ZTLiJH0xuuN2iHfnfj8zQ5kcqijeotggo2rF8Uu7KSR3HxVyN9mO22C6p1r5wVQIDAQAB
-#APP登录秘钥
-login_private_key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAJa8rpRYK1Kn/yqdOrJR87TBuDgK7E57sh6INICYBN8edaoE+dtnvepDgD3S8ajAHuanleeYG+BPB9e0OHTzJ3hu2UfBIPdKFtHIZ8Z9XyVzjtlMuIkfTG643aId+d+PzNDmRyqKN6i2CCjasXxS7spJHcfFXI32Y7bYLqnWvnBVAgMBAAECgYBNzQFGq+NgfDllo1WCaG4jI8GTm3+wWoPq4l5G6S/KgYw1vu+/YOJTIZf1UQVOFitc3a6vpIDu25uup+Rj6IS8B4V8NDfc8P+iMNwdIKqqBj8wHu0/SaxYdW1uqlU5+XkJMxsNMgNRRGPSIQhla5OPHtBzIa7t4lmypETMZtXEmQJBAMsa1OIQzAKU05GweCnNNSoqo/nAQLqp8zfbJypxRx24uaCyS7C+KxN+O4FyaYmM9n0X+cgkr+RYHAIa7mg3gccCQQC9/nJvRBum8+4TINnz6QrvTmTlhi8QKW/CiRYpGgmo5PtQYw4BkRQbYO8ktFDM2yeO75XBv09qnGQaivDCeL0DAkEAisFg8LSy+4x7YcvivAQirxUEg2qRjjTvIZjKEBflkuuRfbRxO2Uf/qg9tPjaGwu/lcScc9yEggaj09hcSbyqHwJAN8QLiqUPCL3oTy0BTBpG316/Nq9f+Ppwl0TtgDroQu6S5VFttwACStb02m0imj5pKgcgibHBeaVVrITDjhEqSQJAaCHD/ytTzgtgLoVVyZZxOB272W7PI3mnzL8qQSldx1/QOBs1NmmEZuo7ELFMrfTmlxa1qR4gsq/ImfIdUdXewQ==
-
-
-#日志文件清理阈值  单位：MB
-log_max=20
-#日志清理天数
-log_clear_day=5
-
-
-
-
-wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
-xcx_appid =wx5cc58f796224af61
-xcx_secret =facea088aae414e5c2ee86b459887721
-xcx_manager_appid=wx2948b3b914a9722e
-xcx_manager_secret=1685dfd99a43e213ed8be07870b898ba
-
-#公众号
-gzh_appid=wx57e6335559bdbda6
-gzh_secret=ecb408af170e3890e6544290cad33760
-
-
-
-#微信支付调试开关
-wx_pay_debug_onoff = false
-
-#快递鸟用户id
-logistics.eBusinessID=1530881
-#快递鸟密钥
-logistics.appKey=f1cf9777-26fb-4e3f-a14d-896075e6384e
-#快递鸟接口地址
-logistics.url=http://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
-#快递鸟接口指令
-logistics.requestType=1002
-
-
-
-
-#发送短信配置
-crm.request_url = http://192.168.1.248
-sms.request_url = http://smssh1.253.com
-sms.login_account = M7315130
-sms.login_password = J7FAoehPkv63e3
-sms.login_accountNe = N4617160
-sms.login_passwordNe = rb1cxLitRB83e0
-
-#接入统一登录平台配置
-platform_app_code = wx_shop
-platform_secret_key = b21e309f07964e4fae5b156d74b5d66z
-#platform_verity_url = http://localhost:8080/platform/getUserInfo
-platform_verity_url = http://stg1-xcerp-ca.xc.jyymatrix.cc/platform/getUserInfo
-
-#微信支付回调地址
-pay_notify_url = https://xcxhive2.jyymatrix.cc/wxCommon/wxpayCallback
-
-qrcodeBackgroundImgPath=/mnt/xcshop/webresource/static/xcxresource/bj1.png
-qrcodeFrontImgPath=/mnt/xcshop/webresource/static/xcxresource/qj2.png
-
-#hive仓库地址
-hive.service=http://localhost:8082/meidu-crm/
-
-
-
-#是否启用异常上报
-is_open_exception_report=false
-showExcptionUrl=http://test.hive.jyymatrix.cc/showException
-
-
-
-
diff --git a/zq-erp/src/main/resources/readme-jyy b/zq-erp/src/main/resources/readme-jyy
index a6787a0..9369bc5 100644
--- a/zq-erp/src/main/resources/readme-jyy
+++ b/zq-erp/src/main/resources/readme-jyy
@@ -1,11 +1 @@
-删除
-cardCash
-projCash
-只留下
-goodsCash
-产品现金业绩和划扣业绩consume
-
-重构订单，收款，退款等方法不要共用逻辑
-
-把所有历史订单的订单类型区分销售订单和退款订单
-
+1、百度编辑器改造获取服务器上传前缀的方法，通过配置文件去获取
diff --git "a/zq-erp/src/main/resources/\346\235\203\351\231\220" "b/zq-erp/src/main/resources/\346\235\203\351\231\220"
index 2b38d8a..e69de29 100644
--- "a/zq-erp/src/main/resources/\346\235\203\351\231\220"
+++ "b/zq-erp/src/main/resources/\346\235\203\351\231\220"
@@ -1,2 +0,0 @@
-select ID, NAME, TYPE, code from sys_data_dictionary where 1=1 and TYPE like CONCAT('%',?,'%')
- 2021-06-26 16:36:49.487-[ TR = rGpKxAflK1Qt5O66 ] [ DEBUG ]-[ http-nio-8080-exec-3 ] ==> Parameters: 字段类型(String)
\ No newline at end of file

--
Gitblit v1.9.1