Merge branch 'dev_v1.0.0' of http://git.qmth.com.cn/teachcloud/eds-server into dev_v1.0.0

src/main/java/com/qmth/eds/EdsServiceApplication.java

@@ -14,10 +14,8 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-import sun.misc.Unsafe;
 
 import javax.annotation.Resource;
-import java.lang.reflect.Field;
 
 @SpringBootApplication(scanBasePackages = "com.qmth.*")
 @MapperScan({"com.qmth.eds.mapper"})
@@ -29,22 +27,22 @@ import java.lang.reflect.Field;
 @EnableCaching // 开启缓存注解
 public class EdsServiceApplication {
 
-    public static void disableWarning() {
-        try {
-            Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
-            theUnsafe.setAccessible(true);
-            Unsafe u = (Unsafe) theUnsafe.get(null);
-
-            Class cls = Class.forName("jdk.internal.module.IllegalAccessLogger");
-            Field logger = cls.getDeclaredField("logger");
-            u.putObjectVolatile(cls, u.staticFieldOffset(logger), null);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
+//    public static void disableWarning() {
+//        try {
+//            Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
+//            theUnsafe.setAccessible(true);
+//            Unsafe u = (Unsafe) theUnsafe.get(null);
+//
+//            Class cls = Class.forName("jdk.internal.module.IllegalAccessLogger");
+//            Field logger = cls.getDeclaredField("logger");
+//            u.putObjectVolatile(cls, u.staticFieldOffset(logger), null);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
 
     public static void main(String[] args) {
-        disableWarning();
+//        disableWarning();
         SpringApplication.run(EdsServiceApplication.class, args);
     }
 

src/main/resources/application-release.properties

@@ -10,15 +10,15 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=eds
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=localhost
+db.host=192.168.10.136
 db.port=3306
-db.name=eds-v1.0.0
-db.username=root
-db.password=123456789
+db.name=eds-test
+db.username=eds-test
+db.password=eds-test
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
-com.qmth.redis.db=13
+com.qmth.redis.db=3
 com.qmth.redis.port=6379
 #com.qmth.redis.password=
 
@@ -122,4 +122,4 @@ sms.config.teachDataChangeNoticeCode=SMS_147416565
 whu.config.appKey=DD1198B44CD624B6E0530107010AF5DF
 whu.config.appSecret=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAojkSbVqi/6v7hNdHZIPU4EKLyyxO7akNAIXilJ0+c0sYHV4Z6vctSrds4LIPp3fXUuMA9F7d1vp6s7HOQfuIfwIDAQABAkBiCowQew635oEEL/d90A7/2jgSepzZFao9/qyJlN8BXg8M6zwBFiEB51GbW0642bWTftFT0Arrq6ipYkXTyH7BAiEA8oMCG7HqUYXX4bt6h9Bz8LIwI4oFx3x90RpK+b0iPmMCIQCrPuAZB90EJtr4fOE3+lQBORoKVOF/cwFQX14mBXRKNQIhAKLeVVYgQMwLZZcWgA4icxsdsLLNiWAWPbFnRR9AZHUdAiA5tGJHjQLJF17KRSqPdmdAUkGYIaorDFHxB3HuVgAt0QIgIMcILJ3lJx6URAEG9e055KXh8J+nXItScHZ4bXMWls4=
 whu.config.tokenUrl=http://120.76.177.81/zfdsb/oauth2/accessToken
-whu.config.kwUrl=http://120.76.177.81/zfdsb/api/kw/ksmd
+whu.config.kwUrl=http://120.76.177.81/zfdsb/api/kw/ksmd

src/main/resources/application-test.properties

@@ -10,15 +10,15 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=eds
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=localhost
+db.host=192.168.10.136
 db.port=3306
-db.name=eds-v1.0.0
-db.username=root
-db.password=123456789
+db.name=eds-test
+db.username=eds-test
+db.password=eds-test
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
-com.qmth.redis.db=13
+com.qmth.redis.db=3
 com.qmth.redis.port=6379
 #com.qmth.redis.password=
 
@@ -122,4 +122,4 @@ sms.config.teachDataChangeNoticeCode=SMS_147416565
 whu.config.appKey=DD1198B44CD624B6E0530107010AF5DF
 whu.config.appSecret=MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAojkSbVqi/6v7hNdHZIPU4EKLyyxO7akNAIXilJ0+c0sYHV4Z6vctSrds4LIPp3fXUuMA9F7d1vp6s7HOQfuIfwIDAQABAkBiCowQew635oEEL/d90A7/2jgSepzZFao9/qyJlN8BXg8M6zwBFiEB51GbW0642bWTftFT0Arrq6ipYkXTyH7BAiEA8oMCG7HqUYXX4bt6h9Bz8LIwI4oFx3x90RpK+b0iPmMCIQCrPuAZB90EJtr4fOE3+lQBORoKVOF/cwFQX14mBXRKNQIhAKLeVVYgQMwLZZcWgA4icxsdsLLNiWAWPbFnRR9AZHUdAiA5tGJHjQLJF17KRSqPdmdAUkGYIaorDFHxB3HuVgAt0QIgIMcILJ3lJx6URAEG9e055KXh8J+nXItScHZ4bXMWls4=
 whu.config.tokenUrl=http://120.76.177.81/zfdsb/oauth2/accessToken
-whu.config.kwUrl=http://120.76.177.81/zfdsb/api/kw/ksmd
+whu.config.kwUrl=http://120.76.177.81/zfdsb/api/kw/ksmd