|  | @@ -1,6 +1,8 @@
 | 
	
		
			
				|  |  |  server:
 | 
	
		
			
				|  |  | -    port: 8002
 | 
	
		
			
				|  |  | -#    port: 8004
 | 
	
		
			
				|  |  | +  #  port: 8080
 | 
	
		
			
				|  |  | +  #  port: 8092
 | 
	
		
			
				|  |  | +  port: 8002
 | 
	
		
			
				|  |  | +  #  port: 8004
 | 
	
		
			
				|  |  |    tomcat:
 | 
	
		
			
				|  |  |      max-swallow-size: -1
 | 
	
		
			
				|  |  |    error:
 | 
	
	
		
			
				|  | @@ -8,7 +10,7 @@ server:
 | 
	
		
			
				|  |  |      include-stacktrace: ALWAYS
 | 
	
		
			
				|  |  |      include-message: ALWAYS
 | 
	
		
			
				|  |  |    servlet:
 | 
	
		
			
				|  |  | -    context-path: /jeecg-boot
 | 
	
		
			
				|  |  | +    context-path: /global-srm
 | 
	
		
			
				|  |  |    compression:
 | 
	
		
			
				|  |  |      enabled: true
 | 
	
		
			
				|  |  |      min-response-size: 1024
 | 
	
	
		
			
				|  | @@ -24,7 +26,7 @@ spring:
 | 
	
		
			
				|  |  |    # flyway配置
 | 
	
		
			
				|  |  |    flyway:
 | 
	
		
			
				|  |  |      # 是否启用flyway
 | 
	
		
			
				|  |  | -    enabled: false
 | 
	
		
			
				|  |  | +    enabled: true
 | 
	
		
			
				|  |  |      # 编码格式,默认UTF-8
 | 
	
		
			
				|  |  |      encoding: UTF-8
 | 
	
		
			
				|  |  |      # 迁移sql脚本文件存放路径,官方默认db/migration
 | 
	
	
		
			
				|  | @@ -63,7 +65,7 @@ spring:
 | 
	
		
			
				|  |  |    quartz:
 | 
	
		
			
				|  |  |      job-store-type: jdbc
 | 
	
		
			
				|  |  |      initialize-schema: embedded
 | 
	
		
			
				|  |  | -    #定时任务开关,true-开  false-关
 | 
	
		
			
				|  |  | +    #定时任务启动开关,true-开  false-关
 | 
	
		
			
				|  |  |      auto-startup: true
 | 
	
		
			
				|  |  |      #延迟1秒启动定时任务
 | 
	
		
			
				|  |  |      startup-delay: 1s
 | 
	
	
		
			
				|  | @@ -126,8 +128,8 @@ spring:
 | 
	
		
			
				|  |  |      druid:
 | 
	
		
			
				|  |  |        stat-view-servlet:
 | 
	
		
			
				|  |  |          enabled: true
 | 
	
		
			
				|  |  | -        loginUsername: admin
 | 
	
		
			
				|  |  | -        loginPassword: 123456
 | 
	
		
			
				|  |  | +        loginUsername:
 | 
	
		
			
				|  |  | +        loginPassword:
 | 
	
		
			
				|  |  |          allow:
 | 
	
		
			
				|  |  |        web-stat-filter:
 | 
	
		
			
				|  |  |          enabled: true
 | 
	
	
		
			
				|  | @@ -144,7 +146,7 @@ spring:
 | 
	
		
			
				|  |  |          timeBetweenEvictionRunsMillis: 60000
 | 
	
		
			
				|  |  |          # 配置一个连接在池中最小生存的时间,单位是毫秒
 | 
	
		
			
				|  |  |          minEvictableIdleTimeMillis: 300000
 | 
	
		
			
				|  |  | -        validationQuery: SELECT 1 FROM DUAL
 | 
	
		
			
				|  |  | +        validationQuery: SELECT 1
 | 
	
		
			
				|  |  |          testWhileIdle: true
 | 
	
		
			
				|  |  |          testOnBorrow: false
 | 
	
		
			
				|  |  |          testOnReturn: false
 | 
	
	
		
			
				|  | @@ -163,8 +165,10 @@ spring:
 | 
	
		
			
				|  |  |        datasource:
 | 
	
		
			
				|  |  |          master:
 | 
	
		
			
				|  |  |            url: jdbc:mysql://localhost:3306/global-srm?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 | 
	
		
			
				|  |  | +          #          url: jdbc:mysql://106.15.206.14:3306/global-srm?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 | 
	
		
			
				|  |  |            username: root
 | 
	
		
			
				|  |  |            password: root
 | 
	
		
			
				|  |  | +          #          password: CuiDian1234
 | 
	
		
			
				|  |  |            driver-class-name: com.mysql.cj.jdbc.Driver
 | 
	
		
			
				|  |  |            # 多数据源配置
 | 
	
		
			
				|  |  |            #multi-datasource1:
 | 
	
	
		
			
				|  | @@ -180,7 +184,7 @@ spring:
 | 
	
		
			
				|  |  |      password: ''
 | 
	
		
			
				|  |  |  #mybatis plus 设置
 | 
	
		
			
				|  |  |  mybatis-plus:
 | 
	
		
			
				|  |  | -  mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
 | 
	
		
			
				|  |  | +  mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml,classpath*:com/cuidian/**/xml/*Mapper.xml
 | 
	
		
			
				|  |  |    global-config:
 | 
	
		
			
				|  |  |      # 关闭MP3.0自带的banner
 | 
	
		
			
				|  |  |      banner: false
 | 
	
	
		
			
				|  | @@ -201,34 +205,33 @@ jeecg:
 | 
	
		
			
				|  |  |    # 平台上线安全配置
 | 
	
		
			
				|  |  |    firewall:
 | 
	
		
			
				|  |  |      # 数据源安全 (开启后,Online报表和图表的数据源为必填)
 | 
	
		
			
				|  |  | -    dataSourceSafe: true
 | 
	
		
			
				|  |  | +    dataSourceSafe: false
 | 
	
		
			
				|  |  |      # 低代码模式(dev:开发模式,prod:发布模式——关闭所有在线开发配置能力)
 | 
	
		
			
				|  |  | -    lowCodeMode: prod
 | 
	
		
			
				|  |  | +    lowCodeMode: dev
 | 
	
		
			
				|  |  |    # 签名密钥串(前后端要一致,正式发布请自行修改)
 | 
	
		
			
				|  |  |    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,/sys/sendChangePwdSms,/sys/user/sendChangePhoneSms,/sys/sms,/desform/api/sendVerifyCode
 | 
	
		
			
				|  |  | -  # local\minio\alioss
 | 
	
		
			
				|  |  | -  uploadType: alioss
 | 
	
		
			
				|  |  | +  # 本地:local、Minio:minio、阿里云:alioss
 | 
	
		
			
				|  |  | +  uploadType: local
 | 
	
		
			
				|  |  |    # 前端访问地址
 | 
	
		
			
				|  |  |    domainUrl:
 | 
	
		
			
				|  |  |      pc: http://localhost:3100
 | 
	
		
			
				|  |  |      app: http://localhost:8051
 | 
	
		
			
				|  |  |    path:
 | 
	
		
			
				|  |  |      #文件上传根目录 设置
 | 
	
		
			
				|  |  | -    upload: D://opt/upFiles
 | 
	
		
			
				|  |  | +    upload:  D://opt/upFiles
 | 
	
		
			
				|  |  |      #webapp文件路径
 | 
	
		
			
				|  |  | -    webapp: D://opt/webapp
 | 
	
		
			
				|  |  | +    webapp:  D://opt/webapp
 | 
	
		
			
				|  |  |    shiro:
 | 
	
		
			
				|  |  | -    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
 | 
	
		
			
				|  |  | +    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**
 | 
	
		
			
				|  |  |    #阿里云oss存储和大鱼短信秘钥配置
 | 
	
		
			
				|  |  |    oss:
 | 
	
		
			
				|  |  |      accessKey: ??
 | 
	
		
			
				|  |  |      secretKey: ??
 | 
	
		
			
				|  |  |      endpoint: oss-cn-beijing.aliyuncs.com
 | 
	
		
			
				|  |  |      bucketName: jeecgdev
 | 
	
		
			
				|  |  | -    staticDomain: https://static.jeecg.com
 | 
	
		
			
				|  |  | -  # ElasticSearch 设置
 | 
	
		
			
				|  |  | +  # ElasticSearch 6设置
 | 
	
		
			
				|  |  |    elasticsearch:
 | 
	
		
			
				|  |  |      cluster-name: jeecg-ES
 | 
	
		
			
				|  |  |      cluster-nodes: 127.0.0.1:9200
 | 
	
	
		
			
				|  | @@ -248,9 +251,9 @@ jeecg:
 | 
	
		
			
				|  |  |      # 平台上线安全配置(v1.6.2+ 新增)
 | 
	
		
			
				|  |  |      firewall:
 | 
	
		
			
				|  |  |        # 数据源安全 (开启后,不允许使用平台数据源、SQL解析加签并且不允许查询数据库)
 | 
	
		
			
				|  |  | -      dataSourceSafe: true
 | 
	
		
			
				|  |  | +      dataSourceSafe: false
 | 
	
		
			
				|  |  |        # 低代码开发模式(dev:开发模式,prod:发布模式—关闭在线报表设计功能,分配角色admin、lowdeveloper可以放开限制)
 | 
	
		
			
				|  |  | -      lowCodeMode: prod
 | 
	
		
			
				|  |  | +      lowCodeMode: dev
 | 
	
		
			
				|  |  |    #xxl-job配置
 | 
	
		
			
				|  |  |    xxljob:
 | 
	
		
			
				|  |  |      enabled: false
 | 
	
	
		
			
				|  | @@ -268,6 +271,20 @@ jeecg:
 | 
	
		
			
				|  |  |      password:
 | 
	
		
			
				|  |  |      type: STANDALONE
 | 
	
		
			
				|  |  |      enabled: true
 | 
	
		
			
				|  |  | +  # ai-chat
 | 
	
		
			
				|  |  | +  ai-chat:
 | 
	
		
			
				|  |  | +    # 是否开启;必须。
 | 
	
		
			
				|  |  | +    enabled: false
 | 
	
		
			
				|  |  | +    # openAi接口秘钥,填写自己的apiKey;必须。
 | 
	
		
			
				|  |  | +    apiKey: "????"
 | 
	
		
			
				|  |  | +    # openAi域名,有代理就填代理的域名。默认:openAI官方apiHost
 | 
	
		
			
				|  |  | +    apiHost: "https://api.openai.com"
 | 
	
		
			
				|  |  | +    # 超时时间单位:s。默认 60s
 | 
	
		
			
				|  |  | +    timeout: 60
 | 
	
		
			
				|  |  | +    # 本地代理地址
 | 
	
		
			
				|  |  | +  #    proxy:
 | 
	
		
			
				|  |  | +  #      host: "http://127.0.0.1"
 | 
	
		
			
				|  |  | +  #      port: "7890"
 | 
	
		
			
				|  |  |    # 百度开放API配置
 | 
	
		
			
				|  |  |    baidu-api:
 | 
	
		
			
				|  |  |      app-id: ??
 | 
	
	
		
			
				|  | @@ -281,15 +298,15 @@ cas:
 | 
	
		
			
				|  |  |  logging:
 | 
	
		
			
				|  |  |    level:
 | 
	
		
			
				|  |  |      org.flywaydb: debug
 | 
	
		
			
				|  |  | -    org.jeecg.modules.system.mapper: info
 | 
	
		
			
				|  |  | +    org.jeecg.modules.system.mapper: debug
 | 
	
		
			
				|  |  |  #swagger
 | 
	
		
			
				|  |  |  knife4j:
 | 
	
		
			
				|  |  |    #开启增强配置
 | 
	
		
			
				|  |  |    enable: true
 | 
	
		
			
				|  |  |    #开启生产环境屏蔽
 | 
	
		
			
				|  |  | -  production: true
 | 
	
		
			
				|  |  | +  production: false
 | 
	
		
			
				|  |  |    basic:
 | 
	
		
			
				|  |  | -    enable: true
 | 
	
		
			
				|  |  | +    enable: false
 | 
	
		
			
				|  |  |      username: jeecg
 | 
	
		
			
				|  |  |      password: jeecg1314
 | 
	
		
			
				|  |  |  #第三方登录
 |