From 8d36924cb6ce265d32cfb4a4b469273f3e451c65 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 10 五月 2022 16:15:12 +0800
Subject: [PATCH] fix 修复 sqlserver 新增数据 id 错误

---
 ruoyi-admin/src/main/resources/application.yml |  286 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 222 insertions(+), 64 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 828966e..56076b3 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -1,19 +1,28 @@
 # 椤圭洰鐩稿叧閰嶇疆
 ruoyi:
   # 鍚嶇О
-  name: RuoYi
+  name: RuoYi-Vue-Plus
   # 鐗堟湰
-  version: 3.1.0
+  version: ${ruoyi-vue-plus.version}
   # 鐗堟潈骞翠唤
-  copyrightYear: 2019
+  copyrightYear: 2022
   # 瀹炰緥婕旂ず寮�鍏�
   demoEnabled: true
-  # 鏂囦欢璺緞,浣跨敤jvm绯荤粺鍙橀噺,鍏煎windows鍜宭inux;
-  profile: ${user.home}/ruoyi/uploadPath
   # 鑾峰彇ip鍦板潃寮�鍏�
-  addressEnabled: false
+  addressEnabled: true
+  # 缂撳瓨鎳掑姞杞�
+  cacheLazy: false
+
+captcha:
+  # 椤甸潰 <鍙傛暟璁剧疆> 鍙紑鍚叧闂� 楠岃瘉鐮佹牎楠�
   # 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
-  captchaType: math
+  type: MATH
+  # line 绾挎骞叉壈 circle 鍦嗗湀骞叉壈 shear 鎵洸骞叉壈
+  category: CIRCLE
+  # 鏁板瓧楠岃瘉鐮佷綅鏁�
+  numberLength: 1
+  # 瀛楃楠岃瘉鐮侀暱搴�
+  charLength: 4
 
 # 寮�鍙戠幆澧冮厤缃�
 server:
@@ -22,92 +31,160 @@
   servlet:
     # 搴旂敤鐨勮闂矾寰�
     context-path: /
+  # undertow 閰嶇疆
   undertow:
-    # 璁剧疆IO绾跨▼鏁�, 瀹冧富瑕佹墽琛岄潪闃诲鐨勪换鍔�,瀹冧滑浼氳礋璐ｅ涓繛鎺�, 榛樿璁剧疆姣忎釜CPU鏍稿績涓�涓嚎绋�
-    io-threads: 8
-    # 闃诲浠诲姟绾跨▼姹�, 褰撴墽琛岀被浼約ervlet璇锋眰闃诲鎿嶄綔, undertow浼氫粠杩欎釜绾跨▼姹犱腑鍙栧緱绾跨▼,瀹冪殑鍊艰缃彇鍐充簬绯荤粺鐨勮礋杞�
-    worker-threads: 256
+    # HTTP post鍐呭鐨勬渶澶уぇ灏忋�傚綋鍊间负-1鏃讹紝榛樿鍊间负澶у皬鏄棤闄愮殑
+    max-http-post-size: -1
     # 浠ヤ笅鐨勯厤缃細褰卞搷buffer,杩欎簺buffer浼氱敤浜庢湇鍔″櫒杩炴帴鐨処O鎿嶄綔,鏈夌偣绫讳技netty鐨勬睜鍖栧唴瀛樼鐞�
     # 姣忓潡buffer鐨勭┖闂村ぇ灏�,瓒婂皬鐨勭┖闂磋鍒╃敤瓒婂厖鍒�
     buffer-size: 512
     # 鏄惁鍒嗛厤鐨勭洿鎺ュ唴瀛�
     direct-buffers: true
+    threads:
+      # 璁剧疆IO绾跨▼鏁�, 瀹冧富瑕佹墽琛岄潪闃诲鐨勪换鍔�,瀹冧滑浼氳礋璐ｅ涓繛鎺�, 榛樿璁剧疆姣忎釜CPU鏍稿績涓�涓嚎绋�
+      io: 8
+      # 闃诲浠诲姟绾跨▼姹�, 褰撴墽琛岀被浼約ervlet璇锋眰闃诲鎿嶄綔, undertow浼氫粠杩欎釜绾跨▼姹犱腑鍙栧緱绾跨▼,瀹冪殑鍊艰缃彇鍐充簬绯荤粺鐨勮礋杞�
+      worker: 256
 
 # 鏃ュ織閰嶇疆
 logging:
   level:
-    com.ruoyi: debug
+    com.ruoyi: @logging.level@
     org.springframework: warn
+  config: classpath:logback.xml
 
 # Spring閰嶇疆
 spring:
+  application:
+    name: ${ruoyi.name}
   # 璧勬簮淇℃伅
   messages:
     # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
     basename: i18n/messages
