feat:1.首页代码提交

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/mapper/xml/LightRailMapper.xml

@@ -97,7 +97,7 @@
                     CONCAT(tr.rail_line_name,"-",ta.line_alias_name,"-",ts.section_name) label,
                     2 type,
                     ts.id lineAliasId,
-                    ta.line_alias_name lineAliasCode,
+                    ta.line_alias_code lineAliasCode,
                     ts.section_starting_mileage startMileage,
                     TRUNCATE((ts.section_end_mileage + ts.section_starting_mileage) / 2, 3) centerMileage,
                     ts.section_end_mileage endMileage

jeecg-module-system/src/main/resources/application-dev.yml

@@ -134,13 +134,7 @@ spring:
           url: jdbc:mysql://47.94.207.62:3306/hzgw_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
           username: root
           password: superAdmin&321
-          driver-class-name: com.mysql.jdbc.Driver
-          # 多数据源配置
-          #multi-datasource1:
-          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          #username: root
-          #password: root
-          #driver-class-name: com.mysql.cj.jdbc.Driver
+          driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
     database: 0

jeecg-module-system/src/main/resources/application-pressure.yml

@@ -134,7 +134,7 @@ spring:
           url: jdbc:mysql://127.0.0.1:3306/hzgw_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
           username: root
           password: superAdmin&321
-          driver-class-name: com.mysql.jdbc.Driver
+          driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
           #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai

jeecg-module-system/src/main/resources/application-prod.yml

 server:
-  port: 16888
+  port: 17002
   tomcat:
     max-swallow-size: -1
   error:
@@ -67,10 +67,10 @@ spring:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
-  jpa:
-    open-in-view: false
   aop:
     proxy-target-class: true
+  jpa:
+    open-in-view: false
   #配置freemarker
   freemarker:
     # 设置模板后缀名
@@ -111,7 +111,7 @@ spring:
         # 初始化大小，最小，最大
         initial-size: 5
         min-idle: 5
-        maxActive: 1000
+        maxActive: 20
         # 配置获取连接等待超时的时间
         maxWait: 60000
         # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
@@ -131,22 +131,23 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/hzgw_prod?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
           username: root
-          password: root
+          password: superAdmin&321
           driver-class-name: com.mysql.cj.jdbc.Driver
-          # 多数据源配置
-          #multi-datasource1:
-          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          #username: root
-          #password: root
-          #driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
-    database: 0
+    database: 3
     host: 127.0.0.1
-    port: 6379
-    password: ''
+    lettuce:
+      pool:
+        max-active: 8   #最大连接数据库连接数,设 0 为没有限制
+        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
+        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
+      shutdown-timeout: 100ms
+    password: 'redis@123'
+    port: 6773
 #mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
@@ -154,13 +155,13 @@ mybatis-plus:
     # 关闭MP3.0自带的banner
     banner: false
     db-config:
-      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
+      #主键类型
       id-type: ASSIGN_ID
       # 默认数据库表下划线命名
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置
@@ -173,19 +174,19 @@ jeecg:
   signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
   # 签名拦截接口
   signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
-  #local\minio\alioss
-  uploadType: alioss
+  # local\minio\alioss
+  uploadType: local
   # 前端访问地址
   domainUrl:
     pc: http://localhost:3100
     app: http://localhost:8051
   path:
     #文件上传根目录 设置
-    upload: /opt/jeecg-boot/upload
+    upload: /opt/ztgk/prod/file
     #webapp文件路径
-    webapp: /opt/jeecg-boot/webapp
+    webapp: /opt/ztgk/prod/file
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??
@@ -196,16 +197,16 @@ jeecg:
   # ElasticSearch 设置
   elasticsearch:
     cluster-name: jeecg-ES
-    cluster-nodes: 127.0.0.1:9200
-    check-enabled: true
+    cluster-nodes: 81.70.47.128:9200
+    check-enabled: false
   # 在线预览文件服务器地址配置
-  file-view-domain: http://fileview.jeecg.com
+  file-view-domain: http://47.94.207.62:18000
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com
     minio_name: ??
     minio_pass: ??
-    bucketName: otatest
+    bucketName: ??
   #大屏报表参数设置
   jmreport:
     mode: prod
@@ -216,7 +217,7 @@ jeecg:
     #安全模式(敏感接口校验、saas模式下不允许使用平台数据源)
     #safeMode: true
     #是否需要校验token
-    is_verify_token: true
+    is_verify_token: false
     #必须校验方法
     verify_methods: remove,delete,save,add,update
   #xxl-job配置
@@ -236,13 +237,13 @@ jeecg:
     password:
     type: STANDALONE
     enabled: true
-#cas单点登录
-cas:
-  prefixUrl: http://cas.example.org:8443/cas
 #Mybatis输出sql日志
 logging:
   level:
     org.jeecg.modules.system.mapper: info
+#cas单点登录
+cas:
+  prefixUrl: http://cas.example.org:8443/cas
 #swagger
 knife4j:
   #开启增强配置
@@ -250,7 +251,7 @@ knife4j:
   #开启生产环境屏蔽
   production: false
   basic:
-    enable: true
+    enable: false
     username: jeecg
     password: jeecg1314
 #第三方登录

jeecg-module-system/src/main/resources/application-test.yml

@@ -134,7 +134,7 @@ spring:
           url: jdbc:mysql://127.0.0.1:3306/hzgw3?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
           username: root
           password: superAdmin&321
-          driver-class-name: com.mysql.jdbc.Driver
+          driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
           #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai