统计样例

pom.xml

@@ -34,7 +34,7 @@
         <commons.io.version>2.11.0</commons.io.version>
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <velocity.version>2.3</velocity.version>
-        <fastjson.version>2.0.12</fastjson.version>
+        <fastjson.version>2.0.11</fastjson.version>
         <jjwt.version>0.9.1</jjwt.version>
         <minio.version>8.2.2</minio.version>
         <poi.version>4.1.2</poi.version>
@@ -42,6 +42,49 @@
         <transmittable-thread-local.version>2.13.2</transmittable-thread-local.version>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>dev</profiles.active>
+<!--                <nacos.server>121.36.73.159:8848</nacos.server>-->
+                <nacos.server>10.16.4.12:8848</nacos.server>
+<!--                <nacos.server>mz.tshe.cn:848</nacos.server>-->
+                <nacos.discovery.group>MZ</nacos.discovery.group>
+                <nacos.discovery.namespace></nacos.discovery.namespace>
+                <nacos.config.group>MZ</nacos.config.group>
+                <nacos.config.namespace></nacos.config.namespace>
+            </properties>
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>strong3</id>
+            <properties>
+                <profiles.active>strong3</profiles.active>
+                <nacos.server>10.16.4.12:8848</nacos.server>
+                <nacos.discovery.group>MZ</nacos.discovery.group>
+                <nacos.config.group>MZ</nacos.config.group>
+                <nacos.discovery.namespace>strong3</nacos.discovery.namespace>
+                <nacos.config.namespace>strong3</nacos.config.namespace>
+            </properties>
+        </profile>
+        <profile>
+            <id>hw</id>
+            <properties>
+                <profiles.active>hw</profiles.active>
+                <nacos.server>192.168.0.252:8848</nacos.server>
+                <nacos.discovery.group>MZ</nacos.discovery.group>
+                <nacos.config.group>MZ</nacos.config.group>
+                <nacos.discovery.namespace>hw</nacos.discovery.namespace>
+                <nacos.config.namespace>hw</nacos.config.namespace>
+            </properties>
+        </profile>
+    </profiles>
+
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
@@ -225,24 +268,24 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
-            <!-- 缓存服务 -->
+            <!-- activiti模块 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-redis</artifactId>
+                <artifactId>ruoyi-common-activiti</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
-            <!-- 系统接口 -->
+            <!-- 缓存服务 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-api-system</artifactId>
+                <artifactId>ruoyi-common-redis</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
-            <!-- activiti模块 -->
+            <!-- 系统接口 -->
             <dependency>
                 <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-activiti</artifactId>
+                <artifactId>ruoyi-api-system</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
@@ -307,49 +350,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <properties>
-                <!-- 环境标识，需要与配置文件的名称相对应 -->
-                <profiles.active>dev</profiles.active>
-                <!--                <nacos.server>121.36.73.159:8848</nacos.server>-->
-                <nacos.server>10.16.4.12:8848</nacos.server>
-                <!--                <nacos.server>mz.tshe.cn:848</nacos.server>-->
-                <nacos.discovery.group>MZ</nacos.discovery.group>
-                <nacos.discovery.namespace></nacos.discovery.namespace>
-                <nacos.config.group>MZ</nacos.config.group>
-                <nacos.config.namespace></nacos.config.namespace>
-            </properties>
-            <activation>
-                <!-- 默认环境 -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-        <profile>
-            <id>strong3</id>
-            <properties>
-                <profiles.active>strong3</profiles.active>
-                <nacos.server>10.16.4.12:8848</nacos.server>
-                <nacos.discovery.group>MZ</nacos.discovery.group>
-                <nacos.config.group>MZ</nacos.config.group>
-                <nacos.discovery.namespace>strong3</nacos.discovery.namespace>
-                <nacos.config.namespace>strong3</nacos.config.namespace>
-            </properties>
-        </profile>
-        <profile>
-            <id>hw</id>
-            <properties>
-                <profiles.active>hw</profiles.active>
-                <nacos.server>192.168.0.252:8848</nacos.server>
-                <nacos.discovery.group>MZ</nacos.discovery.group>
-                <nacos.config.group>MZ</nacos.config.group>
-                <nacos.discovery.namespace>hw</nacos.discovery.namespace>
-                <nacos.config.namespace>hw</nacos.config.namespace>
-            </properties>
-        </profile>
-    </profiles>
-
-
-</project>
+</project>

ruoyi-ui/vue.config.js

@@ -42,8 +42,8 @@ module.exports = {
         // target: `http://4j9755v434.qicp.vip:30877`,
         // target: `http://10.16.4.3:8080`, //陈航
         // target: `http://10.16.4.5:8080`,//孙坤阳
-        target: `http://localhost:8080`,
-        // target: `http://mz.tshe.cn:801/prod-api`,
+        // target: `http://localhost:8080`,
+        target: `http://mz.tshe.cn:801/prod-api`,
         // target: `http://10.16.4.14:801/prod-api`,
         changeOrigin: true,
         pathRewrite: {

ruoyi-web/vite.config.js

@@ -26,13 +26,14 @@ export default defineConfig(({ mode, command }) => {
     },
     // vite 相关配置
     server: {
-      port: 80,
+      port: 8090,
       host: true,
       open: true,
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
           target: 'http://localhost:8080',
+         // target: `http://mz.tshe.cn:801/prod-api`,
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },