Merge branch 'production' into 'develop'

Production

See merge request !1

ruoyi-admin/src/main/java/com/ruoyi/algorithm/controller/AlgorithmBaseController.java

@@ -97,8 +97,8 @@ public class AlgorithmBaseController extends BaseController {
 
     private static final String PUBLIC_KEY_URL = "https://124.160.33.135:4077/evo-apigw/evo-oauth/1.0.0/oauth/public-key";
 
-    @GetMapping("/test")
+    /*@GetMapping("/test")
     public String test() throws ClientException {
         return IccUtil.StartPlaybackByTime();
-    }
+    }*/
 }

ruoyi-admin/src/main/resources/application-druid.yml

@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: root
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: F:/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -137,7 +137,7 @@ flink:
   # 端口，默认为8081
   port: 8081
   # jarId
-  jarId: 0b1a0852-931e-4933-b1f6-6b7d9c4f7f1b_my-flink-project-0.1.jar
+  jarId: b16f9fc0-b483-489c-8ae4-f4c5b1962ba0_my-flink-project-0.1.jar
   # flink启动类
   entryClass: com.censoft.flink.StreamingJob
   # 启动参数