wangwx hace 1 año
padre
commit
52e5ed1be9
Se han modificado 2 ficheros con 7 adiciones y 7 borrados
  1. 6 6
      ruoyi-admin/src/main/resources/application.yml
  2. 1 1
      ruoyi-ui/vue.config.js

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

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口,默认为8080
-  port: 9995
+  port: 9101
   servlet:
     # 应用的访问路径
     context-path: /
@@ -141,13 +141,13 @@ mcu:
     dealThreadQuantity: 2
   socket25:
     # 监听端口
-    socketPort: 9989
+    socketPort: 9103
     # 缓冲区大小
     bufferSize: 4096
     #处理收发数据的线程数,默认为2
     dealThreadQuantity: 2
-    # 监听端口
-    socketPortTest: 9083
+    # 25寸图片下载
+    httpServer: http://localhost:9101/httpServer/
 
 #复旦微通信 RSA秘钥
 se:
@@ -177,7 +177,7 @@ se:
     fuDanWeiCaCert: ./cert/server_leaf_fmshca_uat_rsa2048pub_20280413.pem
     #我们本地的证书
     localCert: ./cert/dc.metroad.cn.jks
-    #我们本地证书的密码
-    localCertPassword: he5NNuD7
+    #我们本地证书的密码.0515-he5NNuD7
+    localCertPassword: 5w1junep
   # dev单向认证,prod双向认证
   environment: prod

+ 1 - 1
ruoyi-ui/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:9995`,
+        target: `http://localhost:9101`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''