Skip to content

Commit a99ce05

Browse files
committed
update 尝试解决log4j问题
1 parent cfc5c1e commit a99ce05

File tree

5 files changed

+57
-36
lines changed

5 files changed

+57
-36
lines changed

app/build.gradle

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,34 @@ android {
3131
}
3232

3333
//签名 其他smb
34-
signingConfigs {
35-
release {
36-
storeFile file("./bysmb.jks")
37-
storePassword "bysmb2022"
38-
keyAlias "bysmb"
39-
keyPassword "bysmb2022"
40-
}
41-
}
42-
buildTypes {
43-
release {
44-
// 混淆
45-
minifyEnabled false
46-
// Zipalign优化
47-
zipAlignEnabled false
48-
// 移除无用的resource文件
49-
shrinkResources false
50-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
51-
signingConfig signingConfigs.release
52-
}
53-
54-
debug {
55-
signingConfig signingConfigs.release
56-
minifyEnabled false
57-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
58-
}
59-
}
34+
// signingConfigs {
35+
// release {
36+
// storeFile file("./bysmb.jks")
37+
// storePassword "bysmb2021"
38+
// keyAlias "bysmb"
39+
// keyPassword "bysmb2021"
40+
// v1SigningEnabled true
41+
// v2SigningEnabled true
42+
// }
43+
// }
44+
// buildTypes {
45+
// release {
46+
// // 混淆
47+
// minifyEnabled false
48+
// // Zipalign优化
49+
// zipAlignEnabled false
50+
// // 移除无用的resource文件
51+
// shrinkResources false
52+
// proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
53+
// signingConfig signingConfigs.release
54+
// }
55+
//
56+
// debug {
57+
//// signingConfig signingConfigs.release
58+
// minifyEnabled false
59+
// proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
60+
// }
61+
// }
6062
}
6163

6264
dependencies {

app/bysmb.jks

-2.54 KB
Binary file not shown.

gradle.properties

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Project-wide Gradle settings.
2+
3+
# IDE (e.g. Android Studio) users:
4+
# Gradle settings configured through the IDE *will override*
5+
# any settings specified in this file.
6+
7+
# For more details on how to configure your build environment visit
8+
# http://www.gradle.org/docs/current/userguide/build_environment.html
9+
10+
# Specifies the JVM arguments used for the daemon process.
11+
# The setting is particularly useful for tweaking memory settings.
12+
# Default value: -Xmx10248m -XX:MaxPermSize=256m
13+
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14+
15+
# When configured, Gradle will run in incubating parallel mode.
16+
# This option should only be used with decoupled projects. More details, visit
17+
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18+
# org.gradle.parallel=true
19+
20+
# Android插件会使用相应的AndroidX库而不是支持库,默认为false。
21+
android.enableJetifier=true
22+
# Android插件会自动迁移现有的第三方库,通过重写其二进制文件来使用AndroidX,默认为false。
23+
android.useAndroidX=true
24+
org.gradle.jvmargs=-Xmx4096m

smb/build.gradle

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@ dependencies {
1818

1919
// 读取及写入网络共享文件
2020
api group: 'com.hierynomus', name: 'smbj', version: '0.10.0'
21-
api group: 'com.hierynomus', name: 'asn-one', version: '0.5.0'
22-
api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.0-alpha6'
23-
api group: 'org.slf4j', name: 'slf4j-log4j12', version: '2.0.0-alpha6'
24-
api group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
25-
api group: 'net.engio', name: 'mbassador', version: '1.3.0'
21+
// api group: 'com.hierynomus', name: 'asn-one', version: '0.5.0'
22+
// api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.0-alpha6'
23+
// api group: 'org.slf4j', name: 'slf4j-log4j12', version: '2.0.0-alpha6'
24+
// api group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
25+
// api group: 'net.engio', name: 'mbassador', version: '1.3.0'
2626
// api group: 'org.apache.cassandra', name: 'cassandra-all', version: '0.8.1'
2727
// api group: 'org.slf4j', name: 'slf4j-simple', version: '1.6.4'
2828

29-
// api 'com.github.youlookwhat:smbj:0.20.0'
30-
// api group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1'
31-
// api group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.1'
3229
}

smb/src/main/java/me/jingbin/smb/BySMB.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.hierynomus.smbj.SmbConfig
88
import com.hierynomus.smbj.auth.AuthenticationContext
99
import com.hierynomus.smbj.connection.Connection
1010
import com.hierynomus.smbj.share.DiskShare
11-
import org.apache.log4j.BasicConfigurator
1211
import java.io.*
1312
import java.util.*
1413
import java.util.concurrent.TimeUnit
@@ -209,7 +208,6 @@ class BySMB(private val builder: Builder) {
209208
System.setProperty("jcifs.smb.client.dfs.disabled", "true")
210209
System.setProperty("jcifs.smb.client.soTimeout", soTimeout)
211210
System.setProperty("jcifs.smb.client.responseTimeout", responseTimeout)
212-
BasicConfigurator.configure()
213211
}
214212
}
215213

0 commit comments

Comments
 (0)