lyhzzz пре 2 година
родитељ
комит
998ff589f3

+ 3 - 3
src/main/java/com/fdkankan/manage/util/RsaUtils.java

@@ -32,12 +32,12 @@ public class RsaUtils {
 	public static void main(String[] args) {
 		RsaUtils rsa = new RsaUtils();
 		KeyPairInfo keyPair = getKeyPair();
-		String publicKey = keyPair.getPublicKey();
-		String privateKey = keyPair.getPrivateKey();
+		//String publicKey = keyPair.getPublicKey();
+		//String privateKey = keyPair.getPrivateKey();
 		System.out.println("公钥:"+publicKey);
 		System.out.println("私钥:"+privateKey);
 
-		String ciphertext = rsa.encipher("0291FC698", publicKey);
+		String ciphertext = rsa.encipher("4DKKPRO_0291FC698", publicKey);
 		System.out.println(String.format("密文:"+ciphertext));
 		String deTxt = rsa.decipher(ciphertext, privateKey);
 		System.out.println(deTxt);

+ 1 - 1
src/main/resources/mapper/manage/ScenePlusMapper.xml

@@ -32,6 +32,6 @@
         GROUP BY camera_id
     </select>
     <select id="getSpaceSumByCameraId" resultType="java.lang.Long">
-        select  sum(space) from  t_scene_plus p left join t_scene_plus_ext e on p.id = e.plus_id and p.rec_status = 'A' and p.camera_id = #{cameraId}
+        select  sum(space) from  t_scene_plus p left join t_scene_plus_ext e on p.id = e.plus_id where p.rec_status = 'A' and p.camera_id = #{cameraId}
     </select>
 </mapper>