Merge branch 'master' of D:\JavaProject\IMS with conflicts.

docker-compose-server.yml

@@ -40,7 +40,7 @@ services:
     container_name: imssystem-system
     volumes:
       - /data/config:/imssystem/config
-  - /data/storage:/imssystem/storage
+      - /data/storage:/imssystem/storage
     ports:
       - 8082:8082
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/client/KingdeeApiClient.java

@@ -43,22 +43,22 @@ public class KingdeeApiClient {
         long beginTime=System.currentTimeMillis();
 
         //生产环境
-        IdentifyInfo identifyInfo = new IdentifyInfo() {};
+        /*IdentifyInfo identifyInfo = new IdentifyInfo() {};
         identifyInfo.setAppId("225533_53fA1cht1lH8S88GT/3ozxUK2t3b2AnE");
         identifyInfo.setAppSecret("bd70ee8503b24e8386022a360e057605");
         identifyInfo.setServerUrl("https://jcg-666.ik3cloud.com/K3Cloud/");
         identifyInfo.setdCID("20210727181855027");
         identifyInfo.setlCID(2052);
-        identifyInfo.setUserName("Administrator");
+        identifyInfo.setUserName("Administrator");*/
 
         //测试环境
-        /*IdentifyInfo identifyInfo = new IdentifyInfo() {};
+        IdentifyInfo identifyInfo = new IdentifyInfo() {};
         identifyInfo.setAppId("225533_53fA1cht1lH8S88GT/3ozxUK2t3b2AnE");
         identifyInfo.setAppSecret("bd70ee8503b24e8386022a360e057605");
         identifyInfo.setServerUrl("https://jcg-666.test.ik3cloud.com/k3cloud/");
         identifyInfo.setdCID("20210727181951968");
         identifyInfo.setlCID(2052);
-        identifyInfo.setUserName("Administrator");*/
+        identifyInfo.setUserName("Administrator");
 
         K3CloudApi k3CloudApi = new K3CloudApi(identifyInfo);
         T send = k3CloudApi.execute(servicename, parameters, returnType);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/kingdeeapi/PurchaseKingdeeApi.java

@@ -65,15 +65,15 @@ public class PurchaseKingdeeApi implements web_api {
             //修改条件FID
             ModelMap.put("FID", maps.get("FID"));
             ModelMap.put("FDate", maps.get("TRX_DATE"));//日期
-            ModelMap.put("FStockOrgId", new HashMap<String, Object>() {{
+            /*ModelMap.put("FStockOrgId", new HashMap<String, Object>() {{
                 put("FNumber", maps.get("ORG_ID"));
             }}); //收料组织
             ModelMap.put("FSettleId", new HashMap<String, Object>() {{
                 put("FNumber", maps.get("SETTLE_SUP"));
             }}); //结算方
-            ModelMap.put("FSupplierId", new HashMap<String, Object>() {{
+            /*ModelMap.put("FSupplierId", new HashMap<String, Object>() {{
                 put("FNumber", maps.get("SUP_ID"));
-            }}); //结算方
+            }}); //结算方*/
 //            ModelMap.put("FChargeId", new HashMap<String, Object>() {{
 //                put("FNumber", maps.get("SETTLE_SUP"));
 //            }}); //收款方

jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -127,14 +127,14 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
           master:
-#            url: jdbc:mysql://127.0.0.1:3306/wmssysteminte?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-#            username: root
-#            password: root
-#            driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://localhost:3306/wmssystem?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+            url: jdbc:mysql://127.0.0.1:3306/wmssystem?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
             username: root
-            password: gf^*i6%&9J83&(*kJ653F&L
+            password: root
             driver-class-name: com.mysql.cj.jdbc.Driver
+#            url: jdbc:mysql://localhost:3306/wmssystem?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#            username: root
+#            password: gf^*i6%&9J83&(*kJ653F&L
+#            driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
             #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai

jeecg-boot-module-system/src/main/resources/application.yml

 spring:
   profiles:
-    active: docker
+    active: test
 swagger:
   production: false
   basic:

jeecg-boot-module-system/src/test/java/org/jeecg/SecurityToolsTest.java

 package org.jeecg;
 
 
-
-import com.alibaba.fastjson.JSON;
+import com.kingdee.bos.webapi.entity.IdentifyInfo;
+import com.kingdee.bos.webapi.entity.RepoResult;
+import com.kingdee.bos.webapi.sdk.K3CloudApi;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
 import org.jeecg.common.util.security.SecurityTools;
 import org.jeecg.common.util.security.entity.*;
 import org.jeecg.modules.iost.ims.Dao.CategoryDao;
-import org.jeecg.modules.iost.ims.Util.HttpUtil;
-import org.jeecg.modules.iost.ims.Util.HttpUtils;
-import org.jeecg.modules.iost.ims.Util.JsonUtil;
-import org.jeecg.modules.iost.ims.Util.MapUtils;
-import org.jeecg.modules.iost.ims.entity.ImsMtrlReject;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.*;
 
 @Slf4j
 @EnableScheduling
@@ -70,11 +56,31 @@ public class SecurityToolsTest {
         //sucess 为验签成功失败标志 true代码验签成功，false代表失败
         // System.out.println(new JSONObject(securityResp).toStringPretty());
     }
+
     @Autowired
     CategoryDao categoryDao;
+
     @Test
-    public void test() throws IOException {
-//wwwww
+    public void test() throws Exception {
+        //生产
+        /*IdentifyInfo identifyInfo = new IdentifyInfo() {};
+        identifyInfo.setAppId("225533_53fA1cht1lH8S88GT/3ozxUK2t3b2AnE");
+        identifyInfo.setAppSecret("bd70ee8503b24e8386022a360e057605");
+        identifyInfo.setServerUrl("https://jcg-666.ik3cloud.com/K3Cloud/");
+        identifyInfo.setdCID("20210727181855027");
+        identifyInfo.setlCID(2052);
+        identifyInfo.setUserName("Administrator");*/
+        //测试
+        IdentifyInfo identifyInfo = new IdentifyInfo() {};
+        identifyInfo.setAppId("225533_53fA1cht1lH8S88GT/3ozxUK2t3b2AnE");
+        identifyInfo.setAppSecret("bd70ee8503b24e8386022a360e057605");
+        identifyInfo.setServerUrl("https://jcg-666.test.ik3cloud.com/k3cloud/");
+        identifyInfo.setdCID("20210727181951968");
+        identifyInfo.setlCID(2052);
+        identifyInfo.setUserName("Administrator");
+        K3CloudApi k3CloudApi = new K3CloudApi(identifyInfo);
+        RepoResult repoResult = k3CloudApi.CheckAuthInfo();
+        System.out.println(repoResult.getResponseStatus().isIsSuccess());
     }
 
 }