Skip to content

Commit e116de6

Browse files
author
BG317958
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/libraries/Maven__commons_logging_commons_logging_1_2.xml # .idea/misc.xml # .idea/workspace.xml # out/production/threadLearn/threadSea/SuspendInstance.class # out/production/threadLearn/threadSea/SuspendLearn.class # out/production/threadLearn/threadSea/Task.class
2 parents 46b40a7 + d520e4f commit e116de6

File tree

7 files changed

+55
-72
lines changed

7 files changed

+55
-72
lines changed

log4j.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ log4j.rootLogger=info,stdout,D
44
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
55
log4j.appender.stdout.Target=System.out
66
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
7-
log4j.appender.stdout.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n
7+
log4j.appender.stdout.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} %d %-5p %m%n
88

99
log4j.appender.D=org.apache.log4j.DailyRollingFileAppender
1010
log4j.appender.D.File=logs/log.log
1111
log4j.appender.D.Append=true
1212
log4j.appender.D.Threshold=INFO
1313
log4j.appender.D.layout=org.apache.log4j.PatternLayout
14-
log4j.appender.D.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n
14+
log4j.appender.D.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} %d %-5p %m%n

src/main/java/service/IUserService.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/main/java/service/UserServiceImpl.java

Lines changed: 0 additions & 51 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package algorithm;
2+
3+
public class ChickenShopping {
4+
5+
public static void main(String[] args) {
6+
for (int a = 0; a <= 34; a++) {
7+
for (int b = 0; b <= 50; b++) {
8+
for (int c = 0; c <= 80; c = c + 3) {
9+
10+
int value = 3 * a + 2 * b + c * 1 / 3;
11+
int count = a + b + c;
12+
13+
if (count == 100 && value == 100) {
14+
System.out.println(a + " " + b + " " + c);
15+
}
16+
}
17+
}
18+
}
19+
20+
String str = "operate_time";
21+
System.out.println(str);
22+
23+
}
24+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package algorithm;
2+
3+
public class ReviewJava {
4+
5+
public static void main(String[] args) {
6+
short a = 3;
7+
int b = 4;
8+
a += b;
9+
System.out.println(a);
10+
System.out.println(System.currentTimeMillis());
11+
}
12+
}

threadLearn/src/jmx/JmxLearn.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package jmx;
2+
3+
import javax.management.MBeanServer;
4+
import javax.management.MBeanServerFactory;
5+
6+
public class JmxLearn {
7+
8+
public static void main(String[] args) {
9+
MBeanServer server= MBeanServerFactory.createMBeanServer();
10+
11+
12+
}
13+
14+
15+
}

threadLearn/src/threadInteraction/ReadWriteLock.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static void main(String[] args) {
2121

2222
class ReadTh extends Thread {
2323

24-
private MyLock lock = new MyLock();
24+
private MyLock lock;
2525

2626
public ReadTh(MyLock lock) {
2727
this.lock = lock;
@@ -34,7 +34,7 @@ public void run() {
3434
}
3535

3636
class WriteTh extends Thread {
37-
private MyLock lock = new MyLock();
37+
private MyLock lock;
3838

3939
public WriteTh(MyLock lock) {
4040
this.lock = lock;

0 commit comments

Comments
 (0)