Merge branch 'master' of http://39.98.38.2:13000/dumingliang/sh-model-platform

pom.xml

@@ -212,11 +212,11 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>cn.com.goldenwater</groupId>
-                <artifactId>gw-cloud-id</artifactId>
-                <version>0.0.1-SNAPSHOT</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>cn.com.goldenwater</groupId>-->
+<!--                <artifactId>gw-cloud-id</artifactId>-->
+<!--                <version>0.0.1-SNAPSHOT</version>-->
+<!--            </dependency>-->
 
             <dependency>
                 <groupId>com.squareup.okhttp3</groupId>

ruoyi-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="/home/sh-models/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/PtServiceController.java

@@ -85,7 +85,7 @@ public class PtServiceController extends BaseController {
         List<PtServiceParam> list = ptServiceParamMapper.selectAll(srvId);
         List<PtServiceReturn> returnList = ptServiceReturnService.listBysrvId(srvId);
         List<PtServiceFile> fileList = ptServiceFileService.selectAll(srvId);
-        String url = RuoYiConfig.getGatewayUrl() + "/gxpt/api/service/" + ptService.getSrvId() + "/get_data";
+        String url = "/gxpt/api/service/" + ptService.getSrvId() + "/get_data";
         ptService.setUrl(url);
         ptService.setExample(url + "?accessToken='值'");
         Map<String, Object> map = new HashMap<>(3);

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/TokenController.java

@@ -29,9 +29,4 @@ public class TokenController {
         return tokenService.token(grant_type, appId, secret);
     }
 
-    @GetMapping("/url")
-    public String getTokenUrl() {
-        return RuoYiConfig.getGatewayUrl() + "/api/service/token";
-    }
-
 }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/PtAppServiceImpl.java

@@ -1,6 +1,5 @@
 package com.ruoyi.interfaces.service.impl;
 
-import cn.com.goldenwater.id.util.UuidUtil;
 import com.github.pagehelper.PageHelper;
 import com.ruoyi.common.utils.CheckUtils;
 import com.ruoyi.interfaces.core.page.Page;
@@ -31,12 +30,12 @@ public class PtAppServiceImpl implements PtAppService {
 
     @Override
     public int insert(PtApp ptApp) {
-        ptApp.setAppId(UuidUtil.uuid());
-        ptApp.setAppSecret(UUID.randomUUID().toString().replace("-", ""));
-        Date date = new Date();
-        ptApp.setAppPublish(date);
-        ptApp.setAuditTime(date);
-        ptApp.setRqTime(date);
+//        ptApp.setAppId(UuidUtil.uuid());
+//        ptApp.setAppSecret(UUID.randomUUID().toString().replace("-", ""));
+//        Date date = new Date();
+//        ptApp.setAppPublish(date);
+//        ptApp.setAuditTime(date);
+//        ptApp.setRqTime(date);
         return ptAppMapper.insert(ptApp);
     }
 

ruoyi-common/pom.xml

@@ -134,11 +134,11 @@
             <artifactId>swagger-models</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>cn.com.goldenwater</groupId>
-            <artifactId>gw-cloud-id</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.com.goldenwater</groupId>-->
+<!--            <artifactId>gw-cloud-id</artifactId>-->
+<!--            <version>0.0.1-SNAPSHOT</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>

ruoyi-ui/.env.development

@@ -10,7 +10,7 @@ VITE_APP_BASE_Title = '/sh'
 # 若依管理系统/生产环境
 VITE_APP_BASE_API = '/sh-api'
 
-VITE_DEV_PATH = 'http://localhost:8082'
+VITE_DEV_PATH = 'http://39.98.38.2:18082/sh-api'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

ruoyi-ui/.env.production

@@ -1,7 +1,7 @@
 # 页面标题
 VITE_APP_TITLE = 上海市水务海洋数字孪生模型服务管理系统
 
-port = 9002
+VITE_PORT = 9002
 
 # 生产环境配置
 VITE_APP_ENV = 'production'

ruoyi-ui/.env.staging

@@ -1,7 +1,7 @@
 # 页面标题
 VITE_APP_TITLE = 上海市水务海洋数字孪生模型服务管理系统
 
-port = 9002
+VITE_PORT = 9002
 
 # 生产环境配置
 VITE_APP_ENV = 'staging'

ruoyi-ui/src/views/base/catalogue/index.vue

@@ -213,8 +213,8 @@ import {
   delCatalog,
   addCatalog,
 } from "@/api/base/catalog";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import Treeselect from 'vue3-treeselect';
+import 'vue3-treeselect/dist/vue3-treeselect.css';
 
 export default {
   name: "Catalog",