Home Explore Help
Sign In
yonge
/
edu-saas
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

yonge 3 years ago
parent
652d0c4689 e150e2a61c
commit
2f61ac09b3
14 changed files with 17 additions and 13 deletions
Split View Show Diff Stats
  1. 1 1
      edu-auth/edu-auth-server/src/main/resources/bootstrap-dev.properties
  2. 1 1
      edu-cms/src/main/resources/bootstrap-dev.properties
  3. 4 0
      edu-common/pom.xml
  4. 1 1
      edu-eureka/src/main/resources/bootstrap-dev.properties
  5. 1 1
      edu-im/edu-im-server/src/main/resources/bootstrap-dev.properties
  6. 1 1
      edu-task/src/main/resources/bootstrap-dev.properties
  7. 1 1
      edu-user/edu-student-server/src/main/resources/bootstrap-dev.properties
  8. 1 1
      edu-user/edu-student-server/src/main/resources/logback-spring.xml
  9. 1 1
      edu-user/edu-teacher-server/src/main/resources/bootstrap-dev.properties
  10. 1 1
      edu-user/edu-teacher-server/src/main/resources/logback-spring.xml
  11. 1 1
      edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/NotifyCallback.java
  12. 1 1
      edu-user/edu-user-server/src/main/resources/bootstrap-dev.properties
  13. 1 1
      edu-user/edu-user-server/src/main/resources/logback-spring.xml
  14. 1 1
      edu-zuul/src/main/resources/bootstrap-dev.properties

+ 1 - 1
edu-auth/edu-auth-server/src/main/resources/bootstrap-dev.properties
View File 

@@ -1,7 +1,7 @@
 
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 
 #spring.profiles.active=dev
 
 #\u670d\u52a1\u5668\u5730\u5740
 
-spring.cloud.nacos.config.server-addr=47.114.176.40:8848
 
+spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 
 spring.cloud.nacos.config.namespace=753368b1-d0a9-42bc-bb76-c4ab319f0203
 
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

+ 1 - 1
edu-cms/src/main/resources/bootstrap-dev.properties
View File 

@@ -1,7 +1,7 @@
 
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 
 #spring.profiles.active=dev
 
 #\u670d\u52a1\u5668\u5730\u5740
 
-spring.cloud.nacos.config.server-addr=47.114.176.40:8848
 
+spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 
 spring.cloud.nacos.config.namespace=753368b1-d0a9-42bc-bb76-c4ab319f0203
 
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

+ 4 - 0
edu-common/pom.xml
View File 

@@ -78,5 +78,9 @@
 
 			<groupId>com.spring4all</groupId>
 
 			<artifactId>swagger-spring-boot-starter</artifactId>
 
 		</dependency>
 
+		<dependency>
 
+			<groupId>org.springframework</groupId>
 
+			<artifactId>spring-webmvc</artifactId>
 
+		</dependency>
 
 	</dependencies>
 
 </project>

+ 1 - 1
edu-eureka/src/main/resources/bootstrap-dev.properties
View File 

@@ -1,7 +1,7 @@
 
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 
 #spring.profiles.active=dev
 
 #\u670d\u52a1\u5668\u5730\u5740
 
-spring.cloud.nacos.config.server-addr=47.114.176.40:8848
 
+spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 
 spring.cloud.nacos.config.namespace=753368b1-d0a9-42bc-bb76-c4ab319f0203
 
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

+ 1 - 1
edu-im/edu-im-server/src/main/resources/bootstrap-dev.properties
View File 

@@ -1,7 +1,7 @@
 
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 
 #spring.profiles.active=dev
 
 #\u670d\u52a1\u5668\u5730\u5740
 
-spring.cloud.nacos.config.server-addr=47.114.176.40:8848
 
+spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 
 spring.cloud.nacos.config.namespace=753368b1-d0a9-42bc-bb76-c4ab319f0203
 
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

+ 1 - 1
edu-task/src/main/resources/bootstrap-dev.properties
View File 

@@ -1,7 +1,7 @@
 
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 
 #spring.profiles.active=dev
 
 #\u670d\u52a1\u5668\u5730\u5740
 
-spring.cloud.nacos.config.server-addr=47.114.176.40:8848
 
+spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 
 spring.cloud.nacos.config.namespace=753368b1-d0a9-42bc-bb76-c4ab319f0203
 
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

