Merge remote-tracking branch 'origin/master'

cooleshow-auth/auth-server/src/main/resources/bootstrap-dev.yml

@@ -2,8 +2,8 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.114.1.200:8848
-        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        server-addr: 192.168.3.183:8848
+        namespace: 4f34bcdc-8547-4a34-8781-4666b12295cb
         group: DEFAULT_GROUP
         prefix: auth
         file-extension: yaml

cooleshow-cms/src/main/resources/bootstrap-dev.properties

@@ -1,8 +1,8 @@
 
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.1.200:8848
+spring.cloud.nacos.config.server-addr=192.168.3.183:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=6f8374a9-598f-4889-bb17-476070ffb8de
+spring.cloud.nacos.config.namespace=4f34bcdc-8547-4a34-8781-4666b12295cb
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

cooleshow-common/src/main/java/com/yonge/cooleshow/common/entity/HttpResponseResult.java

@@ -1,5 +1,16 @@
 package com.yonge.cooleshow.common.entity;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.yonge.cooleshow.common.exception.BizException;
+import com.yonge.toolset.thirdparty.exception.ThirdpartyException;
+import com.yonge.toolset.utils.http.HttpUtil;
+import com.yonge.toolset.utils.json.JsonUtil;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.http.HttpStatus;
 import java.util.Date;
 
@@ -124,4 +135,9 @@ public class HttpResponseResult<T> {
 		obj.setMsg(message);
 		return obj;
 	}
+
+	@Override
+	public String toString(){
+	    return JsonUtil.toJSONString(this, SerializerFeature.PrettyFormat);
+    }
 }

cooleshow-gateway/gateway-web/src/main/resources/bootstrap-dev.properties

@@ -1,9 +1,9 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.1.200:8848
+spring.cloud.nacos.config.server-addr=192.168.3.183:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=6f8374a9-598f-4889-bb17-476070ffb8de
+spring.cloud.nacos.config.namespace=4f34bcdc-8547-4a34-8781-4666b12295cb
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

cooleshow-task/src/main/resources/bootstrap-dev.properties

@@ -1,9 +1,9 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.1.200:8848
+spring.cloud.nacos.config.server-addr=192.168.3.183:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=6f8374a9-598f-4889-bb17-476070ffb8de
+spring.cloud.nacos.config.namespace=4f34bcdc-8547-4a34-8781-4666b12295cb
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

cooleshow-user/user-admin/src/main/resources/bootstrap-dev.yml

@@ -2,8 +2,8 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.114.1.200:8848
-        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        server-addr: 192.168.3.183:8848
+        namespace: 4f34bcdc-8547-4a34-8781-4666b12295cb
         group: DEFAULT_GROUP
         prefix: admin
         file-extension: yaml

cooleshow-user/user-teacher/src/main/resources/logback-spring.xml

@@ -4,12 +4,20 @@
 	<property name="LOG_HOME" value="/mdata/logs/cms-%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" />
-
+    <!--
 	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder charset="UTF-8">
 			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
 		</encoder>
-	</appender>
+	</appender>-->
+
+    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>
+                %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n
+            </pattern>
+        </layout>
+    </appender>
 
 	<appender name="file"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">

toolset/audit-log/src/test/resources/application.properties

@@ -1,6 +1,6 @@
 spring.application.name=audit-log
 
 # mongodb
-spring.data.mongodb.uri=mongodb://47.114.1.200:27017
+spring.data.mongodb.uri=mongodb://192.168.3.183:27017
 
 spring.data.mongodb.database=mec_dev