From 2025087a8dec8f2d301459b9d41c9ef00f6f9289 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 19 七月 2023 17:51:41 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml | 152 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 98 insertions(+), 54 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml index 24eb247..f283218 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml @@ -1,76 +1,120 @@ #鏈嶅姟鍣ㄧ鍙� server: - port: 36013 - + port: 36014 + tomcat: + uri-encoding: UTF-8 + servlet: + encoding: + enabled: true + charset: UTF-8 + force: true #鏁版嵁婧愰厤缃� spring: datasource: - url: ${blade.datasource.dev.url} - username: ${blade.datasource.dev.username} - password: ${blade.datasource.dev.password} + url: ${ubcs.datasource.mdm.dev.url} + username: ${ubcs.datasource.mdm.dev.username} + password: ${ubcs.datasource.mdm.dev.password} messages: - encoding: UTF-8 + encoding: utf-8 basename: i18n/messages +#鍏抽棴椹煎嘲鍛藉悕鏄犲皠 +mybatis-plus: + configuration: + map-underscore-to-camel-case: false + call-setters-on-nulls: true -#####搴旂敤鍩烘湰閰嶇疆 -app: - name: web - group: 鍖椾含瀹忓崥杩滆揪绉戞妧鏈夐檺鍏徃 - description: 骞冲彴B/S瀹㈡埛绔� - private-token-key: vciweb20210212 -###鏈」鐩殑閰嶇疆锛屾敞鎰弒pring瀹舵棌璇诲彇閰嶇疆鏃讹紝澶у啓瀛楁瘝闇�瑕佽浆鎹负-鐨勬柟寮忥紝鑰宖eign闇�瑕佸ぇ灏忓啓瀹屽叏鐩稿悓 -session: - session-info-storage-type: "database" - database-platform: oracle - clear-session-on-start: false - ###鏄惁寮�鍚敤鎴峰湪绾挎鏌� - checkSessionTimeout: false - ###瀹㈡埛绔垽鏂秴鏃惰疆璇㈡椂闂达紝鍗曚綅涓虹 - sessionInterval: 10 - ###瀹㈡埛绔渶澶у瓨鍦ㄦ椂闂达紝鍗曚綅涓哄垎閽� - sessionIdlTime: 30 - ###瓒呮椂鎻愰啋鏃堕棿锛屽崟浣嶄负鍒嗛挓 - sessionRemind: 3 -user-table-compatibility: "platform1" -#鍙�2021鐗堟湰鐨勯儴鍒嗘帴鍙g殑褰卞搷锛屼笅闈㈢殑鍐呭闇�瑕侀厤缃紝 -vciPlatform: - objectServiceUrl: "" - cache: - type: ehcache - -##web閰嶇疆 -vciweb: - debug: true -file-preview: - enabled: true - preview-service-url: "http://dev.yunkeruida.top:28090/vciFilePreview/ajaxPreview.html" - preview-system-key: plt2020 -docking: - #鏄惁寮�鍚富鏁版嵁/鍒嗙被鏁版嵁鎺ㄩ�佸悓姝� - insertCache2: false - cron: 0 0/1 * * * ? - #棰勭敵璇锋暟鎹紝閰嶇疆妯℃澘鏂囦欢瀛樻斁鐨勬枃浠跺す - templateDir: D:\desktop - tranTemp: D:\mes - #鍥惧彿鐨刱ey - tuhao: tuhao - +#椤跺眰鎵归噺鐢宠閰嶇疆 +batchadd: + exportattr: + type: 鍩烘湰淇℃伅 + redis: + time: 6000000 +#缁熶竴鎺ュ彛灞炴�ф槧灏勬枃浠堕厤缃� +attrconfig: + #绯荤粺闆嗘垚 + system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml} +#鏁版嵁瀹氭椂鎺ㄩ�侀厤缃� dataSyncPush: isStart: false cronTime: "0 0/1 * * * ?" dataParamName: dataString dataTranTemp: D:\desktop +#鍒嗙被瀹氭椂鎺ㄩ�侀厤缃� clsfSyncPush: isStart: false cronTime: "0 0/1 * * * ?" dataParamName: dataString dataTranTemp: D:\desktop +#缁熶竴鎺ュ彛鐩稿叧閰嶇疆 +code: + universalinterface: + checkSystemConfig: false + attrconfig: + #绯荤粺闆嗘垚 + system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml} -attrconfig: - #绯荤粺闆嗘垚 - system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml} - #MPM鏋氫妇鍊煎睘鎬ф槧灏� - mpmEnumMap: {partType: [{enumValue: 1,enumText: 浜у搧},{enumValue: 2,enumText: 浜у搧},{'enumValue': 3,enumText: 鏍囧噯浠秨,{'enumValue': 7,enumText: 鏉愭枡}]} +#mybatis-plus-join: +# table-alias: t +######搴旂敤鍩烘湰閰嶇疆 +#app: +# name: web +# group: 鍖椾含瀹忓崥杩滆揪绉戞妧鏈夐檺鍏徃 +# description: 骞冲彴B/S瀹㈡埛绔� +# private-token-key: vciweb20210212 + +###鏈」鐩殑閰嶇疆锛屾敞鎰弒pring瀹舵棌璇诲彇閰嶇疆鏃讹紝澶у啓瀛楁瘝闇�瑕佽浆鎹负-鐨勬柟寮忥紝鑰宖eign闇�瑕佸ぇ灏忓啓瀹屽叏鐩稿悓 +#session: +# session-info-storage-type: "database" +# database-platform: oracle +# clear-session-on-start: false +# ###鏄惁寮�鍚敤鎴峰湪绾挎鏌� +# checkSessionTimeout: false +# ###瀹㈡埛绔垽鏂秴鏃惰疆璇㈡椂闂达紝鍗曚綅涓虹 +# sessionInterval: 10 +# ###瀹㈡埛绔渶澶у瓨鍦ㄦ椂闂达紝鍗曚綅涓哄垎閽� +# sessionIdlTime: 30 +# ###瓒呮椂鎻愰啋鏃堕棿锛屽崟浣嶄负鍒嗛挓 +# sessionRemind: 3 +#user-table-compatibility: "platform1" +##鍙�2021鐗堟湰鐨勯儴鍒嗘帴鍙g殑褰卞搷锛屼笅闈㈢殑鍐呭闇�瑕侀厤缃紝 +#vciPlatform: +# objectServiceUrl: "" +# cache: +## type: ehcache +# +###web閰嶇疆 +#vciweb: +# debug: true +#file-preview: +# enabled: true +# preview-service-url: "http://dev.yunkeruida.top:28090/vciFilePreview/ajaxPreview.html" +# preview-system-key: plt2020 +#docking: +# #鏄惁寮�鍚富鏁版嵁/鍒嗙被鏁版嵁鎺ㄩ�佸悓姝� +# insertCache2: false +# cron: 0 0/1 * * * ? +# #棰勭敵璇锋暟鎹紝閰嶇疆妯℃澘鏂囦欢瀛樻斁鐨勬枃浠跺す +# templateDir: D:\desktop +# tranTemp: D:\mes +# #鍥惧彿鐨刱ey +# tuhao: tuhao +# +#dataSyncPush: +# isStart: false +# cronTime: "0 0/1 * * * ?" +# dataParamName: dataString +# dataTranTemp: D:\desktop +#clsfSyncPush: +# isStart: false +# cronTime: "0 0/1 * * * ?" +# dataParamName: dataString +# dataTranTemp: D:\desktop +# +#attrconfig: +# #绯荤粺闆嗘垚 +# system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml} +# #MPM鏋氫妇鍊煎睘鎬ф槧灏� +# mpmEnumMap: {partType: [{enumValue: 1,enumText: 浜у搧},{enumValue: 2,enumText: 浜у搧},{'enumValue': 3,enumText: 鏍囧噯浠秨,{'enumValue': 7,enumText: 鏉愭枡}]} -- Gitblit v1.9.3