1：update

陈威
1 parent a2873b92
Showing 20 changed files with 48 additions and 3 deletions Show diff stats
zr-cloud/zr-modules/zr-schsf/doc/lib备份/client-sdk.api-1.0.2.jar
zr-cloud/zr-modules/zr-schsf/doc/lib备份/client-sdk.common-1.0.0-SNAPSHOT.jar
zr-cloud/zr-modules/zr-schsf/doc/lib备份/client-sdk.core-1.0.0-SNAPSHOT.jar
zr-cloud/zr-modules/zr-schsf/doc/lib备份/client-sdk.example-1.0.0-SNAPSHOT.jar
zr-cloud/zr-modules/zr-schsf/doc/lib备份/client-sdk.spring-1.0.0-SNAPSHOT.jar
zr-cloud/zr-modules/zr-schsf/doc/lib备份/lippi-oapi-encrpt.jar
zr-cloud/zr-modules/zr-schsf/doc/lib备份/taobao-sdk-java-auto_1479188381469-20190325-source.jar
zr-cloud/zr-modules/zr-schsf/doc/lib备份/taobao-sdk-java-auto_1479188381469-20190325.jar
zr-cloud/zr-modules/zr-schsf/lib/client-sdk.example-1.0.0-SNAPSHOT.jar
zr-cloud/zr-modules/zr-schsf/lib/taobao-sdk-java-auto_1479188381469-20190325-source.jar
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/DingtalkServiceImpl.java
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/service/impl/McVisitServiceImpl.java
zr-cloud/zr-modules/zr-schsf/src/main/resources/lib/client-sdk.api-1.0.2.jar
zr-cloud/zr-modules/zr-schsf/src/main/resources/lib/client-sdk.common-1.0.0-SNAPSHOT.jar
zr-cloud/zr-modules/zr-schsf/src/main/resources/lib/client-sdk.core-1.0.0-SNAPSHOT.jar
zr-cloud/zr-modules/zr-schsf/src/main/resources/lib/client-sdk.example-1.0.0-SNAPSHOT.jar
zr-cloud/zr-modules/zr-schsf/src/main/resources/lib/client-sdk.spring-1.0.0-SNAPSHOT.jar
zr-cloud/zr-modules/zr-schsf/src/main/resources/lib/lippi-oapi-encrpt.jar
zr-cloud/zr-modules/zr-schsf/src/main/resources/lib/taobao-sdk-java-auto_1479188381469-20190325-source.jar
zr-cloud/zr-modules/zr-schsf/src/main/resources/lib/taobao-sdk-java-auto_1479188381469-20190325.jar
@@ -13,6 +13,9 @@ import com.dingtalk.open.client.api.service.corp.JsapiService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
+import java.security.MessageDigest;
+import java.util.Formatter;
+
 @Service
 public class DingtalkServiceImpl implements DingtalkService {
  
@@ -76,4 +79,45 @@ public class DingtalkServiceImpl implements DingtalkService {
             throw new ServiceException(ex.getMessage());
         }
     }
+
+
+//    @Override
+//    public String getSign(String ticket, String nonceStr, Long timeStamp, String url) {
+//        try {
+//            return getJsApiSingnature(url, nonceStr, timeStamp, ticket);
+//        } catch (Exception ex) {
+//            throw new ServiceException(ex.getMessage());
+//        }
+//    }
+//
+//    public static String getJsApiSingnature(String url, String nonce, Long timeStamp, String jsTicket)  {
+//        String plainTex = "jsapi_ticket=" + jsTicket + "&noncestr=" + nonce + "&timestamp=" + timeStamp + "&url=" + url;
+//        System.out.println(plainTex);
+//        String signature = "";
+//
+//        try {
+//            MessageDigest crypt = MessageDigest.getInstance("SHA-1");
+//            crypt.reset();
+//            crypt.update(plainTex.getBytes("UTF-8"));
+//            signature = byteToHex(crypt.digest());
+//            return signature;
+//        } catch (Exception e) {
+//            throw new RuntimeException("钉钉通信异常："+e.getMessage());
+//        }
+//    }
+//
+//    private static String byteToHex(byte[] hash) {
+//        Formatter formatter = new Formatter();
+//        byte[] var2 = hash;
+//        int var3 = hash.length;
+//
+//        for(int var4 = 0; var4 < var3; ++var4) {
+//            byte b = var2[var4];
+//            formatter.format("%02x", b);
+//        }
+//
+//        String result = formatter.toString();
+//        formatter.close();
+//        return result;
+//    }
 }