+ 1 - 1
edu-user/edu-student-server/src/main/resources/bootstrap-dev.properties
View File 

@@ -1,7 +1,7 @@
 
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 
 #spring.profiles.active=dev
 
 #\u670d\u52a1\u5668\u5730\u5740
 
-spring.cloud.nacos.config.server-addr=47.114.176.40:8848
 
+spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 
 spring.cloud.nacos.config.namespace=753368b1-d0a9-42bc-bb76-c4ab319f0203
 
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

+ 1 - 1
edu-user/edu-student-server/src/main/resources/logback-spring.xml
View File 

@@ -1,7 +1,7 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration scan="true" scanPeriod="10 seconds">
 
 
-	<property name="LOG_HOME" value="/mdata/logs/cms-%d{yyyy-MM-dd_HH}-%i.log" />
 
+	<property name="LOG_HOME" value="/mdata/logs/student-%d{yyyy-MM-dd_HH}-%i.log" />
 
 	<property name="CONSOLE_LOG_PATTERN"
 
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />

+ 1 - 1
edu-user/edu-teacher-server/src/main/resources/bootstrap-dev.properties
View File 

@@ -1,7 +1,7 @@
 
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 
 #spring.profiles.active=dev
 
 #\u670d\u52a1\u5668\u5730\u5740
 
-spring.cloud.nacos.config.server-addr=47.114.176.40:8848
 
+spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 
 spring.cloud.nacos.config.namespace=753368b1-d0a9-42bc-bb76-c4ab319f0203
 
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

+ 1 - 1
edu-user/edu-teacher-server/src/main/resources/logback-spring.xml
View File 

@@ -1,7 +1,7 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration scan="true" scanPeriod="10 seconds">
 
 
-	<property name="LOG_HOME" value="/mdata/logs/cms-%d{yyyy-MM-dd_HH}-%i.log" />
 
+	<property name="LOG_HOME" value="/mdata/logs/teacher-%d{yyyy-MM-dd_HH}-%i.log" />
 
 	<property name="CONSOLE_LOG_PATTERN"
 
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />

+ 1 - 1
edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/NotifyCallback.java
View File 

@@ -187,7 +187,7 @@ public class NotifyCallback implements MQTTCallbackHandler {
 
         hfMember.setStatus("succeeded");
 
         hfMember.setMemo(corpMemberObj.getString("audit_desc"));
 
         if (corpMemberObj.containsKey("audit_state") && corpMemberObj.getString("audit_state").equals("E")) {
 
-            JSONObject accounts = JSON.parseObject(corpMemberObj.get("settle_accounts").toString());
 
+            JSONObject accounts = JSON.parseObject(corpMemberObj.getString("settle_accounts"));
 
             hfMember.setSettleAccountId(accounts.getString("id"));
 
         }
 
         notifyCallback.hfMemberDao.update(hfMember);

+ 1 - 1
edu-user/edu-user-server/src/main/resources/bootstrap-dev.properties
View File 

@@ -1,7 +1,7 @@
 
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 
 #spring.profiles.active=dev
 
 #\u670d\u52a1\u5668\u5730\u5740
 
-spring.cloud.nacos.config.server-addr=47.114.176.40:8848
 
+spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 
 spring.cloud.nacos.config.namespace=753368b1-d0a9-42bc-bb76-c4ab319f0203
 
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

+ 1 - 1
edu-user/edu-user-server/src/main/resources/logback-spring.xml
View File 

@@ -1,7 +1,7 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration scan="true" scanPeriod="10 seconds">
 
 
-	<property name="LOG_HOME" value="/mdata/logs/cms-%d{yyyy-MM-dd_HH}-%i.log" />
 
+	<property name="LOG_HOME" value="/mdata/logs/user-%d{yyyy-MM-dd_HH}-%i.log" />
 
 	<property name="CONSOLE_LOG_PATTERN"
 
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />

+ 1 - 1
edu-zuul/src/main/resources/bootstrap-dev.properties
View File 

@@ -1,7 +1,7 @@
 
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 
 #spring.profiles.active=dev
 
 #\u670d\u52a1\u5668\u5730\u5740
 
-spring.cloud.nacos.config.server-addr=47.114.176.40:8848
 
+spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 
 spring.cloud.nacos.config.namespace=753368b1-d0a9-42bc-bb76-c4ab319f0203
 
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e