提交代码

ruoyi-ui/src/views/index.vue

@@ -1,91 +1,280 @@
-<template>
+user  root;
-  <div class="app-container home">
+worker_processes  1;
-    <my-index></my-index>
-  </div>
-</template>
 
-<script>
+#error_log  logs/error.log;
-import myIndex from '@/views/project/surProject/myIndex.vue'
+#error_log  logs/error.log  notice;
-export default {
+#error_log  logs/error.log  info;
-  name: "index",
-  components:{
-    myIndex
-  },
-  data() {
-    return {
-      // 版本号
-      version: "3.4.0",
-    };
-  },
-  methods: {
-    goTarget(href) {
-      window.open(href, "_blank");
-    },
-  },
-};
-</script>
 
-<style scoped lang="scss">
+#pid        logs/nginx.pid;
-.home {
-  blockquote {
-    padding: 10px 20px;
-    margin: 0 0 20px;
-    font-size: 17.5px;
-    border-left: 5px solid #eee;
-  }
-  hr {
-    margin-top: 20px;
-    margin-bottom: 20px;
-    border: 0;
-    border-top: 1px solid #eee;
-  }
-  .col-item {
-    margin-bottom: 20px;
-  }
 
-  ul {
-    padding: 0;
-    margin: 0;
-  }
 
-  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+events {
-  font-size: 13px;
+    worker_connections  1024;
-  color: #676a6c;
-  overflow-x: hidden;
-
-  ul {
-    list-style-type: none;
-  }
-
-  h4 {
-    margin-top: 0px;
-  }
-
-  h2 {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 100;
-  }
-
-  p {
-    margin-top: 10px;
-
-    b {
-      font-weight: 700;
-    }
-  }
-
-  .update-log {
-    ol {
-      display: block;
-      list-style-type: decimal;
-      margin-block-start: 1em;
-      margin-block-end: 1em;
-      margin-inline-start: 0;
-      margin-inline-end: 0;
-      padding-inline-start: 40px;
-    }
-  }
 }
-</style>
 
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    #                  '$status $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+   
+    include /usr/local/nginx/conf/conf.d/*.conf;
+    #gzip  on;
+
+    server {
+              listen       80;
+	      listen      443 ssl;
+       	      server_name xiangguan.sxyanzhu.com;
+    	      ssl_certificate     /usr/local/nginx/cert/xiangguan.sxyanzhu.com_chain.pem;
+    	      ssl_certificate_key /usr/local/nginx/cert/xiangguan.sxyanzhu.com_key.key;
+    	      ssl_session_cache    shared:SSL:1m;
+    	      ssl_session_timeout  5m;
+    	      ssl_ciphers  HIGH:!aNULL:!MD5;
+    	      ssl_prefer_server_ciphers  on;
+	      client_max_body_size 500m;
+	      client_body_timeout 60;
+	      client_header_timeout 60;
+        #charset koi8-r;
+
+        #access_log  logs/host.access.log  main;
+
+	#ssl_certificate      /usr/local/nginx/conf/makalu.cc.pem;
+        #ssl_certificate_key  /usr/local/nginx/conf/makalu.cc.key;
+        #ssl_session_cache    shared:SSL:1m;
+        #ssl_session_timeout  5m;
+        #ssl_ciphers  HIGH:!aNULL:!MD5;
+        #ssl_prefer_server_ciphers  on;
+
+         location / {
+ 	  alias /usr/local/xd/web/xd;
+          index  index.html index.htm;
+	  try_files $uri $uri/ /index.html;
+         }
+
+	location /jhbs {
+            alias /usr/local/jh/jhbs;
+            index  index.html index.htm;
+        }
+	
+    location  /YanZhuGZAI/ {
+         add_header Access-Control-Allow-Origin *;
+         add_header Access-Control-Allow-Credentials: true;
+         client_max_body_size "100m";
+         proxy_pass http://127.0.0.1:8087/YanZhuGZAI/;
+   }
+
+    location  /yzProject {
+         proxy_pass http://49.235.181.228:8088/;
+   } 
+
+   location  /YZLJXM/ {
+         add_header Access-Control-Allow-Origin *;
+         add_header Access-Control-Allow-Credentials: true;
+         client_max_body_size "100m";
+         proxy_pass http://49.235.181.228:8088/api/;
+   }
+
+    location  /YanZhuGZMJ/ {
+         add_header Access-Control-Allow-Origin *;
+         add_header Access-Control-Allow-Credentials: true;
+         client_max_body_size "100m";
+         proxy_pass http://202.105.29.14:8450/mj/;
+    }
+
+        location /prjapp {
+            alias /usr/local/tempapp/prjapp;
+            index  index.html index.htm;
+        }
+
+	location /cesium {
+            alias /usr/local/jh/Cesium;
+            index  index.html index.htm;
+        }
+
+	location /cdn {
+            alias /usr/local/jh/cdn;
+            index  index.html index.htm;
+        }
+
+	location /ai {
+          alias /usr/local/jh/ai;
+          index  index.html index.htm;
+        }
+
+	location /power {
+          alias /usr/local/jh/power;
+          index  index.html index.htm;
+        }
+
+	location /jhfiles {
+            alias /usr/local/jh/jhfiles;
+            index  index.html index.htm;
+        }
+
+      location /jhapi {
+        proxy_pass http://127.0.0.1:8090/jhapi;
+      }
+
+       location /ai2 {
+          alias /usr/local/jh/ai2;
+          index  index.html index.htm;
+        }
+
+ 	location /xd {
+          alias /usr/local/xd/web/xd;
+          index  index.html index.htm;
+	  try_files $uri $uri/ /index.html;
+        }
+      location /app1 {
+          alias /usr/local/xd/web/app1;
+          index  index.html index.htm;
+	  try_files $uri $uri/ /index.html;
+        }
+        location /app2 {
+          alias /usr/local/xd/web/app2;
+          index  index.html index.htm;
+	  try_files $uri $uri/ /index.html;
+        }
+       
+       	location /xdbs {
+          alias /usr/local/xd/xdbs;
+          index  index.html index.htm;
+        }
+
+      location /api/ {
+	 client_max_body_size "500m";
+	 proxy_pass http://10.5.1.153:8800/;
+	 ##proxy_pass http://10.5.1.21:8800/;
+      }
+
+
+ location /prod-api/ {
+	client_max_body_size "500m";
+        proxy_pass http://localhost:8080/;
+	charset utf-8;
+      }
+
+ location /statics {
+        proxy_pass http://localhost:9300/statics;
+      }
+
+
+      location /mk/ {
+        proxy_pass http://127.0.0.1:8700/;
+      }
+
+
+
+
+     location /yanZhuProject {
+	   proxy_pass http://127.0.0.1:7070/yanZhuProject;
+     }
+
+     location /cas/ {
+	   proxy_pass http://127.0.0.1:18080/cas/;
+     }
+
+ location /mklapi/ {
+	   proxy_pass http://127.0.0.1:9004/mklapi/;
+     }
+
+	#姜玉琦 - 0311
+location  / {
+	client_max_body_size	500m;
+	proxy_set_header Host $http_host;
+	proxy_set_header X-Real-IP $remote_addr;
+	proxy_set_header REMOTE-HOST $remote_addr;
+	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	proxy_pass http://127.0.0.1:8080/;
+    }
+
+location  ^~ /statics/ {
+	 alias /data/yanzhu/uploadPath/;
+}
+
+	location  ^~ /profile/ {
+	 	alias /data/wxProfile/;
+	}
+
+        #error_page  404              /404.html;
+
+        # redirect server error pages to the static page /50x.html
+        #
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+
+	
+
+        # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+        #
+        #location ~ \.php$ {
+        #    proxy_pass   http://127.0.0.1;
+        #}
+
+        # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+        #
+        #location ~ \.php$ {
+        #    root           html;
+        #    fastcgi_pass   127.0.0.1:9000;
+        #    fastcgi_index  index.php;
+        #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+        #    include        fastcgi_params;
+        #}
+
+        # deny access to .htaccess files, if Apache's document root
+        # concurs with nginx's one
+        #
+        #location ~ /\.ht {
+        #    deny  all;
+        #}
+    }
+
+
+    # another virtual host using mix of IP-, name-, and port-based configuration
+    #
+    #server {
+    #    listen       8000;
+    #    listen       somename:8080;
+    #    server_name  somename  alias  another.alias;
+
+    #    location / {
+    #        root   html;
+    #        index  index.html index.htm;
+    #    }
+    #}
+
+
+    # HTTPS server
+    #
+    #server {
+    #    listen       443 ssl;
+    #    server_name  localhost;
+
+    #    ssl_certificate      cert.pem;
+    #    ssl_certificate_key  cert.key;
+
+    #    ssl_session_cache    shared:SSL:1m;
+    #    ssl_session_timeout  5m;
+
+    #    ssl_ciphers  HIGH:!aNULL:!MD5;
+    #    ssl_prefer_server_ciphers  on;
+
+    #    location / {
+    #        root   html;
+    #        index  index.html index.htm;
+    #    }
+    #}
+
+}

ruoyi-ui/src/views/login.vue

@@ -150,7 +150,7 @@
     </div>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2023 西咸新区泾河新城产业发展集团 All Rights Reserved.</span>
+      <span>Copyright © 2025 长安区数字工程监管系统 All Rights Reserved.</span>
     </div>
   </div>
 </template>
@@ -398,7 +398,7 @@ export default {
   font-family: Arial;
   font-size: 12px;
   letter-spacing: 1px;
-  color: #111;
+  color: #fdf9f9;
   text-shadow: 3px 3px 5px #d3a3a3;
 }
 .login-code-img {

yanzhu-deviceApi/src/main/java/com/ruoyi/api/TowerCraneApiController.java

@@ -395,7 +395,7 @@ public class TowerCraneApiController {
         log.info("desApi.towerCrane.v2_ty.run.push...{}",req.getEid());
         DevTowerProjectConfig config = redisCache.getCacheObject(YANZHU_DEVICE_TOWER + req.getEid());
         if (config == null) {
-            throw new ServiceException(HttpStatusEnum.ERROR.getInfo(), HttpStatusEnum.ERROR.getCode());
+            throw new ServiceException(HttpStatusEnum.ERROR.getInfo()+"::"+req.getEid(), HttpStatusEnum.ERROR.getCode());
         }
         String deviceKey = req.getEid().toString();
         DevTowerDataLimit devTowerDataLimit = staticLimitMap.get(deviceKey);
@@ -447,7 +447,7 @@ public class TowerCraneApiController {
         log.info("desApi.towerCrane.v2_ty.round.push...{}",req.getEid());
         DevTowerProjectConfig config = redisCache.getCacheObject(YANZHU_DEVICE_TOWER + req.getEid());
         if (config == null) {
-            throw new ServiceException(HttpStatusEnum.ERROR.getInfo(), HttpStatusEnum.ERROR.getCode());
+            throw new ServiceException(HttpStatusEnum.ERROR.getInfo()+"::"+req.getEid(), HttpStatusEnum.ERROR.getCode());
         }
         DevTowerDataRound devTowerDataRound = new DevTowerDataRound();
         devTowerDataRound.setCfgId(config.getId());
@@ -487,7 +487,7 @@ public class TowerCraneApiController {
         log.info("desApi.towerCrane.v2_ty.warning.push...{}",req.getEid());
         DevTowerProjectConfig config = redisCache.getCacheObject(YANZHU_DEVICE_TOWER + req.getEid());
         if (config == null) {
-            throw new ServiceException(HttpStatusEnum.ERROR.getInfo(), HttpStatusEnum.ERROR.getCode());
+            throw new ServiceException(HttpStatusEnum.ERROR.getInfo()+"::"+req.getEid(), HttpStatusEnum.ERROR.getCode());
         }
         DevTowerDataWarning devTowerDataWarning = new DevTowerDataWarning();
         devTowerDataWarning.setCfgId(config.getId());