-  profiles: 
-    active: dev
+  profiles:
+    active: @profiles.active@
   # 鏂囦欢涓婁紶
   servlet:
-     multipart:
-       # 鍗曚釜鏂囦欢澶у皬
-       max-file-size:  10MB
-       # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
-       max-request-size:  20MB
+    multipart:
+      # 鍗曚釜鏂囦欢澶у皬
+      max-file-size: 10MB
+      # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
+      max-request-size: 20MB
   # 鏈嶅姟妯″潡
   devtools:
     restart:
       # 鐑儴缃插紑鍏�
       enabled: true
+  mvc:
+    pathmatch:
+      # 閫傞厤 boot 2.6 璺敱涓� springfox 鍏煎
+      matching-strategy: ANT_PATH_MATCHER
+  jackson:
+    # 鏃ユ湡鏍煎紡鍖�
+    date-format: yyyy-MM-dd HH:mm:ss
+    serialization:
+      # 鏍煎紡鍖栬緭鍑�
+      indent_output: false
+      # 蹇界暐鏃犳硶杞崲鐨勫璞�
+      fail_on_empty_beans: false
+    deserialization:
+      # 鍏佽瀵硅薄蹇界暐json涓笉瀛樺湪鐨勫睘鎬�
+      fail_on_unknown_properties: false
 
-# token閰嶇疆
-token:
-    # 浠ょ墝鑷畾涔夋爣璇�
-    header: Authorization
-    # 浠ょ墝瀵嗛挜
-    secret: abcdefghijklmnopqrstuvwxyz
-    # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
-    expireTime: 30
+# Sa-Token閰嶇疆
+sa-token:
+  # token鍚嶇О (鍚屾椂涔熸槸cookie鍚嶇О)
+  token-name: Authorization
+  # token鏈夋晥鏈� 璁句负涓�澶� (蹇呭畾杩囨湡) 鍗曚綅: 绉�
+  timeout: 86400
+  # token涓存椂鏈夋晥鏈� (鎸囧畾鏃堕棿鏃犳搷浣滃氨杩囨湡) 鍗曚綅: 绉�
+  activity-timeout: 1800
+  # 鏄惁鍏佽鍚屼竴璐﹀彿骞跺彂鐧诲綍 (涓簍rue鏃跺厑璁镐竴璧风櫥褰�, 涓篺alse鏃舵柊鐧诲綍鎸ゆ帀鏃х櫥褰�)
+  is-concurrent: true
+  # 鍦ㄥ浜虹櫥褰曞悓涓�璐﹀彿鏃讹紝鏄惁鍏辩敤涓�涓猼oken (涓簍rue鏃舵墍鏈夌櫥褰曞叡鐢ㄤ竴涓猼oken, 涓篺alse鏃舵瘡娆＄櫥褰曟柊寤轰竴涓猼oken)
+  is-share: false
+  # 鏄惁灏濊瘯浠巋eader閲岃鍙杢oken
+  is-read-head: true
+  # 鏄惁灏濊瘯浠巆ookie閲岃鍙杢oken
+  is-read-cookie: false
+  # token鍓嶇紑
+  token-prefix: "Bearer"
+  # jwt绉橀挜
+  jwt-secret-key: abcdefghijklmnopqrstuvwxyz
+  # 鏄惁杈撳嚭鎿嶄綔鏃ュ織
+  is-log: true
 
-# MyBatis閰嶇疆
+# security閰嶇疆
+security:
+  # 鎺掗櫎璺緞
+  excludes:
+    - /login
+    - /smsLogin
+    - /xcxLogin
+    - /logout
+    - /register
+    - /captchaImage
+    - /captchaSms
+    # 闈欐�佽祫婧�
+    - /*.html
+    - /**/*.html
+    - /**/*.css
+    - /**/*.js
+    # swagger 鏂囨。閰嶇疆
+    - /favicon.ico
+    - /doc.html
+    - /swagger-resources/**
+    - /webjars/**
+    - /*/api-docs
+    # druid 鐩戞帶閰嶇疆
+    - /druid/**
+    # actuator 鐩戞帶閰嶇疆
+    - /actuator
+    - /actuator/**
+
+# MyBatisPlus閰嶇疆
+# https://baomidou.com/config/
 mybatis-plus:
-  mapper-locations: classpath*:mapper/**/*Mapper.xml
-  #瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
+  # 涓嶆敮鎸佸鍖�, 濡傛湁闇�瑕佸彲鍦ㄦ敞瑙ｉ厤缃� 鎴� 鎻愬崌鎵寘绛夌骇
+  # 渚嬪 com.**.**.mapper
+  mapperPackage: com.ruoyi.**.mapper
+  # 瀵瑰簲鐨� XML 鏂囦欢浣嶇疆
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
   typeAliasesPackage: com.ruoyi.**.domain
