Merge remote-tracking branch 'origin/master'

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>com.malk</groupId>
     <artifactId>pro</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.3</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

src/main/java/com/malk/pro/guyuan/controller/NhIVController.java

@@ -157,7 +157,9 @@ public class NhIVController {
                 "河南能辉绿电科技有限公司",
                 "河南省绿色生态新能源科技有限公司",
                 "贵州能辉智慧能源科技有限公司",
-                "上海能辉科技股份有限公司");
+                "上海能辉科技股份有限公司",
+                "贵州能魁智电科技有限公司"
+                );
         McException.assertAccessException(!corpNames.contains(BuyerName), tips + ", 购买方名称不合法!");
     }
 

src/main/java/com/malk/pro/zyjn/service/impl/ZyjnServiceImpl.java

@@ -41,6 +41,7 @@ import java.util.regex.Pattern;
 @Service
 public class ZyjnServiceImpl implements ZyjnService {
     private final String tableFilePath = "/home/server/zhiyejineng/file/";
+//    private final String tableFilePath = "d:\\";
 
     private final String downloadUrl = "https://mc.cloudpure.cn/pro/zyjn/download/";
 
@@ -248,7 +249,7 @@ public class ZyjnServiceImpl implements ZyjnService {
             fileURL = fileURL.substring(0,fileURL.lastIndexOf("/") + 1) + encodeFileName;
         }
         //若是宜搭附件url 则需获得附件临时免登地址
-        if (fileURL.contains("aliwork")){
+        if (!fileURL.contains("mc.cloudpure.cn")){
             String pid= MDC.get("MDC_KEY_PID");
             String[] yida= McProject.getYida(pid);