diff --git a/ad_config.cfg b/ad_config.cfg
deleted file mode 100644
index 95bbccf..0000000
--- a/ad_config.cfg
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "array": [
- {},
- {},
- {},
- {},
- {
- "title": "穿山甲",
- "ltName": "open_ad_sdk.jar",
- "manifest": [
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- "",
-
- "",
- "",
- " ",
- "",
- "",
- "",
- "",
- "",
-
- ],
- "class":[
- "com.bytedance.sdk.openadsdk.activity.TTLandingPageActivity",
- "com.bytedance.sdk.openadsdk.activity.TTPlayableLandingPageActivity",
- "com.bytedance.sdk.openadsdk.activity.TTVideoLandingPageActivity",
- "com.bytedance.sdk.openadsdk.activity.TTRewardVideoActivity",
- "com.bytedance.sdk.openadsdk.activity.TTRewardExpressVideoActivity",
- "com.bytedance.sdk.openadsdk.activity.TTFullScreenVideoActivity",
- "com.bytedance.sdk.openadsdk.activity.TTFullScreenExpressVideoActivity",
- "com.bytedance.sdk.openadsdk.activity.TTDelegateActivity",
- "com.bytedance.sdk.openadsdk.multipro.aidl.BinderPoolService",
- "com.bytedance.embedapplog.collector.Collector",
- "com.bytedance.tea.crash.upload.CrashUploadService",
- "com.bytedance.sdk.openadsdk.activity.TTBaseVideoActivity",
- "com.ss.android.socialbase.downloader.notification.DownloadNotificationService",
- "com.ss.android.socialbase.downloader.downloader.DownloadService",
- "com.ss.android.socialbase.downloader.downloader.IndependentProcessDownloadService",
- "com.ss.android.socialbase.downloader.impls.DownloadHandleService",
- "com.ss.android.socialbase.appdownloader.DownloadHandlerService",
- "com.ss.android.socialbase.appdownloader.view.DownloadSizeLimitActivity",
- "com.ss.android.socialbase.appdownloader.view.DownloadTaskDeleteActivity",
- "com.ss.android.downloadlib.activity.TTDelegateActivity"
- ],
- "random":[
- "com",
- "nusqu",
- "gzxem"
- ],
- "isAllPackage":false,
- "isReName":true,
- "isJarLib":true,
- "packagerlimit":3,
- "isManual":true,
- "outManifest":false,
- "manual":[
- {
- "class":"com.bytedance.sdk.openadsdk.downloadnew.a.d",
- "find":" const-string v1, \".TTFileProvider\"",
- "data":" const-string v1, \".fileprovider\"\n",
- "end":" invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;",
- "msg":"把TTFileProvider改成fileprovider"
- },{
- "class":"com.bytedance.embedapplog.util.TTEncryptUtils",
- "find":"const-string v0, \"tobEmbedEncrypt\"",
- "data":"const-string v0, \"ttb\"\n",
- "end":"invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V"
- },{
- "class":"com.pgl.sys.ces.a",
- "find":"const-string v0, \"nms\"",
- "data":"const-string v0, \"ees\"\n",
- "end":"invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V"
- },{
- "class":"com.pgl.sys.ces.b",
- "find":"const-string p1, \"nms\"",
- "data":"const-string p1, \"ees\"\n",
- "end":"invoke-static {p0, p1}, Lcom/pgl/a/b/e;->a(Landroid/content/Context;Ljava/lang/String;)Z"
- }
- ],
- "rename":{
- "TTLandingPageActivity":"{>+/activity}TTLandingPageActivity",
- "TTPlayableLandingPageActivity":"{>+/activity}TTPlayableLandingPageActivity",
- "TTVideoLandingPageActivity":"{>+/activity}TTVideoLandingPageActivity",
- "TTRewardVideoActivity":"{>+/activity}TTRewardVideoActivity",
- "TTRewardExpressVideoActivity":"{>+/activity}TTRewardExpressVideoActivity",
- "TTFullScreenVideoActivity":"{>+/activity}TTFullScreenVideoActivity",
- "TTFullScreenExpressVideoActivity":"{>+/activity}TTFullScreenExpressVideoActivity",
- "TTDelegateActivity":"{>+/activity}TTDelegateActivity",
- "TTBaseVideoActivity":"{>+/activity}TTBaseVideoActivity",
- "BinderPoolService":"{>+/multipro/aidl}BinderPoolService",
- "Collector":"{>+/cc/collector}Collector",
- "CrashUploadService":"{>+/cc/crash/upload}CrashUploadService",
- "com.ss.android.downloadlib.activity.TTDelegateActivity":"{>+/dl/activity}TTDelegateActivity",
- "DownloadNotificationService":"{>+/sb/downloader/notification}DownloadNotificationService",
- "DownloadService":"{>+/sb/downloader/downloader}DownloadService",
- "IndependentProcessDownloadService":"{>+/sb/downloader/downloader}IndependentProcessDownloadService",
- "DownloadHandleService":"{>+/sb/downloader/impls}DownloadHandleService",
- "DownloadHandlerService":"{>+/sb/appdownloader}DownloadHandlerService",
- "DownloadSizeLimitActivity":"{>+/sb/appdownloader/view}DownloadSizeLimitActivity",
- "DownloadTaskDeleteActivity":"{>+/sb/appdownloader/view}DownloadTaskDeleteActivity",
- "DownloadReceiver":"{>+/dl/core/download}DownloadReceiver",
-
- },
- "filter":[
- "com.android",
- "com.xandroid",
- "com.google",
- "com.android",
- "com.androidx"
- ]
-
- }
- ]
-}
\ No newline at end of file
diff --git a/config.cfg b/config.cfg
deleted file mode 100644
index 9f22613..0000000
--- a/config.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "csjConfig": {
- "xml": {
- "data": [
- {
- "command": "remove",
- "name": "${demoRoot}/res/values/public.xml",
- "data": [
- {
- "title": "type",
- "value": "raw"
- },
- {
- "title": "type",
- "value": "xml"
- }
- ]
- }
- ]
- },
- "file": {
- "data": [
- {
- "command": "delete",
- "name": "${demoRoot}/res/raw/*"
- },
- {
- "command": "delete",
- "name": "${demoRoot}/lib/*"
- }
- ]
- }
- }
-}
\ No newline at end of file
diff --git a/csj/demo.apk b/csj/demo.apk
deleted file mode 100644
index 9e8408a..0000000
Binary files a/csj/demo.apk and /dev/null differ
diff --git a/src/main/java/com/yutou/tools/Tools/GoogleAccount.java b/src/main/java/com/yutou/tools/Tools/GoogleAccount.java
new file mode 100644
index 0000000..227cf7a
--- /dev/null
+++ b/src/main/java/com/yutou/tools/Tools/GoogleAccount.java
@@ -0,0 +1,157 @@
+package com.yutou.tools.Tools;
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Scanner;
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import org.apache.commons.codec.binary.Base32;
+import org.apache.commons.codec.binary.Base64;
+
+public class GoogleAccount {
+ // 生成的key长度( Generate secret key length)
+ public static final int SECRET_SIZE = 10;
+
+ public static final String SEED = "g8GjEvTbW5oVSV7avL47357438reyhreyuryetredLDVKs2m0QN7vxRs2im5MDaNCWGmcD2rvcZx";
+ // Java实现随机数算法
+ public static final String RANDOM_NUMBER_ALGORITHM = "SHA1PRNG";
+ // 最多可偏移的时间
+ int window_size = 3; // default 3 - max 17
+
+ /**
+ * set the windows size. This is an integer value representing the number of
+ * 30 second windows we allow The bigger the window, the more tolerant of
+ * clock skew we are.
+ *
+ * @param s window size - must be >=1 and <=17. Other values are ignored
+ */
+ public void setWindowSize(int s) {
+ if (s >= 1 && s <= 17)
+ window_size = s;
+ }
+
+ /**
+ * Generate a random secret key. This must be saved by the server and
+ * associated with the users account to verify the code displayed by Google
+ * Authenticator. The user must register this secret on their device.
+ * 生成一个随机秘钥
+ *
+ * @return secret key
+ */
+ public static String generateSecretKey() {
+ SecureRandom sr = null;
+ try {
+ sr = SecureRandom.getInstance(RANDOM_NUMBER_ALGORITHM);
+ sr.setSeed(Base64.decodeBase64(SEED));
+ byte[] buffer = sr.generateSeed(SECRET_SIZE);
+ Base32 codec = new Base32();
+ byte[] bEncodedKey = codec.encode(buffer);
+ String encodedKey = new String(bEncodedKey);
+ return encodedKey;
+ } catch (NoSuchAlgorithmException e) {
+ // should never occur... configuration error
+ }
+ return null;
+ }
+
+ /**
+ * Return a URL that generates and displays a QR barcode. The user scans
+ * this bar code with the Google Authenticator application on their
+ * smartphone to register the auth code. They can also manually enter the
+ * secret if desired
+ *
+ * @param user user id (e.g. fflinstone)
+ * @param host host or system that the code is for (e.g. myapp.com)
+ * @param secret the secret that was previously generated for this user
+ * @return the URL for the QR code to scan
+ */
+ public static String getQRBarcodeURL(String user, String host, String secret) {
+ String format = "http://www.google.com/chart?chs=200x200&chld=M%%7C0&cht=qr&chl=otpauth://totp/%s@%s?secret=%s";
+ return String.format(format, user, host, secret);
+ }
+
+ /**
+ * 生成一个google身份验证器，识别的字符串，只需要把该方法返回值生成二维码扫描就可以了。
+ *
+ * @param user 账号
+ * @param secret 密钥
+ * @return
+ */
+ public static String getQRBarcode(String user, String secret) {
+ String format = "otpauth://totp/%s?secret=%s";
+ return String.format(format, user, secret);
+ }
+
+ /**
+ * Check the code entered by the user to see if it is valid 验证code是否合法
+ *
+ * @param secret The users secret.
+ * @param code The code displayed on the users device
+ * @param timeMsec The time in msec (System.currentTimeMillis() for example)
+ * @return
+ */
+ public boolean check_code(String secret, long code, long timeMsec) {
+ Base32 codec = new Base32();
+ byte[] decodedKey = codec.decode(secret);
+ // convert unix msec time into a 30 second "window"
+ // this is per the TOTP spec (see the RFC for details)
+ long t = (timeMsec / 1000L) / 30L;
+ // Window is used to check codes generated in the near past.
+ // You can use this value to tune how far you're willing to go.
+ for (int i = -window_size; i <= window_size; ++i) {
+ long hash;
+ try {
+ hash = verify_code(decodedKey, t + i);
+ } catch (Exception e) {
+ // Yes, this is bad form - but
+ // the exceptions thrown would be rare and a static
+ // configuration problem
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
+ // return false;
+ }
+ if (hash == code) {
+ return true;
+ }
+ }
+ // The validation code is invalid.
+ return false;
+ }
+
+ private static int verify_code(byte[] key, long t) throws NoSuchAlgorithmException, InvalidKeyException {
+ byte[] data = new byte[8];
+ long value = t;
+ for (int i = 8; i-- > 0; value >>>= 8) {
+ data[i] = (byte) value;
+ }
+ SecretKeySpec signKey = new SecretKeySpec(key, "HmacSHA1");
+ Mac mac = Mac.getInstance("HmacSHA1");
+ mac.init(signKey);
+ byte[] hash = mac.doFinal(data);
+ int offset = hash[20 - 1] & 0xF;
+ // We're using a long because Java hasn't got unsigned int.
+ long truncatedHash = 0;
+ for (int i = 0; i < 4; ++i) {
+ truncatedHash <<= 8;
+ // We are dealing with signed bytes:
+ // we just keep the first byte.
+ truncatedHash |= (hash[offset + i] & 0xFF);
+ }
+ truncatedHash &= 0x7FFFFFFF;
+ truncatedHash %= 1000000;
+ return (int) truncatedHash;
+ }
+
+ public static void main(String[] args) {
+ String secret=GoogleAccount.generateSecretKey();
+ String qrcode = GoogleAccount.getQRBarcode("yutou", secret);
+ System.out.println("qrcode:" + qrcode + ",key:" + secret);
+ while (true){
+ String code=new Scanner(System.in).nextLine();
+ GoogleAccount account=new GoogleAccount();
+ boolean check=account.check_code(secret,Long.parseLong(code),System.currentTimeMillis());
+ System.out.println("验证结果:"+check);
+ }
+ }
+}
diff --git a/src/main/java/com/yutou/tools/utils/RedisTools.java b/src/main/java/com/yutou/tools/utils/RedisTools.java
index 1b11490..afcacb2 100644
--- a/src/main/java/com/yutou/tools/utils/RedisTools.java
+++ b/src/main/java/com/yutou/tools/utils/RedisTools.java
@@ -16,6 +16,7 @@ import redis.clients.jedis.JedisPubSub;
import javax.accessibility.AccessibleAction;
public class RedisTools {
+ private static boolean isNotInstallRedis = false;
private static String host;
private static int port;
public static int TOKEN_TIMEOUT_DEFAULT = 360;
@@ -35,6 +36,9 @@ public class RedisTools {
public static boolean set(int dbIndex, String key, String value) {
try {
+ if (isNotInstallRedis) {
+ return false;
+ }
Jedis jedis = getRedis();
jedis.select(dbIndex);
String ret = jedis.set(key, value);
@@ -54,6 +58,9 @@ public class RedisTools {
public static boolean set(String key, String value, int timeout) {
try {
+ if (isNotInstallRedis) {
+ return false;
+ }
Jedis jedis = getRedis();
if (timeout == -1) {
jedis.set(key, value);
@@ -71,6 +78,9 @@ public class RedisTools {
public static String get(String key, int dbIndex) {
String value = "-999";
+ if (isNotInstallRedis) {
+ return value;
+ }
Jedis jedis = null;
try {
jedis = getRedis();
@@ -92,6 +102,9 @@ public class RedisTools {
}
public static boolean remove(String key) {
+ if (isNotInstallRedis) {
+ return false;
+ }
Jedis jedis = getRedis();
Long i = jedis.del(key);
jedis.close();
@@ -121,6 +134,9 @@ public class RedisTools {
}
public static boolean exists(String key, String value) {
+ if (isNotInstallRedis) {
+ return false;
+ }
Jedis jedis = getRedis();
boolean flag = value.equals(jedis.get(key));
jedis.close();
@@ -150,6 +166,9 @@ public class RedisTools {
}
private static Jedis getPoolRedis() {
+ if (isNotInstallRedis) {
+ return null;
+ }
JedisPoolConfig poolConfig = new JedisPoolConfig();
poolConfig.setMaxIdle(0);
poolConfig.setMaxWaitMillis(1000);
@@ -178,7 +197,8 @@ public class RedisTools {
@Override
public void run() {
Jedis jedis = getPoolRedis();
- jedis.psubscribe(new Consumer(), "*");
+ if (jedis != null)
+ jedis.psubscribe(new Consumer(), "*");
}
}).start();
@@ -191,12 +211,12 @@ public class RedisTools {
System.out.println("onPMessage: channel=" + channel + " msg=" + message + " pattern=" + pattern);
switch (channel) {
case "system":
- switch (message){
+ switch (message) {
case "openPC":
- system("openPC",null);
+ system("openPC", null);
break;
case "updateIP":
- system("updateIP",null);
+ system("updateIP", null);
break;
}
break;
@@ -226,7 +246,7 @@ public class RedisTools {
exec = value;
break;
case "updateIP":
- exec="python3 /media/yutou/4t/public/Python/tools/ip.py";
+ exec = "python3 /media/yutou/4t/public/Python/tools/ip.py";
break;
}
if (exec != null) {