+  # 鍚姩鏃舵槸鍚︽鏌� MyBatis XML 鏂囦欢鐨勫瓨鍦紝榛樿涓嶆鏌�
+  checkConfigLocation: false
   configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: true
+    # 鑷姩椹煎嘲鍛藉悕瑙勫垯锛坈amel case锛夋槧灏�
+    mapUnderscoreToCamelCase: true
+    # MyBatis 鑷姩鏄犲皠绛栫暐
+    # NONE锛氫笉鍚敤 PARTIAL锛氬彧瀵归潪宓屽 resultMap 鑷姩鏄犲皠 FULL锛氬鎵�鏈� resultMap 鑷姩鏄犲皠
+    autoMappingBehavior: PARTIAL
+    # MyBatis 鑷姩鏄犲皠鏃舵湭鐭ュ垪鎴栨湭鐭ュ睘鎬у鐞嗙瓥
+    # NONE锛氫笉鍋氬鐞� WARNING锛氭墦鍗扮浉鍏宠鍛� FAILING锛氭姏鍑哄紓甯稿拰璇︾粏淇℃伅
+    autoMappingUnknownColumnBehavior: NONE
+    # 鏇磋缁嗙殑鏃ュ織杈撳嚭 浼氭湁鎬ц兘鎹熻�� org.apache.ibatis.logging.stdout.StdOutImpl
+    # 鍏抽棴鏃ュ織璁板綍 (鍙崟绾娇鐢� p6spy 鍒嗘瀽) org.apache.ibatis.logging.nologging.NoLoggingImpl
+    # 榛樿鏃ュ織杈撳嚭 org.apache.ibatis.logging.slf4j.Slf4jImpl
+    logImpl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:
-    banner: false
-    #鍒锋柊mapper 璋冭瘯绁炲櫒
-    refresh: true
-    db-config:
-      #涓婚敭绫诲瀷  0:"鏁版嵁搴揑D鑷", 1:"鐢ㄦ埛杈撳叆ID",2:"鍏ㄥ眬鍞竴ID (鏁板瓧绫诲瀷鍞竴ID)", 3:"鍏ㄥ眬鍞竴ID UUID";
-      id-type: auto
-      #瀛楁绛栫暐 0:"蹇界暐鍒ゆ柇",1:"闈� NULL 鍒ゆ柇"),2:"闈炵┖鍒ゆ柇"
-      field-strategy: not_empty
-      #椹煎嘲涓嬪垝绾胯浆鎹�
-      db-column-underline: true
-      #鏁版嵁搴撳ぇ鍐欎笅鍒掔嚎杞崲
-      #capital-mode: true
-      #搴忓垪鎺ュ彛瀹炵幇绫婚厤缃�
-      #key-generator: com.baomidou.springboot.xxx
-      #閫昏緫鍒犻櫎閰嶇疆
-      logic-delete-value: 1
-      logic-not-delete-value: 0
-      #鏁版嵁搴撶被鍨�
-      db-type: mysql
-    #鑷畾涔塖QL娉ㄥ叆鍣�
-    #sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
-    #鑷畾涔夊～鍏呯瓥鐣ユ帴鍙ｅ疄鐜�
-    #meta-object-handler: com.baomidou.springboot.xxx
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper: 
-  helperDialect: mysql
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql 
+    # 鏄惁鎵撳嵃 Logo banner
+    banner: true
+    dbConfig:
+      # 涓婚敭绫诲瀷
+      # AUTO 鑷 NONE 绌� INPUT 鐢ㄦ埛杈撳叆 ASSIGN_ID 闆姳 ASSIGN_UUID 鍞竴 UUID
+      idType: ASSIGN_ID
+      # 閫昏緫宸插垹闄ゅ��
+      logicDeleteValue: 2
+      # 閫昏緫鏈垹闄ゅ��
+      logicNotDeleteValue: 0
+      # 瀛楁楠岃瘉绛栫暐涔� insert,鍦� insert 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
+      # IGNORED 蹇界暐 NOT_NULL 闈濶ULL NOT_EMPTY 闈炵┖ DEFAULT 榛樿 NEVER 涓嶅姞鍏� SQL
+      insertStrategy: NOT_NULL
+      # 瀛楁楠岃瘉绛栫暐涔� update,鍦� update 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐
+      updateStrategy: NOT_NULL
+      # 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢
+      where-strategy: NOT_NULL
 
 # Swagger閰嶇疆
 swagger:
@@ -115,12 +192,93 @@
   enabled: true
   # 璇锋眰鍓嶇紑
   pathMapping: /dev-api
