Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/resources/application-dev.yml

@@ -19,7 +19,7 @@ shuzhihua:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 9011
+  port: 9098
   servlet:
     # 应用的访问路径
     context-path: /
@@ -194,11 +194,11 @@ xss:
 
 dsk:
   open:
-#    endPoint: 120.27.13.145:8865
-#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
-#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-#    protocol: http
-    endPoint: openapi.jiansheku.com
+    endPoint: 120.27.13.145:8865
     accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
     accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    protocol: https
+#    protocol: http
+#    endPoint: openapi.jiansheku.com
+#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+#    protocol: https

pom.xml

@@ -28,9 +28,9 @@
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
-        <mybatis-plus.version>3.4.2</mybatis-plus.version>
+        <mybatis-plus.version>3.4.3</mybatis-plus.version>
         <lombok.version>1.18.20</lombok.version>
-        <hutool-all.version>5.8.0</hutool-all.version>
+        <hutool-all.version>5.8.20</hutool-all.version>
         <dsk-openapi-sdk.version>2.1.0</dsk-openapi-sdk.version>
     </properties>