Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

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

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

base-manager/src/test/java/com/mortals/httpclient/dept/DeptController.http

@@ -10,8 +10,8 @@ Content-Type: application/json
 POST {{baseUrl}}/dept/list
 Content-Type: application/json
 
-#{"siteId":1,"page":"1","size":"3","idList":[422,420,413,412],"orderColList":[{"colName":"sort","sortKind":"asc"}]}
-{"siteId":1,"page":"1","size":"3","idList":[9,5,3,2],"orderColList":[{"colName":"sort","sortKind":"asc"}]}
+{"siteId":1,"page":"1","size":"3","idList":[422,420,413,412],"orderColList":[{"colName":"sort","sortKind":"asc"}]}
+
 ###部门更新与保存
 POST {{baseUrl}}/dept/save
 Content-Type: application/json

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -6,8 +6,17 @@
     "baseUrl": "http://192.168.0.60:17211/base"
   },
   "base-test": {
-    "baseUrl": "http://192.168.0.98:11078/base"
+    "baseUrl": "http://192.168.0.98:11071/basics_api/base"
   },
+
+  "base-test-https": {
+    "baseUrl": "https://192.168.0.98:31071/basics_api/base"
+  },
+
+  "base-test1-https": {
+    "baseUrl": "https://192.168.0.98:31071/base"
+  },
+
   "base-test1": {
     "baseUrl": "http://8.136.255.30:11078/base"
   },