@@ -267,12 +267,13 @@ public class McVisitServiceImpl implements IMcVisitService {
     public String getTicketType(String isCharged, String isVisited) {
         if (YesNoEnums.Y.getName().equals(isCharged) && YesNoEnums.Y.getName().equals(isVisited)) {
             return VisitTypeEnums.VISITANDSFEES.getCode();
-        } else if (YesNoEnums.Y.getName().equals(isCharged) || YesNoEnums.N.getName().equals(isVisited)) {
+        } else if (YesNoEnums.Y.getName().equals(isCharged) && YesNoEnums.N.getName().equals(isVisited)) {
             return VisitTypeEnums.CHARGE.getCode();
-        } else if (YesNoEnums.N.getName().equals(isCharged) || YesNoEnums.Y.getName().equals(isVisited)) {
+        } else if (YesNoEnums.N.getName().equals(isCharged) && YesNoEnums.Y.getName().equals(isVisited)) {
             return VisitTypeEnums.VISIT.getCode();
         } else {
-            return VisitTypeEnums.OTHER.getCode();
+            throw new ServiceException("请选择拜访，收费，或者拜访+收费。");
+//            return VisitTypeEnums.OTHER.getCode();
         }
     }
...	...	@@ -13,6 +13,9 @@ import com.dingtalk.open.client.api.service.corp.JsapiService;
13	13	import org.springframework.beans.factory.annotation.Autowired;
14	14	import org.springframework.stereotype.Service;
15	15
	16	+import java.security.MessageDigest;
	17	+import java.util.Formatter;
	18	+
16	19	@Service
17	20	public class DingtalkServiceImpl implements DingtalkService {
18	21
...	...	@@ -76,4 +79,45 @@ public class DingtalkServiceImpl implements DingtalkService {
76	79	throw new ServiceException(ex.getMessage());
77	80	}
78	81	}
	82	+
	83	+
	84	+// @Override
	85	+// public String getSign(String ticket, String nonceStr, Long timeStamp, String url) {
	86	+// try {
	87	+// return getJsApiSingnature(url, nonceStr, timeStamp, ticket);
	88	+// } catch (Exception ex) {
	89	+// throw new ServiceException(ex.getMessage());
	90	+// }
	91	+// }
	92	+//
	93	+// public static String getJsApiSingnature(String url, String nonce, Long timeStamp, String jsTicket) {
	94	+// String plainTex = "jsapi_ticket=" + jsTicket + "&noncestr=" + nonce + "&timestamp=" + timeStamp + "&url=" + url;
	95	+// System.out.println(plainTex);
	96	+// String signature = "";
	97	+//
	98	+// try {
	99	+// MessageDigest crypt = MessageDigest.getInstance("SHA-1");
	100	+// crypt.reset();
	101	+// crypt.update(plainTex.getBytes("UTF-8"));
	102	+// signature = byteToHex(crypt.digest());
	103	+// return signature;
	104	+// } catch (Exception e) {
	105	+// throw new RuntimeException("钉钉通信异常："+e.getMessage());
	106	+// }
	107	+// }
	108	+//
	109	+// private static String byteToHex(byte[] hash) {
	110	+// Formatter formatter = new Formatter();
	111	+// byte[] var2 = hash;
	112	+// int var3 = hash.length;
	113	+//
	114	+// for(int var4 = 0; var4 < var3; ++var4) {
	115	+// byte b = var2[var4];
	116	+// formatter.format("%02x", b);
	117	+// }
	118	+//
	119	+// String result = formatter.toString();
	120	+// formatter.close();
	121	+// return result;
	122	+// }
79	123	}
...	...
...	...	@@ -267,12 +267,13 @@ public class McVisitServiceImpl implements IMcVisitService {
267	267	public String getTicketType(String isCharged, String isVisited) {
268	268	if (YesNoEnums.Y.getName().equals(isCharged) && YesNoEnums.Y.getName().equals(isVisited)) {
269	269	return VisitTypeEnums.VISITANDSFEES.getCode();
270		- } else if (YesNoEnums.Y.getName().equals(isCharged) \|\| YesNoEnums.N.getName().equals(isVisited)) {
	270	+ } else if (YesNoEnums.Y.getName().equals(isCharged) && YesNoEnums.N.getName().equals(isVisited)) {
271	271	return VisitTypeEnums.CHARGE.getCode();
272		- } else if (YesNoEnums.N.getName().equals(isCharged) \|\| YesNoEnums.Y.getName().equals(isVisited)) {
	272	+ } else if (YesNoEnums.N.getName().equals(isCharged) && YesNoEnums.Y.getName().equals(isVisited)) {
273	273	return VisitTypeEnums.VISIT.getCode();
274	274	} else {
275		- return VisitTypeEnums.OTHER.getCode();
	275	+ throw new ServiceException("请选择拜访，收费，或者拜访+收费。");
	276	+// return VisitTypeEnums.OTHER.getCode();
276	277	}
277	278	}
278	279
...	...