+  # 鏍囬
+  title: '鏍囬锛�${ruoyi.name}鍚庡彴绠＄悊绯荤粺_鎺ュ彛鏂囨。'
+  # 鎻忚堪
+  description: '鎻忚堪锛氱敤浜庣鐞嗛泦鍥㈡棗涓嬪叕鍙哥殑浜哄憳淇℃伅,鍏蜂綋鍖呮嫭XXX,XXX妯″潡...'
+  # 鐗堟湰
+  version: '鐗堟湰鍙�: ${ruoyi-vue-plus.version}'
+  # 浣滆�呬俊鎭�
+  contact:
+    name: Lion Li
+    email: crazylionli@163.com
+    url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
+  groups:
+    - name: 1.婕旂ず妗堜緥
+      basePackage: com.ruoyi.demo
+    - name: 2.绯荤粺妯″潡
+      basePackage: com.ruoyi.web
+    - name: 3.浠ｇ爜鐢熸垚妯″潡
+      basePackage: com.ruoyi.generator
+
+knife4j:
+  # 鏄惁寮�鍚疜nife4j澧炲己妯″紡
+  enable: true
+  # 鏄惁寮�鍚敓浜х幆澧冧繚鎶ょ瓥鐣�
+  production: @knife4j.production@
+  basic:
+    enable: true
+    username: ruoyi
+    password: 123456
+  # 鍓嶇Ui鐨勪釜鎬у寲閰嶇疆灞炴��
+  setting:
+    # 榛樿璇█
+    language: zh-CN
+    # 鏄惁鏄剧ずFooter
+    enableFooter: false
+    # 鏄惁寮�鍚姩鎬佸弬鏁拌皟璇曞姛鑳�
+    enableDynamicParameter: true
+    # 鏄惁鍦ㄦ瘡涓狣ebug璋冭瘯鏍忓悗鏄剧ず鍒锋柊鍙橀噺鎸夐挳
+    enableReloadCacheParameter: true
 
 # 闃叉XSS鏀诲嚮
-xss: 
+xss:
   # 杩囨护寮�鍏�
   enabled: true
   # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
-  excludes: /system/notice/*
+  excludes: /system/notice
   # 鍖归厤閾炬帴
   urlPatterns: /system/*,/monitor/*,/tool/*
+
+# 鍏ㄥ眬绾跨▼姹犵浉鍏抽厤缃�
+thread-pool:
+  # 鏄惁寮�鍚嚎绋嬫睜
+  enabled: false
+  # 闃熷垪鏈�澶ч暱搴�
+  queueCapacity: 128
+  # 绾跨▼姹犵淮鎶ょ嚎绋嬫墍鍏佽鐨勭┖闂叉椂闂�
+  keepAliveSeconds: 300
+
+--- # redisson 缂撳瓨閰嶇疆
+redisson:
+  cacheGroup:
+    # 鐢ㄤ緥: @Cacheable(cacheNames="groupId", key="#XXX") 鏂瑰彲浣跨敤缂撳瓨缁勯厤缃�
+    - groupId: redissonCacheMap
+      # 缁勮繃鏈熸椂闂�(鑴氭湰鐩戞帶)
+      ttl: 60000
+      # 缁勬渶澶х┖闂叉椂闂�(鑴氭湰鐩戞帶)
+      maxIdleTime: 60000
+      # 缁勬渶澶ч暱搴�
+      maxSize: 0
+    - groupId: testCache
+      ttl: 1000
+      maxIdleTime: 500
+
+--- # 鍒嗗竷寮忛攣 lock4j 鍏ㄥ眬閰嶇疆
+lock4j:
+  # 鑾峰彇鍒嗗竷寮忛攣瓒呮椂鏃堕棿锛岄粯璁や负 3000 姣
+  acquire-timeout: 3000
+  # 鍒嗗竷寮忛攣鐨勮秴鏃舵椂闂达紝榛樿涓� 30 姣
+  expire: 30000
+
+--- # Actuator 鐩戞帶绔偣鐨勯厤缃」
+management:
+  endpoints:
+    web:
+      exposure:
+        # 闇�瑕佸紑鏀剧殑绔偣銆傞粯璁ゅ�煎彧鎵撳紑 health 鍜� info 涓や釜绔偣銆傞�氳繃璁剧疆 * 锛屽彲浠ュ紑鏀炬墍鏈夌鐐广��
+        # 鐢熶骇鐜涓嶅缓璁斁寮�鎵�鏈� 鏍规嵁椤圭洰闇�姹傛斁寮�鍗冲彲
+        include: @endpoints.include@
+  endpoint:
+    logfile:
+      external-file: ./logs/sys-console.log

--
Gitblit v1.9.3