Merge remote-tracking branch 'origin/master'

portal-manager/pom.xml

@@ -17,9 +17,6 @@
 	<profiles>
 		<profile>
 			<id>develop</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
 			<properties>
 				<profiles.active>develop</profiles.active>
 				<profiles.queue.type>rabbitmq</profiles.queue.type>
@@ -39,6 +36,9 @@
 		</profile>
 		<profile>
 			<id>test</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 			<properties>
 				<profiles.active>test</profiles.active>
 				<profiles.server.path>/zwfw</profiles.server.path>

portal-manager/src/main/java/com/mortals/xhx/module/page/web/PageInfoController.java

@@ -61,9 +61,10 @@ public class PageInfoController extends BaseCRUDJsonBodyMappingController<PageIn
                 model.put("data", result.getData().getData());
                 model.put("pageInfo", result.getData().getPageInfo());
                 model.put("dict", result.getData().getDict());
+                model.put("message_info", busiDesc + "成功");
+            }else {
+                model.put("message_info", result.getMsg());
             }
-
-            model.put("message_info", busiDesc + "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception var9) {
             code = -1;

portal-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -16,5 +16,7 @@
 			<property name="dialect" value="MySql" />
 			<property name="showSql" value="MySql" />
 		</plugin>
+		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
+		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file